tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-10 01:33:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci/pinned: update

Browse source 
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:
5eda4ee812...f56b1934f5

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
This commit is contained in:
Sergei Zimmerman 2025-10-09 22:21:33 +03:00 committed by Wolfgang Walther
parent 266982a701
commit b3d75f7b45
No known key found for this signature in database
GPG key ID: B39893FA5F65CAE1
4 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ci/pinned.json
View file

@ -9,9 +9,9 @@
}, },
"branch": "nixpkgs-unstable", "branch": "nixpkgs-unstable",
"submodules": false, "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": { "treefmt-nix": {
"type": "Git", "type": "Git",
@ -22,9 +22,9 @@
}, },
"branch": "main", "branch": "main",
"submodules": false, "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 "version": 5

3
nixos/tests/k3s/auto-deploy-charts.nix
View file

@ -82,7 +82,8 @@ import ../make-test-python.nix (
values-file = testChart // { values-file = testChart // {
# Remove unsafeDiscardStringContext workaround when Nix can convert a string to a path # Remove unsafeDiscardStringContext workaround when Nix can convert a string to a path
# https://github.com/NixOS/nix/issues/12407 # https://github.com/NixOS/nix/issues/12407
values = /. values =
/.
+ builtins.unsafeDiscardStringContext ( + builtins.unsafeDiscardStringContext (
builtins.toFile "k3s-test-chart-values.yaml" '' builtins.toFile "k3s-test-chart-values.yaml" ''
runCommand: "echo 'Hello, file!'" runCommand: "echo 'Hello, file!'"

6
pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
View file

@ -29,9 +29,9 @@ stdenv.mkDerivation {
buildCommand = '' buildCommand = ''
mkdir -pv $out/repos 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" '' ${mkscript "$out/bin/checkout-git.sh" ''
if test "$#" -ne 4; then if test "$#" -ne 4; then

6
pkgs/by-name/te/textadept/package.nix
View file

@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
'' ''
+ lib.concatStringsSep "\n" ( + 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 = { meta = {