Merge branch 'staging-next' into staging

Merging #245957 with #246022.
NixOS · Aug 21, 2023 · d494084 · d494084
2 parents ef4e037 + 5883668
commit d494084
Show file tree

Hide file tree

Showing 100 changed files with 6,337 additions and 10,562 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -170,6 +170,7 @@
 
 "6.topic: TeX":
   - doc/languages-frameworks/texlive.section.md
+  - pkgs/test/texlive/**
   - pkgs/tools/typesetting/tex/**/*
 
 "6.topic: vim":

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -749,5 +749,3 @@ Names of files and directories should be in lowercase, with dashes between words
 
   As an exception, an explicit conditional expression with null can be used when fixing a important bug without triggering a mass rebuild.
   If this is done a follow up pull request _should_ be created to change the code to `lib.optional(s)`.
-
-- Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first.
diff --git a/lib/customisation.nix b/lib/customisation.nix
@@ -278,9 +278,24 @@ rec {
         };
     in self;
 
+  /* backward compatibility with old uncurried form; deprecated */
+  makeScopeWithSplicing =
+    splicePackages: newScope: otherSplices: keep: extra: f:
+    makeScopeWithSplicing' {
+      inherit splicePackages newScope otherSplices keep extra f;
+    };
+
   /* Like the above, but aims to support cross compilation. It's still ugly, but
      hopefully it helps a little bit. */
-  makeScopeWithSplicing = splicePackages: newScope: otherSplices: keep: extra: f:
+  makeScopeWithSplicing' =
+    { splicePackages
+    , newScope
+    }:
+    { otherSplices
+    , keep ? (_self: {})
+    , extra ? (_spliced0: {})
+    , f
+    }:
     let
       spliced0 = splicePackages {
         pkgsBuildBuild = otherSplices.selfBuildBuild;
@@ -296,13 +311,11 @@ rec {
         callPackage = newScope spliced; # == self.newScope {};
         # N.B. the other stages of the package set spliced in are *not*
         # overridden.
-        overrideScope = g: makeScopeWithSplicing
-          splicePackages
-          newScope
-          otherSplices
-          keep
-          extra
-          (lib.fixedPoints.extends g f);
+        overrideScope = g: (makeScopeWithSplicing'
+          { inherit splicePackages newScope; }
+          { inherit otherSplices keep extra;
+            f = lib.fixedPoints.extends g f;
+          });
         packages = f;
       };
     in self;

diff --git a/lib/default.nix b/lib/default.nix
@@ -112,7 +112,7 @@ let
       noDepEntry fullDepEntry packEntry stringAfter;
     inherit (self.customisation) overrideDerivation makeOverridable
       callPackageWith callPackagesWith extendDerivation hydraJob
-      makeScope makeScopeWithSplicing;
+      makeScope makeScopeWithSplicing makeScopeWithSplicing';
     inherit (self.derivations) lazyDerivation;
     inherit (self.meta) addMetaAttrs dontDistribute setName updateName
       appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -10010,6 +10010,12 @@
     githubId = 8555953;
     name = "Laure Tavard";
   };
+  lu15w1r7h = {
+    email = "lwirth2000@gmail.com";
+    github = "LU15W1R7H";
+    githubId = 37505890;
+    name = "Luis Wirth";
+  };
   luc65r = {
     email = "lucas@ransan.tk";
     github = "luc65r";
@@ -15386,6 +15392,13 @@
       fingerprint = "7246 B6E1 ABB9 9A48 4395  FD11 DC26 B921 A9E9 DBDE";
     }];
   };
+  sfr = {
+    email = "sol@solfisher.com";
+    matrix = "@sfr:enby.space";
+    github = "solfisher";
+    githubId = 57151943;
+    name = "Sol Fisher Romanoff";
+  };
   sfrijters = {
     email = "sfrijters@gmail.com";
     github = "SFrijters";

diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/applications/audio/easyabc/default.nix
@@ -1,7 +1,23 @@
-{ lib, fetchFromGitHub, substituteAll, makeWrapper, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }:
+{ lib, fetchFromGitHub, fetchPypi, substituteAll, python39, fluidsynth, soundfont-fluid, wrapGAppsHook, abcmidi, abcm2ps, ghostscript }:
 
-# requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52
-python39.pkgs.buildPythonApplication {
+let
+  # requires python39 due to https://stackoverflow.com/a/71902541 https://github.com/jwdj/EasyABC/issues/52
+  python = python39.override {
+    self = python;
+    packageOverrides = self: super: {
+      # currently broken with 4.2.1
+      # https://github.com/jwdj/EasyABC/issues/75
+      wxPython_4_2 = super.wxPython_4_2.overrideAttrs (args: rec {
+        version = "4.2.0";
+        src = fetchPypi {
+          inherit version;
+          pname = "wxPython";
+          hash = "sha256-ZjzrxFCdfl0RNRiGX+J093+VQ0xdV7w4btWNZc7thsc=";
+        };
+      });
+    };
+  };
+in python.pkgs.buildPythonApplication {
   pname = "easyabc";
   version = "1.3.8.6";
 
@@ -14,7 +30,7 @@ python39.pkgs.buildPythonApplication {
 
   nativeBuildInputs = [ wrapGAppsHook ];
 
-  propagatedBuildInputs = with python39.pkgs; [
+  propagatedBuildInputs = with python.pkgs; [
     cx-freeze
     wxPython_4_2
     pygame
@@ -48,7 +64,7 @@ python39.pkgs.buildPythonApplication {
     ln -s ${abcmidi}/bin/abc2abc $out/share/easyabc/bin/abc2abc
     ln -s ${abcm2ps}/bin/abcm2ps $out/share/easyabc/bin/abcm2ps
 
-    makeWrapper ${python39.interpreter} $out/bin/easyabc \
+    makeWrapper ${python.interpreter} $out/bin/easyabc \
       --set PYTHONPATH "$PYTHONPATH:$out/share/easyabc" \
       --add-flags "-O $out/share/easyabc/easy_abc.py"