diff --git a/flake.lock b/flake.lock index 93c7ca0..842552d 100644 --- a/flake.lock +++ b/flake.lock @@ -15,56 +15,7 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1649676176, - "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nix-dart": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs", - "pub2nix": "pub2nix" - }, - "locked": { - "lastModified": 1652213615, - "narHash": "sha256-+eehm2JlhoKgY+Ea4DTxDMei/x4Fgz7S+ZPqWpZysuI=", - "owner": "tadfisher", - "repo": "nix-dart", - "rev": "6f686ddf984306d944e9b5adf9f35f3a0a0a70b7", - "type": "github" - }, - "original": { - "owner": "tadfisher", - "repo": "nix-dart", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1652133925, - "narHash": "sha256-kfATGChLe9/fQVZkXN9G71JAVMlhePv1qDbaRKklkQs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "51d859cdab1ef58755bd342d45352fc607f5e59b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1667610399, "narHash": "sha256-XZd0f4ZWAY0QOoUSdiNWj/eFiKb4B9CJPtl9uO9SYY4=", @@ -80,27 +31,10 @@ "type": "github" } }, - "pub2nix": { - "flake": false, - "locked": { - "lastModified": 1594192744, - "narHash": "sha256-pDvcXSG1Mh2BpwkqAcNDJzcupV3pIAAtZJLfkiHMAz4=", - "owner": "paulyoung", - "repo": "pub2nix", - "rev": "0c7ecca590fcd1616db8c6468f799ffef36c85e9", - "type": "github" - }, - "original": { - "owner": "paulyoung", - "repo": "pub2nix", - "type": "github" - } - }, "root": { "inputs": { "flake-utils": "flake-utils", - "nix-dart": "nix-dart", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 3ed37f4..e7fe485 100644 --- a/flake.nix +++ b/flake.nix @@ -3,23 +3,15 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; - nix-dart.url = "github:tadfisher/nix-dart"; }; - outputs = { self, nixpkgs, flake-utils, nix-dart }: flake-utils.lib.eachDefaultSystem (system: let + outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; config = { android_sdk.accept_license = true; allowUnfree = true; }; - - overlays = [ - (prev: final: { - pub2nix-lock = nix-dart.packages."${system}".pub2nix-lock; - buildDartPackage = (nix-dart.overlay prev final).buildDartPackage; - }) - ]; }; android = pkgs.androidenv.composeAndroidPackages { # TODO: Find a way to pin these @@ -56,7 +48,7 @@ devShell = pkgs.mkShell { buildInputs = with pkgs; [ - flutter pinnedJDK android.platform-tools dart pub2nix-lock # Dart + flutter pinnedJDK android.platform-tools dart # Dart gitlint # Code hygiene ripgrep # General utilities @@ -77,7 +69,7 @@ xorg.libX11 xorg.xorgproto - # Dev + # For the scripts in ./scripts/ pythonEnv ];