Merge pull request #21 from NixOS/fix-updates

Fix updates (another try)
NixOS · Mar 21, 2024 · febcf57 · febcf57
2 parents 4208244 + 4561070
commit febcf57
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 54 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,4 +13,4 @@ jobs:
       - uses: cachix/install-nix-action@v26
 
       - name: build
-        run: nix-build -A build -A shell -A checks
+        run: nix-build -A ci
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -17,7 +17,7 @@ jobs:
       - name: update
         run: |
           nix-build repo -A autoPrUpdate
-          result/bin/auto-pr-update > body
+          result/bin/auto-pr-update repo > body
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6

diff --git a/default.nix b/default.nix
@@ -30,63 +30,71 @@ let
     nix-store --init
   '';
 
-  build = pkgs.callPackage ./package.nix {
-    inherit nixpkgsLibPath initNix runtimeExprPath testNixpkgsPath;
-  };
 
-in
-build // {
+  results = {
+    build = pkgs.callPackage ./package.nix {
+      inherit nixpkgsLibPath initNix runtimeExprPath testNixpkgsPath;
+    };
 
-  inherit build;
+    shell = pkgs.mkShell {
+      env.NIX_CHECK_BY_NAME_EXPR_PATH = toString runtimeExprPath;
+      env.NIX_PATH = "test-nixpkgs=${toString testNixpkgsPath}:test-nixpkgs/lib=${toString nixpkgsLibPath}";
+      env.RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
+      inputsFrom = [ results.build ];
+      nativeBuildInputs = with pkgs; [
+        npins
+        rust-analyzer
+      ];
+    };
 
-  # Used by CI and good for debugging
-  inherit pkgs;
+    # Run regularly by CI and turned into a PR
+    autoPrUpdate = pkgs.writeShellApplication {
+      name = "auto-pr-update";
+      runtimeInputs = with pkgs; [
+        npins
+        cargo
+      ];
+      text =
+        let
+          commands = {
+            "npins changes" = ''
+              npins update --directory "$REPO_ROOT/npins"'';
+            "cargo changes" = ''
+              cargo update --manifest-path "$REPO_ROOT/Cargo.toml"'';
+          };
+        in
+        ''
+          REPO_ROOT=$1
+          echo "Run automated updates"
+        ''
+        + pkgs.lib.concatStrings (pkgs.lib.mapAttrsToList (title: command: ''
+          echo -e '<details><summary>${title}</summary>\n\n```'
+          ${command} 2>&1
+          echo -e '```\n</details>'
+        '') commands);
+    };
 
-  shell = pkgs.mkShell {
-    env.NIX_CHECK_BY_NAME_EXPR_PATH = toString runtimeExprPath;
-    env.NIX_PATH = "test-nixpkgs=${toString testNixpkgsPath}:test-nixpkgs/lib=${toString nixpkgsLibPath}";
-    env.RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
-    inputsFrom = [ build ];
-    nativeBuildInputs = with pkgs; [
-      npins
-      rust-analyzer
-    ];
+    # Tests the tool on the pinned Nixpkgs tree, this is a good sanity check
+    nixpkgsCheck = pkgs.runCommand "test-nixpkgs-check-by-name" {
+      nativeBuildInputs = [
+        results.build
+        pkgs.nix
+      ];
+      nixpkgsPath = nixpkgs;
+    } ''
+      ${initNix}
+      nixpkgs-check-by-name --base "$nixpkgsPath" "$nixpkgsPath"
+      touch $out
+    '';
   };
 
-  # Run regularly by CI and turned into a PR
-  autoPrUpdate = pkgs.writeShellApplication {
-    name = "auto-pr-update";
-    runtimeInputs = with pkgs; [
-      npins
-      cargo
-    ];
-    text =
-      let
-        commands = [
-          "npins update"
-          "cargo update"
-        ];
-      in
-      ''
-        echo "Run automated updates"
-      ''
-      + pkgs.lib.concatMapStrings (command: ''
-        echo -e '<details><summary>${command}</summary>\n\n```'
-        ${command} 2>&1
-        echo -e '```\n</details>'
-      '') commands;
-  };
+in
+results.build // results // {
+
+  # Good for debugging
+  inherit pkgs;
+
+  # Built by CI
+  ci = pkgs.linkFarm "ci" results;
 
-  # Tests the tool on the pinned Nixpkgs tree, this is a good sanity check
-  checks.nixpkgs = pkgs.runCommand "test-nixpkgs-check-by-name" {
-    nativeBuildInputs = [
-      build
-      pkgs.nix
-    ];
-    nixpkgsPath = nixpkgs;
-  } ''
-    ${initNix}
-    nixpkgs-check-by-name --base "$nixpkgsPath" "$nixpkgsPath"
-    touch $out
-  '';
 }