diff --git a/flake.lock b/flake.lock index e185afd6..75b2a71a 100644 --- a/flake.lock +++ b/flake.lock @@ -40,31 +40,15 @@ "locked": { "lastModified": 1, "narHash": "sha256-arp7Uy7ct5ryTcmSY032eN7hr33i7D2XvjTRLliCFDc=", - "path": "/nix/store/0nh60a9qln601acyd9774ymdshhz3s6r-source/nixpatches", + "path": "/nix/store/jblp2g67p3wid2qarcyd8bzrbs9wg5lb-source/nixpatches", "type": "path" }, "original": { - "path": "/nix/store/0nh60a9qln601acyd9774ymdshhz3s6r-source/nixpatches", + "path": "/nix/store/jblp2g67p3wid2qarcyd8bzrbs9wg5lb-source/nixpatches", "type": "path" } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1675061157, - "narHash": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f413457e0dd7a42adefdbcea4391dd9751509025", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1674352297, "narHash": "sha256-OkAnJPrauEcUCrst4/3DKoQfUn2gXKuU6CFvhtMrLgg=", @@ -100,7 +84,6 @@ "inputs": { "mobile-nixos": "mobile-nixos", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unpatched": "nixpkgs-unpatched", "sops-nix": "sops-nix", "uninsane-dot-org": "uninsane-dot-org" @@ -111,7 +94,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1674546403, diff --git a/flake.nix b/flake.nix index 7cca86ea..22414ccf 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ # but `inputs` is required to be a strict attrset: not an expression. inputs = { # - nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11"; + # nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11"; # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable"; @@ -46,12 +46,12 @@ outputs = { self, nixpkgs, - nixpkgs-stable, nixpkgs-unpatched, mobile-nixos, sops-nix, - uninsane-dot-org - }: + uninsane-dot-org, + ... + }@inputs: let nixpkgsCompiledBy = local: nixpkgs.legacyPackages."${local}"; @@ -117,9 +117,12 @@ pins = import ./overlays/pins.nix; # TODO: move to `nixpatches/` input passthru = let - stable = next: prev: { - stable = nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}"; - }; + stable = + if inputs ? "nixpkgs-stable" then ( + next: prev: { + stable = inputs.nixpkgs-stable.legacyPackages."${prev.stdenv.hostPlatform.system}"; + } + ) else (next: prev: {}); mobile = (import "${mobile-nixos}/overlay/overlay.nix"); uninsane = uninsane-dot-org.overlay; in