ci/pinned: update (#450451)

ci/pinned.json

@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "e57b3b16ad8758fd681511a078f35c416a8cc939",
+      "revision": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
-      "url": "https://github.com/NixOS/nixpkgs/archive/e57b3b16ad8758fd681511a078f35c416a8cc939.tar.gz",
+      "url": "https://github.com/NixOS/nixpkgs/archive/d5faa84122bc0a1fd5d378492efce4e289f8eac1.tar.gz",
-      "hash": "04zp6jjd4xr6jfps84p8yh5ym5962mii4825fn75lqk14sz4rq56"
+      "hash": "0r2pkx7m1pb0fzfhb74jkr8y5qhs2b93sak5bd5rabvbm2zn36zs"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
+      "revision": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2",
-      "url": "https://github.com/numtide/treefmt-nix/archive/5eda4ee8121f97b218f7cc73f5172098d458f1d1.tar.gz",
+      "url": "https://github.com/numtide/treefmt-nix/archive/f56b1934f5f8fcab8deb5d38d42fd692632b47c2.tar.gz",
-      "hash": "1vqns9hjhmbnhdq2xvcmdxng11jrmcn9lpk2ncfh1f969z9lj8y9"
+      "hash": "1klcfmqb4q4vvy9kdm5i9ddl26rhlyhf1mrd5aw1d4529bqnq5b5"
     }
   },
   "version": 5

nixos/tests/k3s/auto-deploy-charts.nix

@@ -82,15 +82,16 @@ import ../make-test-python.nix (
             values-file = testChart // {
               # Remove unsafeDiscardStringContext workaround when Nix can convert a string to a path
               # https://github.com/NixOS/nix/issues/12407
-              values = /.
+              values =
-              + builtins.unsafeDiscardStringContext (
+                /.
-                builtins.toFile "k3s-test-chart-values.yaml" ''
+                + builtins.unsafeDiscardStringContext (
-                  runCommand: "echo 'Hello, file!'"
+                  builtins.toFile "k3s-test-chart-values.yaml" ''
-                  image:
+                    runCommand: "echo 'Hello, file!'"
-                    repository: test.local/test
+                    image:
-                    tag: local
+                      repository: test.local/test
-                ''
+                      tag: local
-              );
+                  ''
+                );
             };
             # advanced chart that should get installed in the "test" namespace with a custom
             # timeout and overridden values

pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix

@@ -29,9 +29,9 @@ stdenv.mkDerivation {
 
   buildCommand = ''
     mkdir -pv $out/repos
-    ${lib.concatMapStrings (
+    ${lib.concatMapStrings (r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n") (
-      r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n"
+      import ./src-libs.nix
-    ) (import ./src-libs.nix)}
+    )}
 
     ${mkscript "$out/bin/checkout-git.sh" ''
       if test "$#" -ne 4; then

pkgs/by-name/te/textadept/package.nix

@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   ''
   + lib.concatStringsSep "\n" (
-    lib.mapAttrsToList (
+    lib.mapAttrsToList (name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}") (
-      name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}"
+      import ./deps.nix
-    ) (import ./deps.nix)
+    )
   );
 
   meta = {