From b3d75f7b455ec22a1280d18189f120c40ecd5cd9 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Thu, 9 Oct 2025 22:21:33 +0300 Subject: [PATCH 1/3] 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 --- ci/pinned.json | 12 ++++++------ nixos/tests/k3s/auto-deploy-charts.nix | 19 ++++++++++--------- .../misc/openmodelica/omlibrary/fakegit.nix | 6 +++--- pkgs/by-name/te/textadept/package.nix | 6 +++--- 4 files changed, 22 insertions(+), 21 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/nixos/tests/k3s/auto-deploy-charts.nix b/nixos/tests/k3s/auto-deploy-charts.nix index 827640b02fd4..18339e201482 100644 --- a/nixos/tests/k3s/auto-deploy-charts.nix +++ b/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 = /. - + builtins.unsafeDiscardStringContext ( - builtins.toFile "k3s-test-chart-values.yaml" '' - runCommand: "echo 'Hello, file!'" - image: - repository: test.local/test - tag: local - '' - ); + values = + /. + + builtins.unsafeDiscardStringContext ( + builtins.toFile "k3s-test-chart-values.yaml" '' + runCommand: "echo 'Hello, file!'" + image: + repository: test.local/test + tag: local + '' + ); }; # advanced chart that should get installed in the "test" namespace with a custom # timeout and overridden values 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 92f2175245c9..18f4fb1a6bf7 100644 --- a/pkgs/by-name/te/textadept/package.nix +++ b/pkgs/by-name/te/textadept/package.nix @@ -36,9 +36,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 = { From dd9fbf60a7167fe933a1ee5fee01a7f9476d5771 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Sun, 26 Oct 2025 00:00:02 -0700 Subject: [PATCH 2/3] qt6.qtbase: override bad cmakeFlag in setup hook; fix finding frameworks This essentially applies https://github.com/NixOS/nixpkgs/pull/455592 to qtbase (and thus all packages depending on Qt on Darwin) without rebuilding the world. We're doing this so that Qt-based applications will be fixed faster than the time it takes to wait for a staging cycle. --- pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index ab35d1906f73..b16805ed09c2 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -292,6 +292,9 @@ stdenv.mkDerivation rec { # When this variable is not set, cmake tries to execute xcodebuild # to query the version. "-DQT_INTERNAL_XCODE_VERSION=0.1" + # This should be removed once https://github.com/NixOS/nixpkgs/pull/455592 makes it to master + # as it will become redundant. + "-DCMAKE_FIND_FRAMEWORK=FIRST" ] ++ lib.optionals isCrossBuild [ "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" From 10760f8ce61c8996877e458a3b55a8b78c6a9e24 Mon Sep 17 00:00:00 2001 From: goatastronaut0212 Date: Mon, 27 Oct 2025 14:46:07 +0700 Subject: [PATCH 3/3] maintainers: remove astronaut0212 --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/ca/caprine/package.nix | 1 - .../tools/inputmethods/ibus-engines/ibus-bamboo/default.nix | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7ca954e260cd..f5a59cd265ae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2360,12 +2360,6 @@ name = "Vincent Fischer"; keys = [ { fingerprint = "BF47 81E1 F304 1ADF 18CE C401 DE16 C7D1 536D A72F"; } ]; }; - astronaut0212 = { - email = "goatastronaut0212@outlook.com"; - github = "goatastronaut0212"; - githubId = 119769817; - name = "goatastronaut0212"; - }; asymmetric = { email = "lorenzo@mailbox.org"; github = "asymmetric"; diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index 17d78ba28d9b..a59ef46cfc20 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -90,7 +90,6 @@ buildNpmPackage rec { homepage = "https://github.com/sindresorhus/caprine"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - astronaut0212 khaneliman ]; inherit (electron.meta) platforms; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix index 3341b2ff2ed5..df9a14bddd2c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/BambooEngine/ibus-bamboo"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ astronaut0212 ]; + maintainers = [ ]; }; }