Merge remote-tracking branch 'upstream/master'

smaret · Sep 10, 2024 · b3904fc · b3904fc
2 parents 424ad8d + 06c636d
commit b3904fc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git 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
@@ -1,9 +1,10 @@
 { pkgs ? import <nixpkgs> { } }:
 
 {
-  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
diff --git 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});
     };
 }