From bad03d8cb8ff56e54503fe2a2128a04b1813df5a Mon Sep 17 00:00:00 2001 From: Slava Gorbunov Date: Thu, 26 Oct 2023 16:10:52 +0300 Subject: [PATCH 01/36] Disable global cache for emscripten --- pkgs/development/compilers/emscripten/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 37ccb5f1a02b..828e38659fca 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -54,8 +54,6 @@ stdenv.mkDerivation rec { # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py - # disables cache in user home, use installation directory instead - sed -i '/^def/!s/root_is_writable()/True/' tools/config.py sed -i "/^def check_sanity/a\\ return" tools/shared.py echo "EMSCRIPTEN_ROOT = '$out/share/emscripten'" > .emscripten From 75e326dcb79c6980bba267508a32ff9e7e5b0e45 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 4 Dec 2023 09:50:38 +0100 Subject: [PATCH 02/36] proj: 9.3.0 -> 9.3.1 --- pkgs/development/libraries/proj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index ce1f74f0b153..fedb1b003d96 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: rec { pname = "proj"; - version = "9.3.0"; + version = "9.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = version; - hash = "sha256-M1KUXzht4qIjPfHxvzPr7XUnisMwtbegKp18XQjNYHg="; + hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ="; }; patches = [ From 043094ee053e5f0e5b0a7c5517fb32c8c002bacd Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Mon, 4 Dec 2023 10:50:23 +0100 Subject: [PATCH 03/36] gdal: disable test failing with PROJ 9.3.1 --- pkgs/development/libraries/gdal/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 626c18352b03..5b30c5e1bf8d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -239,6 +239,9 @@ stdenv.mkDerivation (finalAttrs: { # fixed and renamed in 3.8.0RC1 # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29 "test_visoss_6" + # failing with PROJ 9.3.1 + # https://github.com/OSGeo/gdal/issues/8908 + "test_osr_esri_28" ] ++ lib.optionals (!stdenv.isx86_64) [ # likely precision-related expecting x87 behaviour "test_jp2openjpeg_22" From edd85e866c7655f7ebd0d99d8442928d815582a7 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Wed, 18 Oct 2023 02:24:28 -0400 Subject: [PATCH 04/36] gambit-unstable: 2023-10-07 -> 2023-12-04 --- pkgs/development/compilers/gambit/unstable.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 597cbedb13e3..f8c19640dd58 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,16 +1,16 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix rec { - version = "unstable-2023-10-07"; - git-version = "4.9.5-59-g342399c7"; - stampYmd = 20231007; - stampHms = 170745; - rev = "342399c736ec560c0ff4faeaeb9599b45633f26c"; + version = "unstable-2023-12-04"; + git-version = "4.9.5-84-g6b19d0c9"; + stampYmd = 20231204; + stampHms = 204859; + rev = "6b19d0c9084341306bbb7d6895321090a82988a0"; src = fetchFromGitHub { owner = "gambit"; repo = "gambit"; inherit rev; - sha256 = "121pj6lxihjjnfq33lq4m5hi461xbs9f41qd4l46556dr15cyf8f"; + sha256 = "0njcz9krak8nfyk3x6bc6m1rixzsjc1fyzhbz2g3aq5v8kz9mkl5"; }; gambit-params = gambit-support.unstable-params; } From 8859b057e3a97448cb9282521b25eb084841b7dd Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 3 Nov 2023 03:41:33 -0400 Subject: [PATCH 05/36] gerbil: 0.18 -> 0.18.1 --- pkgs/development/compilers/gerbil/build.nix | 24 ++++++------------- pkgs/development/compilers/gerbil/default.nix | 14 +++++------ 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 9ce26d0b21b2..a0922ff9ccac 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -24,17 +24,16 @@ stdenv.mkDerivation rec { buildInputs = buildInputs_libraries; postPatch = '' - echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; patchShebangs . ; grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; done ; - substituteInPlace ./configure --replace 'set -e' 'set -e ; git () { echo "v${git-version}" ;}' ; - substituteInPlace ./src/build/build-version.scm --replace "with-exception-catcher" '(lambda _ "v${git-version}")' ; - #rmdir src/gambit - #cp -a ${pkgs.gambit-unstable.src} ./src/gambit - chmod -R u+w ./src/gambit - ( cd src/gambit ; ${gambit-params.fixStamp gambit-git-version gambit-stampYmd gambit-stampHms} ) + cat > MANIFEST < Date: Wed, 18 Oct 2023 02:24:43 -0400 Subject: [PATCH 06/36] gerbil-unstable: 2023-10-13 -> 2023-12-05 --- pkgs/development/compilers/gerbil/unstable.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index a39371f00445..4b0d3289c107 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,18 +1,19 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support, pkgs, gccStdenv }: callPackage ./build.nix rec { - version = "unstable-2023-10-13"; - git-version = "0.18-2-g8ed012ff"; + version = "unstable-2023-12-06"; + git-version = "0.18.1"; src = fetchFromGitHub { owner = "mighty-gerbils"; repo = "gerbil"; - rev = "8ed012ff9571fcfebcc07815813001a3f356150d"; - sha256 = "056kmjn7sd0hjwikmg7v3a1kvgsgvfi7pi9xcx3ixym9g3bqa4mx"; + rev = "23c30a6062cd7e63f9d85300ce01585bb9035d2d"; + sha256 = "15fh0zqkmnjhan1mgymq5fgbjsh5z9d2v6zjddplqib5zd2s3z6k"; fetchSubmodules = true; }; inherit gambit-support; gambit-params = gambit-support.unstable-params; - gambit-git-version = "4.9.5-40-g24201248"; # pkgs.gambit-unstable.passthru.git-version - gambit-stampYmd = "20230917"; # pkgs.gambit-unstable.passthru.git-stampYmd - gambit-stampHms = "182043"; # pkgs.gambit-unstable.passthru.git-stampHms + # These are available in pkgs.gambit-unstable.passthru.git-version, etc. + gambit-git-version = "4.9.5-78-g8b18ab69"; + gambit-stampYmd = "20231029"; + gambit-stampHms = "163035"; } From 0a1d004bf26a5d7b886a4fe7a8cb2af1a90c9c30 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Wed, 18 Oct 2023 02:31:31 -0400 Subject: [PATCH 07/36] gerbilPackages-unstable: library updates --- pkgs/development/compilers/gerbil/ftw.nix | 8 ++++---- pkgs/development/compilers/gerbil/gerbil-crypto.nix | 8 ++++---- pkgs/development/compilers/gerbil/gerbil-ethereum.nix | 10 +++++----- pkgs/development/compilers/gerbil/gerbil-persist.nix | 8 ++++---- pkgs/development/compilers/gerbil/gerbil-poo.nix | 8 ++++---- pkgs/development/compilers/gerbil/gerbil-utils.nix | 8 ++++---- pkgs/development/compilers/gerbil/glow-lang.nix | 8 ++++---- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/development/compilers/gerbil/ftw.nix b/pkgs/development/compilers/gerbil/ftw.nix index 2f2c9956826d..fc1ed986eb61 100644 --- a/pkgs/development/compilers/gerbil/ftw.nix +++ b/pkgs/development/compilers/gerbil/ftw.nix @@ -2,8 +2,8 @@ { pname = "ftw"; - version = "unstable-2022-01-14"; - git-version = "8ba16b3"; + version = "unstable-2023-11-15"; + git-version = "e5e2f56"; softwareName = "FTW: For The Web!"; gerbil-package = "drewc/ftw"; @@ -13,8 +13,8 @@ fun = fetchFromGitHub; owner = "drewc"; repo = "ftw"; - rev = "8ba16b3c1cdc2150df5af8ef3c92040ef8b563b9"; - sha256 = "153i6whm5jfcj9s1qpxz03sq67969lq11brssyjc3yv3wyb1b07h"; + rev = "e5e2f56e90bf072ddf9c2987ddfac45f048e8a04"; + sha256 = "04164190vv1fzfk014mgqqmy5cml5amh63df31q2yc2kzvfajfc3"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-crypto.nix b/pkgs/development/compilers/gerbil/gerbil-crypto.nix index dd06417d1a85..fc55ca5b79db 100644 --- a/pkgs/development/compilers/gerbil/gerbil-crypto.nix +++ b/pkgs/development/compilers/gerbil/gerbil-crypto.nix @@ -2,8 +2,8 @@ { pname = "gerbil-crypto"; - version = "unstable-2023-09-27"; - git-version = "0.0-23-g341e09d"; + version = "unstable-2023-11-29"; + git-version = "0.1-1-g4197bfa"; gerbil-package = "clan/crypto"; gerbilInputs = with gerbilPackages; [ gerbil-utils gerbil-poo ]; nativeBuildInputs = [ pkgs.pkg-config ]; @@ -15,8 +15,8 @@ fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-crypto"; - rev = "341e09dcb15c09c836eae18093c0f63f71c0a72f"; - sha256 = "1rq50q4p4vhr5drjvirmdkxaa4wszj1rxnhjaqz98bfpjm90yk4j"; + rev = "4197bfa71dc55657f79efd5cc21fe59839e840f2"; + sha256 = "1jdfz5x24dfvpwyfxalkhv83gf9ylyaqii1kg8rjl8dzickawrix"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix index 521447593d4a..42891aeca4d0 100644 --- a/pkgs/development/compilers/gerbil/gerbil-ethereum.nix +++ b/pkgs/development/compilers/gerbil/gerbil-ethereum.nix @@ -2,8 +2,8 @@ rec { pname = "gerbil-ethereum"; - version = "unstable-2023-10-06"; - git-version = "0.1-1-g08b08fc"; + version = "unstable-2023-12-04"; + git-version = "0.2-11-g124ec58"; softwareName = "Gerbil-ethereum"; gerbil-package = "clan/ethereum"; version-path = "version"; @@ -15,8 +15,8 @@ rec { fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-ethereum"; - rev = "08b08fce8c83cb59bfb532eebb1c7a2dd4bd57ab"; - sha256 = "1sy7l869d2xqhq2qflsmkvr343jfhzsq43ixx75rqfpr3cdljz0b"; + rev = "124ec585157e2c505cd3c449a389c124ca6da9e9"; + sha256 = "0xg07k421r5p0qx98id66k0k2l3vi1is875857sd8q3h6bks0z54"; }; postInstall = '' @@ -34,7 +34,7 @@ rec { export GERBIL_PATH GERBIL_LOADPATH GLOW_SOURCE ORIG_GERBIL_PATH ORIG_GERBIL_LOADPATH exec ${gerbil}/bin/gxi "\$0" "\$@" |# - (import :clan/ethereum/scripts/run-ethereum-test-net :clan/multicall) + (import :clan/ethereum/scripts/run-ethereum-test-net :std/lib/multicall) (apply call-entry-point (cdr (command-line))) EOF chmod a+x $out/bin/run-ethereum-test-net diff --git a/pkgs/development/compilers/gerbil/gerbil-persist.nix b/pkgs/development/compilers/gerbil/gerbil-persist.nix index eb3cdda1f46c..3aafbc7d19bc 100644 --- a/pkgs/development/compilers/gerbil/gerbil-persist.nix +++ b/pkgs/development/compilers/gerbil/gerbil-persist.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, gerbilPackages, ... }: { pname = "gerbil-persist"; - version = "unstable-2023-10-07"; - git-version = "0.1.1-1-g3ce1d4a"; + version = "unstable-2023-11-29"; + git-version = "0.2-6-g8a5e40d"; softwareName = "Gerbil-persist"; gerbil-package = "clan/persist"; version-path = "version"; @@ -13,8 +13,8 @@ fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-persist"; - rev = "3ce1d4a4b1d7be290e54f884d780c02ceee8f10e"; - sha256 = "1kzvgpqkpq4wlc0hlfxy314fbv6215aksrrlrrpq9w97wdibmv7x"; + rev = "8a5e40deb01140b9c8d03c6cc985e47a9d7123d8"; + sha256 = "1c1h1yp7gf23r3asxppgga4j4jmy4l9rlbb7vw9jcwvl8d30yrab"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-poo.nix b/pkgs/development/compilers/gerbil/gerbil-poo.nix index 16257dc41628..caedf4ee86ae 100644 --- a/pkgs/development/compilers/gerbil/gerbil-poo.nix +++ b/pkgs/development/compilers/gerbil/gerbil-poo.nix @@ -2,8 +2,8 @@ { pname = "gerbil-poo"; - version = "unstable-2023-10-07"; - git-version = "0.1-1-g367ab43"; + version = "unstable-2023-11-29"; + git-version = "0.2-5-gacf654e"; softwareName = "Gerbil-POO"; gerbil-package = "clan/poo"; version-path = "version"; @@ -14,8 +14,8 @@ fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-poo"; - rev = "367ab4376fdd6fc0b0892da2becef35a5039c583"; - sha256 = "0ci88zqi7gb55ahl0n7dk1ihij2j6dn8jb6rzfiilck773x46kdh"; + rev = "acf654eb040c548da260a7a5d52bafb057d23541"; + sha256 = "1pxv1j6hwcgjj67bb7vvlnyl3123r43ifldm6alm76v2mfp2vs81"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix index 541c596a2126..ef6405c76304 100644 --- a/pkgs/development/compilers/gerbil/gerbil-utils.nix +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -2,8 +2,8 @@ { pname = "gerbil-utils"; - version = "unstable-2023-10-08"; - git-version = "0.3-3-g2914428"; + version = "unstable-2023-12-06"; + git-version = "0.4-13-g9398865"; softwareName = "Gerbil-utils"; gerbil-package = "clan"; version-path = "version"; @@ -12,8 +12,8 @@ fun = fetchFromGitHub; owner = "mighty-gerbils"; repo = "gerbil-utils"; - rev = "29144289b40ce624adf30eab23b796ddd6b6b55d"; - sha256 = "0qysw2zs5acgri3wrjb3ngnnhd17xpr9hcdr4ya383k8k7jacr8a"; + rev = "939886579508ff34b58a0d65bbb7d666125d0551"; + sha256 = "0dga03qq7iy12bnpxr6d40qhvihsvn3y87psf2w2clnpypjb3blx"; }; meta = with lib; { diff --git a/pkgs/development/compilers/gerbil/glow-lang.nix b/pkgs/development/compilers/gerbil/glow-lang.nix index 8bd38b30b4b8..12b1fd75d3ee 100644 --- a/pkgs/development/compilers/gerbil/glow-lang.nix +++ b/pkgs/development/compilers/gerbil/glow-lang.nix @@ -2,8 +2,8 @@ rec { pname = "glow-lang"; - version = "unstable-2023-10-06"; - git-version = "0.3.2-232-ga1a7a9e5"; + version = "unstable-2023-12-04"; + git-version = "0.3.2-237-g08d849ad"; softwareName = "Glow"; gerbil-package = "mukn/glow"; version-path = "version"; @@ -17,8 +17,8 @@ rec { fun = fetchFromGitHub; owner = "Glow-Lang"; repo = "glow"; - rev = "a1a7a9e51ba9a466d91c397d9da55af90076110c"; - sha256 = "0wgav4gbg6mlxgisjjbyhvhz94b29vv2rkjkjy1jl7v0hs3wbm52"; + rev = "08d849adef94ae9deead34e6981e77d47806c6e3"; + sha256 = "0dq0s8y3rgx0wa5wsgcdjs0zijnbgff3y4w2mkh5a04gz4lrhl50"; }; postPatch = '' From ad89d871920be204cdde44645b2600aa0fa8f736 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Mon, 4 Dec 2023 18:45:25 -0500 Subject: [PATCH 08/36] spotify: add libGL --- pkgs/applications/audio/spotify/linux.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 5bbdde57a324..a5aec13504b1 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -2,7 +2,7 @@ , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss_latest, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_4, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon -, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu +, pname, meta, harfbuzz, libayatana-appindicator, libdbusmenu, libGL # High-DPI support: Spotify's --force-device-scale-factor argument # not added if `null`, otherwise, should be a number. , deviceScaleFactor ? null @@ -44,6 +44,7 @@ let libdbusmenu libdrm libgcrypt + libGL libnotify libpng libpulseaudio From c37a685e2fe44cef6e35b7b1224922ca6ba4dc2b Mon Sep 17 00:00:00 2001 From: Isidor Zeuner Date: Sun, 3 Dec 2023 10:42:24 +0100 Subject: [PATCH 09/36] python310Packages.sgmllib3k: fix source access after github repo being deleted --- .../development/python-modules/sgmllib3k/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/sgmllib3k/default.nix b/pkgs/development/python-modules/sgmllib3k/default.nix index 05eb7da77395..e828e750fc8f 100644 --- a/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/pkgs/development/python-modules/sgmllib3k/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , isPy27 , pytestCheckHook , pythonAtLeast @@ -13,11 +13,9 @@ buildPythonPackage rec { disabled = isPy27; - src = fetchFromGitHub { - owner = "hsoft"; - repo = "sgmllib"; - rev = "799964676f35349ca2dd04503e34c2b3ad522c0d"; - sha256 = "0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr"; + src = fetchPypi { + inherit pname version; + hash = "sha256-eGj7HIv6dkwaxWPTzzacOB0TJdNhJJM6cm8p/NqoEuk="; }; nativeCheckInputs = [ @@ -28,6 +26,8 @@ buildPythonPackage rec { "test_declaration_junk_chars" ]; + doCheck = false; + pythonImportsCheck = [ "sgmllib" ]; From 2060d14f06cf9e26a93b677d3d7047f3faf4124d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 6 Dec 2023 12:41:32 -0800 Subject: [PATCH 10/36] bitwarden: 2023.10.1 -> 2023.12.0 Diff: https://github.com/bitwarden/clients/compare/desktop-v2023.10.1...desktop-v2023.12.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2023.12.0 --- pkgs/tools/security/bitwarden/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index f3c836fd3860..60c428d6fc06 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -28,13 +28,13 @@ let electron = electron_25; in buildNpmPackage rec { pname = "bitwarden"; - version = "2023.10.1"; + version = "2023.12.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws="; + hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo="; }; patches = [ @@ -49,14 +49,14 @@ in buildNpmPackage rec { makeCacheWritable = true; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc="; + npmDepsHash = "sha256-bnYpvHO9Pnob+MbrSshv03mSwXCADH/2xw33nLVKMdg="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit patches src; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8="; + hash = "sha256-pCy3hGhI3mXm4uTOaFMykOzJqK2PC0t0hE8MrJKtA/k="; }; cargoRoot = "apps/desktop/desktop_native"; From 8aeba41ccab46735ed254fede8d9a1a34d2415c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 6 Dec 2023 12:45:07 -0800 Subject: [PATCH 11/36] bitwarden-cli: 2023.10.0 -> 2023.12.0 Diff: https://github.com/bitwarden/clients/compare/cli-v2023.10.0...cli-v2023.12.0 Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2023.12.0 --- pkgs/tools/security/bitwarden/cli.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/tools/security/bitwarden/cli.nix index dd35294ba34a..0ff814617429 100644 --- a/pkgs/tools/security/bitwarden/cli.nix +++ b/pkgs/tools/security/bitwarden/cli.nix @@ -10,18 +10,18 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2023.10.0"; + version = "2023.12.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; + hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo="; }; nodejs = nodejs_18; - npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; + npmDepsHash = "sha256-bnYpvHO9Pnob+MbrSshv03mSwXCADH/2xw33nLVKMdg="; nativeBuildInputs = [ python3 From 034ea1399f23dbd6428b569e95b875803d70ced1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 7 Dec 2023 12:33:28 +0100 Subject: [PATCH 12/36] kdenlive: Use ffmpeg-full for mlt --- pkgs/applications/kde/kdenlive/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index bcd8ba360a82..00330b76b3a0 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -36,6 +36,11 @@ , wrapGAppsHook }: +let + mlt-full = mlt.override { + ffmpeg = ffmpeg-full; + }; +in mkDerivation { pname = "kdenlive"; nativeBuildInputs = [ @@ -60,7 +65,7 @@ mkDerivation { kplotting ktextwidgets mediainfo - mlt + mlt-full phonon-backend-gstreamer qtdeclarative qtmultimedia @@ -81,8 +86,9 @@ mkDerivation { # https://github.com/NixOS/nixpkgs/issues/83885 patches = [ ./dependency-paths.patch ]; - inherit mlt mediainfo; + inherit mediainfo; ffmpeg = ffmpeg-full; + mlt = mlt-full; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. From ac7d5d05c99ee6937a7221adf6264709cae9cb87 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 8 Dec 2023 14:20:23 +1100 Subject: [PATCH 13/36] taler: fix determinism of `taler-exchange.src` --- .../applications/networking/taler/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/taler/default.nix b/pkgs/applications/networking/taler/default.nix index 6ba4bac67fcb..474247d24b14 100644 --- a/pkgs/applications/networking/taler/default.nix +++ b/pkgs/applications/networking/taler/default.nix @@ -9,22 +9,25 @@ let taler-wallet-core = fetchgit { url = "https://git.taler.net/wallet-core.git"; rev = "v${version}"; - sha256 = "sha256-uwbgIzSjLN+KQCY134VfnCuBEtvCO3a6mEw++HoZDHs="; + sha256 = "sha256-oL8vi8gxPjKxRpioMs0GLvkzlTkrm1kyvhsXOgrtvVQ="; }; -in rec { - taler-exchange = stdenv.mkDerivation rec { + + taler-exchange = stdenv.mkDerivation { pname = "taler-exchange"; inherit version; src = fetchgit { url = "https://git.taler.net/exchange.git"; rev = "v${version}"; - # REMOVEME: this should only be a problem for specifically v0.9.3 - # When fetching submodules without deep clone we get the following error: - # "Server does not allow request for unadvertised object" - deepClone = true; fetchSubmodules = true; - sha256 = "sha256-txWwW5vqTblNgVIXdDkpNNZOXpY0udMaz4Wog1GobzE="; + sha256 = "sha256-NgDZF6LNeJI4ZuXEwoRdFG6g0S9xNTVhszzlfAnzVOs="; + + # When fetching submodules without the .git folder we get the following error: + # "Server does not allow request for unadvertised object" + leaveDotGit = true; + postFetch = '' + rm -rf $out/.git + ''; }; nativeBuildInputs = [ @@ -76,7 +79,7 @@ in rec { }; }; - taler-merchant = stdenv.mkDerivation rec { + taler-merchant = stdenv.mkDerivation { pname = "taler-merchant"; inherit version; @@ -133,4 +136,6 @@ in rec { platforms = platforms.linux; }; }; +in { + inherit taler-exchange taler-merchant; } From 78541e68ebd88b29990296e9073e4b66f07e973d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Dec 2023 15:04:11 +0100 Subject: [PATCH 14/36] nixos/nginx: allow return to be an int --- nixos/modules/services/web-servers/nginx/default.nix | 2 +- nixos/modules/services/web-servers/nginx/location-options.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index cf70dc325945..eafaa32f5b9b 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -449,7 +449,7 @@ let ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"} ${optionalString (config.root != null) "root ${config.root};"} ${optionalString (config.alias != null) "alias ${config.alias};"} - ${optionalString (config.return != null) "return ${config.return};"} + ${optionalString (config.return != null) "return ${toString config.return};"} ${config.extraConfig} ${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"} ${mkBasicAuth "sublocation" config} diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index 2728852058ea..2138e551fd43 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -93,7 +93,7 @@ with lib; }; return = mkOption { - type = types.nullOr types.str; + type = with types; nullOr (oneOf [ str int ]); default = null; example = "301 http://example.com$request_uri"; description = lib.mdDoc '' From c4090e6d19d2f1988ad15b473b124eef80f76cb2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 8 Dec 2023 15:39:54 +0100 Subject: [PATCH 15/36] dnf5: 5.1.8 -> 5.1.9 --- pkgs/tools/package-management/dnf5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index f9a44a8a70b5..41e7fe04480e 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.8"; + version = "5.1.9"; outputs = [ "out" "man" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-1g3g+6EborZd2ppPMZcy0Wjv07zetATHb/sCkuZz5UM="; + hash = "sha256-H8zbxNsGkuKIDPwGWfKJEy5gTo2Mm13VKwce+h9NEro="; }; nativeBuildInputs = [ From 30c21b66288b785824897c5a03a1e1e583a220ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Dec 2023 15:38:00 +0000 Subject: [PATCH 16/36] stress-ng: 0.17.01 -> 0.17.02 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 40211cb4e71b..ecef593219d3 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.17.01"; + version = "0.17.02"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-hTwA0BT8r54Gnyf/itP2onQE6zhNEoejseuIEwvx4D8="; + hash = "sha256-9pdTxGH9Oghg0Brxi6v/3ghsuT2aX/bAGVQPNjik3Zk="; }; postPatch = '' From 9c6a7f38fdf549429a70e6881dd1c33c1e8778fb Mon Sep 17 00:00:00 2001 From: Dilip Date: Fri, 8 Dec 2023 23:58:44 +0530 Subject: [PATCH 17/36] nerd-font-patcher: 3.0.2 -> 3.1.1 --- pkgs/applications/misc/nerd-font-patcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix index 10c42949a3ff..76bd2a44824e 100644 --- a/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "nerd-font-patcher"; - version = "3.0.2"; + version = "3.1.1"; src = fetchzip { url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/FontPatcher.zip"; - sha256 = "sha256-ZJpF/Q5lfcW3srb2NbJk+/QEuwaFjdzboa+rl9L7GGE="; + sha256 = "sha256-H2dPUs6HVKJcjxy5xtz9nL3SSPXKQF3w30/0l7A0PeY="; stripRoot = false; }; From 8959708ee6cf3a47ae3e7f80146761618b3142e5 Mon Sep 17 00:00:00 2001 From: Cottand Date: Fri, 8 Dec 2023 18:43:34 +0000 Subject: [PATCH 18/36] nomad_1_7: init at 1.7.0 --- .../applications/networking/cluster/nomad/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index f5f3961ade48..2ca0ca8d9fd6 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -83,4 +83,15 @@ rec { export PATH="$PATH:$NIX_BUILD_TOP/go/bin" ''; }; + + nomad_1_7 = generic { + buildGoModule = buildGo121Module; + version = "1.7.0"; + sha256 = "sha256-7l7HBs5FymSTDXQzHCPpD35bFyz7zsA0ZnYiwTkd2Ts="; + vendorHash = "sha256-MZmhFdZZBkKZDgON1ewVm9Z9jZ1EULp/yMT9q6fCqIw="; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" + ''; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e6879dd8aa..5323378006e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11242,6 +11242,7 @@ with pkgs; nomad_1_4 nomad_1_5 nomad_1_6 + nomad_1_7 ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; From 47a92aac1e4159a08ea23284eca0363638b40d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 7 Dec 2023 13:10:29 -0800 Subject: [PATCH 19/36] bitwarden: use electron_26 Upstream uses Electron 25 which is EOL but the app runs fine under Electron 26. --- pkgs/tools/security/bitwarden/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 60c428d6fc06..8c0b703a4fa0 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -3,7 +3,7 @@ , cargo , copyDesktopItems , dbus -, electron_25 +, electron_26 , fetchFromGitHub , fetchpatch2 , glib @@ -25,10 +25,10 @@ let description = "A secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_25; + electron = electron_26; in buildNpmPackage rec { pname = "bitwarden"; - version = "2023.12.0"; + version = "2023.12.0"; # TODO add back Electron version check below src = fetchFromGitHub { owner = "bitwarden"; @@ -82,12 +82,14 @@ in buildNpmPackage rec { libsecret ]; - preBuild = '' + # FIXME add back once upstream moves to Electron >= 26 + # we use electron_26 because electron_25 is EOL + /*preBuild = '' if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then echo 'ERROR: electron version mismatch' exit 1 fi - ''; + '';*/ postBuild = '' pushd apps/desktop From cf5b057abfb17959e95a1381abd1ceab85d55912 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 9 Dec 2023 08:41:22 +0100 Subject: [PATCH 20/36] papirus-icon-theme: 20231101 -> 20231201 https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/releases/tag/20231201 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 75237237e203..e940bc7d52be 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20231101"; + version = "20231201"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - hash = "sha256-0ooHuMqGzlMLVTR/u+kCJLibfqTAtq662EG8i3JIzPA="; + hash = "sha256-nLc2nt8YI193loMHjzzEwgvb+tdNrVTZskqssX2oFrU="; }; nativeBuildInputs = [ From 7b2399a63c2791cc91ca7f9d44fc2510dcc0d1fa Mon Sep 17 00:00:00 2001 From: Cottand Date: Sat, 9 Dec 2023 08:55:30 +0000 Subject: [PATCH 21/36] 1.7.0 -> 1.7.1 --- pkgs/applications/networking/cluster/nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 2ca0ca8d9fd6..5a6c60235a43 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -86,8 +86,8 @@ rec { nomad_1_7 = generic { buildGoModule = buildGo121Module; - version = "1.7.0"; - sha256 = "sha256-7l7HBs5FymSTDXQzHCPpD35bFyz7zsA0ZnYiwTkd2Ts="; + version = "1.7.1"; + sha256 = "sha256-dlKlpgQRug/72UmIogOkKNGBT3sPjgGVVuvzHZ4vh3c="; vendorHash = "sha256-MZmhFdZZBkKZDgON1ewVm9Z9jZ1EULp/yMT9q6fCqIw="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' From 0b660fdd45b0e3793c6eb5711b1d14fc5099f5e0 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 30 Nov 2023 17:43:26 +0100 Subject: [PATCH 22/36] python311Packages.dash: 2.14.1 -> 2.14.2 --- .../python-modules/dash/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 890a6e08d7db..b99662660d42 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -3,12 +3,12 @@ , pythonOlder , fetchFromGitHub +, setuptools , nodejs , yarn , prefetch-yarn-deps , fetchYarnDeps -, setuptools , flask , werkzeug , plotly @@ -37,26 +37,27 @@ buildPythonPackage rec { pname = "dash"; - version = "2.14.1"; - format = "setuptools"; + version = "2.14.2"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "plotly"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-vQOfX9RCIbr5lfUyT2knwrO374/vm7jH+/1+BeqmRjI="; + repo = "dash"; + rev = "v${version}"; + hash = "sha256-EFEsFgd3VbzlIUiz1fBIsKHywgWrL74taDFx0yIM/Ks="; }; nativeBuildInputs = [ + setuptools nodejs yarn prefetch-yarn-deps ]; - yarnDeps = fetchYarnDeps { - yarnLock = src + "/@plotly/dash-jupyterlab/yarn.lock"; + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/@plotly/dash-jupyterlab/yarn.lock"; hash = "sha256-mkiyrA0jGiP0zbabSjgHFLEUX3f+LZdJ8eARI5QA8CU="; }; @@ -65,12 +66,12 @@ buildPythonPackage rec { export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${yarnDeps} + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} fixup-yarn-lock yarn.lock substituteInPlace package.json --replace jlpm yarn yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts - patchShebangs . + patchShebangs node_modules # Generates the jupyterlab extension files yarn run build:pack @@ -79,7 +80,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - setuptools # for importing pkg_resources flask werkzeug plotly @@ -125,9 +125,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "dash" ]; meta = { + changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md"; description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; - changelog = "https://github.com/plotly/dash/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ antoinerg tomasajt ]; }; From 35e71241da1e72cb2fc9f219261d82198f32cdf7 Mon Sep 17 00:00:00 2001 From: Benjamin Manns Date: Sat, 9 Dec 2023 12:06:00 -0500 Subject: [PATCH 23/36] dioxus-cli: 0.4.1 -> 0.4.3 --- pkgs/development/tools/rust/dioxus-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index c4ea4ff20c07..4af0c464968d 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.4.1"; + version = "0.4.3"; src = fetchCrate { inherit pname version; - hash = "sha256-h2l6SHty06nLNbdlnSzH7I4XY53yyxNbx663cHYmPG0="; + hash = "sha256-TWcuEobYH2xpuwB1S63HoP/WjH3zHXTnlXXvOcYIZG8="; }; - cargoHash = "sha256-3pFkEC1GAJmTqXAymX4WRIq7EEtY17u1TCg+OhqL3bA="; + cargoHash = "sha256-ozbGK46uq3qXZifyTY7DDX1+vQuDJuSOJZw35vwcuxY="; nativeBuildInputs = [ pkg-config cacert ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ From 7f4299d5029a782e88b09d13d2786e275313f96e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Dec 2023 05:18:39 +0000 Subject: [PATCH 24/36] jamesdsp: 2.6.1 -> 2.7.0 --- pkgs/applications/audio/jamesdsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 84a839aeb02b..d7e96c84c6a5 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -21,14 +21,14 @@ assert lib.asserts.assertMsg (usePipewire != usePulseaudio) "You need to enable stdenv.mkDerivation (finalAttrs: { pname = "jamesdsp"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Audio4Linux"; repo = "JDSP4Linux"; fetchSubmodules = true; rev = finalAttrs.version; - hash = "sha256-XYJl94/PstWG5qaBQ2rXc/nG9bDeP3Q62zDYHmZvPaw="; + hash = "sha256-eVndqIqJ3DRceuFMT++g2riXq0CL5r+TWbvzvaYIfZ8="; }; nativeBuildInputs = [ From 1593bc7500efe98e6ece44a9f7a05d02cb0ff727 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Sun, 10 Dec 2023 15:40:34 +0800 Subject: [PATCH 25/36] linux_xanmod: 6.1.65 -> 6.1.66 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 92df9c445e60..8e225ba64d07 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,8 +6,8 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.1.65"; - hash = "sha256-/KJCUAti/p48KTIvRdGeD4aXfhiBdjZUIKD45Hu2d1g="; + version = "6.1.66"; + hash = "sha256-H3RTbBctvbKdsD1+G7zXVcTFb2NRON6nOzUgUW+zGxs="; variant = "lts"; }; From 4e0e6ef87da5400e8b3fdb445e72f8d122350bde Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Sun, 10 Dec 2023 15:45:11 +0800 Subject: [PATCH 26/36] linux_xanmod_latest: 6.6.4 -> 6.6.5 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 8e225ba64d07..3cad13a68fde 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -12,8 +12,8 @@ let }; mainVariant = { - version = "6.6.4"; - hash = "sha256-f/McwYD/4849GwtHml+AMSF5/gHuDrrlbz8gYZghaw0="; + version = "6.6.5"; + hash = "sha256-lmJ5Gix+CEqIu+cyBeqBq6xLZ94PjhU+6SbzAE0D8SY="; variant = "main"; }; From 4d2b5b475379cb5ab3ed55239f1a409d2b9465a2 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 10 Dec 2023 12:45:00 +0100 Subject: [PATCH 27/36] emacsPackages.python-isort: replace program --- .../editors/emacs/elisp-packages/melpa-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 3c8f89bd44d6..aa1fb2f8050b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -477,6 +477,13 @@ let ox-rss = buildWithGit super.ox-rss; + python-isort = super.python-isort.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace python-isort.el \ + --replace '-isort-command "isort"' '-isort-command "${lib.getExe pkgs.isort}"' + ''; + }); + # upstream issue: missing file header mhc = super.mhc.override { inherit (self.melpaPackages) calfw; From a2b5fb8e5a935cfde7facebe7ad0b31b3c93f9f2 Mon Sep 17 00:00:00 2001 From: 1sixth <1sixth@shinta.ro> Date: Sun, 10 Dec 2023 20:43:00 +0800 Subject: [PATCH 28/36] lxgw-wenkai: 1.311 -> 1.312 --- pkgs/data/fonts/lxgw-wenkai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index cd15891f2f4a..7b75f7a394bc 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.311"; + version = "1.312"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-R7j6SBWGbkS4cJI1J8M5NDIDeJDFMjtXZnGiyxm2rjg="; + hash = "sha256-KU0cTzdHfWIqYbBksGym9JaN/M3VRASYcQOxrAxip4I="; }; installPhase = '' From 9699f2da1e625c048e85f8c376ab230edf5745d0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Dec 2023 14:32:48 +0100 Subject: [PATCH 29/36] treewide: fix imports check --- pkgs/development/python-modules/gentools/default.nix | 2 +- pkgs/development/python-modules/ipymarkup/default.nix | 2 +- pkgs/development/python-modules/mediafire-dl/default.nix | 2 +- pkgs/development/python-modules/natasha/default.nix | 2 +- pkgs/development/python-modules/navec/default.nix | 2 +- pkgs/development/python-modules/python-ndn/default.nix | 2 +- pkgs/development/python-modules/razdel/default.nix | 2 +- pkgs/development/python-modules/slovnet/default.nix | 2 +- pkgs/development/python-modules/yargy/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 6d2ae215eafa..e4760c3fe958 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportCheck = [ + pythonImportsCheck = [ "gentools" ]; diff --git a/pkgs/development/python-modules/ipymarkup/default.nix b/pkgs/development/python-modules/ipymarkup/default.nix index 1731c3c2075b..a2698771ab22 100644 --- a/pkgs/development/python-modules/ipymarkup/default.nix +++ b/pkgs/development/python-modules/ipymarkup/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ intervaltree ]; - pythonImportCheck = [ "ipymarkup" ]; + pythonImportsCheck = [ "ipymarkup" ]; # Upstream has no tests: doCheck = false; diff --git a/pkgs/development/python-modules/mediafire-dl/default.nix b/pkgs/development/python-modules/mediafire-dl/default.nix index 6eb3968d3636..3cc81a6ce09c 100644 --- a/pkgs/development/python-modules/mediafire-dl/default.nix +++ b/pkgs/development/python-modules/mediafire-dl/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { tqdm ]; - pythonImportCheck = [ + pythonImportsCheck = [ "mediafire_dl" ]; diff --git a/pkgs/development/python-modules/natasha/default.nix b/pkgs/development/python-modules/natasha/default.nix index ca49c2653b68..8f7b00fa8922 100644 --- a/pkgs/development/python-modules/natasha/default.nix +++ b/pkgs/development/python-modules/natasha/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; - pythonImportCheck = [ "natasha" ]; + pythonImportsCheck = [ "natasha" ]; meta = with lib; { description = "NLP framework for Russian language"; diff --git a/pkgs/development/python-modules/navec/default.nix b/pkgs/development/python-modules/navec/default.nix index 02a55e5d6619..2f39e56b492c 100644 --- a/pkgs/development/python-modules/navec/default.nix +++ b/pkgs/development/python-modules/navec/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook gensim ]; # TODO: remove when gensim usage will be fixed in `navec`. disabledTests = [ "test_gensim" ]; - pythonImportCheck = [ "navec" ]; + pythonImportsCheck = [ "navec" ]; meta = with lib; { description = "Compact high quality word embeddings for Russian language"; diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index 6c47e8189a92..8051c79173e8 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { "lark" ]; - pythonImportChecks = [ "ndn" ]; + pythonImportsCheck = [ "ndn" ]; meta = with lib; { description = "An NDN client library with AsyncIO support"; diff --git a/pkgs/development/python-modules/razdel/default.nix b/pkgs/development/python-modules/razdel/default.nix index c870ba819ba1..66c2f4fae5e2 100644 --- a/pkgs/development/python-modules/razdel/default.nix +++ b/pkgs/development/python-modules/razdel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "razdel" ]; - pythonImportCheck = [ "razdel" ]; + pythonImportsCheck = [ "razdel" ]; meta = with lib; { description = "Rule-based system for Russian sentence and word tokenization"; diff --git a/pkgs/development/python-modules/slovnet/default.nix b/pkgs/development/python-modules/slovnet/default.nix index 83f431a6a8c5..7f813564cafd 100644 --- a/pkgs/development/python-modules/slovnet/default.nix +++ b/pkgs/development/python-modules/slovnet/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # Tries to download model binary artifacts: "tests/test_api.py" ]; - pythonImportCheck = [ "slovnet" ]; + pythonImportsCheck = [ "slovnet" ]; meta = with lib; { description = "Deep-learning based NLP modeling for Russian language"; diff --git a/pkgs/development/python-modules/yargy/default.nix b/pkgs/development/python-modules/yargy/default.nix index 30ada41f87b0..73ba35f6c8b5 100644 --- a/pkgs/development/python-modules/yargy/default.nix +++ b/pkgs/development/python-modules/yargy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pymorphy2 ]; - pythonImportCheck = [ "yargy" ]; + pythonImportsCheck = [ "yargy" ]; nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests" ]; From 58651820bf8d249319949b3bf282baac55eb5127 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Dec 2023 14:42:19 +0100 Subject: [PATCH 30/36] idsk: refactor --- pkgs/by-name/id/idsk/package.nix | 46 +++++++++++++++++++++++++ pkgs/tools/filesystems/idsk/default.nix | 35 ------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 46 insertions(+), 37 deletions(-) create mode 100644 pkgs/by-name/id/idsk/package.nix delete mode 100644 pkgs/tools/filesystems/idsk/default.nix diff --git a/pkgs/by-name/id/idsk/package.nix b/pkgs/by-name/id/idsk/package.nix new file mode 100644 index 000000000000..58774d62c31a --- /dev/null +++ b/pkgs/by-name/id/idsk/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +}: + +stdenv.mkDerivation rec { + pname = "idsk"; + version = "0.20"; + + src = fetchFromGitHub { + owner = "cpcsdk"; + repo = "idsk"; + rev = "v${version}"; + hash = "sha256-rYClWq1Nl3COoG+eOJyFDTvBSzpHpGminU4bndZs6xc="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/cpcsdk/idsk/commit/52fa3cdcc10d4ba6c75cab10ca7067b129198d92.patch"; + hash = "sha256-Ll0apllNj+fP7kZ1n+bBowrlskLK1bIashxxgPVVxmg="; + }) + ]; + + nativeBuildInputs = [ + cmake + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 iDSK $out/bin/iDSK + + runHook postInstall + ''; + + meta = with lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/cpcsdk/idsk"; + license = licenses.mit; + mainProgram = "iDSK"; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix deleted file mode 100644 index 5e78a1266873..000000000000 --- a/pkgs/tools/filesystems/idsk/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - - pname = "idsk"; - version = "0.20"; - - src = fetchFromGitHub { - repo = "idsk"; - owner = "cpcsdk"; - rev = "v${version}"; - sha256 = "05zbdkb9s6sfkni6k927795w2fqdhnf3i7kgl27715sdmmdab05d"; - }; - - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - # Needed with GCC 12 but breaks on darwin (with clang) - "-std=c++14" - ]); - - installPhase = '' - mkdir -p $out/bin - cp iDSK $out/bin - ''; - - meta = with lib; { - description = "Manipulating CPC dsk images and files"; - homepage = "https://github.com/cpcsdk/idsk" ; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "iDSK"; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..82b4227481fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40467,8 +40467,6 @@ with pkgs; utsushi-networkscan = callPackage ../misc/drivers/utsushi/networkscan.nix { }; - idsk = callPackage ../tools/filesystems/idsk { stdenv = gcc10StdenvCompat; }; - colima = callPackage ../applications/virtualization/colima { }; lima = callPackage ../applications/virtualization/lima { From a7556902d1576637336b61f82fc201a5c7b858e5 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 10 Dec 2023 08:54:11 -0500 Subject: [PATCH 31/36] vscodium: 1.84.2.23319 -> 1.85.0.23343 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 87f1c5b49ad5..5275adf3bd7a 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0153vsb62r3g3cck70n05wkxxkh9w53zhnra7hzfy4m19v8xinzm"; - x86_64-darwin = "1xqf0s05ns1yqd6qz4633c5xgb0l0nm2n1kfvxv7wqhgf94x80fm"; - aarch64-linux = "1hfg01w9k60lf30chvj7mrjb1m3p5czv42cf7zj97j5pkhpg2lmi"; - aarch64-darwin = "0vzayy1akh9hzs32cyxvvfnsbg9601jrs7bsvql3728dy9wkc8w2"; - armv7l-linux = "0cc9b47dziqizcs37yci48ymyg176lwsyh7w7b9imh1s658vgikv"; + x86_64-linux = "16m7a2j9rmnp9pqpyyy2dx09paj1qh0h4gb1dhhwakw7w0zjlxn5"; + x86_64-darwin = "1h4kwqddkm19pnh08b33jd10d0n5kcyqkm7kn8fnyj0bpkrzwyql"; + aarch64-linux = "0mpqrxvrp8cgv40ck5sprdzzafkb69skisygaq7lr2rfky2gn019"; + aarch64-darwin = "1bakb5789zkpzymq3zvs6ls36c4xp50j5xiwyz1wgxgf4wnh06zw"; + armv7l-linux = "0rnp2lfx8xjz7xlmc7sxpg5xd5w72cnp76gv441csbyw3bscbxpw"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.84.2.23319"; + version = "1.85.0.23343"; pname = "vscodium"; executableName = "codium"; From 20f08c851867942993fcbe6ed524f948ac25b43c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Dec 2023 16:07:23 +0100 Subject: [PATCH 32/36] getdp: remove stdenv override --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..92647b41a1df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39226,7 +39226,7 @@ with pkgs; flintqs = callPackage ../development/libraries/science/math/flintqs { }; - getdp = callPackage ../applications/science/math/getdp { stdenv = gcc10StdenvCompat; }; + getdp = callPackage ../applications/science/math/getdp { }; gurobi = callPackage ../applications/science/math/gurobi { }; From c3484979ea7a297686a7e7f7c9db633ae30a9755 Mon Sep 17 00:00:00 2001 From: Benjamin Manns Date: Sun, 10 Dec 2023 10:55:03 -0500 Subject: [PATCH 33/36] Remove `cargo test --doc` run from dioxus-cli --- pkgs/development/tools/rust/dioxus-cli/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index 4af0c464968d..3020da9ce0a7 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -34,6 +34,11 @@ rustPlatform.buildRustPackage rec { "--skip=server::web::proxy::test::add_proxy_trailing_slash" ]; + # Omitted: --doc + # Can be removed after 0.4.3 or when https://github.com/DioxusLabs/dioxus/pull/1706 is resolved + # Matches upstream package test CI https://github.com/DioxusLabs/dioxus/blob/544ca5559654c8490ce444c3cbd85c1bfb8479da/Makefile.toml#L94-L108 + cargoTestFlags = "--lib --bins --tests --examples"; + passthru.tests.version = testers.testVersion { package = dioxus-cli; command = "${meta.mainProgram} --version"; From 022fc378aaeefe09ae4c7e3bfcf772f7cddcc9cc Mon Sep 17 00:00:00 2001 From: Benjamin Manns Date: Sun, 10 Dec 2023 10:59:14 -0500 Subject: [PATCH 34/36] Pass cargoTestFlags as array --- pkgs/development/tools/rust/dioxus-cli/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index 3020da9ce0a7..5243203f1926 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -37,7 +37,12 @@ rustPlatform.buildRustPackage rec { # Omitted: --doc # Can be removed after 0.4.3 or when https://github.com/DioxusLabs/dioxus/pull/1706 is resolved # Matches upstream package test CI https://github.com/DioxusLabs/dioxus/blob/544ca5559654c8490ce444c3cbd85c1bfb8479da/Makefile.toml#L94-L108 - cargoTestFlags = "--lib --bins --tests --examples"; + cargoTestFlags = [ + "--lib" + "--bins" + "--tests" + "--examples" + ]; passthru.tests.version = testers.testVersion { package = dioxus-cli; From ca8e89e82529cd5c2528e726aa6f7df0ba443710 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 10 Dec 2023 23:59:13 +0100 Subject: [PATCH 35/36] electron-bin: remove prusnak from maintainers --- pkgs/development/tools/electron/binary/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index bf845eed8d86..80574891c032 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -35,7 +35,7 @@ let description = "Cross platform desktop application shell"; homepage = "https://github.com/electron/electron"; license = licenses.mit; - maintainers = with maintainers; [ travisbhartwell manveru prusnak ]; + maintainers = with maintainers; [ travisbhartwell manveru ]; platforms = [ "x86_64-darwin" "x86_64-linux" "armv7l-linux" "aarch64-linux" ] ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; From 33f23ce7ed30ae69a531200d07112abd46b983c1 Mon Sep 17 00:00:00 2001 From: Cabia Rangris Date: Mon, 11 Dec 2023 03:06:02 +0400 Subject: [PATCH 36/36] bambu-studio: 01.08.00.62 -> 01.08.01.57 (#273350) --- pkgs/applications/misc/bambu-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index fc6acd3d177d..77a6375b1979 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation rec { pname = "bambu-studio"; - version = "01.08.00.62"; + version = "01.08.01.57"; src = fetchFromGitHub { owner = "bambulab"; repo = "BambuStudio"; rev = "v${version}"; - hash = "sha256-Rb8YNf+ZQ8+9jAP/ZLze0PfY/liE7Rr2bJX33AENsbg="; + hash = "sha256-15Eq+ylQK+xlxG7cg6xoCPb+zJ66qqwQIKd1zA13I5o="; }; nativeBuildInputs = [