diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77888e9..21af51c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,9 +34,9 @@ jobs: cachixName: - smaret nixPath: - # - nixpkgs=channel:nixos-unstable - # - nixpkgs=channel:nixpkgs-unstable - - nixpkgs=channel:nixos-22.11 + - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixpkgs-unstable.tar.gz + - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-unstable.tar.gz + - nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-24.05.tar.gz runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/default.nix b/default.nix index 8812363..8b1dd23 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,10 @@ { pkgs ? import { } }: { - lib = import ./lib { inherit pkgs; }; - modules = import ./modules; - overlays = import ./overlays; + # The `lib`, `modules`, and `overlays` names are special + lib = import ./lib { inherit pkgs; }; # functions + modules = import ./modules; # NixOS modules + overlays = import ./overlays; # nixpkgs overlays astrochem = pkgs.python3Packages.toPythonModule ( pkgs.callPackage ./pkgs/astrochem { diff --git a/flake.lock b/flake.lock index a804412..78cf35d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1624561540, - "narHash": "sha256-izJ2PYZMGMsSkg+e7c9A1x3t/yOLT+qzUM6WQsc2tqo=", + "lastModified": 1712449641, + "narHash": "sha256-U9DDWMexN6o5Td2DznEgguh8TRIUnIl9levmit43GcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6a049a3d32293b24c0f894a840872cf67fd7c11", + "rev": "600b15aea1b36eeb43833a50b0e96579147099ff", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4c84ed7..81a143f 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,9 @@ forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system); in { - packages = forAllSystems (system: import ./default.nix { + legacyPackages = forAllSystems (system: import ./default.nix { pkgs = import nixpkgs { inherit system; }; }); + packages = forAllSystems (system: nixpkgs.lib.filterAttrs (_: v: nixpkgs.lib.isDerivation v) self.legacyPackages.${system}); }; }