From f788e310f70049d4aa533333bd3cc87314c2452e Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Thu, 9 Oct 2025 22:21:33 +0300 Subject: [PATCH] ci/pinned: update This gives us Nix 2.32 for use in CI's Eval job and nixfmt 1.1.0. From the nixpkgs-unstable channel: https://hydra.nixos.org/build/311062898#tabs-buildinputs Changes for treefmt-nix: https://github.com/numtide/treefmt-nix/compare/5eda4ee8121f97b218f7cc73f5172098d458f1d1...f56b1934f5f8fcab8deb5d38d42fd692632b47c2 Co-authored-by: Wolfgang Walther (cherry picked from commit b3d75f7b455ec22a1280d18189f120c40ecd5cd9) --- ci/pinned.json | 12 ++++++------ .../science/misc/openmodelica/omlibrary/fakegit.nix | 6 +++--- pkgs/by-name/te/textadept/package.nix | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/pinned.json b/ci/pinned.json index 4d5456837b2c..4451869289fd 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,9 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "e57b3b16ad8758fd681511a078f35c416a8cc939", - "url": "https://github.com/NixOS/nixpkgs/archive/e57b3b16ad8758fd681511a078f35c416a8cc939.tar.gz", - "hash": "04zp6jjd4xr6jfps84p8yh5ym5962mii4825fn75lqk14sz4rq56" + "revision": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "url": "https://github.com/NixOS/nixpkgs/archive/d5faa84122bc0a1fd5d378492efce4e289f8eac1.tar.gz", + "hash": "0r2pkx7m1pb0fzfhb74jkr8y5qhs2b93sak5bd5rabvbm2zn36zs" }, "treefmt-nix": { "type": "Git", @@ -22,9 +22,9 @@ }, "branch": "main", "submodules": false, - "revision": "5eda4ee8121f97b218f7cc73f5172098d458f1d1", - "url": "https://github.com/numtide/treefmt-nix/archive/5eda4ee8121f97b218f7cc73f5172098d458f1d1.tar.gz", - "hash": "1vqns9hjhmbnhdq2xvcmdxng11jrmcn9lpk2ncfh1f969z9lj8y9" + "revision": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", + "url": "https://github.com/numtide/treefmt-nix/archive/f56b1934f5f8fcab8deb5d38d42fd692632b47c2.tar.gz", + "hash": "1klcfmqb4q4vvy9kdm5i9ddl26rhlyhf1mrd5aw1d4529bqnq5b5" } }, "version": 5 diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix index b0509a8e97a9..6ad49d7655ba 100644 --- a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix +++ b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix @@ -29,9 +29,9 @@ stdenv.mkDerivation { buildCommand = '' mkdir -pv $out/repos - ${lib.concatMapStrings ( - r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n" - ) (import ./src-libs.nix)} + ${lib.concatMapStrings (r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n") ( + import ./src-libs.nix + )} ${mkscript "$out/bin/checkout-git.sh" '' if test "$#" -ne 4; then diff --git a/pkgs/by-name/te/textadept/package.nix b/pkgs/by-name/te/textadept/package.nix index c9e63785dae5..2c31b7ddc955 100644 --- a/pkgs/by-name/te/textadept/package.nix +++ b/pkgs/by-name/te/textadept/package.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.concatStringsSep "\n" ( - lib.mapAttrsToList ( - name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}" - ) (import ./deps.nix) + lib.mapAttrsToList (name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}") ( + import ./deps.nix + ) ); meta = {