From 7732e956a82f0ab9211d317f23e80aa044d5a420 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Mon, 26 Aug 2024 09:12:59 +0330 Subject: [PATCH 001/180] libphidget22: init at 0-unstable-2024-04-11 --- pkgs/by-name/li/libphidget22/package.nix | 31 ++++++++++++++++ pkgs/by-name/li/libphidget22extra/package.nix | 35 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 pkgs/by-name/li/libphidget22/package.nix create mode 100644 pkgs/by-name/li/libphidget22extra/package.nix diff --git a/pkgs/by-name/li/libphidget22/package.nix b/pkgs/by-name/li/libphidget22/package.nix new file mode 100644 index 0000000000000..8dd3d5e2f475d --- /dev/null +++ b/pkgs/by-name/li/libphidget22/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchurl, + automake, + libusb1, +}: + +stdenv.mkDerivation { + pname = "libphidget22"; + version = "0-unstable-2024-04-11"; + + src = fetchurl { + url = "https://cdn.phidgets.com/downloads/phidget22/libraries/linux/libphidget22.tar.gz"; + hash = "sha256-mDoYVs0LhBb3+vzKjzYr9EmcrztmA4cy9xh5ONxHaxI="; + }; + + nativeBuildInputs = [ automake ]; + + buildInputs = [ libusb1 ]; + + strictDeps = true; + + meta = { + description = "Phidget Inc sensor boards and electronics Library"; + homepage = "https://www.phidgets.com/docs/OS_-_Linux"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mksafavi ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/li/libphidget22extra/package.nix b/pkgs/by-name/li/libphidget22extra/package.nix new file mode 100644 index 0000000000000..b67d2026b655f --- /dev/null +++ b/pkgs/by-name/li/libphidget22extra/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchurl, + automake, + libusb1, + libphidget22, +}: + +stdenv.mkDerivation { + pname = "libphidget22extra"; + version = "0-unstable-2024-04-11"; + + src = fetchurl { + url = "https://cdn.phidgets.com/downloads/phidget22/libraries/linux/libphidget22extra.tar.gz"; + hash = "sha256-UD6Crr1dl7c3NOAVNi3xrXJI3OYPLZBJX1MXVvbyEUE="; + }; + + nativeBuildInputs = [ automake ]; + + buildInputs = [ + libphidget22 + libusb1 + ]; + + strictDeps = true; + + meta = { + description = "Phidget Inc sensor boards and electronics extras library"; + homepage = "https://www.phidgets.com/docs/OS_-_Linux"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mksafavi ]; + platforms = lib.platforms.linux; + }; +} From 77292c4f5b0ba8a5ef0581194325151132a3d503 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Fri, 20 Sep 2024 16:00:47 -0300 Subject: [PATCH 002/180] buildDartApplication: include dart SDK builder by default --- .../dart/build-dart-application/default.nix | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix index c99b8bbf325e9..3e09b80fd2aee 100644 --- a/pkgs/build-support/dart/build-dart-application/default.nix +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -60,7 +60,25 @@ let generators = callPackage ./generators.nix { inherit dart; } { buildDrvArgs = args; }; pubspecLockFile = builtins.toJSON pubspecLock; - pubspecLockData = pub2nix.readPubspecLock { inherit src packageRoot pubspecLock gitHashes sdkSourceBuilders customSourceBuilders; }; + pubspecLockData = pub2nix.readPubspecLock { + inherit src packageRoot pubspecLock gitHashes customSourceBuilders; + sdkSourceBuilders = { + # https://github.com/dart-lang/pub/blob/e1fbda73d1ac597474b82882ee0bf6ecea5df108/lib/src/sdk/dart.dart#L80 + "dart" = name: runCommand "dart-sdk-${name}" { passthru.packageRoot = "."; } '' + for path in '${dart}/pkg/${name}'; do + if [ -d "$path" ]; then + ln -s "$path" "$out" + break + fi + done + + if [ ! -e "$out" ]; then + echo 1>&2 'The Dart SDK does not contain the requested package: ${name}!' + exit 1 + fi + ''; + } // sdkSourceBuilders; + }; packageConfig = generators.linkPackageConfig { packageConfig = pub2nix.generatePackageConfig { pname = if args.pname != null then "${args.pname}-${args.version}" else null; From 9eef14c6781ab15b9fd6cb84a7699dabcc9efd6a Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Wed, 25 Sep 2024 20:33:02 +0200 Subject: [PATCH 003/180] rPackages.sf: fix build on darwin --- pkgs/development/r-modules/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 3ac1f52f2e76e..ed90789255b2c 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1084,6 +1084,12 @@ let ''; }); + sf = old.sf.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + rzmq = old.rzmq.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); From 39fd7e26f03fc126b4d0c85ee885aa8ef3999085 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Wed, 25 Sep 2024 20:33:18 +0200 Subject: [PATCH 004/180] rPackages.terra: fix build on darwin --- pkgs/development/r-modules/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index ed90789255b2c..953af0eead350 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1090,6 +1090,12 @@ let ]; }); + terra = old.terra.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + rzmq = old.rzmq.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); From 3b2590eee2b057ada39066e536c3a0ebe66d2f8d Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Wed, 25 Sep 2024 20:33:35 +0200 Subject: [PATCH 005/180] rPackages.vapour: fix build on darwin --- pkgs/development/r-modules/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 953af0eead350..d17cf9941491a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1096,6 +1096,12 @@ let ]; }); + vapour = old.vapour.overrideAttrs (attrs: { + configureFlags = [ + "--with-proj-lib=${pkgs.lib.getLib pkgs.proj}/lib" + ]; + }); + rzmq = old.rzmq.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); From 956b32d77485a368fe820af8adfa64aa328bf4a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 13:07:14 +0000 Subject: [PATCH 006/180] boxbuddy: 2.2.12 -> 2.2.13 --- pkgs/by-name/bo/boxbuddy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index db8e357899f67..34c3cd1911acc 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.12"; + version = "2.2.13"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-PoPIIwe2SlK/iQTyqIhMG0dRobU98L5hnOciMmi9coo="; + hash = "sha256-47LOwBm7ql3Nvx6PZ2+x5aR9LSpzc8xuixdvKGdNS94="; }; - cargoHash = "sha256-En5TVCW/URJEry4sTd+vdi8K1YO2L0X5pYu/TGsrx6U="; + cargoHash = "sha256-W4W2tnnNgBcGD0/t5pobj4ca/YrRkHE1l5dIVe21KPU="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here From 26de7d1cbfaeb394b1f99b07b0e397f998dab6a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Thu, 3 Oct 2024 19:12:51 +0300 Subject: [PATCH 007/180] arti: 1.2.7 -> 1.2.8 Update the package to the latest version. Remove from skipped 1 test that was fixed. --- pkgs/by-name/ar/arti/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 6185ec1c683ff..0fdb1f50115ea 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-lyko4xwTn03/Es8icOx8GIrjC4XDXvZPDYHYILw8Opo="; + hash = "sha256-vw/hebZ23Pk+hQx3YN9iXsKWq20fqpwp91E2tul8zmA="; }; - cargoHash = "sha256-I45SaawWAK7iTZDFhJT4YVO439D/3NmWLp3FtFmhLC0="; + cargoHash = "sha256-4F+0KEVoeppNQ26QQ+a2CSIbrklE8NY3+OK11I5JstA="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; @@ -47,8 +47,7 @@ rustPlatform.buildRustPackage rec { ]; checkFlags = [ - # problematic tests that were fixed after the release - "--skip=reload_cfg::test::watch_single_file" + # problematic test that hangs the build "--skip=reload_cfg::test::watch_multiple" ]; From 5e5961ab42ce981752c100b1ecffa4cb6c925724 Mon Sep 17 00:00:00 2001 From: romner-set Date: Fri, 4 Oct 2024 02:17:28 +0200 Subject: [PATCH 008/180] maintainers: add romner-set --- maintainers/maintainer-list.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 340a24cac087c..66f33e7a807d6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18287,6 +18287,18 @@ githubId = 1217934; name = "José Romildo Malaquias"; }; + romner-set = { + email = "admin@cynosure.red"; + github = "romner-set"; + githubId = 41077433; + name = "romner-set"; + keys = [ + { + # uploaded to https://keys.openpgp.org + fingerprint = "4B75 244B 0279 9598 FF3B C21F 95FC 58F1 8CFD FAB0"; + } + ]; + }; ronanmacf = { email = "macfhlar@tcd.ie"; github = "RonanMacF"; From 19b9676383c4e473b16bafa5e3a704a01639420f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 5 Oct 2024 13:31:09 +0200 Subject: [PATCH 009/180] linux: mark <6.12 with Rust as broken, assert on <6.7 with Rust Linux 6.7 is the oldest kernel with Rust support, so the config part should fail hard if 6.6 or older requests the Rust feature. Until now this was silently ignored[1]. It turned out that Rust for Linux 6.11 or older fails for unknown reasons[2]. We decided to not bother since it's not a longterm kernel and 6.12 seems fine again. As a result, marking this as broken. [1] https://github.com/NixOS/nixpkgs/pull/345534#discussion_r1781392312 [2] https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381 --- pkgs/os-specific/linux/kernel/common-config.nix | 6 +++++- pkgs/os-specific/linux/kernel/manual-config.nix | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index ee3862052135a..8051876960b8f 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -34,7 +34,11 @@ let # Currently not enabling Rust by default, as upstream requires rustc 1.81 defaultRust = false; - withRust = (forceRust || defaultRust) && kernelSupportsRust; + withRust = + assert lib.assertMsg (!(forceRust && !kernelSupportsRust)) '' + Kernels below 6.7 (the kernel being built is ${version}) don't support Rust. + ''; + (forceRust || defaultRust) && kernelSupportsRust; options = { diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 5544409a74d69..f69de86fd1a64 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -396,6 +396,9 @@ let requiredSystemFeatures = [ "big-parallel" ]; meta = { + # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381 + broken = withRust && lib.versionOlder version "6.12"; + description = "The Linux kernel" + (if kernelPatches == [] then "" else From acf163b07d6c5d7577cb28e2d6023bc8107a304f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 13:37:02 +0000 Subject: [PATCH 010/180] metacubexd: 1.150.0 -> 1.151.0 --- pkgs/by-name/me/metacubexd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index 6b5b6c7e8fe75..5986155ee0f48 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "metacubexd"; - version = "1.150.0"; + version = "1.151.0"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "metacubexd"; rev = "v${finalAttrs.version}"; - hash = "sha256-UItmZmrcCSO7705TzEO80IVGSsCrDjm9Apw17XAQ9jY="; + hash = "sha256-H6zMEicE9RT84NJmmcihw46TDOSE0HhUoIRIrpNxM+c="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-jIotwZmFzzv3jN4iXV4aonxnVDuIGzxNH8RGD0r7t0c="; + hash = "sha256-XwIcwvTcB4vO5tqJ/jdqgkTrkmN3H0e3q5eDNOvUrcA="; }; buildPhase = '' From 8761a97cc96945ed077e8bf1b19d83fd5024e457 Mon Sep 17 00:00:00 2001 From: RoyDubnium <72664566+RoyDubnium@users.noreply.github.com> Date: Tue, 20 Aug 2024 09:24:10 +0100 Subject: [PATCH 011/180] qdiskinfo: add themes --- pkgs/by-name/qd/qdiskinfo/package.nix | 57 +++- pkgs/by-name/qd/qdiskinfo/sources.nix | 18 ++ pkgs/by-name/qd/qdiskinfo/themes.nix | 403 ++++++++++++++++++++++++++ 3 files changed, 475 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/qd/qdiskinfo/sources.nix create mode 100644 pkgs/by-name/qd/qdiskinfo/themes.nix diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index 736a6e09c1b2a..907d5c0873622 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -3,10 +3,39 @@ stdenv, smartmontools, fetchFromGitHub, + fetchzip, cmake, qt6, + theme ? "", + customBgDark ? "", + customBgLight ? "", + customStatusPath ? "", + customSrc ? "", + customRightCharacter ? false, }: +let + isTheme = theme != null && theme != ""; + + rightCharacter = + (builtins.elem theme [ + "aoi" + "shizukuTeaBreak" + ]) + || customRightCharacter; + themeSources = import ./sources.nix { inherit fetchzip; }; + themes = import ./themes.nix { + inherit + customBgDark + customBgLight + customSrc + customStatusPath + lib + themeSources + ; + }; +in +assert !isTheme || lib.attrsets.hasAttrByPath [ theme ] themes; stdenv.mkDerivation (finalAttrs: { pname = "qdiskinfo"; version = "0.3"; @@ -31,10 +60,32 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "MinSizeRel"; - cmakeFlags = [ - "-DQT_VERSION_MAJOR=6" - ]; + cmakeFlags = + [ + "-DQT_VERSION_MAJOR=6" + ] + ++ lib.optionals isTheme [ "-DINCLUDE_OPTIONAL_RESOURCES=ON" ] + ++ (if rightCharacter then [ "-DCHARACTER_IS_RIGHT=ON" ] else [ "-DCHARACTER_IS_RIGHT=OFF" ]); + postUnpack = '' + cp -r $sourceRoot $TMPDIR/src + sourceRoot=$TMPDIR/src + ''; + patchPhase = lib.optionalString isTheme '' + export SRCPATH=${themes."${theme}".src}/CdiResource/themes/ + export DESTPATH=$sourceRoot/dist/theme/ + mkdir -p $DESTPATH + if [ -n "${themes."${theme}".paths.bgDark}" ]; then + cp $SRCPATH/${themes."${theme}".paths.bgDark} $DESTPATH/bg_dark.png + fi + if [ -n "${themes."${theme}".paths.bgLight}" ]; then + cp $SRCPATH/${themes."${theme}".paths.bgLight} $DESTPATH/bg_light.png + fi + cp $SRCPATH/${themes."${theme}".paths.status}/SDdiskStatusBad-300.png $DESTPATH/bad.png + cp $SRCPATH/${themes."${theme}".paths.status}/SDdiskStatusCaution-300.png $DESTPATH/caution.png + cp $SRCPATH/${themes."${theme}".paths.status}/SDdiskStatusGood-300.png $DESTPATH/good.png + cp $SRCPATH/${themes."${theme}".paths.status}/SDdiskStatusUnknown-300.png $DESTPATH/unknown.png + ''; postInstall = '' wrapProgram $out/bin/QDiskInfo \ --suffix PATH : ${smartmontools}/bin diff --git a/pkgs/by-name/qd/qdiskinfo/sources.nix b/pkgs/by-name/qd/qdiskinfo/sources.nix new file mode 100644 index 0000000000000..aa28afcf75148 --- /dev/null +++ b/pkgs/by-name/qd/qdiskinfo/sources.nix @@ -0,0 +1,18 @@ +{ fetchzip }: +{ + aoi = fetchzip { + url = "https://pilotfiber.dl.sourceforge.net/project/crystaldiskinfo/9.3.2/CrystalDiskInfo9_3_2Aoi.zip?viasf=1#cdi.zip"; + hash = "sha256-yldOX/aQYK1Fsd+BpD0SdcyfnHxtwB5rmZHU1nY7Ov8="; + stripRoot = false; + }; + kureikei = fetchzip { + url = "https://pilotfiber.dl.sourceforge.net/project/crystaldiskinfo/9.3.2/CrystalDiskInfo9_3_2KureiKei.zip?viasf=1#cdi.zip"; + hash = "sha256-mzV3wHKczsh5NOsUxA3kGYSBZyVNJZUWkZdjiJA8+Po="; + stripRoot = false; + }; + shizuku = fetchzip { + url = "https://pilotfiber.dl.sourceforge.net/project/crystaldiskinfo/9.3.2/CrystalDiskInfo9_3_2Shizuku.zip?viasf=1#cdi.zip"; + hash = "sha256-4dVeOHXWUVjfSssJKpcSBQ7OTMaYmgF15M4ROD3SBDA="; + stripRoot = false; + }; +} diff --git a/pkgs/by-name/qd/qdiskinfo/themes.nix b/pkgs/by-name/qd/qdiskinfo/themes.nix new file mode 100644 index 0000000000000..6cec442206d0d --- /dev/null +++ b/pkgs/by-name/qd/qdiskinfo/themes.nix @@ -0,0 +1,403 @@ +{ + customBgDark, + customBgLight, + customSrc, + customStatusPath, + lib, + themeSources, +}: + +{ + aoi = { + src = themeSources.aoi; + paths = { + bgDark = "AoiNight/AoiBackground-300.png"; + bgLight = "Aoi/AoiBackground-300.png"; + status = "Aoi"; + }; + }; + custom = { + src = themeSources."${customSrc}"; + paths = { + bgDark = customBgDark; + bgLight = customBgLight; + status = customStatusPath; + }; + }; + kureikei = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiBikini = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiBikini/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiHomebuiltComputer = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiHomebuiltComputer~Kronotokage/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiPresent = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiPresent/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiRecoding = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiRecoding/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiRecodingKimiya = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiRecoding~KIMIYA/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiSummerKimono = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiSummerKimono/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiUniform = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKeiUniform/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiAsyuihira = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~AsYuihira/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiHasumikaoru = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~hasumikaoru/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiKohakumuro = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~kohakumuro/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiKosake = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~kosake/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiKunimi = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~kunimi/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiMaru = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~maru/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiMugya = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~mugya/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiNanatunatu = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~nanatunatu/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiNekopan = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~nekopan/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiNyamco = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~nyamco/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiPoyoyonchihiro = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~poyoyonchihiro/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiShitimiNanami = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~ShitimiNanami/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiTakiOuno = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~TakiOuno/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiTori = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~tori/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + kureikeiYoite = { + src = themeSources.kureikei; + paths = { + bgDark = ""; + bgLight = "KureiKei~yoite/KureiKeiBackground-300.png"; + status = "KureiKei"; + }; + }; + shizuku = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "Shizuku/ShizukuBackground-300.png"; + status = "Shizuku"; + }; + }; + shizuku5thAnniversary = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "Shizuku5thAnniversary/ShizukuBackground-300.png"; + status = "Shizuku5thAnniversary"; + }; + }; + shizuku7thAnniversary = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "Shizuku7thAnniversary/ShizukuBackground-300.png"; + status = "Shizuku"; + }; + }; + shizukuDate = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuDate/ShizukuBackground-300.png"; + status = "ShizukuDate"; + }; + }; + shizukuHanabi = { + src = themeSources.shizuku; + paths = { + bgDark = "ShizukuHanabi/ShizukuBackground-300.png"; + bgLight = ""; + status = "ShizukuHanabi"; + }; + }; + shizukuHaregi = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuHaregi/ShizukuBackground-300.png"; + status = "ShizukuHaregi"; + }; + }; + shizukuHeianKomachi = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuHeianKomachi/ShizukuBackground-300.png"; + status = "ShizukuHeianKomachi"; + }; + }; + shizukuHotaru = { + src = themeSources.shizuku; + paths = { + bgDark = "ShizukuHotaru/ShizukuBackground-300.png"; + bgLight = ""; + status = "Shizuku"; + }; + }; + shizukuIdol = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuIdol/ShizukuBackground-300.png"; + status = "ShizukuIdol"; + }; + }; + shizukuKotatsu = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuKotatsu/ShizukuBackground-300.png"; + status = "ShizukuKotatsu"; + }; + }; + shizukuKotatsuNight = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuKotatsuNight/ShizukuBackground-300.png"; + status = "ShizukuKotatsu"; + }; + }; + shizukuLiteratureGirl = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuLiteratureGirl/ShizukuBackground-300.png"; + status = "ShizukuLiteratureGirl"; + }; + }; + shizukuLiteratureGirlWithGlasses = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuLiteratureGirlwithGlasses/ShizukuBackground-300.png"; + status = "ShizukuLiteratureGirlwithGlasses"; + }; + }; + shizukuMaidCool = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuMaidCool/ShizukuBackground-300.png"; + status = "ShizukuMaidCool"; + }; + }; + shizukuMaidCute = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuMaidCute/ShizukuBackground-300.png"; + status = "ShizukuMaidCute"; + }; + }; + shizukuMeijiMizugi = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuMeijiMizugi/ShizukuBackground-300.png"; + status = "ShizukuMeijiMizugi"; + }; + }; + shizukuMermaid = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuMermaid/ShizukuBackground-300.png"; + status = "ShizukuMermaid"; + }; + }; + shizukuMiko = { + src = themeSources.shizuku; + paths = { + bgDark = "ShizukuMikoNight/ShizukuBackground-300.png"; + bgLight = "ShizukuMiko/ShizukuBackground-300.png"; + status = "ShizukuMiko"; + }; + }; + shizukuOffice = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuOffice/ShizukuBackground-300.png"; + status = "Shizuku"; + }; + }; + shizukuSakura = { + src = themeSources.shizuku; + paths = { + bgDark = "ShizukuSakuraNight/ShizukuBackground-300.png"; + bgLight = "ShizukuSakura/ShizukuBackground-300.png"; + status = "ShizukuSakura"; + }; + }; + shizukuTaishoRoman = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuTaishoRoman/ShizukuBackground-300.png"; + status = "ShizukuTaishoRoman"; + }; + }; + shizukuTeaBreak = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuTeaBreak/ShizukuBackground-300.png"; + status = "Shizuku"; + }; + }; + shizukuWebRadio = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuWebRadio/ShizukuBackground-300.png"; + status = "ShizukuWebRadio"; + }; + }; + shizukuWinterLamp = { + src = themeSources.shizuku; + paths = { + bgDark = ""; + bgLight = "ShizukuWinterLamp/ShizukuBackground-300.png"; + status = "ShizukuWinterLamp"; + }; + }; +} From 9d5adb9e4586867342671b9baa296731cd75d874 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 7 Oct 2024 09:29:21 -0700 Subject: [PATCH 012/180] flutter326: init at 3.26.0-0.1pre --- .../flutter/artifacts/fetch-artifacts.nix | 11 +- .../flutter/artifacts/prepare-artifacts.nix | 1 + .../compilers/flutter/versions/3_26/data.json | 1052 +++++++++++++++++ ...deregister-pub-dependencies-artifact.patch | 19 + .../3_26/patches/disable-auto-update.patch | 30 + .../fix-ios-build-xcode-backend-sh.patch | 69 ++ .../gradle-flutter-tools-wrapper.patch | 44 + pkgs/top-level/all-packages.nix | 1 + 8 files changed, 1225 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/compilers/flutter/versions/3_26/data.json create mode 100644 pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch create mode 100644 pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch create mode 100644 pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch create mode 100644 pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix index 0e1ce6e678cba..f7412a37ec100 100644 --- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix @@ -59,15 +59,22 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}" passthru = { inherit flutterPlatform; }; -} '' +} ('' export FLUTTER_ROOT="$NIX_BUILD_TOP" lndir -silent '${flutter'}' "$FLUTTER_ROOT" rm -rf "$FLUTTER_ROOT/bin/cache" mkdir "$FLUTTER_ROOT/bin/cache" +'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") '' + mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk" + lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk" +'' + '' HOME="$(mktemp -d)" flutter precache -v '--${flutterPlatform}' ${builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))} rm -rf "$FLUTTER_ROOT/bin/cache/lockfile" +'' + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") '' + rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk" +'' + '' find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete cp -r bin/cache "$out" -'' +'') diff --git a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix index def75e280da77..23bd8485ccffa 100644 --- a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix +++ b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix @@ -16,6 +16,7 @@ mkdir -p "$out/bin" cp -r . "$out/bin/cache" + rm -f "$out/bin/cache/flutter.version.json" runHook postInstall ''; diff --git a/pkgs/development/compilers/flutter/versions/3_26/data.json b/pkgs/development/compilers/flutter/versions/3_26/data.json new file mode 100644 index 0000000000000..3d1b530a66ad1 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/data.json @@ -0,0 +1,1052 @@ +{ + "version": "3.26.0-0.1.pre", + "engineVersion": "059e4e6d8ff6de39c29441c53e949bfb0bf17972", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", + "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", + "channel": "beta", + "engineHashes": { + "x86_64-linux": { + "aarch64-linux": "sha256-tOrgkuPsQedWjCObrwZ9ICY15YWi+aVpxOQPE6vdeGc=", + "x86_64-linux": "sha256-tOrgkuPsQedWjCObrwZ9ICY15YWi+aVpxOQPE6vdeGc=" + } + }, + "dartVersion": "3.6.0-216.1.beta", + "dartHash": { + "x86_64-linux": "sha256-Vvdx4Bi7a/ySrxAv3UejlmmbNyKzdDr9RCS9tVGscDQ=", + "aarch64-linux": "sha256-SHqk1bm/5+ixOA5RHuToHQDN/NrNKZIrkkaBh9Cvl/I=", + "x86_64-darwin": "sha256-dbw0+OtjYkdRCgLDP+oNcOUgR5C8gC12NdftNAk7x0Q=", + "aarch64-darwin": "sha256-XOpBwyrMqIKutXgLEjGuta/3yhK+DpoSChNVXc9MMYA=" + }, + "flutterHash": "sha256-4YXm/MbhQsifJYpeUjmP8h6sm7pWrjBSpbCTV9p659o=", + "artifactHashes": { + "android": { + "aarch64-darwin": "sha256-CmjEq9T5gNgNKp8mik6HwVAsAfdWXBK2nHwL28L08xk=", + "aarch64-linux": "sha256-sucpfdtDzNMmCpWOZGVp48uNSrj221fOROI8huRs8Xc=", + "x86_64-darwin": "sha256-CmjEq9T5gNgNKp8mik6HwVAsAfdWXBK2nHwL28L08xk=", + "x86_64-linux": "sha256-sucpfdtDzNMmCpWOZGVp48uNSrj221fOROI8huRs8Xc=" + }, + "fuchsia": { + "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" + }, + "ios": { + "aarch64-darwin": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "aarch64-linux": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "x86_64-darwin": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=", + "x86_64-linux": "sha256-kRgyKtnMs7xefe+XmCoYbO7sa7Dz1o0ltcRdiDvSeik=" + }, + "linux": { + "aarch64-darwin": "sha256-tnvQp4Vdthqwgt1bFRpZVJOuTX752yJE91yJNpwSOp4=", + "aarch64-linux": "sha256-tnvQp4Vdthqwgt1bFRpZVJOuTX752yJE91yJNpwSOp4=", + "x86_64-darwin": "sha256-vIfHgLif151Ymtu/aFtwHZTk28H2feHd9cOedUmSWXY=", + "x86_64-linux": "sha256-vIfHgLif151Ymtu/aFtwHZTk28H2feHd9cOedUmSWXY=" + }, + "macos": { + "aarch64-darwin": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "aarch64-linux": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "x86_64-darwin": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=", + "x86_64-linux": "sha256-/4R3Wlcs6ksMkTTZJ/YzEgWWCQJBKlnWr+PNCtcL3oc=" + }, + "universal": { + "aarch64-darwin": "sha256-M2Fuqfgq79+FilJ5vU0Iarn0cpV3+4AxuxFEc3fwm+4=", + "aarch64-linux": "sha256-NqlNboNjLFAeuLHu6lNnMnrEb902nwIV1b/DNfrr3h8=", + "x86_64-darwin": "sha256-tlGwnwAov1eBe54mD9Q6D86qIEBkHBODJs5SVJyP5M0=", + "x86_64-linux": "sha256-0lxLRRQq+bRDPXyxEtZVGtzzqhrcsTYx01jeFX3ejLc=" + }, + "web": { + "aarch64-darwin": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "aarch64-linux": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "x86_64-darwin": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=", + "x86_64-linux": "sha256-fVOuJCTciHWv+HRFtSgn8zrexspBe+MUnc/cZlOeoqM=" + }, + "windows": { + "x86_64-darwin": "sha256-mwbk0VwxsbnMjy8trtjgZZ96jF3QuQJDcc0VSs6mQxI=", + "x86_64-linux": "sha256-mwbk0VwxsbnMjy8trtjgZZ96jF3QuQJDcc0VSs6mQxI=" + } + }, + "pubspecLock": { + "packages": { + "_fe_analyzer_shared": { + "dependency": "direct main", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "73.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.8.0" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "direct main", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "built_collection": { + "dependency": "direct main", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "direct main", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "checked_yaml": { + "dependency": "direct dev", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_config": { + "dependency": "direct main", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "clock": { + "dependency": "direct main", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "direct dev", + "description": { + "name": "collection", + "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.0" + }, + "completion": { + "dependency": "direct main", + "description": { + "name": "completion", + "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "direct main", + "description": { + "name": "coverage", + "sha256": "7b594a150942e0d3be99cd45a1d0b5caff27ba5a27f292ed8e8d904ba3f167b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "csslib": { + "dependency": "direct main", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "dap": { + "dependency": "direct main", + "description": { + "name": "dap", + "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "dds": { + "dependency": "direct main", + "description": { + "name": "dds", + "sha256": "263f8831bfe57136fd4c07cf87df9b3f65457438b8b4d237e1b1d603c6d1cdbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.6" + }, + "dds_service_extensions": { + "dependency": "direct main", + "description": { + "name": "dds_service_extensions", + "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "devtools_shared": { + "dependency": "direct main", + "description": { + "name": "devtools_shared", + "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.2" + }, + "dtd": { + "dependency": "direct main", + "description": { + "name": "dtd", + "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "24.1.0" + }, + "extension_discovery": { + "dependency": "direct main", + "description": { + "name": "extension_discovery", + "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "fake_async": { + "dependency": "direct main", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "direct main", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_testing": { + "dependency": "direct dev", + "description": { + "name": "file_testing", + "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter_template_images": { + "dependency": "direct main", + "description": { + "name": "flutter_template_images", + "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "frontend_server_client": { + "dependency": "direct main", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "direct main", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "direct main", + "description": { + "name": "http_parser", + "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "direct main", + "description": { + "name": "js", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.1" + }, + "json_annotation": { + "dependency": "direct dev", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_rpc_2": { + "dependency": "direct main", + "description": { + "name": "json_rpc_2", + "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "matcher": { + "dependency": "direct main", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "multicast_dns": { + "dependency": "direct main", + "description": { + "name": "multicast_dns", + "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+7" + }, + "mustache_template": { + "dependency": "direct main", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "native_assets_builder": { + "dependency": "direct main", + "description": { + "name": "native_assets_builder", + "sha256": "3368f3eda23d59e98c8eadeafe609feb3bf6c342e5885796d6eceadc3d4581f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.2" + }, + "native_assets_cli": { + "dependency": "direct main", + "description": { + "name": "native_assets_cli", + "sha256": "1ff032c0ca050391c4c5107485f1a26e0e95cee18d1fdb2b7bdbb990efd3c188", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "native_stack_traces": { + "dependency": "direct main", + "description": { + "name": "native_stack_traces", + "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "node_preamble": { + "dependency": "direct main", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "direct main", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "direct main", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "process": { + "dependency": "direct main", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "direct dev", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "direct main", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "direct main", + "description": { + "name": "shelf_web_socket", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_map_stack_trace": { + "dependency": "direct main", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "direct main", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "direct main", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "direct main", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sse": { + "dependency": "direct main", + "description": { + "name": "sse", + "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.6" + }, + "stack_trace": { + "dependency": "direct main", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "standard_message_codec": { + "dependency": "direct main", + "description": { + "name": "standard_message_codec", + "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1+4" + }, + "stream_channel": { + "dependency": "direct main", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "direct main", + "description": { + "name": "string_scanner", + "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "sync_http": { + "dependency": "direct main", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "term_glyph": { + "dependency": "direct main", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct main", + "description": { + "name": "test", + "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.25.8" + }, + "test_api": { + "dependency": "direct main", + "description": { + "name": "test_api", + "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "test_core": { + "dependency": "direct main", + "description": { + "name": "test_core", + "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.5" + }, + "typed_data": { + "dependency": "direct main", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "unified_analytics": { + "dependency": "direct main", + "description": { + "name": "unified_analytics", + "sha256": "916215af2dc2f54a204c6bfbc645ec401b6a150048764814379f42e09b557d2d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "usage": { + "dependency": "direct main", + "description": { + "name": "usage", + "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "83d37c7ad7aaf9aa8e275490669535c8080377cfa7a7004c24dfac53afffaa90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.4.2" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "vm_service_interface": { + "dependency": "direct main", + "description": { + "name": "vm_service_interface", + "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "vm_snapshot_analysis": { + "dependency": "direct main", + "description": { + "name": "vm_snapshot_analysis", + "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "direct main", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket": { + "dependency": "direct main", + "description": { + "name": "web_socket", + "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "direct main", + "description": { + "name": "web_socket_channel", + "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "webdriver": { + "dependency": "direct main", + "description": { + "name": "webdriver", + "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "direct main", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + } + }, + "sdks": { + "dart": ">=3.4.3 <4.0.0" + } + } +} diff --git a/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch new file mode 100644 index 0000000000000..01e34c6d292c9 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/deregister-pub-dependencies-artifact.patch @@ -0,0 +1,19 @@ +diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart +index 252021cf78..e50ef0885d 100644 +--- a/packages/flutter_tools/lib/src/flutter_cache.dart ++++ b/packages/flutter_tools/lib/src/flutter_cache.dart +@@ -51,14 +51,6 @@ class FlutterCache extends Cache { + registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform)); + } + registerArtifact(FontSubsetArtifacts(this, platform: platform)); +- registerArtifact(PubDependencies( +- logger: logger, +- // flutter root and pub must be lazily initialized to avoid accessing +- // before the version is determined. +- flutterRoot: () => Cache.flutterRoot!, +- pub: () => pub, +- projectFactory: projectFactory, +- )); + } + } + \ No newline at end of file diff --git a/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch new file mode 100644 index 0000000000000..2ad292efd222e --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/disable-auto-update.patch @@ -0,0 +1,30 @@ +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart +index e4e474ab6e..5548599802 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart +@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter -h') for available flutter commands and + + // Populate the cache. We call this before pub get below so that the + // sky_engine package is available in the flutter cache for pub to find. +- if (shouldUpdateCache) { ++ if (false) { + // First always update universal artifacts, as some of these (e.g. + // ios-deploy on macOS) are required to determine `requiredArtifacts`. + final bool offline; +diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +index 50783f8435..db94062840 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner { + globals.analytics.suppressTelemetry(); + } + +- globals.flutterVersion.ensureVersionFile(); + final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false; +- if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) { +- await globals.flutterVersion.checkFlutterVersionFreshness(); +- } + + // See if the user specified a specific device. + final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?; + diff --git a/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 0000000000000..825d40fc6176a --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "//XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + diff --git a/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch new file mode 100644 index 0000000000000..de6080efbba8d --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_26/patches/gradle-flutter-tools-wrapper.patch @@ -0,0 +1,44 @@ +This patch introduces an intermediate Gradle build step to alter the behavior +of flutter_tools' Gradle project, specifically moving the creation of `build` +and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`. + +Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle` +directories within the Nix Store. Resulting in read-only errors when trying to build a +Flutter Android app at runtime. + +This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project +when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")` + +`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory. + +The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle//` and `includeBuild`s it. +This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting +`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`. + +Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle//`, but `build` doesn't. +To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle//` as well, we need to set `buildDirectory`. +diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle +new file mode 100644 +index 0000000000..b2485c94b4 +--- /dev/null ++++ b/packages/flutter_tools/gradle/settings.gradle +@@ -0,0 +1,19 @@ ++rootProject.buildFileName = "/dev/null" ++ ++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10) ++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev") ++dir.mkdirs() ++def file = new File(dir, "settings.gradle") ++ ++file.text = """ ++rootProject.projectDir = new File("$settingsDir") ++apply from: new File("$settingsDir/settings.gradle.kts") ++ ++gradle.allprojects { project -> ++ project.beforeEvaluate { ++ project.layout.buildDirectory = new File("$dir/build") ++ } ++} ++""" ++ ++includeBuild(dir) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91d88c0f9dea2..855440e51f8a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14568,6 +14568,7 @@ with pkgs; flutterPackages-source = recurseIntoAttrs (callPackage ../development/compilers/flutter { useNixpkgsEngine = true; }); flutterPackages = flutterPackages-bin; flutter = flutterPackages.stable; + flutter326 = flutterPackages.v3_26; flutter324 = flutterPackages.v3_24; flutter319 = flutterPackages.v3_19; From 3920b9d8191e7766a536fb5205ff36049d7a39d6 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 7 Oct 2024 16:47:09 -0700 Subject: [PATCH 013/180] uboot: 2024.07 -> 2024.10 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 351c5788584a2..61f4a283206ba 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -28,10 +28,10 @@ }: let - defaultVersion = "2024.07"; + defaultVersion = "2024.10"; defaultSrc = fetchurl { url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - hash = "sha256-9ZHamrkO89az0XN2bQ3f+QxO1zMGgIl0hhF985DYPI8="; + hash = "sha256-so2vSsF+QxVjYweL9RApdYQTf231D87ZsS3zT2GpL7A="; }; # Dependencies for the tools need to be included as either native or cross, From 6521bf431833332e68708220562d469792b3d39a Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Oct 2024 00:27:41 -0400 Subject: [PATCH 014/180] niri: format with nixfmt --- pkgs/by-name/ni/niri/package.nix | 45 ++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 3748f3dbf819c..d5bcb5ef987bf 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -1,22 +1,23 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script -, pkg-config -, libdisplay-info -, libxkbcommon -, pango -, pipewire -, seatd -, stdenv -, wayland -, systemd -, libinput -, mesa -, fontconfig -, libglvnd -, autoPatchelfHook -, clang +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + pkg-config, + libdisplay-info, + libxkbcommon, + pango, + pipewire, + seatd, + stdenv, + wayland, + systemd, + libinput, + mesa, + fontconfig, + libglvnd, + autoPatchelfHook, + clang, }: rustPlatform.buildRustPackage rec { @@ -86,7 +87,11 @@ rustPlatform.buildRustPackage rec { description = "Scrollable-tiling Wayland compositor"; homepage = "https://github.com/YaLTeR/niri"; license = licenses.gpl3Only; - maintainers = with maintainers; [ iogamaster foo-dogsquared sodiboo ]; + maintainers = with maintainers; [ + iogamaster + foo-dogsquared + sodiboo + ]; mainProgram = "niri"; platforms = platforms.linux; }; From d9aecbc3e0dca3d3ce34161473469d24c56f9660 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Oct 2024 00:32:37 -0400 Subject: [PATCH 015/180] niri: cleanup dependencies Some of these were not required, not explicitly listed, or shouldn't always be added to the rpath --- pkgs/by-name/ni/niri/package.nix | 40 +++++++++++++++----------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index d5bcb5ef987bf..ea3c2ed972baa 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -1,23 +1,22 @@ { lib, - rustPlatform, + autoPatchelfHook, + clang, + dbus, fetchFromGitHub, - nix-update-script, - pkg-config, libdisplay-info, + libglvnd, + libinput, libxkbcommon, + mesa, + nix-update-script, pango, pipewire, + pkg-config, + rustPlatform, seatd, - stdenv, - wayland, systemd, - libinput, - mesa, - fontconfig, - libglvnd, - autoPatchelfHook, - clang, + wayland, }: rustPlatform.buildRustPackage rec { @@ -39,30 +38,29 @@ rustPlatform.buildRustPackage rec { }; }; + strictDeps = true; + nativeBuildInputs = [ - pkg-config - rustPlatform.bindgenHook autoPatchelfHook clang + pkg-config + rustPlatform.bindgenHook ]; buildInputs = [ - wayland - systemd # For libudev - seatd # For libseat + dbus libdisplay-info - libxkbcommon libinput + libxkbcommon mesa # For libgbm - fontconfig - stdenv.cc.cc.lib - pipewire pango + pipewire + seatd + systemd # Also includes libudev ]; runtimeDependencies = [ wayland - mesa libglvnd # For libEGL ]; From f1cf61e2bf1db1ff6a3343717406fecc34089d0e Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Oct 2024 00:34:51 -0400 Subject: [PATCH 016/180] niri: force linking with linker args instead of patchelf We don't need to be patching an already built binary here --- pkgs/by-name/ni/niri/package.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index ea3c2ed972baa..2519fe3134892 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -1,6 +1,5 @@ { lib, - autoPatchelfHook, clang, dbus, fetchFromGitHub, @@ -41,7 +40,6 @@ rustPlatform.buildRustPackage rec { strictDeps = true; nativeBuildInputs = [ - autoPatchelfHook clang pkg-config rustPlatform.bindgenHook @@ -50,6 +48,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ dbus libdisplay-info + libglvnd # For libEGL libinput libxkbcommon mesa # For libgbm @@ -57,11 +56,7 @@ rustPlatform.buildRustPackage rec { pipewire seatd systemd # Also includes libudev - ]; - - runtimeDependencies = [ - wayland - libglvnd # For libEGL + wayland # For libwayland-client ]; passthru.providedSessions = [ "niri" ]; @@ -79,6 +74,19 @@ rustPlatform.buildRustPackage rec { install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/share/systemd/user ''; + env = { + # Force linking with libEGL and libwayland-client + # so they can be discovered by `dlopen()` + RUSTFLAGS = toString ( + map (arg: "-C link-arg=" + arg) [ + "-Wl,--push-state,--no-as-needed" + "-lEGL" + "-lwayland-client" + "-Wl,--pop-state" + ] + ); + }; + passthru.updateScript = nix-update-script { }; meta = with lib; { From f03374e375faaf5fe3511b4ec1283dada1fda6af Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Oct 2024 00:38:20 -0400 Subject: [PATCH 017/180] niri: cleanup This reorders some of the attributes to be a bit more sensible, as well as adopts some "best practices" --- pkgs/by-name/ni/niri/package.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 2519fe3134892..2fe758bf2225d 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -25,10 +25,16 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg="; }; + postPatch = '' + patchShebangs resources/niri-session + substituteInPlace resources/niri.service \ + --replace-fail '/usr/bin' "$out/bin" + ''; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -59,14 +65,6 @@ rustPlatform.buildRustPackage rec { wayland # For libwayland-client ]; - passthru.providedSessions = [ "niri" ]; - - postPatch = '' - patchShebangs ./resources/niri-session - substituteInPlace ./resources/niri.service \ - --replace-fail '/usr/bin' "$out/bin" - ''; - postInstall = '' install -Dm0755 ./resources/niri-session -t $out/bin install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions @@ -87,18 +85,21 @@ rustPlatform.buildRustPackage rec { ); }; - passthru.updateScript = nix-update-script { }; + passthru = { + providedSessions = [ "niri" ]; + updateScript = nix-update-script { }; + }; - meta = with lib; { + meta = { description = "Scrollable-tiling Wayland compositor"; homepage = "https://github.com/YaLTeR/niri"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ iogamaster foo-dogsquared sodiboo ]; mainProgram = "niri"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 6a2a50845c5f163f2abcc2fd0e2cae94aeb2f46a Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Oct 2024 00:39:32 -0400 Subject: [PATCH 018/180] niri: add `meta.changelog` --- pkgs/by-name/ni/niri/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 2fe758bf2225d..79e80486d4bce 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -93,6 +93,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Scrollable-tiling Wayland compositor"; homepage = "https://github.com/YaLTeR/niri"; + changelog = "https://github.com/YaLTeR/niri/releases/tag/v${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ iogamaster From ec537c2c0306edd5e59d8ddd1910a51aff0f33f2 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 20 Sep 2024 05:01:15 +0000 Subject: [PATCH 019/180] harbor-cli: init at 0.0.1 --- pkgs/by-name/ha/harbor-cli/package.nix | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/ha/harbor-cli/package.nix diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix new file mode 100644 index 0000000000000..c47f50ecc2aad --- /dev/null +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + testers, + harbor-cli, + installShellFiles, +}: + +buildGoModule rec { + pname = "harbor-cli"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "goharbor"; + repo = "harbor-cli"; + rev = "v${version}"; + hash = "sha256-WSADuhr6p8N0Oh1xIG7yItM6t0EWUiAkzNbdKsSc4WA="; + }; + + vendorHash = "sha256-UUD9/5+McR1t5oO4/6TSScT7hhSKM0OpBf94LVQG1Pw="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.Version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd harbor \ + --bash <($out/bin/harbor completion bash) \ + --fish <($out/bin/harbor completion fish) \ + --zsh <($out/bin/harbor completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = harbor-cli; + command = "harbor version"; + }; + + meta = { + homepage = "https://github.com/goharbor/harbor-cli"; + description = "Command-line tool facilitates seamless interaction with the Harbor container registry"; + changelog = "https://github.com/goharbor/harbor-cli/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ aaronjheng ]; + mainProgram = "harbor"; + }; +} From a155c718d3a2175bfc3cdfacf49e1e73cf89e3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Oct 2024 13:36:13 +0200 Subject: [PATCH 020/180] nixos/nginx: expand proxyResolveWhileRunning's description --- nixos/modules/services/web-servers/nginx/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index d49ee0eba1159..1a58662adafa5 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -853,9 +853,12 @@ in type = types.bool; default = false; description = '' - Resolves domains of proxyPass targets at runtime - and not only at start, you have to set - services.nginx.resolver, too. + Resolves domains of proxyPass targets at runtime and not only at startup. + This can be used as a workaround if nginx fails to start because of not-yet-working DNS. + + :::{.warn} + `services.nginx.resolver` must be set for this option to work. + ::: ''; }; From ce8336e70989364521ab397f8257b87ab8a887cb Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 8 Oct 2024 16:10:24 +0300 Subject: [PATCH 021/180] ubootOrangePi3B: init at 2024.10 --- pkgs/misc/uboot/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 61f4a283206ba..6d5f6ae9bf6f9 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -442,6 +442,14 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootOrangePi3B = buildUBoot { + defconfig = "orangepi-3b-rk3566_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + ROCKCHIP_TPL = rkbin.TPL_RK3568; + BL31 = rkbin.BL31_RK3568; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; + }; + ubootPcduino3Nano = buildUBoot { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2edc4e6ec7565..d182c591cf06d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26627,6 +26627,7 @@ with pkgs; ubootOlimexA64Olinuxino ubootOlimexA64Teres1 ubootOrangePi3 + ubootOrangePi3B ubootOrangePi5 ubootOrangePi5Plus ubootOrangePiPc From 19bda3deeea0c87a0443299e342917b85c66f165 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 8 Oct 2024 16:10:16 +0300 Subject: [PATCH 022/180] ubootCM3588NAS: init at 2024.10 --- pkgs/misc/uboot/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 6d5f6ae9bf6f9..037b4ca8d0085 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -212,6 +212,14 @@ in { filesToInstall = ["u-boot-with-spl.kwb"]; }; + ubootCM3588NAS = buildUBoot { + defconfig = "cm3588-nas-rk3588_defconfig"; + extraMeta.platforms = [ "aarch64-linux" ]; + BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; + ROCKCHIP_TPL = rkbin.TPL_RK3588; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; + }; + ubootCubieboard2 = buildUBoot { defconfig = "Cubieboard2_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d182c591cf06d..aceacc1ce5a2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26615,6 +26615,7 @@ with pkgs; ubootBananaPim64 ubootAmx335xEVM ubootClearfog + ubootCM3588NAS ubootCubieboard2 ubootGuruplug ubootJetsonTK1 From b8d9a0eaa691eb611de21d3cb8891333cc29f062 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 8 Oct 2024 08:46:45 -0700 Subject: [PATCH 023/180] ubootCM3588NAS: don't install non-existent image for SPI flash The defconfig for ubootCM3588NAS does not specify building an image for SPI flash, so remove the attempt to install the non-existent file. --- pkgs/misc/uboot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 037b4ca8d0085..1983157df1f60 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -217,7 +217,7 @@ in { extraMeta.platforms = [ "aarch64-linux" ]; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; ROCKCHIP_TPL = rkbin.TPL_RK3588; - filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ]; }; ubootCubieboard2 = buildUBoot { From 0c5d185ad706ca2a6479fe72b3b5d9e3514995dd Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Oct 2024 00:43:01 -0400 Subject: [PATCH 024/180] niri: allow configuration of build features --- pkgs/by-name/ni/niri/package.nix | 57 +++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 79e80486d4bce..e0d0a0fa4e621 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -2,6 +2,7 @@ lib, clang, dbus, + eudev, fetchFromGitHub, libdisplay-info, libglvnd, @@ -16,6 +17,10 @@ seatd, systemd, wayland, + withDbus ? true, + withDinit ? false, + withScreencastSupport ? true, + withSystemd ? true, }: rustPlatform.buildRustPackage rec { @@ -51,26 +56,40 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = [ - dbus - libdisplay-info - libglvnd # For libEGL - libinput - libxkbcommon - mesa # For libgbm - pango - pipewire - seatd - systemd # Also includes libudev - wayland # For libwayland-client - ]; + buildInputs = + [ + libdisplay-info + libglvnd # For libEGL + libinput + libxkbcommon + mesa # For libgbm + pango + seatd + wayland # For libwayland-client + ] + ++ lib.optional (withDbus || withScreencastSupport || withSystemd) dbus + ++ lib.optional withScreencastSupport pipewire + ++ lib.optional withSystemd systemd # Includes libudev + ++ lib.optional (!withSystemd) eudev; # Use an alternative libudev implementation when building w/o systemd - postInstall = '' - install -Dm0755 ./resources/niri-session -t $out/bin - install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions - install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal - install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/share/systemd/user - ''; + buildFeatures = + lib.optional withDbus "dbus" + ++ lib.optional withDinit "dinit" + ++ lib.optional withScreencastSupport "xdp-gnome-screencast" + ++ lib.optional withSystemd "systemd"; + buildNoDefaultFeatures = true; + + postInstall = + '' + install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions + '' + + lib.optionalString withDbus '' + install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal + '' + + lib.optionalString withSystemd '' + install -Dm0755 resources/niri-session -t $out/bin + install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/share/systemd/user + ''; env = { # Force linking with libEGL and libwayland-client From 9b12b98033391f685d5ff5c225f5d69485154a77 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 8 Oct 2024 00:53:44 -0400 Subject: [PATCH 025/180] niri: add getchoo as maintainer --- pkgs/by-name/ni/niri/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index e0d0a0fa4e621..c41c04dd5dd8e 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -118,6 +118,7 @@ rustPlatform.buildRustPackage rec { iogamaster foo-dogsquared sodiboo + getchoo ]; mainProgram = "niri"; platforms = lib.platforms.linux; From 4a466a74a192239e1409f7fa42627043a2f46e3f Mon Sep 17 00:00:00 2001 From: genga Date: Tue, 8 Oct 2024 16:54:26 +0300 Subject: [PATCH 026/180] maintainers: add genga898 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e568256461f60..3f8a0fedfedd6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7651,6 +7651,12 @@ githubId = 111183546; keys = [ { fingerprint = "58CE D4BE 6B10 149E DA80 A990 2F48 6356 A4CB 30F3"; } ]; }; + genga898 = { + email = "genga898@gmail.com"; + github = "genga898"; + githubId = 84174227; + name = "Emmanuel Genga"; + }; genofire = { name = "genofire"; email = "geno+dev@fireorbit.de"; From 454dd145513f0fd9ce5c0b9457120a4562ffebf2 Mon Sep 17 00:00:00 2001 From: genga Date: Tue, 8 Oct 2024 21:25:43 +0300 Subject: [PATCH 027/180] gomanagedocker: init at 1.4 --- pkgs/by-name/go/gomanagedocker/package.nix | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/go/gomanagedocker/package.nix diff --git a/pkgs/by-name/go/gomanagedocker/package.nix b/pkgs/by-name/go/gomanagedocker/package.nix new file mode 100644 index 0000000000000..d31d435a7aa40 --- /dev/null +++ b/pkgs/by-name/go/gomanagedocker/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + stdenv, + darwin, + xorg, +}: +let + version = "1.4"; +in +buildGoModule { + pname = "gomanagedocker"; + inherit version; + + src = fetchFromGitHub { + owner = "ajayd-san"; + repo = "gomanagedocker"; + rev = "refs/tags/v${version}"; + hash = "sha256-oM0DCOHdVPJFWgmHF8yeGGo6XvuTCXar7NebM1obahg="; + }; + + vendorHash = "sha256-M/jfQWCBrv7hZm450yLBmcjWtNSCziKOpfipxI6U9ak="; + + buildInputs = + lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] + ++ lib.optionals stdenv.isLinux [ xorg.libX11 ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "TUI tool to manage your docker images, containers and volumes"; + homepage = "https://github.com/ajayd-san/gomanagedocker"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "gomanagedocker"; + }; +} From b2e9cc6167358731e0987293673b2a8ff0f7f892 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 9 Oct 2024 16:26:16 +1100 Subject: [PATCH 028/180] qemu-vm: fix case-hack appearing in store image --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index edefb4c227f03..c6084e5590969 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -141,6 +141,7 @@ let --absolute-names \ --verbatim-files-from \ --transform 'flags=rSh;s|/nix/store/||' \ + --transform 'flags=rSh;s|~nix~case~hack~[[:digit:]]\+||g' \ --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \ | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ --quiet \ From 42f90a443b0bf8a9772a39de8ba1d189ded59bde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Oct 2024 03:33:16 +0000 Subject: [PATCH 029/180] zimfw: 1.14.0 -> 1.15.0 --- pkgs/shells/zsh/zimfw/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index f1e7afa8c3841..d37b4c8b522ef 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - hash = "sha256-JBMrgUMGsvjYasEHJsZ0jZAHmrN3Z0d8T8agI9FiEPs="; + hash = "sha256-8GnxUhBvMy7fhDILDKYEf/9Mhgzz7suaiZ5elRZmT0o="; }; strictDeps = true; dontConfigure = true; @@ -24,17 +24,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - ## zim automates the downloading of any plugins you specify in the `.zimrc` - ## file. To do that with Nix, you'll need $ZIM_HOME to be writable. - ## `~/.cache/zim` is a good place for that. The problem is that zim also - ## looks for `zimfw.zsh` there, so we're going to tell it here to look for - ## the `zimfw.zsh` where we currently are. - postFixup = '' - substituteInPlace $out/zimfw.zsh \ - --replace "\''${ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" \ - --replace "\''${(q-)ZIM_HOME}/zimfw.zsh" "$out/zimfw.zsh" - ''; - meta = with lib; { description = "The Zsh configuration framework with blazing speed and modular extensions"; From ec6f7710bf4cddfc6d832665a88f1ab40929cf37 Mon Sep 17 00:00:00 2001 From: Tali Auster Date: Wed, 9 Oct 2024 12:27:34 -0700 Subject: [PATCH 030/180] alire: 2.0.1 -> 2.0.2 --- pkgs/development/tools/build-managers/alire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/alire/default.nix b/pkgs/development/tools/build-managers/alire/default.nix index cfa6e58ff3a0f..17f6f256edb3e 100644 --- a/pkgs/development/tools/build-managers/alire/default.nix +++ b/pkgs/development/tools/build-managers/alire/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "alire"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "alire-project"; repo = "alire"; rev = "v${finalAttrs.version}"; - hash = "sha256-fJXt3mM/v87hWumML6L3MH1O/uKkzmpE58B9nDRohzM="; + hash = "sha256-m4EPiqh7KCeNgq4G727jrW5ABb+uecvvpmZyskqtml4="; fetchSubmodules = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gprbuild gnat ]; postPatch = '' - patchShebangs ./dev/build.sh + patchShebangs ./dev/build.sh ./scripts/version-patcher.sh ''; buildPhase = '' From 1bc3a3c06693fd3b8e830ca4f919a3080d3b11c2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 9 Oct 2024 19:47:41 +0200 Subject: [PATCH 031/180] python312Packages.reflex: 0.6.1 -> 0.6.2 Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.6.2 --- pkgs/development/python-modules/reflex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 572a4417ccad3..1fba1e49f9676 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -56,7 +56,7 @@ buildPythonPackage rec { owner = "reflex-dev"; repo = "reflex"; rev = "refs/tags/v${version}"; - hash = "sha256-p7o7e/OBX8P5QKsHNInKKQO1jklTr61SXuGk+ceakJU="; + hash = "sha256-d/1Pb8jI97pvaKnWwauuyFCMt/35G/30BlAn7nyj61U="; }; pythonRelaxDeps = [ From 8b2b7db6d420ac52ea9e3b2fc39411c687816d1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Oct 2024 04:18:41 +0000 Subject: [PATCH 032/180] python312Packages.pylint-django: 2.5.4 -> 2.6.0 --- pkgs/development/python-modules/pylint-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 5cf7838dea18e..0bac1f4037cea 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.5.4"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "pylint-django"; rev = "refs/tags/v${version}"; - hash = "sha256-MNgu3LvFoohXA+JzUiHIaYFw0ssEe+H5T8Ea56LcGuI="; + hash = "sha256-Rnty8ryKd5PxFFVYcvB8p9VS3qlHCprxR8+/ySY5qC8="; }; nativeBuildInputs = [ poetry-core ]; From efaf696f2dc06623d8605d43dc71550b2877faba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Oct 2024 05:04:35 +0000 Subject: [PATCH 033/180] python312Packages.tika-client: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/tika-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index f2e74ad90c93e..ce6bfb6db1429 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { pname = "tika-client"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = "refs/tags/${version}"; - hash = "sha256-1Gc/WF8eEGT17z2CiuSLUIngDZVoHdBhfsUddNUBwWo="; + hash = "sha256-0cv2HaquIUQOb5CPkCxSYvXDzu3OV7WKIT80jI+pjpY="; }; propagatedBuildInputs = [ From f31c369faef3ad6a19e57db5e8d234b3f6a9de55 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 10 Oct 2024 11:30:27 +0200 Subject: [PATCH 034/180] panoply: 5.5.2 -> 5.5.3 --- pkgs/tools/misc/panoply/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index 94ff8e10bb7ee..78bd166a5f6ff 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.5.2"; + version = "5.5.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - hash = "sha256-ff7O3pW8/2CDXrd6CU+ygFeyNoGNCeTHIH7cdm+k8TE="; + hash = "sha256-TCuCLWMVp7t0JpHA6TbwUdURj/aBggzLa9I7llRY0TU="; }; nativeBuildInputs = [ makeWrapper ]; From 1b0fea21dfea57382f75cbec79787e91a8b0738f Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 10 Oct 2024 13:33:06 +0000 Subject: [PATCH 035/180] audiobookshelf: 2.13.4 -> 2.14.0 --- pkgs/by-name/au/audiobookshelf/source.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 350ca60dfd956..87811d028730b 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "ce213c3d89458baeb77324ce59a5f2137740564e", - "hash": "sha256-7vPhvsjGJQvus5Mmx8543OuBeuPWC/4cLfHHYmN2lnk=", - "version": "2.13.4", - "depsHash": "sha256-1CmtuzE8R6zkb0DT7gt9MrxErAw0mqY2AkJZh3PjuBQ=", - "clientDepsHash": "sha256-BfrVN70i1e4JWELxLS0jliHLfG4/kN8tj8aQOjsnZ/M=" + "rev": "cf5598aeb9b086a28e853d6a89b82a7467fd6969", + "hash": "sha256-tObC7QbdwpAlt97eXB9QzZEaQcquuST+8nC6lYEXTUM=", + "version": "2.14.0", + "depsHash": "sha256-nVsmV3Vms2S9oM7duFfgt+go1+wM2JniI8B3UFmv/TE=", + "clientDepsHash": "sha256-oaoGxcMs8XQVaRx8UO9NSThqbHuZsA4fm8OGlSiaKO0=" } From 36a83a3bf1d5ff8df5dd3a001b58a2a6ed74349c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 26 Aug 2024 23:05:56 +0300 Subject: [PATCH 036/180] mastodon: 4.2.13 -> 4.3.0 Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.3.0 --- nixos/modules/services/web-apps/mastodon.nix | 97 +- pkgs/servers/mastodon/default.nix | 51 +- pkgs/servers/mastodon/gemset.nix | 1467 +++++++++++------- pkgs/servers/mastodon/source.nix | 6 +- pkgs/servers/mastodon/update.sh | 6 +- pkgs/servers/mastodon/yarn.nix | 34 + pkgs/top-level/all-packages.nix | 6 +- 7 files changed, 1050 insertions(+), 617 deletions(-) create mode 100644 pkgs/servers/mastodon/yarn.nix diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 5c383e9f16ab8..a3a2bbd1eca6d 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -12,9 +12,12 @@ let RAILS_ENV = "production"; NODE_ENV = "production"; + BOOTSNAP_CACHE_DIR="/var/cache/mastodon/precompile"; LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; - # mastodon-web concurrency. + MASTODON_USE_LIBVIPS = "true"; + + # Concurrency mastodon-web WEB_CONCURRENCY = toString cfg.webProcesses; MAX_THREADS = toString cfg.webThreads; @@ -24,7 +27,7 @@ let DB_NAME = cfg.database.name; LOCAL_DOMAIN = cfg.localDomain; SMTP_SERVER = cfg.smtp.host; - SMTP_PORT = toString(cfg.smtp.port); + SMTP_PORT = toString cfg.smtp.port; SMTP_FROM_ADDRESS = cfg.smtp.fromAddress; PAPERCLIP_ROOT_PATH = "/var/lib/mastodon/public-system"; PAPERCLIP_ROOT_URL = "/system"; @@ -33,12 +36,12 @@ let TRUSTED_PROXY_IP = cfg.trustedProxy; } // lib.optionalAttrs (cfg.redis.host != null) { REDIS_HOST = cfg.redis.host; } - // lib.optionalAttrs (cfg.redis.port != null) { REDIS_PORT = toString(cfg.redis.port); } + // lib.optionalAttrs (cfg.redis.port != null) { REDIS_PORT = toString cfg.redis.port; } // lib.optionalAttrs (cfg.redis.createLocally && cfg.redis.enableUnixSocket) { REDIS_URL = "unix://${config.services.redis.servers.mastodon.unixSocket}"; } // lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) { DB_PORT = toString cfg.database.port; } // lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; } // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_HOST = cfg.elasticsearch.host; } - // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PORT = toString(cfg.elasticsearch.port); } + // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PORT = toString cfg.elasticsearch.port; } // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_PRESET = cfg.elasticsearch.preset; } // lib.optionalAttrs (cfg.elasticsearch.user != null) { ES_USER = cfg.elasticsearch.user; } // cfg.extraConfig; @@ -51,6 +54,9 @@ let Group = cfg.group; # Working directory WorkingDirectory = cfg.package; + # Cache directory and mode + CacheDirectory = "mastodon"; + CacheDirectoryMode = "0750"; # State directory and mode StateDirectory = "mastodon"; StateDirectoryMode = "0750"; @@ -127,7 +133,7 @@ let description = "Mastodon sidekiq${jobClassLabel}"; wantedBy = [ "mastodon.target" ]; environment = env // { - PORT = toString(cfg.sidekiqPort); + PORT = toString cfg.sidekiqPort; DB_POOL = threads; }; serviceConfig = { @@ -309,7 +315,7 @@ in { Voluntary Application Server Identification. A new keypair can be generated by running: - `nix build -f '' mastodon; cd result; bin/rake webpush:generate_keys` + `nix build -f '' mastodon; cd result; RAILS_ENV=production bin/rake webpush:generate_keys` If {option}`mastodon.vapidPrivateKeyFile`does not exist, it and this file will be created with a new keypair. @@ -324,12 +330,57 @@ in { type = lib.types.str; }; + activeRecordEncryptionDeterministicKeyFile = lib.mkOption { + description = '' + This key must be set to enable the Active Record Encryption feature within + Rails that Mastodon uses to encrypt and decrypt some database attributes. + A new Active Record keys can be generated by running: + + `nix build -f '' mastodon; cd result; RAILS_ENV=production ./bin/rails db:encryption:init` + + If this file does not exist, it will be created with a new Active Record + keys. + ''; + default = "/var/lib/mastodon/secrets/active-record-encryption-deterministic-key"; + type = lib.types.str; + }; + + activeRecordEncryptionKeyDerivationSaltFile = lib.mkOption { + description = '' + This key must be set to enable the Active Record Encryption feature within + Rails that Mastodon uses to encrypt and decrypt some database attributes. + A new Active Record keys can be generated by running: + + `nix build -f '' mastodon; cd result; RAILS_ENV=production ./bin/rails db:encryption:init` + + If this file does not exist, it will be created with a new Active Record + keys. + ''; + default = "/var/lib/mastodon/secrets/active-record-encryption-key-derivation-salt"; + type = lib.types.str; + }; + + activeRecordEncryptionPrimaryKeyFile = lib.mkOption { + description = '' + This key must be set to enable the Active Record Encryption feature within + Rails that Mastodon uses to encrypt and decrypt some database attributes. + A new Active Record keys can be generated by running: + + `nix build -f '' mastodon; cd result; RAILS_ENV=production ./bin/rails db:encryption:init` + + If this file does not exist, it will be created with a new Active Record + keys. + ''; + default = "/var/lib/mastodon/secrets/active-record-encryption-primary-key"; + type = lib.types.str; + }; + secretKeyBaseFile = lib.mkOption { description = '' Path to file containing the secret key base. A new secret key base can be generated by running: - `nix build -f '' mastodon; cd result; bin/rake secret` + `nix build -f '' mastodon; cd result; bin/bundle exec rails secret` If this file does not exist, it will be created with a new secret key base. ''; @@ -342,7 +393,7 @@ in { Path to file containing the OTP secret. A new OTP secret can be generated by running: - `nix build -f '' mastodon; cd result; bin/rake secret` + `nix build -f '' mastodon; cd result; bin/bundle exec rails secret` If this file does not exist, it will be created with a new OTP secret. ''; @@ -708,13 +759,28 @@ in { script = '' umask 077 + if ! test -d /var/cache/mastodon/precompile; then + ${cfg.package}/bin/bundle exec bootsnap precompile --gemfile ${cfg.package}/app ${cfg.package}/lib + fi + if ! test -f ${cfg.activeRecordEncryptionDeterministicKeyFile}; then + mkdir -p $(dirname ${cfg.activeRecordEncryptionDeterministicKeyFile}) + bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=//' > ${cfg.activeRecordEncryptionDeterministicKeyFile} + fi + if ! test -f ${cfg.activeRecordEncryptionKeyDerivationSaltFile}; then + mkdir -p $(dirname ${cfg.activeRecordEncryptionKeyDerivationSaltFile}) + bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=//' > ${cfg.activeRecordEncryptionKeyDerivationSaltFile} + fi + if ! test -f ${cfg.activeRecordEncryptionPrimaryKeyFile}; then + mkdir -p $(dirname ${cfg.activeRecordEncryptionPrimaryKeyFile}) + bin/rails db:encryption:init | grep --only-matching "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=[^ ]\+" | sed 's/^ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=//' > ${cfg.activeRecordEncryptionPrimaryKeyFile} + fi if ! test -f ${cfg.secretKeyBaseFile}; then mkdir -p $(dirname ${cfg.secretKeyBaseFile}) - bin/rake secret > ${cfg.secretKeyBaseFile} + bin/bundle exec rails secret > ${cfg.secretKeyBaseFile} fi if ! test -f ${cfg.otpSecretFile}; then mkdir -p $(dirname ${cfg.otpSecretFile}) - bin/rake secret > ${cfg.otpSecretFile} + bin/bundle exec rails secret > ${cfg.otpSecretFile} fi if ! test -f ${cfg.vapidPrivateKeyFile}; then mkdir -p $(dirname ${cfg.vapidPrivateKeyFile}) $(dirname ${cfg.vapidPublicKeyFile}) @@ -724,6 +790,9 @@ in { fi cat > /var/lib/mastodon/.secrets_env <> gemset.nix # Create trailing newline to please EditorConfig checks -echo "Creating yarn-hash.nix" -YARN_HASH="$(prefetch-yarn-deps "$SOURCE_DIR/yarn.lock")" -YARN_HASH="$(nix hash to-sri --type sha256 "$YARN_HASH")" -sed -i "s/sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=/$YARN_HASH/g" source.nix +echo "Required manual update of yarn-hash" +exit 1 diff --git a/pkgs/servers/mastodon/yarn.nix b/pkgs/servers/mastodon/yarn.nix new file mode 100644 index 0000000000000..3fb4018906d25 --- /dev/null +++ b/pkgs/servers/mastodon/yarn.nix @@ -0,0 +1,34 @@ +{ + stdenvNoCC, + yarn-berry, + cacert, + version, + src, + hash, +}: +stdenvNoCC.mkDerivation { + pname = "yarn-deps"; + inherit version src; + + nativeBuildInputs = [ + yarn-berry + ]; + + dontInstall = true; + + NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + buildPhase = '' + export HOME=$(mktemp -d) + export YARN_ENABLE_TELEMETRY=0 + + cache="$(yarn config get cacheFolder)" + yarn install --immutable --mode skip-build + + mkdir -p $out + cp -r $cache/* $out/ + ''; + + outputHash = hash; + outputHashMode = "recursive"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c58aaa8b0f2f..e22700fb2d071 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24522,8 +24522,10 @@ with pkgs; maker-panel = callPackage ../tools/misc/maker-panel { }; mastodon = callPackage ../servers/mastodon { - nodejs-slim = nodejs-slim_20; - ruby = ruby_3_2; + nodejs-slim = nodejs-slim_22; + python3 = python311; + ruby = ruby_3_3; + yarn-berry = yarn-berry.override { nodejs = nodejs-slim_22; }; }; gotosocial = callPackage ../servers/gotosocial { }; From 8a277a6abf9abef6ac2f85f64ef2ff9cea760ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Zavala=20Villag=C3=B3mez?= Date: Mon, 7 Oct 2024 22:34:11 -0400 Subject: [PATCH 037/180] nixos/automatic-timezoned: set time.timeZone to null to avoid silent overriding Currently if a timezone was selected explicitly, the service will silently override the value, essentially ignoring what is meant to be a a deliberate choice of option. This may cause confusion as to why the option is not doing anything when this service is enabled, particularly in more complex set-ups after some time. This will simply make the choice deliberate from the user's part, either by having to remove the option or lowering its priority as a recognition that it may be ignored. This change was inspired by the `services.tzupdate` module, which does the same. [1]: --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ nixos/modules/services/system/automatic-timezoned.nix | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index e802470e7a04d..22e49f6f66a42 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -678,6 +678,9 @@ - ZFS now imports its pools in `postResumeCommands` rather than `postDeviceCommands`. If you had `postDeviceCommands` scripts that depended on ZFS pools being imported, those now need to be in `postResumeCommands`. +- `services.automatic-timezoned.enable = true` will now set `time.timeZone = null`. + This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part. + - `services.localtimed.enable = true` will now set `time.timeZone = null`. This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part. diff --git a/nixos/modules/services/system/automatic-timezoned.nix b/nixos/modules/services/system/automatic-timezoned.nix index 6150aa22cfbdf..50f84f39af7d2 100644 --- a/nixos/modules/services/system/automatic-timezoned.nix +++ b/nixos/modules/services/system/automatic-timezoned.nix @@ -16,6 +16,11 @@ in timezone up-to-date based on the current location. It uses geoclue2 to determine the current location and systemd-timedated to actually set the timezone. + + To avoid silent overriding by the service, if you have explicitly set a + timezone, either remove it or ensure that it is set with a lower priority + than the default value using `lib.mkDefault` or `lib.mkOverride`. This is + to make the choice deliberate. An error will be presented otherwise. ''; }; package = mkPackageOption pkgs "automatic-timezoned" { }; @@ -23,6 +28,10 @@ in }; config = mkIf cfg.enable { + # This will give users an error if they have set an explicit time + # zone, rather than having the service silently override it. + time.timeZone = null; + security.polkit.extraConfig = '' polkit.addRule(function(action, subject) { if (action.id == "org.freedesktop.timedate1.set-timezone" From c4ade803f1b34eefc77d5bd7cc2e21e967de7386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 10 Oct 2024 21:05:09 +0200 Subject: [PATCH 038/180] osu-lazer-bin: fix hash for the second time --- pkgs/by-name/os/osu-lazer-bin/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index 6425ebe7eb748..3cecd70c66c48 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -25,7 +25,7 @@ let }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-PAbLw/IVJHe/y7YSyrTK9wJVcN3VIZYhrgDoHzYtjS8="; + hash = "sha256-2H2SPcUm/H/0D9BqBiTFvaCwd0c14/r+oWhyeZdNpoU="; }; } .${stdenv.system} or (throw "osu-lazer-bin: ${stdenv.system} is unsupported."); From f9b28d5678b351f06365ed683c6a948669fe23fd Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 10 Oct 2024 21:17:53 +0200 Subject: [PATCH 039/180] workflows/codeowners: Cache codeowner validator build The codeowner-validator build declared in ci/codeowners-validator was not cached before and needed to be built for every PR, which is slow and wasteful: https://github.com/NixOS/nixpkgs/actions/runs/11280533037/job/31373720922 --- .github/workflows/codeowners.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/codeowners.yml b/.github/workflows/codeowners.yml index 164b5a1136f22..56588d45c9cd8 100644 --- a/.github/workflows/codeowners.yml +++ b/.github/workflows/codeowners.yml @@ -25,6 +25,13 @@ jobs: steps: - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 + - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 + if: github.repository_owner == 'NixOS' + with: + # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. + name: nixpkgs-ci + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + # Important: Because we use pull_request_target, this checks out the base branch of the PR, not the PR itself. # We later build and run code from the base branch with access to secrets, # so it's important this is not the PRs code. From e5b88700efc6465eba0b2398cf1e9ec6dc7f8aee Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 10 Oct 2024 21:13:14 +0200 Subject: [PATCH 040/180] nfs-ganesha: build man pages --- pkgs/servers/nfs-ganesha/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 82f9eca8d88d8..5531a2f1b583b 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, sphinx , krb5, xfsprogs, jemalloc, dbus, libcap , ntirpc, liburcu, bison, flex, nfs-utils, acl } : @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; version = "6.1"; - outputs = [ "out" "tools" ]; + outputs = [ "out" "man" "tools" ]; src = fetchFromGitHub { owner = "nfs-ganesha"; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { "-DENABLE_VFS_POSIX_ACL=ON" "-DUSE_ACL_MAPPING=ON" "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" + "-DUSE_MAN_PAGE=ON" ]; nativeBuildInputs = [ @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { pkg-config bison flex + sphinx ]; buildInputs = [ @@ -63,6 +65,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl3Plus; mainProgram = "ganesha.nfsd"; - outputsToInstall = [ "out" "tools" ]; + outputsToInstall = [ "out" "man" "tools" ]; }; } From 5db859d4d00a08281c4e7f0a0880962532758501 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 10 Oct 2024 21:36:56 +0200 Subject: [PATCH 041/180] nfs-ganesha: apply nixfmt, src.sha256 -> hash --- pkgs/servers/nfs-ganesha/default.nix | 38 +++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 5531a2f1b583b..53a5601c5171b 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -1,18 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, sphinx -, krb5, xfsprogs, jemalloc, dbus, libcap -, ntirpc, liburcu, bison, flex, nfs-utils, acl -} : +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + sphinx, + krb5, + xfsprogs, + jemalloc, + dbus, + libcap, + ntirpc, + liburcu, + bison, + flex, + nfs-utils, + acl, +}: stdenv.mkDerivation rec { pname = "nfs-ganesha"; version = "6.1"; - outputs = [ "out" "man" "tools" ]; + + outputs = [ + "out" + "man" + "tools" + ]; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-XQpbQ7NXVGVbm99d1ZEh1ckR5fd81xwZw8HorXHaeBk="; + hash = "sha256-XQpbQ7NXVGVbm99d1ZEh1ckR5fd81xwZw8HorXHaeBk="; }; preConfigure = "cd src"; @@ -65,6 +85,10 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl3Plus; mainProgram = "ganesha.nfsd"; - outputsToInstall = [ "out" "man" "tools" ]; + outputsToInstall = [ + "out" + "man" + "tools" + ]; }; } From e91dc734d5edf9fab45f3e15c95efaa031aa7889 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 10 Oct 2024 22:02:46 +0200 Subject: [PATCH 042/180] python312Packages.reflex: 0.6.2 -> 0.6.2.post1 Diff: https://github.com/reflex-dev/reflex/compare/refs/tags/v0.6.2...v0.6.2.post1 Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.6.2.post1 --- pkgs/development/python-modules/reflex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 1fba1e49f9676..a0b7767fd1bb1 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.6.2"; + version = "0.6.2.post1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -56,7 +56,7 @@ buildPythonPackage rec { owner = "reflex-dev"; repo = "reflex"; rev = "refs/tags/v${version}"; - hash = "sha256-d/1Pb8jI97pvaKnWwauuyFCMt/35G/30BlAn7nyj61U="; + hash = "sha256-JW1hebcoBMMEirJkJ5Cquh23p9Gv3RU5AxPbXUcwPK4="; }; pythonRelaxDeps = [ From 6da24bc7712eb94f05041746dcc100a0b2a4098a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 9 Oct 2024 23:16:01 +0200 Subject: [PATCH 043/180] python312Packages.plotly: cleanup, enable checks on darwin --- .../python-modules/plotly/default.nix | 66 +++++-------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 6a4bed2545ba7..1d1fe4401ac98 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -14,12 +14,10 @@ xarray, pillow, scipy, - psutil, statsmodels, ipython, ipywidgets, which, - orca, nbformat, scikit-image, }: @@ -61,69 +59,39 @@ buildPythonPackage rec { xarray pillow scipy - psutil statsmodels ipython ipywidgets which - orca nbformat scikit-image ]; - # the check inputs are broken on darwin - doCheck = !stdenv.hostPlatform.isDarwin; - disabledTests = [ - # FAILED plotly/matplotlylib/mplexporter/tests/test_basic.py::test_legend_dots - AssertionError: assert '3' == '2' + # failed pinning test, sensitive to dep versions "test_legend_dots" - # FAILED plotly/matplotlylib/mplexporter/tests/test_utils.py::test_linestyle - AssertionError: "test_linestyle" - # FAILED plotly/tests/test_io/test_to_from_plotly_json.py::test_sanitize_json[auto] - KeyError: 'template' - # FAILED plotly/tests/test_io/test_to_from_plotly_json.py::test_sanitize_json[json] - KeyError: 'template' + # test bug, i assume sensitive to dep versions "test_sanitize_json" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_validate_orca - ValueError: - "test_validate_orca" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_orca_executable_path - ValueError: - "test_orca_executable_path" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_orca_version_number - ValueError: - "test_orca_version_number" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_ensure_orca_ping_and_proc - ValueError: - "test_ensure_orca_ping_and_proc" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_server_timeout_shutdown - ValueError: - "test_server_timeout_shutdown" - # FAILED plotly/tests/test_orca/test_orca_server.py::test_external_server_url - ValueError: - "test_external_server_url" - # FAILED plotly/tests/test_orca/test_to_image.py::test_simple_to_image[eps] - ValueError: - "test_simple_to_image" - # FAILED plotly/tests/test_orca/test_to_image.py::test_to_image_default[eps] - ValueError: - "test_to_image_default" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_string[eps] - ValueError: - "test_write_image_string" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_writeable[eps] - ValueError: - "test_write_image_writeable" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_string_format_inference[eps] - ValueError: - "test_write_image_string_format_inference" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_string_bad_extension_failure - assert 'must be specified as one of the followi... - "test_write_image_string_bad_extension_failure" - # FAILED plotly/tests/test_orca/test_to_image.py::test_write_image_string_bad_extension_override - ValueError: - "test_write_image_string_bad_extension_override" - # FAILED plotly/tests/test_orca/test_to_image.py::test_topojson_fig_to_image[eps] - ValueError: - "test_topojson_fig_to_image" - # FAILED plotly/tests/test_orca/test_to_image.py::test_latex_fig_to_image[eps] - ValueError: - "test_latex_fig_to_image" - # FAILED plotly/tests/test_orca/test_to_image.py::test_problematic_environment_variables[eps] - ValueError: - "test_problematic_environment_variables" - # FAILED plotly/tests/test_orca/test_to_image.py::test_invalid_figure_json - assert 'Invalid' in "\nThe orca executable is required in order to e... - "test_invalid_figure_json" - # FAILED test_init/test_dependencies_not_imported.py::test_dependencies_not_imported - AssertionError: assert 'plotly' not in {'IPython': - "test_dependencies_not_imported" - # FAILED test_init/test_lazy_imports.py::test_lazy_imports - AssertionError: assert 'plotly' not in {'IPython': Date: Thu, 10 Oct 2024 23:33:40 +0200 Subject: [PATCH 044/180] python312Packages.pylitejet: init at 0.3.0 Library for interfacing with the LiteJet lighting system https://github.com/joncar/pylitejet --- .../python-modules/pylitejet/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pylitejet/default.nix diff --git a/pkgs/development/python-modules/pylitejet/default.nix b/pkgs/development/python-modules/pylitejet/default.nix new file mode 100644 index 0000000000000..20ff36a25dbd3 --- /dev/null +++ b/pkgs/development/python-modules/pylitejet/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyserial, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pylitejet"; + version = "0.3.0"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "joncar"; + repo = "pylitejet"; + rev = "refs/tags/${version}"; + hash = "sha256-fgsAb8zvmIKtitgAQbAPfTzbEGGaj3dU6FXzlSyy4Dk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pyserial ]; + + # Only custom tests which uses the CLi are available + doCheck = false; + + pythonImportsCheck = [ "pylitejet" ]; + + meta = { + description = "Library for interfacing with the LiteJet lighting system"; + homepage = "https://github.com/joncar/pylitejet"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 247dae3889246..c9caf721ee942 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11615,6 +11615,8 @@ self: super: with self; { pylion = callPackage ../development/python-modules/pylion { }; + pylitejet = callPackage ../development/python-modules/pylitejet { }; + pylitterbot = callPackage ../development/python-modules/pylitterbot { }; py-libzfs = callPackage ../development/python-modules/py-libzfs { }; From 8aa86bd57db3b5419b41a93e66bf327662d7e92a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Oct 2024 23:41:59 +0200 Subject: [PATCH 045/180] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a593d677fb165..47885c03442db 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2414,7 +2414,8 @@ "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc "litejet" = ps: with ps; [ - ]; # missing inputs: pylitejet + pylitejet + ]; "litterrobot" = ps: with ps; [ pylitterbot ]; @@ -5404,6 +5405,7 @@ "light" "linear_garage_door" "linkplay" + "litejet" "litterrobot" "livisi" "local_calendar" From 3d2546bf45f45ba430860b3f018a205e1347f0f9 Mon Sep 17 00:00:00 2001 From: RoyDubnium <72664566+RoyDubnium@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:43:33 +0100 Subject: [PATCH 046/180] qdiskinfo: refactor themes --- pkgs/by-name/qd/qdiskinfo/package.nix | 90 ++++++++++++++++----------- pkgs/by-name/qd/qdiskinfo/themes.nix | 19 +----- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/pkgs/by-name/qd/qdiskinfo/package.nix b/pkgs/by-name/qd/qdiskinfo/package.nix index 907d5c0873622..6a3c238692d17 100644 --- a/pkgs/by-name/qd/qdiskinfo/package.nix +++ b/pkgs/by-name/qd/qdiskinfo/package.nix @@ -6,36 +6,33 @@ fetchzip, cmake, qt6, - theme ? "", - customBgDark ? "", - customBgLight ? "", - customStatusPath ? "", - customSrc ? "", - customRightCharacter ? false, + qdiskinfo, + themeBundle ? null, }: let - isTheme = theme != null && theme != ""; - - rightCharacter = - (builtins.elem theme [ - "aoi" - "shizukuTeaBreak" - ]) - || customRightCharacter; - themeSources = import ./sources.nix { inherit fetchzip; }; - themes = import ./themes.nix { - inherit - customBgDark - customBgLight - customSrc - customStatusPath - lib - themeSources - ; - }; + isThemed = themeBundle != null && themeBundle != { }; + themeBundle' = + if isThemed then + { + rightCharacter = false; + } + // themeBundle + else + { rightCharacter = false; }; in -assert !isTheme || lib.attrsets.hasAttrByPath [ theme ] themes; + +# check theme bundle +assert + isThemed + -> ( + themeBundle' ? src + && themeBundle' ? paths.bgDark + && themeBundle' ? paths.bgLight + && themeBundle' ? paths.status + && themeBundle' ? rightCharacter + ); + stdenv.mkDerivation (finalAttrs: { pname = "qdiskinfo"; version = "0.3"; @@ -64,33 +61,50 @@ stdenv.mkDerivation (finalAttrs: { [ "-DQT_VERSION_MAJOR=6" ] - ++ lib.optionals isTheme [ "-DINCLUDE_OPTIONAL_RESOURCES=ON" ] - ++ (if rightCharacter then [ "-DCHARACTER_IS_RIGHT=ON" ] else [ "-DCHARACTER_IS_RIGHT=OFF" ]); + ++ lib.optionals isThemed [ "-DINCLUDE_OPTIONAL_RESOURCES=ON" ] + ++ ( + if themeBundle'.rightCharacter then + [ "-DCHARACTER_IS_RIGHT=ON" ] + else + [ "-DCHARACTER_IS_RIGHT=OFF" ] + ); postUnpack = '' cp -r $sourceRoot $TMPDIR/src sourceRoot=$TMPDIR/src ''; - patchPhase = lib.optionalString isTheme '' - export SRCPATH=${themes."${theme}".src}/CdiResource/themes/ + patchPhase = lib.optionalString isThemed '' + export SRCPATH=${themeBundle'.src}/CdiResource/themes/ export DESTPATH=$sourceRoot/dist/theme/ mkdir -p $DESTPATH - if [ -n "${themes."${theme}".paths.bgDark}" ]; then - cp $SRCPATH/${themes."${theme}".paths.bgDark} $DESTPATH/bg_dark.png + if [ -n "${themeBundle'.paths.bgDark}" ]; then + cp $SRCPATH/${themeBundle'.paths.bgDark} $DESTPATH/bg_dark.png fi - if [ -n "${themes."${theme}".paths.bgLight}" ]; then - cp $SRCPATH/${themes."${theme}".paths.bgLight} $DESTPATH/bg_light.png + if [ -n "${themeBundle'.paths.bgLight}" ]; then + cp $SRCPATH/${themeBundle'.paths.bgLight} $DESTPATH/bg_light.png fi - cp $SRCPATH/${themes."${theme}".paths.status}/SDdiskStatusBad-300.png $DESTPATH/bad.png - cp $SRCPATH/${themes."${theme}".paths.status}/SDdiskStatusCaution-300.png $DESTPATH/caution.png - cp $SRCPATH/${themes."${theme}".paths.status}/SDdiskStatusGood-300.png $DESTPATH/good.png - cp $SRCPATH/${themes."${theme}".paths.status}/SDdiskStatusUnknown-300.png $DESTPATH/unknown.png + cp $SRCPATH/${themeBundle'.paths.status}/SDdiskStatusBad-300.png $DESTPATH/bad.png + cp $SRCPATH/${themeBundle'.paths.status}/SDdiskStatusCaution-300.png $DESTPATH/caution.png + cp $SRCPATH/${themeBundle'.paths.status}/SDdiskStatusGood-300.png $DESTPATH/good.png + cp $SRCPATH/${themeBundle'.paths.status}/SDdiskStatusUnknown-300.png $DESTPATH/unknown.png ''; postInstall = '' wrapProgram $out/bin/QDiskInfo \ --suffix PATH : ${smartmontools}/bin ''; + passthru = + let + themeSources = import ./sources.nix { inherit fetchzip; }; + in + rec { + themeBundles = import ./themes.nix { inherit themeSources; }; + tests = lib.flip lib.mapAttrs themeBundles ( + themeName: themeBundle: + (qdiskinfo.override { inherit themeBundle; }).overrideAttrs { pname = "qdiskinfo-${themeName}"; } + ); + }; + meta = { description = "CrystalDiskInfo alternative for Linux"; homepage = "https://github.com/edisionnano/QDiskInfo"; diff --git a/pkgs/by-name/qd/qdiskinfo/themes.nix b/pkgs/by-name/qd/qdiskinfo/themes.nix index 6cec442206d0d..f02f4ce2887be 100644 --- a/pkgs/by-name/qd/qdiskinfo/themes.nix +++ b/pkgs/by-name/qd/qdiskinfo/themes.nix @@ -1,11 +1,4 @@ -{ - customBgDark, - customBgLight, - customSrc, - customStatusPath, - lib, - themeSources, -}: +{ themeSources }: { aoi = { @@ -15,14 +8,7 @@ bgLight = "Aoi/AoiBackground-300.png"; status = "Aoi"; }; - }; - custom = { - src = themeSources."${customSrc}"; - paths = { - bgDark = customBgDark; - bgLight = customBgLight; - status = customStatusPath; - }; + rightCharacter = true; }; kureikei = { src = themeSources.kureikei; @@ -383,6 +369,7 @@ bgLight = "ShizukuTeaBreak/ShizukuBackground-300.png"; status = "Shizuku"; }; + rightCharacter = true; }; shizukuWebRadio = { src = themeSources.shizuku; From 0eabd560ceb6047b311a6c2b1638d7ba96c2187f Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 11 Oct 2024 08:33:02 +0800 Subject: [PATCH 047/180] kanata: add a version check using versionCheckHook --- pkgs/tools/system/kanata/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index b55d5227b0d19..f4b0cbbb629a6 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -5,6 +5,7 @@ , fetchFromGitHub , jq , moreutils +, versionCheckHook , nix-update-script , withCmd ? false }: @@ -51,6 +52,11 @@ rustPlatform.buildRustPackage rec { install -Dm 444 assets/kanata-icon.svg $out/share/icons/hicolor/scalable/apps/kanata.svg ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + passthru = { updateScript = nix-update-script { }; }; From abe002700418aff554951070430928ae28893870 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 11 Oct 2024 07:52:31 +0530 Subject: [PATCH 048/180] tailscale: 1.74.1 -> 1.76.0 Diff: https://github.com/tailscale/tailscale/compare/v1.74.1...v1.76.0 Changelog: https://github.com/tailscale/tailscale/releases/tag/v1.76.0 Signed-off-by: Muhammad Falak R Wani --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 4ab40c33fcf89..c01b02914221c 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -15,7 +15,7 @@ }: let - version = "1.74.1"; + version = "1.76.0"; in buildGoModule { pname = "tailscale"; @@ -27,7 +27,7 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-672FtDKgz7Nmoufoe4Xg/b8sA8EuKH8X+3n9PAKYjFk="; + hash = "sha256-fCUrZ+rrNJ9+XYjCtgaTUWmWczBbavtPe1pFM3L913w="; }; patches = [ @@ -39,7 +39,7 @@ buildGoModule { }) ]; - vendorHash = "sha256-HJEgBs2GOzXvRa95LdwySQmG4/+QwupFDBGrQT6Y2vE="; + vendorHash = "sha256-xCZ6YMJ0fqVzO+tKbCzF0ftV05NOB+lJbJBovLqlrtQ="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ makeWrapper ] ++ [ installShellFiles ]; From ed897d230af4802bb7f19b7548639941166ed755 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 11 Sep 2024 17:03:31 +0200 Subject: [PATCH 049/180] lomiri.u1db-qt: 0.1.7 -> 0.1.8 --- .../lomiri/development/u1db-qt/default.nix | 56 ++++++++----------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/pkgs/desktops/lomiri/development/u1db-qt/default.nix index 8eeffa84ce352..9bba0d914c7af 100644 --- a/pkgs/desktops/lomiri/development/u1db-qt/default.nix +++ b/pkgs/desktops/lomiri/development/u1db-qt/default.nix @@ -1,25 +1,26 @@ -{ stdenv -, lib -, fetchFromGitLab -, fetchpatch -, gitUpdater -, testers -, cmake -, dbus-test-runner -, pkg-config -, qtbase -, qtdeclarative +{ + stdenv, + lib, + fetchFromGitLab, + fetchpatch, + gitUpdater, + testers, + cmake, + dbus-test-runner, + pkg-config, + qtbase, + qtdeclarative, }: stdenv.mkDerivation (finalAttrs: { pname = "u1db-qt"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/u1db-qt"; rev = finalAttrs.version; - hash = "sha256-qlWkxpiVEUbpsKhzR0s7SKaEFCLM2RH+v9XmJ3qLoGY="; + hash = "sha256-KmAEgnWHY0cDKJqRhZpY0fzVjNlEU67e559XEbAPpJI="; }; outputs = [ @@ -29,12 +30,11 @@ stdenv.mkDerivation (finalAttrs: { ]; patches = [ - # Fixes some issues with the pkg-config file - # Remove when https://gitlab.com/ubports/development/core/u1db-qt/-/merge_requests/7 merged & in release + # Remove when https://gitlab.com/ubports/development/core/u1db-qt/-/merge_requests/8 merged & in release (fetchpatch { - name = "0001-u1db-qt-Fix-pkg-config-files-includedir-variable.patch"; - url = "https://gitlab.com/ubports/development/core/u1db-qt/-/commit/ddafbfadfad6dfc508a866835354a4701dda1fe1.patch"; - hash = "sha256-entwjU9TiHuSuht7Cdl0k1v0cP7350a04/FXgTVhGmk="; + name = "0001-u1db-qt-Use-BUILD_TESTING.patch"; + url = "https://gitlab.com/ubports/development/core/u1db-qt/-/commit/df5d526df26c056d54bfa532a3a3fa025d655690.patch"; + hash = "sha256-CILMcvqXrTbEL/N2Tic4IsKLnTtmFJ2QbV3r4PsQ5t0="; }) ]; @@ -48,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: { # For our automatic pkg-config output patcher to work, prefix must be used here substituteInPlace libu1db-qt.pc.in \ --replace-fail 'libdir=''${exec_prefix}/lib' 'libdir=''${prefix}/lib' - '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' - # Other locations add dependencies to custom check target from tests - substituteInPlace CMakeLists.txt \ - --replace-fail 'add_subdirectory(tests)' 'add_custom_target(check COMMAND "echo check dummy")' ''; strictDeps = true; @@ -67,9 +63,7 @@ stdenv.mkDerivation (finalAttrs: { qtdeclarative ]; - nativeCheckInputs = [ - dbus-test-runner - ]; + nativeCheckInputs = [ dbus-test-runner ]; cmakeFlags = [ # Needs qdoc, see https://github.com/NixOS/nixpkgs/pull/245379 @@ -104,14 +98,12 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Qt5 binding and QtQuick2 plugin for U1DB"; homepage = "https://gitlab.com/ubports/development/core/u1db-qt"; - license = licenses.lgpl3Only; - maintainers = teams.lomiri.members; - platforms = platforms.linux; - pkgConfigModules = [ - "libu1db-qt5" - ]; + license = lib.licenses.lgpl3Only; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + pkgConfigModules = [ "libu1db-qt5" ]; }; }) From 6037708c33bc2014125e27721cd4e61121c8c03c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 16 Sep 2024 13:04:27 +0200 Subject: [PATCH 050/180] lomiri.lomiri-content-hub: Rename from lomiri.content-hub, 1.1.1 -> 2.0.0 --- .../services/desktop-managers/lomiri.nix | 8 +-- nixos/tests/lomiri.nix | 22 +++---- .../lomiri-camera-app/default.nix | 8 +-- .../applications/lomiri-clock-app/default.nix | 6 +- .../lomiri-docviewer-app/default.nix | 10 +-- .../lomiri-filemanager-app/default.nix | 8 +-- .../lomiri-gallery-app/default.nix | 19 ++++-- .../lomiri-system-settings/default.nix | 4 +- .../applications/morph-browser/default.nix | 11 +++- .../lomiri/applications/teleports/default.nix | 8 +-- pkgs/desktops/lomiri/default.nix | 3 +- .../default.nix | 64 ++++--------------- 12 files changed, 72 insertions(+), 99 deletions(-) rename pkgs/desktops/lomiri/services/{content-hub => lomiri-content-hub}/default.nix (56%) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 310657179fea9..75834eab0cd87 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -16,7 +16,6 @@ in { libayatana-common ubports-click ]) ++ (with pkgs.lomiri; [ - content-hub hfd-service history-service libusermetrics @@ -24,6 +23,7 @@ in { lomiri-calculator-app lomiri-camera-app lomiri-clock-app + lomiri-content-hub lomiri-docviewer-app lomiri-download-manager lomiri-filemanager-app @@ -129,7 +129,7 @@ in { environment.pathsToLink = [ # Configs for inter-app data exchange system - "/share/content-hub/peers" + "/share/lomiri-content-hub/peers" # Configs for inter-app URL requests "/share/lomiri-url-dispatcher/urls" # Splash screens & other images for desktop apps launched via lomiri-app-launch @@ -194,10 +194,6 @@ in { }; users.groups.usermetrics = { }; - - # TODO content-hub cannot pass files between applications without asking AA for permissions. And alot of the Lomiri stack is designed with AA availability in mind. This might be a requirement to be closer to upstream? - # But content-hub currently fails to pass files between applications even with AA enabled, and we can get away without AA in many places. Let's see how this develops before requiring this for good. - # security.apparmor.enable = true; }; meta.maintainers = lib.teams.lomiri.members; diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 95a3cd0dd90ee..66f9216104606 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -360,13 +360,13 @@ in }; variables = { - # So we can test what content-hub is working behind the scenes - CONTENT_HUB_LOGGING_LEVEL = "2"; + # So we can test what lomiri-content-hub is working behind the scenes + LOMIRI_CONTENT_HUB_LOGGING_LEVEL = "2"; }; systemPackages = with pkgs; [ - # For a convenient way of kicking off content-hub peer collection - lomiri.content-hub.examples + # For a convenient way of kicking off lomiri-content-hub peer collection + lomiri.lomiri-content-hub.examples ]; }; @@ -484,9 +484,9 @@ in # lomiri-terminal-app has a separate VM test to test its basic functionality - # for the LSS content-hub test to work reliably, we need to kick off peer collecting - machine.send_chars("content-hub-test-importer\n") - wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from content-hub + # for the LSS lomiri-content-hub test to work reliably, we need to kick off peer collecting + machine.send_chars("lomiri-content-hub-test-importer\n") + wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from lomiri-content-hub machine.send_key("ctrl-c") # Doing this here, since we need an in-session shell & separately starting a terminal again wastes time @@ -510,7 +510,7 @@ in wait_for_text("Rotation Lock") machine.screenshot("settings_open") - # lomiri-system-settings has a separate VM test, only test Lomiri-specific content-hub functionalities here + # lomiri-system-settings has a separate VM test, only test Lomiri-specific lomiri-content-hub functionalities here # Make fullscreen, can't navigate to Background plugin via keyboard unless window has non-phone-like aspect ratio toggle_maximise() @@ -536,7 +536,7 @@ in # Peers should be loaded wait_for_text("Morph") # or Gallery, but Morph is already packaged - machine.screenshot("settings_content-hub_peers") + machine.screenshot("settings_lomiri-content-hub_peers") # Select Morph as content source mouse_click(370, 100) @@ -544,11 +544,11 @@ in # Expect Morph to be brought into the foreground, with its Downloads page open wait_for_text("No downloads") - # If content-hub encounters a problem, it may have crashed the original application issuing the request. + # If lomiri-content-hub encounters a problem, it may have crashed the original application issuing the request. # Check that it's still alive machine.succeed("pgrep -u ${user} -f lomiri-system-settings") - machine.screenshot("content-hub_exchange") + machine.screenshot("lomiri-content-hub_exchange") # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign machine.send_key("esc") diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix index 34abc5d808eec..88770eeaf9b47 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix @@ -6,12 +6,12 @@ gitUpdater, nixosTests, cmake, - content-hub, exiv2, gettext, gst_all_1, libusermetrics, lomiri-action-api, + lomiri-content-hub, lomiri-ui-toolkit, lomiri-thumbnailer, pkg-config, @@ -145,9 +145,9 @@ stdenv.mkDerivation (finalAttrs: { qzxing # QML - content-hub libusermetrics lomiri-action-api + lomiri-content-hub lomiri-ui-toolkit lomiri-thumbnailer qtpositioning @@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { export QML2_IMPORT_PATH=${ listToQtVar qtbase.qtQmlPrefix [ lomiri-ui-toolkit - content-hub + lomiri-content-hub lomiri-thumbnailer ] } @@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/share/lomiri-camera-app/assets/lomiri-camera-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-camera-app.svg ln -s $out/share/lomiri-camera-app/assets/lomiri-barcode-reader-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-barcode-reader-app.svg - install -Dm644 ../camera-contenthub.json $out/share/content-hub/peers/lomiri-camera-app + install -Dm644 ../camera-contenthub.json $out/share/lomiri-content-hub/peers/lomiri-camera-app ''; dontWrapGApps = true; diff --git a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix index 6403ed165c293..b750184e7300a 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix @@ -6,10 +6,10 @@ gitUpdater, nixosTests, cmake, - content-hub, geonames, gettext, libusermetrics, + lomiri-content-hub, lomiri-sounds, lomiri-ui-toolkit, makeWrapper, @@ -124,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: { qtbase # QML - content-hub libusermetrics + lomiri-content-hub lomiri-ui-toolkit qtdeclarative qtmultimedia @@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: { export QML2_IMPORT_PATH=${ listToQtVar qtbase.qtQmlPrefix ( [ - content-hub + lomiri-content-hub lomiri-ui-toolkit qtmultimedia u1db-qt diff --git a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix index 165987ef18c9a..58168edbc5942 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix @@ -7,9 +7,9 @@ gitUpdater, nixosTests, cmake, - content-hub, gettext, libreoffice-unwrapped, + lomiri-content-hub, lomiri-ui-toolkit, pkg-config, poppler, @@ -84,11 +84,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0="; }) - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/77 merged & in release + # Remove when version > 3.0.4 (fetchpatch { name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/98f5ab9d51ba05e8c3ed1991c0b67d3922b5ba90.patch"; - hash = "sha256-JA26ga1CNOdbis87lSzqbUbs94Oc1vlxraXZxx3dsu8="; + url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/d6731f6d00050b42d561d63ae91751761f7fd278.patch"; + hash = "sha256-EFuQ+pMI8fwYM0lgapi/XeAagFbXUzLWzAx0bPkEdzA="; }) ]; @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { qtdeclarative # QML - content-hub + lomiri-content-hub lomiri-ui-toolkit qtsystems ]; diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix index fa91e1531bf21..c27f10b918609 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix @@ -7,8 +7,8 @@ nixosTests, biometryd, cmake, - content-hub, gettext, + lomiri-content-hub, lomiri-thumbnailer, lomiri-ui-extras, lomiri-ui-toolkit, @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { # QML biometryd - content-hub + lomiri-content-hub lomiri-thumbnailer lomiri-ui-extras lomiri-ui-toolkit @@ -119,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Some misc files don't get installed to the correct paths for us - mkdir -p $out/share/{content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash} - ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/content-hub/peers/lomiri-filemanager-app + mkdir -p $out/share/{lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash} + ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/lomiri-content-hub/peers/lomiri-filemanager-app ln -s $out/share/lomiri-filemanager-app/filemanager.svg $out/share/icons/hicolor/scalable/apps/lomiri-filemanager-app.svg ln -s $out/share/lomiri-filemanager-app/splash.svg $out/share/lomiri-app-launch/splash/lomiri-filemanager-app.svg ''; diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix index deed853358b48..eedf4c6a7ac3c 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix @@ -6,11 +6,11 @@ gitUpdater, nixosTests, cmake, - content-hub, exiv2, imagemagick, libglvnd, libmediainfo, + lomiri-content-hub, lomiri-thumbnailer, lomiri-ui-extras, lomiri-ui-toolkit, @@ -88,6 +88,18 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/90a79972741ee0c5dc734dba6c42afeb3ee6a699.patch"; hash = "sha256-YAmH0he5/rZYKWFyPzUFAKJuHhUTxB3q8zbLL7Spz/c="; }) + + # Remove when version >= 3.1.0 + (fetchpatch { + name = "0101-lomiri-gallery-app-Updated-content-hub-peer-name.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/9a3376760ea6825d9915262264f98d7faf94bf81.patch"; + hash = "sha256-aKRtKUNDhQNJPW5MkohXw1lTnKvZwz4LnRMqp2pKMpU="; + }) + (fetchpatch { + name = "0102-lomiri-gallery-app-lomiri-content-hub-rename.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/cb6eb0ffdf8d67de97572450447df277ce56a226.patch"; + hash = "sha256-32QNWmZU1DmXeGkwYUH4g4nPMkYId9k6IdOKm+KfSuE="; + }) ]; postPatch = '' @@ -130,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: { qtsvg # QML - content-hub + lomiri-content-hub lomiri-thumbnailer lomiri-ui-extras lomiri-ui-toolkit @@ -164,9 +176,6 @@ stdenv.mkDerivation (finalAttrs: { # Link splash to splash dir mkdir -p $out/share/lomiri-app-launch/splash ln -s $out/share/{lomiri-gallery-app/lomiri-gallery-app-splash.svg,lomiri-app-launch/splash/lomiri-gallery-app.svg} - - # Old name - mv $out/share/content-hub/peers/{,lomiri-}gallery-app ''; passthru = { diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index 115d1d01abfc2..6085f4d1b5fbf 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -9,7 +9,6 @@ biometryd, cmake, cmake-extras, - content-hub, dbus, deviceinfo, geonames, @@ -24,6 +23,7 @@ libqofono, libqtdbustest, libqtdbusmock, + lomiri-content-hub, lomiri-indicator-network, lomiri-schemas, lomiri-settings-components, @@ -122,8 +122,8 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ ayatana-indicator-datetime biometryd - content-hub libqofono + lomiri-content-hub lomiri-indicator-network lomiri-schemas lomiri-settings-components diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index 12c71a4f90b87..6733f6b0d8784 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -5,10 +5,10 @@ , gitUpdater , nixosTests , cmake -, content-hub , gettext , libapparmor , lomiri-action-api +, lomiri-content-hub , lomiri-ui-extras , lomiri-ui-toolkit , pkg-config @@ -50,6 +50,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/0527a1e01fb27c62f5e0011274f73bad400e9691.patch"; hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no="; }) + + # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/580 merged & in release + (fetchpatch { + name = "0003-morph-browser-lomiri-content-hub-rename.patch"; + url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/29e5031a1fd0aa69587724b25772ae78d6d2bd7d.patch"; + hash = "sha256-nxOaiRSKi+Nb0JLopi0UNvpnctjkPkjhaHLAWPHRfQA="; + }) ]; postPatch = '' @@ -84,8 +91,8 @@ stdenv.mkDerivation (finalAttrs: { qtwebengine # QML - content-hub lomiri-action-api + lomiri-content-hub lomiri-ui-extras lomiri-ui-toolkit qqc2-suru-style diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix index f5fceb5bd40a7..8a9d318f4b2c2 100644 --- a/pkgs/desktops/lomiri/applications/teleports/default.nix +++ b/pkgs/desktops/lomiri/applications/teleports/default.nix @@ -7,8 +7,8 @@ gitUpdater, nixosTests, cmake, - content-hub, intltool, + lomiri-content-hub, lomiri-indicator-network, lomiri-push-qml, lomiri-thumbnailer, @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - content-hub + lomiri-content-hub lomiri-indicator-network lomiri-push-qml lomiri-thumbnailer @@ -102,10 +102,10 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - mkdir -p $out/share/{applications,content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls} + mkdir -p $out/share/{applications,lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls} ln -s $out/share/teleports/teleports.desktop $out/share/applications/teleports.desktop - ln -s $out/share/teleports/teleports.content-hub $out/share/content-hub/peers/teleports + ln -s $out/share/teleports/teleports.content-hub $out/share/lomiri-content-hub/peers/teleports ln -s $out/share/teleports/assets/icon.svg $out/share/icons/hicolor/scalable/apps/teleports.svg ln -s $out/share/teleports/assets/splash.svg $out/share/lomiri-app-launch/splash/teleports.svg ln -s $out/share/teleports/teleports.url-dispatcher $out/share/lomiri-url-dispatcher/urls/teleports.url-dispatcher diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 8e5dbd2ff9efb..c4794109b8622 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -56,7 +56,7 @@ let #### Services biometryd = callPackage ./services/biometryd { }; - content-hub = callPackage ./services/content-hub { }; + lomiri-content-hub = callPackage ./services/lomiri-content-hub { }; hfd-service = callPackage ./services/hfd-service { }; history-service = callPackage ./services/history-service { }; lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; @@ -70,5 +70,6 @@ let in lib.makeScope libsForQt5.newScope packages // lib.optionalAttrs config.allowAliases { + content-hub = lib.warn "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11 lomiri-system-settings-security-privacy = lib.warn "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08 } diff --git a/pkgs/desktops/lomiri/services/content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix similarity index 56% rename from pkgs/desktops/lomiri/services/content-hub/default.nix rename to pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index a1fd997578442..dd2f6d3ab23ea 100644 --- a/pkgs/desktops/lomiri/services/content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -1,8 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch -, fetchpatch2 , gitUpdater , testers , cmake @@ -30,14 +28,14 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "content-hub"; - version = "1.1.1"; + pname = "lomiri-content-hub"; + version = "2.0.0"; src = fetchFromGitLab { owner = "ubports"; - repo = "development/core/content-hub"; + repo = "development/core/lomiri-content-hub"; rev = finalAttrs.version; - hash = "sha256-sQeyJV+Wc6PHKGIefl/dfU06XqTdICsn+Xamjx3puiI="; + hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0="; }; outputs = [ @@ -46,44 +44,6 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; - patches = [ - # Remove when version > 1.1.1 - (fetchpatch { - name = "0001-content-hub-Migrate-to-GetConnectionCredentials.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/9ec9df32f77383eec7994d8e3e6961531bc8464d.patch"; - hash = "sha256-14dZosMTMa1FDGEMuil0r1Hz6vn+L9XC83NMAqC7Ol8="; - }) - - # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/34 merged & in release - (fetchpatch { - name = "0002-content-hub-import-Lomiri-Content-CMakeLists-Drop-qt-argument-to-qmlplugindump.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/63a4baf1469de31c4fd50c69ed85d061f5e8e80a.patch"; - hash = "sha256-T+6T9lXne6AhDFv9d7L8JNwdl8f0wjDmvSoNVPkHza4="; - }) - - # Remove when version > 1.1.1 - # fetchpatch2 due to renames, https://github.com/NixOS/nixpkgs/issues/32084 - (fetchpatch2 { - name = "0003-content-hub-Add-more-better-GNUInstallDirs-variables-usage.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/3c5ca4a8ec125e003aca78c14521b70140856c25.patch"; - hash = "sha256-kYN0eLwMyM/9yK+zboyEsoPKZMZ4SCXodVYsvkQr2F8="; - }) - - # Remove when version > 1.1.1 - (fetchpatch { - name = "0004-content-hub-Fix-generation-of-transfer_files-and-moc_test_harness.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/68899c75e77e1f34176b8a550d52794413e5070f.patch"; - hash = "sha256-HAxePnzY/cL2c+o+Aw2N1pdr8rsbHGmRsH2EQkrBcHg="; - }) - - # Remove when https://gitlab.com/ubports/development/core/lomiri-content-hub/-/merge_requests/40 merged & in release - (fetchpatch { - name = "0006-content-hub-Fix-AppArmor-less-transfer.patch"; - url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/b58e5c8babf00ad7c402555c96254ce0165adb9e.patch"; - hash = "sha256-a7x/0NiUBmmFlq96jkHyLCL0f5NIFh5JR/H+FQ/2GqI="; - }) - ]; - postPatch = '' substituteInPlace import/*/Content/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" @@ -163,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput share/applications/$exampleExe.desktop $examples done moveToOutput share/icons $examples - moveToOutput share/content-hub/peers $examples + moveToOutput share/lomiri-content-hub/peers $examples ''; postFixup = '' @@ -178,20 +138,20 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "Content sharing/picking service"; + description = "Content sharing/picking service for the Lomiri desktop"; longDescription = '' - content-hub is a mediation service to let applications share content between them, + lomiri-content-hub is a mediation service to let applications share content between them, even if they are not running at the same time. ''; - homepage = "https://gitlab.com/ubports/development/core/content-hub"; - changelog = "https://gitlab.com/ubports/development/core/content-hub/-/blob/${finalAttrs.version}/ChangeLog"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-content-hub"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/blob/${finalAttrs.version}/ChangeLog"; license = with lib.licenses; [ gpl3Only lgpl3Only ]; - mainProgram = "content-hub-service"; + mainProgram = "lomiri-content-hub-service"; maintainers = lib.teams.lomiri.members; platforms = lib.platforms.linux; pkgConfigModules = [ - "libcontent-hub" - "libcontent-hub-glib" + "liblomiri-content-hub" + "liblomiri-content-hub-glib" ]; }; }) From 44e237cb65a6ff10c2d4a22f99cde58e7a8bc275 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 Sep 2024 13:41:32 +0200 Subject: [PATCH 051/180] lomiri.lomiri-filemanager-app: 1.0.4 -> 1.1.1 --- .../lomiri-filemanager-app/default.nix | 57 ++++--------------- 1 file changed, 10 insertions(+), 47 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix index c27f10b918609..28d3c23f6ee99 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix @@ -22,54 +22,26 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-filemanager-app"; - version = "1.0.4"; + version = "1.1.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-filemanager-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-vjGCTfXoqul1S7KUJXG6JwgZOc2etXWsdKbyQ/V3abA="; + hash = "sha256-KZzkD+h2yUeBvNFn9xLLtc4Iukk6maimFjIdpGCWLOE="; }; patches = [ - # This sets the *wrong* domain, but at least it sets *some* domain. - # Remove when version > 1.0.4 + # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/117 merged & in release (fetchpatch { - name = "0001-lomiri-filemanager-app-Set-a-gettext-domain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/b310434d2c25a3b446d3d975f3755eb473a833e8.patch"; - hash = "sha256-gzFFzZCIxedMGW4fp6sonnHj/HmwqdqU5fvGhXUsSOI="; + name = "0001-lomiri-filemanager-app-Install-content-hub-and-url-dispatcher-files.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/e15dc7c5b4dd0b9e5df3e4e99da8f28bd760e093.patch"; + hash = "sha256-MXuQXpZcf5fJP4aenl5KDOtdaDFTTnkzIfem9BpE5ig="; }) - - # Set the *correct* domain. - # Remove when version > 1.0.4 - (fetchpatch { - name = "0002-lomiri-filemanager-app-Fix-gettext-domain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/2bb19aeef2baba8d12df1e4976becc08d7cf341d.patch"; - hash = "sha256-wreOMMvBjf316N/XJv3VfI5f5N/VFiEraeadtgRStjA="; - }) - - # Bind domain to locale dir - # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/112 merged & in release - (fetchpatch { - name = "0003-lomiri-filemanager-app-Call-i18n.bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/ac0ab681c52c691d464cf94707b013b39675ad2d.patch"; - hash = "sha256-mwpcHwMT2FcNC6KIZNuSWU/bA8XP8rEQKHn7t5m6npM="; - }) - - # Stop using deprecated qt5_use_modules - # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/113 merged & in release - (fetchpatch { - name = "0004-lomiri-filemanager-app-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/c2bfe927b16e660bf4730371b1e61e442e034780.patch"; - hash = "sha256-wPOZP2FOaacEGj4SMS5Q/TO+/L11Qz7NTux4kA86Bcs="; - }) - - # Use pkg-config for smbclient flags - # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/115 merged & in release (fetchpatch { - name = "0005-lomiri-filemanager-app-Get-smbclient-flags-via-pkg-config.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/aa791da5999719724e0b0592765e8fa2962305c6.patch"; - hash = "sha256-fFAYKBR28ym/n7fhP9O6VE2owarLxK8cN9QeExHFbtU="; + name = "0002-lomiri-filemanager-app-Let-desktop-icon-be-found-via-lookup.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/8c38f30ac099609379b95079fac771a61d73e7d6.patch"; + hash = "sha256-I3hB+W/5JW08HcLiNrSpZ7rTeQyKNoMNINVrFbF/Uiw="; }) ]; @@ -79,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace CMakeLists.txt \ --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ${placeholder "out"}/${qtbase.qtQmlPrefix}' \ --replace-fail 'add_subdirectory(tests)' '#add_subdirectory(tests)' \ - --replace-fail 'ICON ''${CMAKE_INSTALL_PREFIX}/''${DATA_DIR}/''${ICON_FILE}' 'ICON lomiri-filemanager-app' \ - --replace-fail 'SPLASH ''${CMAKE_INSTALL_PREFIX}/''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-filemanager-app.svg' + --replace-fail 'SPLASH ''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-filemanager-app.svg' # In case this ever gets run, at least point it to a correct-ish path substituteInPlace tests/autopilot/CMakeLists.txt \ @@ -117,14 +88,6 @@ stdenv.mkDerivation (finalAttrs: { # No tests we can actually run (just autopilot) doCheck = false; - postInstall = '' - # Some misc files don't get installed to the correct paths for us - mkdir -p $out/share/{lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash} - ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/lomiri-content-hub/peers/lomiri-filemanager-app - ln -s $out/share/lomiri-filemanager-app/filemanager.svg $out/share/icons/hicolor/scalable/apps/lomiri-filemanager-app.svg - ln -s $out/share/lomiri-filemanager-app/splash.svg $out/share/lomiri-app-launch/splash/lomiri-filemanager-app.svg - ''; - passthru = { tests.vm = nixosTests.lomiri-filemanager-app; updateScript = gitUpdater { rev-prefix = "v"; }; From 7f4d08fb7eb726e68b41dd3d156ae88181e40099 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 Sep 2024 14:08:07 +0200 Subject: [PATCH 052/180] lomiri.lomiri-gallery-app: 3.0.2 -> 3.1.0 --- .../lomiri-gallery-app/default.nix | 77 ++----------------- 1 file changed, 8 insertions(+), 69 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix index eedf4c6a7ac3c..817ce9b69bfc8 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix @@ -25,91 +25,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-gallery-app"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-gallery-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-nX9dTL4W0WxrwvszGd4AUIx4yUrghMM7ZMtGZLhZE/8="; + hash = "sha256-uKGPic9XYUj0rLA05i6GjLM+n17MYgiFJMWnLXHKmIU="; }; patches = [ - # Remove when version > 3.0.2 - (fetchpatch { - name = "0001-lomiri-gallery-app-Newer-Evix2-compat.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/afa019b5e9071fbafaa9afb3b4effdae6e0774c5.patch"; - hash = "sha256-gBc++6EQ7t3VcBZTknkIpC0bJ/P15oI+G0YoQWtjnSY="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/147 merged & in release - (fetchpatch { - name = "0002-lomiri-gallery-app-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/0149c8d422c3e0889d7d523789dc65776a52c4f9.patch"; - hash = "sha256-jS81F7KNbAn5J8sDDXzhXARNYAu6dEKcbNHpHp/3MaI="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/148 merged & in release - (fetchpatch { - name = "0003-lomiri-gallery-app-Fix-GNUInstallDirs.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/805121b362a9b486094e570053884b9ffa92b152.patch"; - hash = "sha256-fyAqKjZ0g7Sw7fWP1IW4SpZ+g0xi/pH6RJie1K3doP0="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/149 merged & in release - (fetchpatch { - name = "0004-lomiri-gallery-app-Fix-icons.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/906966536363e80fe9906dee935d991955e8f842.patch"; - hash = "sha256-LJ+ILhokceXFUvP/G1BEBE/J1/XUAmNBxu551x0Q6nk="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/150 merged & in release - (fetchpatch { - name = "0005-lomiri-gallery-app-Add-ENABLE_WERROR.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/fe32a3453b88cc3563e53ab124f669ce307e9688.patch"; - hash = "sha256-nFCtY3857D5e66rIME+lj6x4exEfx9D2XGEgyWhemgI="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/151 merged & in release - (fetchpatch { - name = "0006-lomiri-gallery-app-BUILD_TESTING.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/51f3d5e643db5576b051da63c58ba3492c851e44.patch"; - hash = "sha256-5aGx2xfCDgq/khgkzGsvUOmTIYALjyfn6W7IR5dldr8="; - }) - (fetchpatch { - name = "0007-lomiri-gallery-app-Top-level-Qt5Test.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/c308c689c2841d71554ff6397a110d1a12016b70.patch"; - hash = "sha256-fXVOKjnj4EPeby9iEp3mZRqx9MLqdF8SUVEouCkyDRc="; - }) - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/152 merged & in release (fetchpatch { - name = "0008-lomiri-gallery-app-bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/90a79972741ee0c5dc734dba6c42afeb3ee6a699.patch"; - hash = "sha256-YAmH0he5/rZYKWFyPzUFAKJuHhUTxB3q8zbLL7Spz/c="; - }) - - # Remove when version >= 3.1.0 - (fetchpatch { - name = "0101-lomiri-gallery-app-Updated-content-hub-peer-name.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/9a3376760ea6825d9915262264f98d7faf94bf81.patch"; - hash = "sha256-aKRtKUNDhQNJPW5MkohXw1lTnKvZwz4LnRMqp2pKMpU="; + name = "0001-lomiri-gallery-app-bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/592eff118cb5056886b73e6698f8941c7a16f2e0.patch"; + hash = "sha256-aR/Lnzvq4RuRLI75mMd4xTGMAcijm1adSAGVFZZ++No="; }) (fetchpatch { - name = "0102-lomiri-gallery-app-lomiri-content-hub-rename.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/cb6eb0ffdf8d67de97572450447df277ce56a226.patch"; - hash = "sha256-32QNWmZU1DmXeGkwYUH4g4nPMkYId9k6IdOKm+KfSuE="; + name = "0002-lomiri-gallery-app-C++ify-i18n.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/a7582abbe0acef4d49c77a4395bc22dbd1707ef3.patch"; + hash = "sha256-qzqTXqIYX+enoOwwV9d9fxe7tVYLuh1WkL8Ij/Qx0H0="; }) ]; postPatch = '' - # 0003-lomiri-gallery-app-Fix-icons.patch cannot be fully applied via patches due to binary diffs - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/149 merged & in release - for size in 64x64 128x128 256x256; do - rm desktop/icons/hicolor/"$size"/apps/gallery-app.png - magick desktop/lomiri-gallery-app.svg -resize "$size" desktop/icons/hicolor/"$size"/apps/lomiri-gallery-app.png - done - # Make splash path in desktop file relative substituteInPlace desktop/lomiri-gallery-app.desktop.in.in \ --replace-fail 'X-Lomiri-Splash-Image=@SPLASH@' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-gallery-app.svg' From d0c3c4dfd8f16fb0615da592dedc2e86d52ee02d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 Sep 2024 15:10:12 +0200 Subject: [PATCH 053/180] lomiri.lomiri-docviewer-app: 3.0.4 -> 3.1.0 --- .../lomiri-docviewer-app/default.nix | 61 +++---------------- 1 file changed, 7 insertions(+), 54 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix index 58168edbc5942..6c5ce2a57cf8c 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix @@ -21,61 +21,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-docviewer-app"; - version = "3.0.4"; + version = "3.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-docviewer-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-xUBE+eSAfG2yMlE/DI+6JHQx+3HiNwtSTv/P4YOAE7Y="; + hash = "sha256-zesBZmaMiMJwHtj3SoaNeHPiM9VNGEa4nTIiG8nskqI="; }; patches = [ - # Remove when version > 3.0.4 - (fetchpatch { - name = "0001-lomiri-docviewer-app-Set-gettext-domain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/8dc2c911817c45451ff341e4ae4b841bcc134945.patch"; - hash = "sha256-vP6MYl7qhJzkgtnVelMMIbc0ZkHxC1s3abUXJ2zVi4w="; - }) - (fetchpatch { - name = "0002-lomiri-docviewer-app-Install-splash-file.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/ef20bbdd5e80040bf11273a5fc2964400086fdc9.patch"; - hash = "sha256-ylPFn53PJRyyzhN1SxtmNFMFeDsV9UxyQhAqULA5PJM="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/72 merged & in release - (fetchpatch { - name = "1001-lomiri-docviewer-app-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/120c81dd71356f2e06ef5c44d114b665236a7382.patch"; - hash = "sha256-4VCw90qYnQ/o67ndp9o8h+wUl2IUpmVGb9xyY55AMIQ="; - }) - (fetchpatch { - name = "1002-lomiri-docviewer-app-Move-Qt-find_package-to-top-level.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/43ee96a3a33b7a8f04e95f434982bcc60ba4b257.patch"; - hash = "sha256-3LggdNo4Yak4SVAD/4/mMCl8PjZy1dIx9i5hKHM5fJU="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/73 merged & in release - (fetchpatch { - name = "1011-lomiri-docviewer-app-Call-i18n-bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/67599a841917304f76ffa1167a217718542a8b46.patch"; - hash = "sha256-nbi3qX14kWtFcXrxAD41IeybDIRTNfUdRgSP1vDI/Hs="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/74 merged & in release - (fetchpatch { - name = "1021-lomiri-docviewer-app-Use-GNUInstallDirs-more-better.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/40a860a118077c05692002db694be77ea62dc5b3.patch"; - hash = "sha256-/zhpIdqZ7WsU4tx4/AZs5w8kEopjH2boiHdHaJk5RXk="; - }) - - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/75 merged & in release - (fetchpatch { - name = "1031-lomiri-docviewer-app-Use-BUILD_TESTING.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/6f1eb739a3e0bf0ba847f94f8ea8411e0a385c2d.patch"; - hash = "sha256-yVuYG+1JGo/I4TVRZ3UQeO/TJ8GiFO5BJ9Bs7glK7hg="; - }) - # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/76 merged & in release # fetchpatch2 because there's a file rename (fetchpatch2 { @@ -84,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0="; }) - # Remove when version > 3.0.4 + # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/81 merged & in release (fetchpatch { - name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/d6731f6d00050b42d561d63ae91751761f7fd278.patch"; - hash = "sha256-EFuQ+pMI8fwYM0lgapi/XeAagFbXUzLWzAx0bPkEdzA="; + name = "1051-lomiri-docviewer-app-XDGify-icon.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/a319e648ba15a7868d9ceb3a77ea15ad196e515b.patch"; + hash = "sha256-JMSnN8EyWPHhqHzaJxy3JIhNaOvPLYkVDnNCrPGbO4E="; }) ]; @@ -98,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { # We don't want absolute paths in desktop files substituteInPlace data/CMakeLists.txt \ - --replace-fail 'ICON "''${DATA_DIR}/''${ICON_FILE}"' 'ICON lomiri-docviewer-app' \ --replace-fail 'SPLASH "''${DATA_DIR}/''${SPLASH_FILE}"' 'SPLASH "lomiri-app-launch/splash/lomiri-docviewer-app.svg"' ''; @@ -133,9 +87,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; postInstall = '' - mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash} + mkdir -p $out/share/lomiri-app-launch/splash - ln -s $out/share/{lomiri-docviewer-app/docviewer-app.svg,icons/hicolor/scalable/apps/lomiri-docviewer-app.svg} ln -s $out/share/{lomiri-docviewer-app/docviewer-app-splash.svg,lomiri-app-launch/splash/lomiri-docviewer-app.svg} ''; From e67242b04c5e746c83437f9ea089b59b80573152 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 27 Sep 2024 22:32:03 +0200 Subject: [PATCH 054/180] lomiri.lomiri-filemanager-app: 1.1.1 -> 1.1.2 --- .../lomiri-filemanager-app/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix index 28d3c23f6ee99..9ad6cee361f9d 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, biometryd, @@ -22,29 +21,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-filemanager-app"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-filemanager-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-KZzkD+h2yUeBvNFn9xLLtc4Iukk6maimFjIdpGCWLOE="; + hash = "sha256-XA1Gdb0Kpc3BEifmgHhQ38moKkCkYbhpr8wptnddZlk="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/117 merged & in release - (fetchpatch { - name = "0001-lomiri-filemanager-app-Install-content-hub-and-url-dispatcher-files.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/e15dc7c5b4dd0b9e5df3e4e99da8f28bd760e093.patch"; - hash = "sha256-MXuQXpZcf5fJP4aenl5KDOtdaDFTTnkzIfem9BpE5ig="; - }) - (fetchpatch { - name = "0002-lomiri-filemanager-app-Let-desktop-icon-be-found-via-lookup.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/8c38f30ac099609379b95079fac771a61d73e7d6.patch"; - hash = "sha256-I3hB+W/5JW08HcLiNrSpZ7rTeQyKNoMNINVrFbF/Uiw="; - }) - ]; - postPatch = '' # Use correct QML install path, don't pull in autopilot test code (we can't run that system) # Remove absolute paths from desktop file, https://github.com/NixOS/nixpkgs/issues/308324 From aca2f57b15d0b057dc4e163270d938475c515f9e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 27 Sep 2024 22:39:18 +0200 Subject: [PATCH 055/180] lomiri.morph-browser: 1.1.0 -> 1.1.1 --- .../applications/morph-browser/default.nix | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index 6733f6b0d8784..ff636197d738a 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -27,36 +27,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "morph-browser"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/morph-browser"; rev = finalAttrs.version; - hash = "sha256-C5iXv8VS8Mm1ryxK7Vi5tVmiM01OSIFiTyH0vP9B/xA="; + hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0="; }; patches = [ - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/575 merged & in release - (fetchpatch { - name = "0001-morph-browser-tst_SessionUtilsTests-Set-permissions-on-temporary-xdg-runtime-directory.patch"; - url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/e90206105b8b287fbd6e45ac37ca1cd259981928.patch"; - hash = "sha256-5htFn+OGVVBn3mJQaZcF5yt0mT+2QRlKyKFesEhklfA="; - }) - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/576 merged & in release (fetchpatch { name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch"; url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/0527a1e01fb27c62f5e0011274f73bad400e9691.patch"; hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no="; }) - - # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/580 merged & in release - (fetchpatch { - name = "0003-morph-browser-lomiri-content-hub-rename.patch"; - url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/29e5031a1fd0aa69587724b25772ae78d6d2bd7d.patch"; - hash = "sha256-nxOaiRSKi+Nb0JLopi0UNvpnctjkPkjhaHLAWPHRfQA="; - }) ]; postPatch = '' @@ -139,7 +125,8 @@ stdenv.mkDerivation (finalAttrs: { standalone = nixosTests.morph-browser; # Lomiri-specific issues with the desktop file may break the entire session, make sure it still works - lomiri = nixosTests.lomiri; + lomiri-basics = nixosTests.lomiri.desktop-basics; + lomiri-appinteractions = nixosTests.lomiri.desktop-appinteractions; }; }; From c10108bfbd860d040ed438b3d6ca814f6cd935bc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 28 Sep 2024 14:54:58 +0200 Subject: [PATCH 056/180] lomiri.lomiri-terminal-app: 2.0.2 -> 2.0.3 --- .../lomiri-terminal-app/default.nix | 31 ++----------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix index 0b2b6f6e57980..a6bf2877ef581 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , gitUpdater , nixosTests , cmake @@ -18,41 +17,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-terminal-app"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-terminal-app"; rev = "v${finalAttrs.version}"; - hash = "sha256-mXbPmVcl5dL78QUp+w3o4im5ohUQCPTKWLSVqlNO0yo="; + hash = "sha256-374ATxF+XhoALzYv6DEyj6IYgb82Ch4zcmqK0RXmlzI="; }; - patches = [ - # Stop usage of private qt5_use_modules function, seemingly unavailable in this package - # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/103 merged & in release - (fetchpatch { - name = "0001-lomiri-terminal-app-Stop-using-qt5_use_modules.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/db210c74e771a427066aebdc3a99cab6e782d326.patch"; - hash = "sha256-op4+/eo8rBRMcW6MZ0rOEFReM7JBCck1B+AsgAPyqAI="; - }) - - # Explicitly bind textdomain, don't rely on hacky workaround in LUITK - # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/104 merged & in release - (fetchpatch { - name = "0002-lomiri-terminal-app-Call-i18n.bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/7f9d419e29043f0d0922d2ac1dce5673e2723a01.patch"; - hash = "sha256-HfIvGVbIdTasoHAfHysnzFLufQQ4lskym5HTekH+mjk="; - }) - - # Add more & correct existing usage of GNUInstallDirs variables - # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/105 merged & in release - (fetchpatch { - name = "0003-lomiri-terminal-app-GNUInstallDirs-usage.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/fcde1f05bb442c74b1dff95917fd7594f26e97a7.patch"; - hash = "sha256-umxCMGNjyz0TVmwH0Gl0MpgjLQtkW9cHkUfpNJcoasE="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt \ --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" From c707f731bf51bbd6f36073d5092d0f74758d82fe Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 9 Oct 2024 21:29:12 +0200 Subject: [PATCH 057/180] lomiri.mediascanner2: Cleanup after bump This was implemented upstream, no need to patch it anymore. --- pkgs/desktops/lomiri/services/mediascanner2/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 28dc57c3d31be..eac245737012f 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -43,11 +43,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" - - # Lomiri desktop doesn't identify itself under Canonical's name anymore - substituteInPlace src/daemon/scannerdaemon.cc \ - --replace 'Unity8' 'Lomiri' + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" ''; strictDeps = true; From de16f5ecfda238f3742552c94371f8dfa6da995a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 9 Oct 2024 21:37:37 +0200 Subject: [PATCH 058/180] lomiri.mediascanner2: nixfmt, modernise abit --- .../lomiri/services/mediascanner2/default.nix | 115 +++++++++--------- 1 file changed, 56 insertions(+), 59 deletions(-) diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index eac245737012f..79670a8eb4998 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -1,28 +1,29 @@ -{ stdenv -, lib -, fetchFromGitLab -, gitUpdater -, testers -, boost -, cmake -, cmake-extras -, dbus -, dbus-cpp -, gdk-pixbuf -, glib -, gst_all_1 -, gtest -, libapparmor -, libexif -, pkg-config -, properties-cpp -, qtbase -, qtdeclarative -, shared-mime-info -, sqlite -, taglib -, udisks -, wrapQtAppsHook +{ + stdenv, + lib, + fetchFromGitLab, + gitUpdater, + testers, + boost, + cmake, + cmake-extras, + dbus, + dbus-cpp, + gdk-pixbuf, + glib, + gst_all_1, + gtest, + libapparmor, + libexif, + pkg-config, + properties-cpp, + qtbase, + qtdeclarative, + shared-mime-info, + sqlite, + taglib, + udisks, + wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -55,35 +56,33 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - buildInputs = [ - boost - cmake-extras - dbus - dbus-cpp - gdk-pixbuf - glib - libapparmor - libexif - properties-cpp - qtbase - qtdeclarative - shared-mime-info - sqlite - taglib - udisks - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - ]); + buildInputs = + [ + boost + cmake-extras + dbus + dbus-cpp + gdk-pixbuf + glib + libapparmor + libexif + properties-cpp + qtbase + qtdeclarative + shared-mime-info + sqlite + taglib + udisks + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + ]); - checkInputs = [ - gtest - ]; + checkInputs = [ gtest ]; - cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" - ]; + cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -104,15 +103,13 @@ stdenv.mkDerivation (finalAttrs: { updateScript = gitUpdater { }; }; - meta = with lib; { + meta = { description = "Media scanner service & access library"; homepage = "https://gitlab.com/ubports/development/core/mediascanner2"; - license = licenses.gpl3Only; - maintainers = teams.lomiri.members; + license = lib.licenses.gpl3Only; + maintainers = lib.teams.lomiri.members; mainProgram = "mediascanner-service-2.0"; - platforms = platforms.linux; - pkgConfigModules = [ - "mediascanner-2.0" - ]; + platforms = lib.platforms.linux; + pkgConfigModules = [ "mediascanner-2.0" ]; }; }) From 1b660ba22a6f7504cece4dfac487af79296c4c1c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 10 Oct 2024 16:38:13 +0200 Subject: [PATCH 059/180] tests/lomiri: Test keymap switch, make keymap OCR more consistent --- nixos/tests/lomiri.nix | 171 +++++++++++++++++++++-------------------- 1 file changed, 87 insertions(+), 84 deletions(-) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 66f9216104606..1ff68e85b94dc 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -4,6 +4,52 @@ let user = "alice"; description = "Alice Foobar"; password = "foobar"; + + # tmpfiles setup to make OCRing on terminal output more reliable + terminalOcrTmpfilesSetup = + { + pkgs, + lib, + config, + }: + let + white = "255, 255, 255"; + black = "0, 0, 0"; + colorSection = color: { + Color = color; + Bold = true; + Transparency = false; + }; + terminalColors = pkgs.writeText "customized.colorscheme" ( + lib.generators.toINI { } { + Background = colorSection white; + Foreground = colorSection black; + Color2 = colorSection black; + Color2Intense = colorSection black; + } + ); + terminalConfig = pkgs.writeText "terminal.ubports.conf" ( + lib.generators.toINI { } { + General = { + colorScheme = "customized"; + fontSize = "16"; + fontStyle = "Inconsolata"; + }; + } + ); + confBase = "${config.users.users.${user}.home}/.config"; + userDirArgs = { + mode = "0700"; + user = user; + group = "users"; + }; + in + { + "${confBase}".d = userDirArgs; + "${confBase}/terminal.ubports".d = userDirArgs; + "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}"; + "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}"; + }; in { greeter = makeTest ( @@ -154,47 +200,9 @@ in }; # Help with OCR - systemd.tmpfiles.settings = - let - white = "255, 255, 255"; - black = "0, 0, 0"; - colorSection = color: { - Color = color; - Bold = true; - Transparency = false; - }; - terminalColors = pkgs.writeText "customized.colorscheme" ( - lib.generators.toINI { } { - Background = colorSection white; - Foreground = colorSection black; - Color2 = colorSection black; - Color2Intense = colorSection black; - } - ); - terminalConfig = pkgs.writeText "terminal.ubports.conf" ( - lib.generators.toINI { } { - General = { - colorScheme = "customized"; - fontSize = "16"; - fontStyle = "Inconsolata"; - }; - } - ); - confBase = "${config.users.users.${user}.home}/.config"; - userDirArgs = { - mode = "0700"; - user = user; - group = "users"; - }; - in - { - "10-lomiri-test-setup" = { - "${confBase}".d = userDirArgs; - "${confBase}/terminal.ubports".d = userDirArgs; - "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}"; - "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}"; - }; - }; + systemd.tmpfiles.settings = { + "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; }; + }; }; enableOCR = true; @@ -371,47 +379,9 @@ in }; # Help with OCR - systemd.tmpfiles.settings = - let - white = "255, 255, 255"; - black = "0, 0, 0"; - colorSection = color: { - Color = color; - Bold = true; - Transparency = false; - }; - terminalColors = pkgs.writeText "customized.colorscheme" ( - lib.generators.toINI { } { - Background = colorSection white; - Foreground = colorSection black; - Color2 = colorSection black; - Color2Intense = colorSection black; - } - ); - terminalConfig = pkgs.writeText "terminal.ubports.conf" ( - lib.generators.toINI { } { - General = { - colorScheme = "customized"; - fontSize = "16"; - fontStyle = "Inconsolata"; - }; - } - ); - confBase = "${config.users.users.${user}.home}/.config"; - userDirArgs = { - mode = "0700"; - user = user; - group = "users"; - }; - in - { - "10-lomiri-test-setup" = { - "${confBase}".d = userDirArgs; - "${confBase}/terminal.ubports".d = userDirArgs; - "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}"; - "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}"; - }; - }; + systemd.tmpfiles.settings = { + "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; }; + }; }; enableOCR = true; @@ -732,8 +702,17 @@ in # Help with OCR fonts.packages = [ pkgs.inconsolata ]; - # Non-QWERTY keymap to test keymap patch - services.xserver.xkb.layout = "de"; + services.xserver.xkb.layout = lib.strings.concatStringsSep "," [ + # Start with a non-QWERTY keymap to test keymap patch + "de" + # Then a QWERTY one to test switching + "us" + ]; + + # Help with OCR + systemd.tmpfiles.settings = { + "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; }; + }; }; enableOCR = true; @@ -784,6 +763,30 @@ in machine.send_chars("touch ${pwInput}\n") machine.wait_for_file("/home/alice/${pwOutput}", 10) + # Issues with this keybind: input leaks to focused surface, may open launcher + # Don't have the keyboard indicator to handle this better + machine.send_key("meta_l-spc") + machine.wait_for_console_text('SET KEYMAP "us"') + + # Handle keybind fallout + machine.sleep(10) # wait for everything to settle + machine.send_key("esc") # close launcher in case it was opened + machine.sleep(2) # wait for animation to finish + # Make sure input leaks are gone + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + machine.send_key("backspace") + + machine.send_chars("touch ${pwInput}\n") + machine.wait_for_file("/home/alice/${pwInput}", 10) + machine.send_key("alt-f4") ''; } From 830062864f0cba1806f67f6bf8488859502525fd Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 11 Oct 2024 17:35:12 +1100 Subject: [PATCH 060/180] nextjs-ollama-llm-ui: 1.0.1 -> 1.1.0 --- .../0001-update-nextjs.patch | 879 ------------------ .../0003-add-standalone-output.patch | 16 - .../ne/nextjs-ollama-llm-ui/package.nix | 12 +- 3 files changed, 3 insertions(+), 904 deletions(-) delete mode 100644 pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch delete mode 100644 pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch deleted file mode 100644 index d904f04f73447..0000000000000 --- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0001-update-nextjs.patch +++ /dev/null @@ -1,879 +0,0 @@ -diff --git a/package-lock.json b/package-lock.json -index 11dfbf6..b9470d0 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -30,7 +30,7 @@ - "framer-motion": "^11.0.3", - "langchain": "^0.1.13", - "lucide-react": "^0.322.0", -- "next": "14.1.0", -+ "next": "^14.2.3", - "next-themes": "^0.2.1", - "react": "^18", - "react-code-blocks": "^0.1.6", -@@ -40,6 +40,7 @@ - "react-resizable-panels": "^2.0.3", - "react-textarea-autosize": "^8.5.3", - "remark-gfm": "^4.0.0", -+ "sharp": "^0.33.4", - "sonner": "^1.4.0", - "tailwind-merge": "^2.2.1", - "tailwindcss-animate": "^1.0.7", -@@ -139,6 +140,15 @@ - "node": ">=6.9.0" - } - }, -+ "node_modules/@emnapi/runtime": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.1.1.tgz", -+ "integrity": "sha512-3bfqkzuR1KLx57nZfjr2NLnFOobvyS0aTszaEGCGqmYMVDRaGvgIZbjGSV/MHSSmLgQ/b9JFHQ5xm5WRZYd+XQ==", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.4.0" -+ } -+ }, - "node_modules/@emoji-mart/data": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@emoji-mart/data/-/data-1.1.2.tgz", -@@ -304,6 +314,437 @@ - "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", - "dev": true - }, -+ "node_modules/@img/sharp-darwin-arm64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.4.tgz", -+ "integrity": "sha512-p0suNqXufJs9t3RqLBO6vvrgr5OhgbWp76s5gTRvdmxmuv9E1rcaqGUsl3l4mKVmXPkTkTErXediAui4x+8PSA==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-darwin-arm64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-darwin-x64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.4.tgz", -+ "integrity": "sha512-0l7yRObwtTi82Z6ebVI2PnHT8EB2NxBgpK2MiKJZJ7cz32R4lxd001ecMhzzsZig3Yv9oclvqqdV93jo9hy+Dw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-darwin-x64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-darwin-arm64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.2.tgz", -+ "integrity": "sha512-tcK/41Rq8IKlSaKRCCAuuY3lDJjQnYIW1UXU1kxcEKrfL8WR7N6+rzNoOxoQRJWTAECuKwgAHnPvqXGN8XfkHA==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "macos": ">=11", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-darwin-x64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.2.tgz", -+ "integrity": "sha512-Ofw+7oaWa0HiiMiKWqqaZbaYV3/UGL2wAPeLuJTx+9cXpCRdvQhCLG0IH8YGwM0yGWGLpsF4Su9vM1o6aer+Fw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "darwin" -+ ], -+ "engines": { -+ "macos": ">=10.13", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linux-arm": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.2.tgz", -+ "integrity": "sha512-iLWCvrKgeFoglQxdEwzu1eQV04o8YeYGFXtfWU26Zr2wWT3q3MTzC+QTCO3ZQfWd3doKHT4Pm2kRmLbupT+sZw==", -+ "cpu": [ -+ "arm" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.28", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linux-arm64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.2.tgz", -+ "integrity": "sha512-x7kCt3N00ofFmmkkdshwj3vGPCnmiDh7Gwnd4nUwZln2YjqPxV1NlTyZOvoDWdKQVDL911487HOueBvrpflagw==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linux-s390x": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.2.tgz", -+ "integrity": "sha512-cmhQ1J4qVhfmS6szYW7RT+gLJq9dH2i4maq+qyXayUSn9/3iY2ZeWpbAgSpSVbV2E1JUL2Gg7pwnYQ1h8rQIog==", -+ "cpu": [ -+ "s390x" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.28", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linux-x64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.2.tgz", -+ "integrity": "sha512-E441q4Qdb+7yuyiADVi5J+44x8ctlrqn8XgkDTwr4qPJzWkaHwD489iZ4nGDgcuya4iMN3ULV6NwbhRZJ9Z7SQ==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linuxmusl-arm64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.2.tgz", -+ "integrity": "sha512-3CAkndNpYUrlDqkCM5qhksfE+qSIREVpyoeHIU6jd48SJZViAmznoQQLAv4hVXF7xyUB9zf+G++e2v1ABjCbEQ==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "musl": ">=1.2.2", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-libvips-linuxmusl-x64": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.2.tgz", -+ "integrity": "sha512-VI94Q6khIHqHWNOh6LLdm9s2Ry4zdjWJwH56WoiJU7NTeDwyApdZZ8c+SADC8OH98KWNQXnE01UdJ9CSfZvwZw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "musl": ">=1.2.2", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-linux-arm": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.4.tgz", -+ "integrity": "sha512-RUgBD1c0+gCYZGCCe6mMdTiOFS0Zc/XrN0fYd6hISIKcDUbAW5NtSQW9g/powkrXYm6Vzwd6y+fqmExDuCdHNQ==", -+ "cpu": [ -+ "arm" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.28", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linux-arm": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linux-arm64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.4.tgz", -+ "integrity": "sha512-2800clwVg1ZQtxwSoTlHvtm9ObgAax7V6MTAB/hDT945Tfyy3hVkmiHpeLPCKYqYR1Gcmv1uDZ3a4OFwkdBL7Q==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linux-arm64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linux-s390x": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.4.tgz", -+ "integrity": "sha512-h3RAL3siQoyzSoH36tUeS0PDmb5wINKGYzcLB5C6DIiAn2F3udeFAum+gj8IbA/82+8RGCTn7XW8WTFnqag4tQ==", -+ "cpu": [ -+ "s390x" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.31", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linux-s390x": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linux-x64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.4.tgz", -+ "integrity": "sha512-GoR++s0XW9DGVi8SUGQ/U4AeIzLdNjHka6jidVwapQ/JebGVQIpi52OdyxCNVRE++n1FCLzjDovJNozif7w/Aw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "glibc": ">=2.26", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linux-x64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linuxmusl-arm64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.4.tgz", -+ "integrity": "sha512-nhr1yC3BlVrKDTl6cO12gTpXMl4ITBUZieehFvMntlCXFzH2bvKG76tBL2Y/OqhupZt81pR7R+Q5YhJxW0rGgQ==", -+ "cpu": [ -+ "arm64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "musl": ">=1.2.2", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linuxmusl-arm64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-linuxmusl-x64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.4.tgz", -+ "integrity": "sha512-uCPTku0zwqDmZEOi4ILyGdmW76tH7dm8kKlOIV1XC5cLyJ71ENAAqarOHQh0RLfpIpbV5KOpXzdU6XkJtS0daw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "musl": ">=1.2.2", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-libvips-linuxmusl-x64": "1.0.2" -+ } -+ }, -+ "node_modules/@img/sharp-wasm32": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.4.tgz", -+ "integrity": "sha512-Bmmauh4sXUsUqkleQahpdNXKvo+wa1V9KhT2pDA4VJGKwnKMJXiSTGphn0gnJrlooda0QxCtXc6RX1XAU6hMnQ==", -+ "cpu": [ -+ "wasm32" -+ ], -+ "optional": true, -+ "dependencies": { -+ "@emnapi/runtime": "^1.1.1" -+ }, -+ "engines": { -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-win32-ia32": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.4.tgz", -+ "integrity": "sha512-99SJ91XzUhYHbx7uhK3+9Lf7+LjwMGQZMDlO/E/YVJ7Nc3lyDFZPGhjwiYdctoH2BOzW9+TnfqcaMKt0jHLdqw==", -+ "cpu": [ -+ "ia32" -+ ], -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, -+ "node_modules/@img/sharp-win32-x64": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.4.tgz", -+ "integrity": "sha512-3QLocdTRVIrFNye5YocZl+KKpYKP+fksi1QhmOArgx7GyhIbQp/WrJRu176jm8IxromS7RIkzMiMINVdBtC8Aw==", -+ "cpu": [ -+ "x64" -+ ], -+ "optional": true, -+ "os": [ -+ "win32" -+ ], -+ "engines": { -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0", -+ "npm": ">=9.6.5", -+ "pnpm": ">=7.1.0", -+ "yarn": ">=3.2.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ } -+ }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", -@@ -800,9 +1241,9 @@ - } - }, - "node_modules/@next/env": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/env/-/env-14.1.0.tgz", -- "integrity": "sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==" -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.3.tgz", -+ "integrity": "sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==" - }, - "node_modules/@next/eslint-plugin-next": { - "version": "14.1.0", -@@ -814,9 +1255,9 @@ - } - }, - "node_modules/@next/swc-darwin-arm64": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.0.tgz", -- "integrity": "sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz", -+ "integrity": "sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==", - "cpu": [ - "arm64" - ], -@@ -829,9 +1270,9 @@ - } - }, - "node_modules/@next/swc-darwin-x64": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.0.tgz", -- "integrity": "sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz", -+ "integrity": "sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==", - "cpu": [ - "x64" - ], -@@ -844,9 +1285,9 @@ - } - }, - "node_modules/@next/swc-linux-arm64-gnu": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.0.tgz", -- "integrity": "sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz", -+ "integrity": "sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==", - "cpu": [ - "arm64" - ], -@@ -859,9 +1300,9 @@ - } - }, - "node_modules/@next/swc-linux-arm64-musl": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.0.tgz", -- "integrity": "sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz", -+ "integrity": "sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==", - "cpu": [ - "arm64" - ], -@@ -874,9 +1315,9 @@ - } - }, - "node_modules/@next/swc-linux-x64-gnu": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.0.tgz", -- "integrity": "sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz", -+ "integrity": "sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==", - "cpu": [ - "x64" - ], -@@ -889,9 +1330,9 @@ - } - }, - "node_modules/@next/swc-linux-x64-musl": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.0.tgz", -- "integrity": "sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz", -+ "integrity": "sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==", - "cpu": [ - "x64" - ], -@@ -904,9 +1345,9 @@ - } - }, - "node_modules/@next/swc-win32-arm64-msvc": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.0.tgz", -- "integrity": "sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz", -+ "integrity": "sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==", - "cpu": [ - "arm64" - ], -@@ -919,9 +1360,9 @@ - } - }, - "node_modules/@next/swc-win32-ia32-msvc": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.0.tgz", -- "integrity": "sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz", -+ "integrity": "sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==", - "cpu": [ - "ia32" - ], -@@ -934,9 +1375,9 @@ - } - }, - "node_modules/@next/swc-win32-x64-msvc": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.0.tgz", -- "integrity": "sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz", -+ "integrity": "sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==", - "cpu": [ - "x64" - ], -@@ -1810,11 +2251,17 @@ - "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==", - "dev": true - }, -+ "node_modules/@swc/counter": { -+ "version": "0.1.3", -+ "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz", -+ "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==" -+ }, - "node_modules/@swc/helpers": { -- "version": "0.5.2", -- "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz", -- "integrity": "sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==", -+ "version": "0.5.5", -+ "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz", -+ "integrity": "sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==", - "dependencies": { -+ "@swc/counter": "^0.1.3", - "tslib": "^2.4.0" - } - }, -@@ -2930,6 +3377,18 @@ - "periscopic": "^3.1.0" - } - }, -+ "node_modules/color": { -+ "version": "4.2.3", -+ "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", -+ "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", -+ "dependencies": { -+ "color-convert": "^2.0.1", -+ "color-string": "^1.9.0" -+ }, -+ "engines": { -+ "node": ">=12.5.0" -+ } -+ }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -@@ -2946,6 +3405,15 @@ - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, -+ "node_modules/color-string": { -+ "version": "1.9.1", -+ "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", -+ "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", -+ "dependencies": { -+ "color-name": "^1.0.0", -+ "simple-swizzle": "^0.2.2" -+ } -+ }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", -@@ -3152,6 +3620,14 @@ - "node": ">=6" - } - }, -+ "node_modules/detect-libc": { -+ "version": "2.0.3", -+ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", -+ "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", -+ "engines": { -+ "node": ">=8" -+ } -+ }, - "node_modules/detect-node-es": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", -@@ -4677,6 +5153,11 @@ - "url": "https://github.com/sponsors/ljharb" - } - }, -+ "node_modules/is-arrayish": { -+ "version": "0.3.2", -+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", -+ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" -+ }, - "node_modules/is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", -@@ -6676,12 +7157,12 @@ - "dev": true - }, - "node_modules/next": { -- "version": "14.1.0", -- "resolved": "https://registry.npmjs.org/next/-/next-14.1.0.tgz", -- "integrity": "sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==", -+ "version": "14.2.3", -+ "resolved": "https://registry.npmjs.org/next/-/next-14.2.3.tgz", -+ "integrity": "sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==", - "dependencies": { -- "@next/env": "14.1.0", -- "@swc/helpers": "0.5.2", -+ "@next/env": "14.2.3", -+ "@swc/helpers": "0.5.5", - "busboy": "1.6.0", - "caniuse-lite": "^1.0.30001579", - "graceful-fs": "^4.2.11", -@@ -6695,18 +7176,19 @@ - "node": ">=18.17.0" - }, - "optionalDependencies": { -- "@next/swc-darwin-arm64": "14.1.0", -- "@next/swc-darwin-x64": "14.1.0", -- "@next/swc-linux-arm64-gnu": "14.1.0", -- "@next/swc-linux-arm64-musl": "14.1.0", -- "@next/swc-linux-x64-gnu": "14.1.0", -- "@next/swc-linux-x64-musl": "14.1.0", -- "@next/swc-win32-arm64-msvc": "14.1.0", -- "@next/swc-win32-ia32-msvc": "14.1.0", -- "@next/swc-win32-x64-msvc": "14.1.0" -+ "@next/swc-darwin-arm64": "14.2.3", -+ "@next/swc-darwin-x64": "14.2.3", -+ "@next/swc-linux-arm64-gnu": "14.2.3", -+ "@next/swc-linux-arm64-musl": "14.2.3", -+ "@next/swc-linux-x64-gnu": "14.2.3", -+ "@next/swc-linux-x64-musl": "14.2.3", -+ "@next/swc-win32-arm64-msvc": "14.2.3", -+ "@next/swc-win32-ia32-msvc": "14.2.3", -+ "@next/swc-win32-x64-msvc": "14.2.3" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.1.0", -+ "@playwright/test": "^1.41.2", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "sass": "^1.3.0" -@@ -6715,6 +7197,9 @@ - "@opentelemetry/api": { - "optional": true - }, -+ "@playwright/test": { -+ "optional": true -+ }, - "sass": { - "optional": true - } -@@ -7928,13 +8413,9 @@ - } - }, - "node_modules/semver": { -- "version": "7.5.4", -- "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", -- "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", -- "dev": true, -- "dependencies": { -- "lru-cache": "^6.0.0" -- }, -+ "version": "7.6.2", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", -+ "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", - "bin": { - "semver": "bin/semver.js" - }, -@@ -7942,18 +8423,6 @@ - "node": ">=10" - } - }, -- "node_modules/semver/node_modules/lru-cache": { -- "version": "6.0.0", -- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", -- "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", -- "dev": true, -- "dependencies": { -- "yallist": "^4.0.0" -- }, -- "engines": { -- "node": ">=10" -- } -- }, - "node_modules/seroval": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.0.4.tgz", -@@ -8010,6 +8479,45 @@ - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", - "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" - }, -+ "node_modules/sharp": { -+ "version": "0.33.4", -+ "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.4.tgz", -+ "integrity": "sha512-7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==", -+ "hasInstallScript": true, -+ "dependencies": { -+ "color": "^4.2.3", -+ "detect-libc": "^2.0.3", -+ "semver": "^7.6.0" -+ }, -+ "engines": { -+ "libvips": ">=8.15.2", -+ "node": "^18.17.0 || ^20.3.0 || >=21.0.0" -+ }, -+ "funding": { -+ "url": "https://opencollective.com/libvips" -+ }, -+ "optionalDependencies": { -+ "@img/sharp-darwin-arm64": "0.33.4", -+ "@img/sharp-darwin-x64": "0.33.4", -+ "@img/sharp-libvips-darwin-arm64": "1.0.2", -+ "@img/sharp-libvips-darwin-x64": "1.0.2", -+ "@img/sharp-libvips-linux-arm": "1.0.2", -+ "@img/sharp-libvips-linux-arm64": "1.0.2", -+ "@img/sharp-libvips-linux-s390x": "1.0.2", -+ "@img/sharp-libvips-linux-x64": "1.0.2", -+ "@img/sharp-libvips-linuxmusl-arm64": "1.0.2", -+ "@img/sharp-libvips-linuxmusl-x64": "1.0.2", -+ "@img/sharp-linux-arm": "0.33.4", -+ "@img/sharp-linux-arm64": "0.33.4", -+ "@img/sharp-linux-s390x": "0.33.4", -+ "@img/sharp-linux-x64": "0.33.4", -+ "@img/sharp-linuxmusl-arm64": "0.33.4", -+ "@img/sharp-linuxmusl-x64": "0.33.4", -+ "@img/sharp-wasm32": "0.33.4", -+ "@img/sharp-win32-ia32": "0.33.4", -+ "@img/sharp-win32-x64": "0.33.4" -+ } -+ }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -@@ -8054,6 +8562,14 @@ - "url": "https://github.com/sponsors/isaacs" - } - }, -+ "node_modules/simple-swizzle": { -+ "version": "0.2.2", -+ "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", -+ "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", -+ "dependencies": { -+ "is-arrayish": "^0.3.1" -+ } -+ }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", -@@ -9369,12 +9885,6 @@ - "node": ">=0.4" - } - }, -- "node_modules/yallist": { -- "version": "4.0.0", -- "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -- "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -- "dev": true -- }, - "node_modules/yaml": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", -diff --git a/package.json b/package.json -index 4185096..4ab1c58 100644 ---- a/package.json -+++ b/package.json -@@ -31,7 +31,7 @@ - "framer-motion": "^11.0.3", - "langchain": "^0.1.13", - "lucide-react": "^0.322.0", -- "next": "14.1.0", -+ "next": "^14.2.3", - "next-themes": "^0.2.1", - "react": "^18", - "react-code-blocks": "^0.1.6", -@@ -41,6 +41,7 @@ - "react-resizable-panels": "^2.0.3", - "react-textarea-autosize": "^8.5.3", - "remark-gfm": "^4.0.0", -+ "sharp": "^0.33.4", - "sonner": "^1.4.0", - "tailwind-merge": "^2.2.1", - "tailwindcss-animate": "^1.0.7", --- -2.42.0 - diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch b/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch deleted file mode 100644 index 50d1611148960..0000000000000 --- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/0003-add-standalone-output.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/next.config.mjs b/next.config.mjs -index dc34f1a..f6f90c4 100644 ---- a/next.config.mjs -+++ b/next.config.mjs -@@ -1,6 +1,7 @@ - /** @type {import('next').NextConfig} */ - const nextConfig = { -- webpack: (config, { isServer }) => { -+ output: 'standalone', -+ webpack: (config, { isServer }) => { - // Fixes npm packages that depend on `fs` module - if (!isServer) { - config.resolve.fallback = { --- -2.42.0 - diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix index aad1420f8b659..604e9680aea59 100644 --- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix +++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix @@ -14,7 +14,7 @@ }: let - version = "1.0.1"; + version = "1.1.0"; in buildNpmPackage { pname = "nextjs-ollama-llm-ui"; @@ -24,20 +24,14 @@ buildNpmPackage { owner = "jakobhoeg"; repo = "nextjs-ollama-llm-ui"; rev = "v${version}"; - hash = "sha256-pZJgiopm0VGwaZxsNcyRawevvzEcK1j5WhngX1Pn6YE="; + hash = "sha256-IA7g96u5QY8cOuTbJEWw7+U+hSFBzIQVk4Kv3qHKAdM="; }; - npmDepsHash = "sha256-wtHOW0CyEOszgiZwDkF2/cSxbw6WFRLbhDnd2FlY70E="; + npmDepsHash = "sha256-3M0BZ9KZZ0ONwvTLycfMR8skMQf8mzjeqYCwJY4l040="; patches = [ - # Update to a newer nextjs version that buildNpmPackage is able to build. - # Remove at nextjs update. - ./0001-update-nextjs.patch # nextjs tries to download google fonts from the internet during buildPhase and fails in Nix sandbox. # We patch the code to expect a local font from src/app/Inter.ttf that we load from Nixpkgs in preBuild phase. ./0002-use-local-google-fonts.patch - # Modify next.config.js to produce a production "standalone" output at .next/standalone. - # This output is easy to package with Nix and run with "node .next/standalone/server.js" later. - ./0003-add-standalone-output.patch ]; # Adjust buildNpmPackage phases with nextjs quirk workarounds. From f385d942e17daa1d73375fcfbf5eb8d437ae9c84 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Fri, 11 Oct 2024 17:35:37 +1100 Subject: [PATCH 061/180] nextjs-ollama-llm-ui: fix nextjs cache dir (#344316) --- nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix | 3 ++- pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix index 9bd2cf310c0af..cbb0ce813a348 100644 --- a/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix +++ b/nixos/modules/services/web-apps/nextjs-ollama-llm-ui.nix @@ -52,7 +52,7 @@ in ollamaUrl = lib.mkOption { type = lib.types.str; - default = "127.0.0.1:11434"; + default = "http://127.0.0.1:11434"; example = "https://ollama.example.org"; description = '' The address (including host and port) under which we can access the Ollama backend server. @@ -79,6 +79,7 @@ in serviceConfig = { ExecStart = "${lib.getExe nextjs-ollama-llm-ui}"; DynamicUser = true; + CacheDirectory = "nextjs-ollama-llm-ui"; }; }; }; diff --git a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix index 604e9680aea59..866f9b5babfed 100644 --- a/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix +++ b/pkgs/by-name/ne/nextjs-ollama-llm-ui/package.nix @@ -64,6 +64,9 @@ buildNpmPackage { mkdir -p $out/share/homepage/.next cp -r .next/static $out/share/homepage/.next/static + # https://github.com/vercel/next.js/discussions/58864 + ln -s /var/cache/nextjs-ollama-llm-ui $out/share/homepage/.next/cache + chmod +x $out/share/homepage/server.js # we set a default port to support "nix run ..." From 1a7ad9eabbb44da5063195ffa2f6bf2056902623 Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:59:42 +0800 Subject: [PATCH 062/180] aider-chat: 0.57.0 -> 0.59.0 https://github.com/Aider-AI/aider/releases/tag/v0.59.0 --- pkgs/by-name/ai/aider-chat/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index d1ed4c6f936b4..d8d42d73c4e8b 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.57.0"; + version = "0.59.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication { owner = "paul-gauthier"; repo = "aider"; rev = "refs/tags/v${version}"; - hash = "sha256-ErDepSju8B4GochHKxL03aUfOLAiNfTaXBAllAZ144M="; + hash = "sha256-20LicYj1j5gGzhF+SxPUKu858nHZgwDF1JxXeHRtYe0="; }; pythonRelaxDeps = true; @@ -68,6 +68,7 @@ python3.pkgs.buildPythonApplication { streamlit tokenizers watchdog + pydub ] ++ lib.optionals (!tensorflow.meta.broken) [ llama-index-core From 19afd5603290706849c18ba5ad06684466c45ac9 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 11 Oct 2024 11:34:20 +0200 Subject: [PATCH 063/180] discord: fix parsing versions in updateScripts Discord changed their download URLs and the new code is now more lenient regarding the actual download URL, as all we care about is the version in the URL path. Example: https://ptb.dl2.discordapp.net/apps/linux/0.0.110/discord-ptb-0.0.110.tar.gz ^-----^ This is what we need Signed-off-by: Sefa Eyeoglu --- .../networking/instant-messengers/discord/darwin.nix | 7 ++----- .../networking/instant-messengers/discord/linux.nix | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index aff995a1cee48..06957341a3bba 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -54,11 +54,8 @@ stdenv.mkDerivation { #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -x set -eou pipefail; - url=$(curl -sI "https://discordapp.com/api/download/${ - builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname - }?platform=osx&format=dmg" | grep -oP 'location: \K\S+') - version=''${url##https://dl*.discordapp.net/apps/osx/} - version=''${version%%/*.dmg} + url=$(curl -sI -o /dev/null -w '%header{location}' "https://discord.com/api/download/${branch}?platform=osx&format=dmg") + version=$(echo $url | grep -oP '/\K(\d+\.){2}\d+') update-source-version ${lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."}${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} ''; }; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index e0375ecf7b89b..3c67d578013b2 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -151,11 +151,8 @@ stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -eou pipefail; - url=$(curl -sI "https://discordapp.com/api/download/${ - builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname - }?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') - version=''${url##https://dl*.discordapp.net/apps/linux/} - version=''${version%%/*.tar.gz} + url=$(curl -sI -o /dev/null -w '%header{location}' "https://discord.com/api/download/${branch}?platform=linux&format=tar.gz") + version=$(echo $url | grep -oP '/\K(\d+\.){2}\d+') update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} ''; }; From a765e430e92e5d596ea561e807f8ebc256d8073f Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 11 Oct 2024 11:50:22 +0200 Subject: [PATCH 064/180] discord: update all discord packages Signed-off-by: Sefa Eyeoglu --- .../instant-messengers/discord/default.nix | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 500b0a28f18e2..8c5410ce8328f 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,52 +2,52 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.70"; - ptb = "0.0.105"; - canary = "0.0.492"; - development = "0.0.28"; + stable = "0.0.71"; + ptb = "0.0.110"; + canary = "0.0.502"; + development = "0.0.30"; } else { - stable = "0.0.318"; - ptb = "0.0.133"; - canary = "0.0.591"; - development = "0.0.49"; + stable = "0.0.322"; + ptb = "0.0.140"; + canary = "0.0.611"; + development = "0.0.53"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { - url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-Ujlewrhbqal97hCG6+Iu+OqntWZJ/oY6ZHeL+HmoU38="; + url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; + hash = "sha256-PMcavgUhL8c1YFaWsooZObDa7APMqCD1IaysED5fWac="; }; ptb = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-u/4wWssZxKlHrRW/Vd9pqUfqN2VQGYv1SDktpRsOayM="; + url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; + hash = "sha256-NV/0YKn1rG54Zkc9qAmpeb+4YbKjxhjTCdPOd84Lcc8="; }; canary = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-NjcNgKYm1Twm8nN3sFlZCG/3x5fcSmX7X2On7CeZm0M="; + url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; + hash = "sha256-2DE7p3eT/mVGC+ejnTcTEhF7sEWyhfUfzj0gYTh+6Dw="; }; development = fetchurl { - url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-326KAuqt3VQSgyJAdsdc7YgrdF3vCVoJoKUCVC2UdaU="; + url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; + hash = "sha256-HxMJQd5fM1VNfrBey4SbnnBkFQYZgbxg4YTy6FIC9Ps="; }; }; x86_64-darwin = { stable = fetchurl { - url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-Ot6IM6EAg4MQPp0JqvUOZNAor6Nr6luc6pGY+722GMo="; + url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; + hash = "sha256-RLAdcCcRrUtDSdaj/RdVLJGvufpIjZoMAKxp0Jyu17A="; }; ptb = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-FFp6CRgD/kpCVxJ4+es0DaOGaW5v2Aa+lzJdG2Zu8eY="; + url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + hash = "sha256-VGhvykujfzI7jwXE+lHTzqT0t08GaON6gCuf13po7wY="; }; canary = fetchurl { - url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-TIXe8cy6feME0900R5aWyItZfUrUA8zXo0pqwQ79yAM="; + url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; + hash = "sha256-QC8RANqoyMAGKjTF0NNhz7wMt65D5LI1xYtd++dHXC4="; }; development = fetchurl { - url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-kfHnS1NHuPD7UR7XvMdtY2LPsDRJVQHk7/Nm+cR/KGc="; + url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; + hash = "sha256-DhY8s7Mhzos0ygB/WuoE07WK6hoIh/FcETeIsffw+e0="; }; }; aarch64-darwin = x86_64-darwin; @@ -78,7 +78,7 @@ let meta = meta // { mainProgram = value.binaryName; }; })) { - stable = rec { + stable = { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; From ffbde0e2077042cc4347ad7ce1d5ff133d3414e9 Mon Sep 17 00:00:00 2001 From: jsz4n Date: Fri, 11 Oct 2024 11:59:13 +0200 Subject: [PATCH 065/180] vlang: 0.4.4 -> 0.4.8 --- pkgs/development/compilers/vlang/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 267f473274a57..62077a7e4f855 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: let - version = "0.4.4"; + version = "0.4.8"; ptraceSubstitution = '' #include #include @@ -10,12 +10,12 @@ let # So we fix its rev to correspond to the V version. vc = stdenv.mkDerivation { pname = "v.c"; - version = "0.4.4"; + version = "0.4.8"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "66eb8eae253d31fa5622e35a69580d9ad8efcccb"; - hash = "sha256-YGlzr0Qq7+NtrnbaFPBuclzjOZBOnTe3BOhsuwdsQ5c="; + rev = "54beb1f416b404a06b894e6883a0e2368d80bc3e"; + hash = "sha256-hofganRnWPRCjjsItwF2BKam4dCqzMCrjgWSjZLSrlo="; }; # patch the ptrace reference for darwin @@ -46,7 +46,7 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - hash = "sha256-Aqecw8K+igHx5R34lQiWtdNfeGn+umcjcS4w0vXgpLM="; + hash = "sha256-V4f14TcuKW8unzlo6i/tE6MzSb3HAll478OU2LxiTPQ="; }; propagatedBuildInputs = [ glfw freetype openssl ] From c70662de0c56719f02cb51e3bee16f73b8ec0015 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 12:52:17 +0200 Subject: [PATCH 066/180] python312Packages.dvc-task: 0.40.1 -> 0.40.2 Diff: https://github.com/iterative/dvc-task/compare/refs/tags/0.40.1...0.40.2 Changelog: https://github.com/iterative/dvc-task/releases/tag/0.40.2 --- pkgs/development/python-modules/dvc-task/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 76ad62960875a..6c4ea111ce533 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-task"; - version = "0.40.1"; + version = "0.40.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-task"; rev = "refs/tags/${version}"; - hash = "sha256-r5rBY4g4S4VaifGCK3bGx6arjPoGZI9th2T9LDC5wfI="; + hash = "sha256-bRQJLncxCigYPEtlvKjUtKqhcBkB7erEtoJQ30yGamE="; }; build-system = [ setuptools-scm ]; From ab7188aeb173641857f48e07dcd84b48b94fc81a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 11:37:28 +0000 Subject: [PATCH 067/180] python312Packages.greatfet: 2024.0.2 -> 2024.0.3 --- pkgs/development/python-modules/greatfet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index 2ed9792df3b23..1e73858510942 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "greatfet"; - version = "2024.0.2"; + version = "2024.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greatscottgadgets"; repo = "greatfet"; rev = "refs/tags/v${version}"; - hash = "sha256-1GfyhxwA6Nhf/umvllR/hkh5hyn42141QOT7+6IGAis="; + hash = "sha256-jdOTEOotLiIxA9TxmFGOjP8IZ/8xo7mzXSJRg3A5Ri4="; }; sourceRoot = "${src.name}/host"; From fd25515bb860e294b59d089a318bb8b297a16593 Mon Sep 17 00:00:00 2001 From: Julius Michaelis Date: Fri, 11 Oct 2024 21:24:19 +0900 Subject: [PATCH 068/180] lls: 0.2.0 -> 0.3.0 --- pkgs/applications/networking/lls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/applications/networking/lls/default.nix index 3662477fde16d..77535a4f4b15c 100644 --- a/pkgs/applications/networking/lls/default.nix +++ b/pkgs/applications/networking/lls/default.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "lls"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "jcaesar"; repo = "lls"; rev = "v${version}"; - hash = "sha256-FtRPRR+/R3JTEI90mAEHFyhqloAbNEdR3jkquKa9Ahw="; + hash = "sha256-f2f09ptMBZfBY1jjOEc8ElAoEj4LKXXSdXLlYLf8Z3M="; }; - cargoHash = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs="; + cargoHash = "sha256-LS0azaKBFWW86R4XO5BkCHMEG2UwgkVQIwLELxewiu0="; meta = with lib; { description = "Tool to list listening sockets"; From d15cb70a346e0087238449a044018b7eb31c2860 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:32:17 +0200 Subject: [PATCH 069/180] kmod-blacklist-ubuntu: 30+20230519-1ubuntu3 -> 31+20240202-2ubuntu8 --- .../km/kmod-blacklist-ubuntu/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename pkgs/{os-specific/linux/kmod-blacklist-ubuntu/default.nix => by-name/km/kmod-blacklist-ubuntu/package.nix} (90%) diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/by-name/km/kmod-blacklist-ubuntu/package.nix similarity index 90% rename from pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix rename to pkgs/by-name/km/kmod-blacklist-ubuntu/package.nix index 464b77ce969ea..b127caff4e532 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/by-name/km/kmod-blacklist-ubuntu/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl }: let - version = "30+20230519-1ubuntu3"; # mantic 2023-08-26 + version = "31+20240202-2ubuntu8"; # Oriole 2024-10-03 in stdenv.mkDerivation { pname = "kmod-blacklist"; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; - hash = "sha256-VGw1/rUjl9/j6026ut0dvC0/8maAAz8umb0D3YGf8p4="; + hash = "sha256-i4XdCRedZIzMBbZL305enz8OAso3X14pdzNIITqK5hE="; }; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fff5e8a232b14..83e59da81bfbb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26045,8 +26045,6 @@ with pkgs; kmod = callPackage ../os-specific/linux/kmod { }; - kmod-blacklist-ubuntu = callPackage ../os-specific/linux/kmod-blacklist-ubuntu { }; - kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { }; libcap = callPackage ../os-specific/linux/libcap { }; From e3d0f0e1210211285522ef6eca272b75e704843d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 11 Oct 2024 17:32:28 +0200 Subject: [PATCH 070/180] lomiri.mediascanner2: 0.116 -> 0.117 --- pkgs/desktops/lomiri/services/mediascanner2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 79670a8eb4998..3a1fbe01221a7 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mediascanner2"; - version = "0.116"; + version = "0.117"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/mediascanner2"; rev = finalAttrs.version; - hash = "sha256-aRNT3DSPxz/vf6gqipf5Qc5zyDGFMHWONevAslwOrCY="; + hash = "sha256-e1vDPnIIfevXj9ODEEKJ2y4TiU0H+08aTf2vU+emdQk="; }; outputs = [ From 228aecc36587ea36bd12eee7d82efb8d2e1846db Mon Sep 17 00:00:00 2001 From: Bojun Ren Date: Fri, 11 Oct 2024 23:33:19 +0800 Subject: [PATCH 071/180] cheat: fix zsh completion --- pkgs/applications/misc/cheat/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index ef8780f1e88b5..07b4eaa398262 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -16,6 +16,21 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + patches = [ + (builtins.toFile "fix-zsh-completion.patch" '' + diff --git a/scripts/cheat.zsh b/scripts/cheat.zsh + index befe1b2..675c9f8 100755 + --- a/scripts/cheat.zsh + +++ b/scripts/cheat.zsh + @@ -62,4 +62,4 @@ _cheat() { + esac + } + + -compdef _cheat cheat + +_cheat "$@" + '') + ]; + postInstall = '' installManPage doc/cheat.1 installShellCompletion scripts/cheat.{bash,fish,zsh} From c4a7d64a875ea1d2850ccd2fe2fb816cc831d43a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 11 Oct 2024 18:38:07 +0300 Subject: [PATCH 072/180] weechatScripts.wee-slack: 2.10.2 -> 2.11.0 The can now drop the fetchpatch, as that fix landed in 2.11.0. --- .../irc/weechat/scripts/wee-slack/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 65b5bbd5d6682..88a3656011460 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,22 +2,16 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-EtPhaNFYDxxSrSLXHHnY4ARpRycNNxbg5QPKtnPem04="; + sha256 = "sha256-xQO/yi4pJSnO/ldzVQkC7UhAfpy57xzO58NV7KZm4E8="; }; patches = [ - # Fix for https://github.com/wee-slack/wee-slack/issues/930 - (fetchpatch { - url = "https://github.com/wee-slack/wee-slack/commit/e610b39aee2d9a49d080924d47d96c5d140f66ac.patch"; - hash = "sha256-+yBZSx0LsoXmTmdN9d3VV2KNzpXfgfNVp4ZqfS4oKzg="; - }) - (substituteAll { src = ./libpath.patch; env = "${buildEnv { From 58d828411c8d5f9941f45fd0fc487a314c6abe85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 17:48:38 +0200 Subject: [PATCH 073/180] python312Packages.dissect-cstruct: 4.1 -> 4.2 Diff: https://github.com/fox-it/dissect.cstruct/compare/refs/tags/4.1...4.2 Changelog: https://github.com/fox-it/dissect.cstruct/releases/tag/4.2 --- pkgs/development/python-modules/dissect-cstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index 05127c50e84dd..3f020492ff67e 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-cstruct"; - version = "4.1"; + version = "4.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cstruct"; rev = "refs/tags/${version}"; - hash = "sha256-8CEvn2TJTXm0t4GBG9OQo9TgSy1+sTZIusaiiGNu05M="; + hash = "sha256-HYBt1ok2ytqBodHwpBPQqjm9fNPkE6ID2j9Bn2sm7wA="; }; build-system = [ From fb481b4c7d6441c17c0dac610f5a1b24efcd03f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 17:49:13 +0200 Subject: [PATCH 074/180] python312Packages.dissect-cobaltstrike: 1.0.0 -> 1.2.0 Diff: https://github.com/fox-it/dissect.cobaltstrike/compare/refs/tags/v1.0.0...v1.2.0 Changelog: https://github.com/fox-it/dissect.cobaltstrike/releases/tag/1.2.0 --- .../dissect-cobaltstrike/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 0795b7aaee8e6..ef8e70ef1305b 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -5,6 +5,8 @@ dissect-util, fetchFromGitHub, flow-record, + hatch-vcs, + hatchling, httpx, lark, pycryptodome, @@ -13,13 +15,11 @@ pytestCheckHook, pythonOlder, rich, - setuptools, - setuptools-scm, }: buildPythonPackage rec { pname = "dissect-cobaltstrike"; - version = "1.0.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,12 +28,12 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.cobaltstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4="; + hash = "sha256-GMpMTsI4mepaOGhw7/cSymkcxzn4mlNS1ZKYGYut+LM="; }; build-system = [ - setuptools - setuptools-scm + hatch-vcs + hatchling ]; dependencies = [ @@ -78,8 +78,5 @@ buildPythonPackage rec { changelog = "https://github.com/fox-it/dissect.cobaltstrike/releases/tag/${version}"; license = licenses.agpl3Only; maintainers = with maintainers; [ fab ]; - # Compatibility with dissect.struct 4.x - # https://github.com/fox-it/dissect.cobaltstrike/issues/53 - broken = versionAtLeast dissect-cstruct.version "4"; }; } From 4747113be6a9e59613f393b611fe24abf546f78c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 17:54:01 +0200 Subject: [PATCH 075/180] python312Packages.asn1tools: 0.166.0 -> 0.167.0 Diff: https://github.com/eerimoq/asn1tools/compare/refs/tags/0.166.0...0.167.0 Changelog: https://github.com/eerimoq/asn1tools/releases/tag/0.167.0 --- pkgs/development/python-modules/asn1tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index cd0b3a0895bbf..17cf074026848 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "asn1tools"; - version = "0.166.0"; + version = "0.167.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "eerimoq"; repo = "asn1tools"; rev = "refs/tags/${version}"; - hash = "sha256-TWAOML6nsLX3TYqoQ9fcSjrUmC4byXOfczfkmSaSa0k="; + hash = "sha256-86bdBYlAVJfd3EY8s0t6ZDRA/qZVWuHD4Jxa1n1Ke5E="; }; nativeBuildInputs = [ setuptools ]; From 2de9ffca9d15cbf6b3ab819c8b2d0e7d4cfc8caf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 17:57:01 +0200 Subject: [PATCH 076/180] python312Packages.asn1tools: refactor --- pkgs/development/python-modules/asn1tools/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/asn1tools/default.nix b/pkgs/development/python-modules/asn1tools/default.nix index 17cf074026848..8ca21fece1476 100644 --- a/pkgs/development/python-modules/asn1tools/default.nix +++ b/pkgs/development/python-modules/asn1tools/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { hash = "sha256-86bdBYlAVJfd3EY8s0t6ZDRA/qZVWuHD4Jxa1n1Ke5E="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bitstruct pyparsing ]; - passthru.optional-depdendencies = { + optional-dependencies = { shell = [ prompt-toolkit ]; cache = [ diskcache ]; }; @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-xdist pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-depdendencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "asn1tools" ]; @@ -53,10 +53,10 @@ buildPythonPackage rec { meta = with lib; { description = "ASN.1 parsing, encoding and decoding"; - mainProgram = "asn1tools"; homepage = "https://github.com/eerimoq/asn1tools"; changelog = "https://github.com/eerimoq/asn1tools/releases/tag/${version}"; license = licenses.mit; maintainers = [ ]; + mainProgram = "asn1tools"; }; } From e789cac7db0c07c42e89ab867e12fbb01feb7f1f Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 11 Oct 2024 18:17:32 +0200 Subject: [PATCH 077/180] userborn: add meta.changelog --- pkgs/by-name/us/userborn/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 233a1ebb1264d..fcdbc3266cab4 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -51,6 +51,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/nikstur/userborn"; description = "Declaratively bear (manage) Linux users and groups"; + changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md"; license = licenses.mit; platforms = platforms.linux; maintainers = with lib.maintainers; [ nikstur ]; From 1bbc8f7ba37c9b498aeb955ce08f13e6fc6672b8 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 11 Oct 2024 18:17:48 +0200 Subject: [PATCH 078/180] userborn: platforms.linux -> platform.unix --- pkgs/by-name/us/userborn/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index fcdbc3266cab4..2f8d34e84c743 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { description = "Declaratively bear (manage) Linux users and groups"; changelog = "https://github.com/nikstur/userborn/blob/${version}/CHANGELOG.md"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with lib.maintainers; [ nikstur ]; mainProgram = "userborn"; }; From 4f78bc8b21b09c83c75ebea5b400529f5c34d997 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 11 Oct 2024 18:17:08 +0200 Subject: [PATCH 079/180] userborn: 0.2.0 -> 0.3.0 --- pkgs/by-name/us/userborn/package.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/us/userborn/package.nix b/pkgs/by-name/us/userborn/package.nix index 2f8d34e84c743..5290fd0543386 100644 --- a/pkgs/by-name/us/userborn/package.nix +++ b/pkgs/by-name/us/userborn/package.nix @@ -2,36 +2,29 @@ lib, rustPlatform, fetchFromGitHub, - makeBinaryWrapper, - mkpasswd, + libxcrypt, nixosTests, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "userborn"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "nikstur"; repo = "userborn"; rev = version; - hash = "sha256-LEKdgmw1inBOi0sriG8laCrtx0ycqR5ftdnmszadx3U="; + hash = "sha256-ABePye1zuGDH74BL6AP05rR9eBOYu1SoVpd2TcZQMW8="; }; sourceRoot = "${src.name}/rust/userborn"; - cargoHash = "sha256-Pjzu6db2WomNsC+jNK1fr1u7koZwUvWPIY5JHMo1gkA="; + cargoHash = "sha256-/S2rkZyXHN5NiW9TFhKguqtf/udFcDOTfV2jYRMV14s="; - nativeBuildInputs = [ makeBinaryWrapper ]; + nativeBuildInputs = [ rustPlatform.bindgenHook ]; - buildInputs = [ mkpasswd ]; - - nativeCheckInputs = [ mkpasswd ]; - - postInstall = '' - wrapProgram $out/bin/userborn --prefix PATH : ${lib.makeBinPath [ mkpasswd ]} - ''; + buildInputs = [ libxcrypt ]; stripAllList = [ "bin" ]; From 7fa83260059aa9010559263619f3b895848a431d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 11 Oct 2024 19:15:02 +0200 Subject: [PATCH 080/180] lomiri.qqc2-suru-style: 0.20230206 -> 0.20230630 --- pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix index 5717ae35f1139..a46199d570726 100644 --- a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix +++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qqc2-suru-style"; - version = "0.20230206"; + version = "0.20230630"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/qqc2-suru-style"; rev = finalAttrs.version; - hash = "sha256-ZLPuXnhlR1IDhGnprcdWHLnOeS6ZzVkFhQML0iKMjO8="; + hash = "sha256-kAgHsNWwUWxHg26bTMmlq8m9DR4+ob4pl/oUX7516hM="; }; # QMake can't find Qt modules from buildInputs From 127dfa6fd3e931a64d8775724d0ed3b18928a41e Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 11 Oct 2024 19:18:30 +0200 Subject: [PATCH 081/180] lomiri.qqc2-suru-style: nixfmt, modernise abit --- .../lomiri/qml/qqc2-suru-style/default.nix | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix index a46199d570726..967485fcf4032 100644 --- a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix +++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, lib -, fetchFromGitLab -, gitUpdater -, qmake -, qtdeclarative -, qtquickcontrols2 +{ + stdenv, + lib, + fetchFromGitLab, + gitUpdater, + qmake, + qtdeclarative, + qtquickcontrols2, }: stdenv.mkDerivation (finalAttrs: { @@ -14,16 +15,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "ubports"; repo = "development/core/qqc2-suru-style"; - rev = finalAttrs.version; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-kAgHsNWwUWxHg26bTMmlq8m9DR4+ob4pl/oUX7516hM="; }; # QMake can't find Qt modules from buildInputs strictDeps = false; - nativeBuildInputs = [ - qmake - ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtdeclarative @@ -34,12 +33,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Suru Style for QtQuick Controls 2"; homepage = "https://gitlab.com/ubports/development/core/qqc2-suru-style"; changelog = "https://gitlab.com/ubports/development/core/qqc2-suru-style/-/blob/${finalAttrs.version}/ChangeLog"; - license = with licenses; [ gpl2Plus lgpl3Only cc-by-sa-30 ]; - maintainers = teams.lomiri.members; - platforms = platforms.unix; + license = with lib.licenses; [ + gpl2Plus + lgpl3Only + cc-by-sa-30 + ]; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.unix; }; }) From 522b1981eb60f05b7d744a40fec49229e0ff1a9e Mon Sep 17 00:00:00 2001 From: oluceps Date: Sun, 6 Oct 2024 18:59:02 +0800 Subject: [PATCH 082/180] dae: use nix-update-script --- pkgs/tools/networking/dae/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index de31e4dff23e5..e91679b261d05 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, buildGoModule, nixosTests, - gitUpdater, + nix-update-script, }: buildGoModule rec { pname = "dae"; @@ -52,9 +52,7 @@ buildGoModule rec { inherit (nixosTests) dae; }; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "Linux high-performance transparent proxy solution based on eBPF"; From 543d7dc4bcfc96cae59db02a617132b497a9ab5d Mon Sep 17 00:00:00 2001 From: oluceps Date: Sat, 12 Oct 2024 01:48:48 +0800 Subject: [PATCH 083/180] dae: 0.7.4 -> 0.8.0 Diff: https://github.com/daeuniverse/dae/compare/v0.7.4...v0.8.0 --- pkgs/tools/networking/dae/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index e91679b261d05..4b26a77eca6cd 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -8,17 +8,17 @@ }: buildGoModule rec { pname = "dae"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-bJ/a/SCNCutQDbmxPp36SYY7qhji2XRv6awp7buZVc0="; + hash = "sha256-Vdh5acE5i/bJ8VXOm+9OqZQbxvqv4TS/t0DDfBs/K5g="; fetchSubmodules = true; }; - vendorHash = "sha256-CVQTBJDwu7AYz6q0MnFPMINRShcnS1JOGqH+Ro4lIRo="; + vendorHash = "sha256-0Q+1cXUu4EH4qkGlK6BIpv4dCdtSKjb1RbLi5Xfjcew="; proxyVendor = true; From af8fdc009ed36a913393532c9593aaa4348c6752 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 20:49:30 +0200 Subject: [PATCH 084/180] python312Packages.aioautomower: 2024.9.3 -> 2024.10.0 https://github.com/Thomas55555/aioautomower/releases/tag/2024.10.0 --- pkgs/development/python-modules/aioautomower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 675657c7be255..8884f0ef904f7 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.9.3"; + version = "2024.10.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-2jPQcMD05SUYnBwAaWHbGKXy7Du2JKPVq3eui9YaqxI="; + hash = "sha256-qWXFkz1yIpSDGFilVZK0n+hEUs7osfO+2xfknr2cOZY="; }; postPatch = '' From 31d7d93b6ae00962ce33488d76a97fd23f2b3470 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 20:49:48 +0200 Subject: [PATCH 085/180] python312Packages.ayla-iot-unofficial: 1.4.1 -> 1.4.2 https://github.com/rewardone/ayla-iot-unofficial/releases/tag/v1.4.2 --- .../python-modules/ayla-iot-unofficial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix index 3e2819fa0feaf..462a9f1130b4d 100644 --- a/pkgs/development/python-modules/ayla-iot-unofficial/default.nix +++ b/pkgs/development/python-modules/ayla-iot-unofficial/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ayla-iot-unofficial"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "rewardone"; repo = "ayla-iot-unofficial"; rev = "refs/tags/v${version}"; - hash = "sha256-SAfDpABOWsic3kqsN0txlchEIRKJ0xtpJERZUH5CKR0="; + hash = "sha256-E0vDaKZxrOwzRsqVYw+RVgFYgRB+klW1yb07KA+9zWc="; }; build-system = [ setuptools ]; From c71496505d5e196392285f63c1f0aa3d2ef4abda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 20:51:27 +0200 Subject: [PATCH 086/180] python312Packages.opower: 0.8.2 -> 0.8.3 https://github.com/tronikos/opower/releases/tag/v0.8.3 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 6f8ec1fb2a896..998eeb79aadd2 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.8.2"; + version = "0.8.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-p1fvfAQVmizfsW+6F3gKkNQTYUF+A0cafh3PZZTpTRw="; + hash = "sha256-W/EsiSNFPSJj81ykcEM3YRnRZDJDKvfOUuV98Sk4Gwo="; }; build-system = [ setuptools ]; From ed8291da276cf6e81ad6beddcbfee3da89b16410 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 20:51:52 +0200 Subject: [PATCH 087/180] python312Packages.pysmlight: 0.1.2 -> 0.1.3 https://github.com/smlight-tech/pysmlight/releases/tag/v0.1.3 --- pkgs/development/python-modules/pysmlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix index 907fbad8fd675..316908f546c0b 100644 --- a/pkgs/development/python-modules/pysmlight/default.nix +++ b/pkgs/development/python-modules/pysmlight/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pysmlight"; - version = "0.1.2"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "smlight-tech"; repo = "pysmlight"; rev = "refs/tags/v${version}"; - hash = "sha256-ouPUNKlTlF2t2K7RMG7oDSfeITjNPoGb5pNC7oUyGDI="; + hash = "sha256-U5/pKlnRt+OQeE/RQabTcnZLiLBIGqBinXdI7yc//30="; }; build-system = [ poetry-core ]; From 4e940d7c0e688b74dc962c742fee5c0bfdb2b03d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 20:54:59 +0200 Subject: [PATCH 088/180] python312Packages.python-kasa: 0.7.4 -> 0.7.5 https://github.com/python-kasa/python-kasa/blob/0.7.5/CHANGELOG.md --- pkgs/development/python-modules/python-kasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 9561deec1b07e..51772d90f9422 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-dzDbA/iJUfTQNKq2V1PlCYpIeg031Fm0JyZvHrDWqHI="; + hash = "sha256-bRhE9pC2SJwy4blkv27JsfFTLEDJPCeWUtnQvVb8Vfs="; }; build-system = [ hatchling ]; From e01a420040197e7a1341d5c8f3742ec4b146f318 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 20:56:23 +0200 Subject: [PATCH 089/180] python312Packages.python-linkplay: 0.0.14 -> 0.0.15 https://github.com/Velleman/python-linkplay/releases/tag/v0.0.15 --- pkgs/development/python-modules/python-linkplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 9b6509591ed3f..7a0cc917a6bc7 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.14"; + version = "0.0.15"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-Sj22bbSJoD52WQBWzdFW36WFQcfvPadpd6mv84vN73U="; + hash = "sha256-PDkDZchAXxrmjg7G/dbbUyZUS8dNrOppH96mLLdwK1s="; }; build-system = [ setuptools ]; From 62ee4607dc824c6fd02c60d36ddf05c0fb5cd509 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 20:56:51 +0200 Subject: [PATCH 090/180] python312Packages.pytouchlinesl: 0.1.7 -> 0.1.8 https://github.com/jnsgruk/pytouchlinesl/releases/tag/0.1.8 --- pkgs/development/python-modules/pytouchlinesl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytouchlinesl/default.nix b/pkgs/development/python-modules/pytouchlinesl/default.nix index 423d29f6cef09..845b734fc59c4 100644 --- a/pkgs/development/python-modules/pytouchlinesl/default.nix +++ b/pkgs/development/python-modules/pytouchlinesl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytouchlinesl"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jnsgruk"; repo = "pytouchlinesl"; rev = "refs/tags/${version}"; - hash = "sha256-Xth1zC08SIL8j7t2n64I4cyLd6UQABoSeg57tYhnvtE="; + hash = "sha256-BSffzy/MKmpPdvk55Ff76i+p4/cY0OHjS/NOc9tEGwo="; }; build-system = [ setuptools ]; From cc785bc59d3273a85b3a83a3c65578e3b3b1ed0d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 20:59:04 +0200 Subject: [PATCH 091/180] home-assistant: 2024.10.1 -> 2024.10.2 https://github.com/home-assistant/core/releases/tag/2024.10.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a593d677fb165..3f54c8c7f0b3b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.10.1"; + version = "2024.10.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4baaeb229d1fe..6fc00b593afc2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -408,7 +408,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.10.1"; + hassVersion = "2024.10.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-yEClfdMyN0E+eelSFESVbVDzvZu/rn4qBCjD5L/L6Is="; + hash = "sha256-YHK6SJJok1FGtFfD2C2QFCtWzNK1ZiOGZe/kbQFkMvU="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-M2vuqHoLNVizoCXnQ4RRQ+//TgtoJxJaQFCz9H7UnVs="; + hash = "sha256-mVKokL6EcvLMvOEKIw1dlEQeXaxMLO8ExMOzw6r1eCs="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index d56630451d99c..70c92b8bcec73 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241002.2"; + version = "20241002.3"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-9NqPBWcNM288ATdKH+Em0e9g2V2497YJLt8Wx5OL4+k="; + hash = "sha256-O1Yb5bCaKoS/Owwb0I0bF2neN2YTOnu28ruVA1cnFzk="; }; # there is nothing to strip in this package From f2b2e22837635e5d2b25c8db993716de1980c2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 11 Oct 2024 20:00:45 +0100 Subject: [PATCH 092/180] cachix: 1.7.4 -> 1.7.5 --- .../haskell-modules/configuration-common.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 01f448cc732c7..ac803a8792110 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -461,31 +461,33 @@ self: super: { # Manually maintained cachix-api = overrideCabal (drv: { - version = "1.7.4"; + version = "1.7.5"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.4"; - sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4="; + rev = "v1.7.5"; + sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; }) super.cachix-api; cachix = (overrideCabal (drv: { - version = "1.7.4"; + version = "1.7.5"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.7.4"; - sha256 = "sha256-lHy5kgx6J8uD+16SO47dPrbob98sh+W1tf4ceSqPVK4="; + rev = "v1.7.5"; + sha256 = "sha256-KxuGSoVUFnQLB2ZcYODW7AVPAh9JqRlD5BrfsC/Q4qs="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; }) (lib.pipe (super.cachix.override { nix = self.hercules-ci-cnix-store.nixPackage; + hnix-store-core = self.hnix-store-core_0_8_0_0; }) [ (addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool pkgs.buildPackages.pkg-config) + (addBuildDepend self.hnix-store-nar) ] )); From 2a534e8ac20f93121b5d45798b2680a37dbee383 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 12 Oct 2024 03:06:01 +0800 Subject: [PATCH 093/180] maintainers/team-list: add AndersonTorres and linj to emacs team --- maintainers/team-list.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 546c944e0c53f..ed58cddae1669 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -278,7 +278,11 @@ with lib.maintainers; }; emacs = { - members = [ adisbladis ]; + members = [ + AndersonTorres + adisbladis + linj + ]; scope = "Maintain the Emacs editor and packages."; shortName = "Emacs"; }; From 89f3f5c7e048a29e132efce7cddfec73281645b9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 12 Oct 2024 03:12:28 +0800 Subject: [PATCH 094/180] OWNERS: reference the Emacs team for Emacs stuff --- ci/OWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/OWNERS b/ci/OWNERS index 97eae12a2d65d..18b343079155d 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -267,9 +267,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/modules/services/mail/rspamd.nix @peti # Emacs -/pkgs/applications/editors/emacs/elisp-packages @adisbladis -/pkgs/applications/editors/emacs @adisbladis -/pkgs/top-level/emacs-packages.nix @adisbladis +/pkgs/applications/editors/emacs/elisp-packages @NixOS/emacs +/pkgs/applications/editors/emacs @NixOS/emacs +/pkgs/top-level/emacs-packages.nix @NixOS/emacs # Kakoune /pkgs/applications/editors/kakoune @philiptaron From 039ea42a9f5458d12927db8daac97686f7161025 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 07:36:51 +0000 Subject: [PATCH 095/180] python312Packages.pyfaidx: 0.8.1.2 -> 0.8.1.3 --- .../python-modules/pyfaidx/default.nix | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index b3cb0f886bd71..eca3180a61768 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -1,26 +1,28 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, glibcLocales, importlib-metadata, - numpy, + packaging, + htslib, + fsspec, pytestCheckHook, - pythonOlder, + biopython, setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "pyfaidx"; - version = "0.8.1.2"; + version = "0.8.1.3"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-2EUkcEVbHnePk5aUR9uOok3rRiTHxAdpUWRZy2+HvDM="; + src = fetchFromGitHub { + owner = "mdshw5"; + repo = "pyfaidx"; + rev = "refs/tags/v${version}"; + hash = "sha256-PKcopIu/0ko4Jl2+G0ZivZXvMwACeIFFFlPt5dlDDfQ="; }; build-system = [ @@ -28,27 +30,31 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ importlib-metadata ]; + dependencies = [ + importlib-metadata + packaging + ]; nativeCheckInputs = [ - glibcLocales - numpy pytestCheckHook - ]; - - disabledTestPaths = [ - # FileNotFoundError: [Errno 2] No such file or directory: 'data/genes.fasta.gz' - "tests/test_Fasta_bgzip.py" + biopython + htslib + fsspec + glibcLocales ]; pythonImportsCheck = [ "pyfaidx" ]; - meta = with lib; { + preCheck = '' + bgzip --keep tests/data/genes.fasta + ''; + + meta = { description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; homepage = "https://github.com/mdshw5/pyfaidx"; changelog = "https://github.com/mdshw5/pyfaidx/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ jbedo ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jbedo ]; mainProgram = "faidx"; }; } From 961d9c049c39333b28e15becc436c3f761425875 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 12 Oct 2024 03:51:44 +0800 Subject: [PATCH 096/180] OWNERS: make the Emacs team own Emacs docs --- ci/OWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/OWNERS b/ci/OWNERS index 18b343079155d..2ad493fbc279c 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -270,6 +270,8 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/emacs/elisp-packages @NixOS/emacs /pkgs/applications/editors/emacs @NixOS/emacs /pkgs/top-level/emacs-packages.nix @NixOS/emacs +/doc/packages/emacs.section.md @NixOS/emacs +/nixos/modules/services/editors/emacs.md @NixOS/emacs # Kakoune /pkgs/applications/editors/kakoune @philiptaron From 1cff75029839c6ec11f7692bf2a7f3eb290cfee0 Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Fri, 11 Oct 2024 21:56:05 +0200 Subject: [PATCH 097/180] disko: 1.8.0 -> 1.8.2 --- pkgs/by-name/di/disko/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index f7553a70fc27c..0883a9bc46b08 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -6,16 +6,17 @@ , nix , nixos-install , coreutils +, testers }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "disko"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho="; + hash = "sha256-O0QVhsj9I/hmcIqJ4qCqFyzvjYL+dtzJP0C5MFd8O/Y="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; @@ -27,7 +28,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { for i in disko disko-install; do sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" chmod 755 "$out/bin/$i" - wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install ]} + wrapProgram "$out/bin/$i" \ + --set DISKO_VERSION "${finalAttrs.version}" \ + --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install ]} done runHook postInstall ''; @@ -38,6 +41,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { $out/bin/disko-install --help runHook postInstallCheck ''; + + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + meta = { homepage = "https://github.com/nix-community/disko"; description = "Declarative disk partitioning and formatting using nix"; From 83e573322350abba3aa4d5c77eafd6d86272cb90 Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Fri, 11 Oct 2024 21:57:02 +0200 Subject: [PATCH 098/180] disko: add iFreilicht as a maintainer --- pkgs/by-name/di/disko/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 0883a9bc46b08..2a3818f45eb39 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Declarative disk partitioning and formatting using nix"; license = lib.licenses.mit; mainProgram = "disko"; - maintainers = with lib.maintainers; [ mic92 lassulus ]; + maintainers = with lib.maintainers; [ mic92 lassulus iFreilicht ]; platforms = lib.platforms.linux; }; }) From 61455410324b0c75c100f3d72bf40d747166bc98 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 22:02:30 +0200 Subject: [PATCH 099/180] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.154 -> 0.13.172 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.172/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 286e7dade0106..499b4b823ea87 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.154"; + version = "0.13.172"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-BmZ12amsa4BzesaxGMdQ2VY2FM5ZfgU32plAl4mG+tE="; + hash = "sha256-azTnNgbdj7AMBLTz+y5BLeQDKUqA5wkxFMG3g30f6wo="; }; build-system = [ setuptools ]; From bd55b8d33b18eb779e55a2cebfa714c616341806 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 11 Oct 2024 22:03:00 +0200 Subject: [PATCH 100/180] home-assistant-custom-components.mass: 2024.8.1 -> 2024.9.1 --- .../servers/home-assistant/custom-components/mass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/mass/default.nix b/pkgs/servers/home-assistant/custom-components/mass/default.nix index 2e0d893d60560..7b8b852532914 100644 --- a/pkgs/servers/home-assistant/custom-components/mass/default.nix +++ b/pkgs/servers/home-assistant/custom-components/mass/default.nix @@ -13,13 +13,13 @@ buildHomeAssistantComponent rec { owner = "music-assistant"; domain = "mass"; - version = "2024.8.1"; + version = "2024.9.1"; src = fetchFromGitHub { owner = "music-assistant"; repo = "hass-music-assistant"; rev = version; - hash = "sha256-lrJx2wsVY0aJ+iVBxbZryC6QRvaXdxjBsTma/4ptl4o="; + hash = "sha256-8YZ77SYv8hDsbKUjxPZnuAycLE8RkIbAq3HXk+OyAmM="; }; dependencies = [ From 364c821099c0a39e18c38f987d481f745d515d6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 11:26:23 +0000 Subject: [PATCH 101/180] python312Packages.pynmeagps: 1.0.42 -> 1.0.43 --- .../python-modules/pynmeagps/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index 99964e420c00a..417b80b29779c 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -3,32 +3,31 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pytest-cov-stub, pythonOlder, setuptools, }: buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.42"; + version = "1.0.43"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "semuconsulting"; repo = "pynmeagps"; rev = "refs/tags/v${version}"; - hash = "sha256-hlGqc4vZ/C98vQwJewK0cfC3zP9xyO0oXXtlyNUDg0Y="; + hash = "sha256-U5AI6iQiMvlCfL0SMAl0PkwC/orCr57royWvHKvWpAI="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--cov --cov-report html --cov-fail-under 98" "" - ''; - build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; pythonImportsCheck = [ "pynmeagps" ]; From 1d95eeb1727651967cf1d89a5647ed952444b256 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 11 Oct 2024 22:23:35 +0200 Subject: [PATCH 102/180] welle-io: 2.4 -> 2.5 --- pkgs/applications/radio/welle-io/default.nix | 16 +++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 39ebfe8886390..5917aed42a8fb 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,20 +1,20 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config -, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config,wrapQtAppsHook +, qtbase, qtcharts, qtmultimedia, qtdeclarative, qt5compat , faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 } : -mkDerivation rec { +stdenv.mkDerivation rec { pname = "welle-io"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "AlbrechtL"; repo = "welle.io"; rev = "v${version}"; - sha256 = "sha256-xXiCL/A2SwCSr5SA4AQQEdieRzBksXx9Z78bHtlFiW4="; + hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ faad2 @@ -25,9 +25,7 @@ mkDerivation rec { qtbase qtcharts qtmultimedia - qtquickcontrols - qtquickcontrols2 - qtgraphicaleffects + qt5compat rtl-sdr soapysdr-with-plugins ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b8d0bc391fef..c2fecb031a1a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29395,7 +29395,7 @@ with pkgs; wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; - welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; + welle-io = qt6Packages.callPackage ../applications/radio/welle-io { }; wireshark = qt6Packages.callPackage ../applications/networking/sniffers/wireshark { inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices SystemConfiguration; From 6789bb5fdb5ab5e555a82376b1a4873fcd3b0184 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 22:53:14 +0200 Subject: [PATCH 103/180] metasploit: 6.4.29 -> 6.4.30 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 6 +++--- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4f192e3a6c104..6a412fbea7bea 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.29" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.30" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 74f56fe453df9..aecfc060bfbf4 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 6f37955454995e39746353a01aeb6d9d58221d1c - ref: refs/tags/6.4.29 + revision: 8207579ba1f213b890b0125f4cb185672dec1d2c + ref: refs/tags/6.4.30 specs: - metasploit-framework (6.4.29) + metasploit-framework (6.4.30) aarch64 abbrev actionpack (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 880cf0eb08ce7..d412fe12d939c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.4.29"; + version = "6.4.30"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-qu5zK/QC9/DapYanw3lvMLdRso8PAndKSJukQaazoZs="; + hash = "sha256-iLL6ssEfms+AfHA2VMjm4jaKxLlrYmb4QmNAB1HWNc0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 92ed07649dd65..2f299e7476aeb 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -724,12 +724,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "6f37955454995e39746353a01aeb6d9d58221d1c"; - sha256 = "16x1nfk4394v9157f0hgiyr53drhdxww79w6lpdg1xq2yhmp7vma"; + rev = "8207579ba1f213b890b0125f4cb185672dec1d2c"; + sha256 = "1k9msr8hfh338bw6cqkbp728ldp2wv458dkhgj0cz6hzq6rgmcl8"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.4.29"; + version = "6.4.30"; }; metasploit-model = { groups = ["default"]; From 4bf2699fb33417f120c843f4d42beb39b72c8744 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 23:02:27 +0200 Subject: [PATCH 104/180] python312Packages.python-kasa: 0.7.4 -> 0.7.5 Diff: https://github.com/python-kasa/python-kasa/compare/refs/tags/0.7.4...0.7.5 Changelog: https://github.com/python-kasa/python-kasa/blob/0.7.5/CHANGELOG.md --- pkgs/development/python-modules/python-kasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 9561deec1b07e..51772d90f9422 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.4"; + version = "0.7.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-dzDbA/iJUfTQNKq2V1PlCYpIeg031Fm0JyZvHrDWqHI="; + hash = "sha256-bRhE9pC2SJwy4blkv27JsfFTLEDJPCeWUtnQvVb8Vfs="; }; build-system = [ hatchling ]; From 3a48d88eac33b08eba02feb2d9a8cc00729e488e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 23:08:22 +0200 Subject: [PATCH 105/180] python312Packages.pylitejet: 0.3.0 -> 0.6.3 Diff: https://github.com/joncar/pylitejet/compare/refs/tags/v0.3.0...v0.6.3 Changelog: https://github.com/joncar/pylitejet/releases/tag/v0.6.3 --- pkgs/development/python-modules/pylitejet/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pylitejet/default.nix b/pkgs/development/python-modules/pylitejet/default.nix index 20ff36a25dbd3..b55bf38bd513f 100644 --- a/pkgs/development/python-modules/pylitejet/default.nix +++ b/pkgs/development/python-modules/pylitejet/default.nix @@ -4,12 +4,12 @@ fetchFromGitHub, pyserial, pythonOlder, - setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "pylitejet"; - version = "0.3.0"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -17,11 +17,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "joncar"; repo = "pylitejet"; - rev = "refs/tags/${version}"; - hash = "sha256-fgsAb8zvmIKtitgAQbAPfTzbEGGaj3dU6FXzlSyy4Dk="; + rev = "refs/tags/v${version}"; + hash = "sha256-LHNMKU7aMDtSi4K+pZqRF9vAL3EKOFRFFNXKsQJVP2Y="; }; - build-system = [ setuptools ]; + build-system = [ setuptools-scm ]; dependencies = [ pyserial ]; @@ -33,6 +33,7 @@ buildPythonPackage rec { meta = { description = "Library for interfacing with the LiteJet lighting system"; homepage = "https://github.com/joncar/pylitejet"; + changelog = "https://github.com/joncar/pylitejet/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; From e19a5660de5c581dc5b8610bbaadd7667fcf3e63 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 11 Oct 2024 17:06:41 -0400 Subject: [PATCH 106/180] python312Packages.debugpy: 1.8.6 -> 1.8.7 Update to latest version: https://github.com/microsoft/debugpy/releases/tag/v1.8.7 --- pkgs/development/python-modules/debugpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 4bf451d834beb..cce50d3b7e511 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.8.6"; + version = "1.8.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "debugpy"; rev = "refs/tags/v${version}"; - hash = "sha256-kkFNIJ3QwojwgiRAOmBiWIg5desxOKTmo9YH1Qup6fI="; + hash = "sha256-JFVhEAfdSfl2ACfXLMdoO/1otdif9bHialdQXucTM5A="; }; patches = From 20664a4fb51c4aa6db223ab87c5feee8b652d897 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 11 Oct 2024 23:12:16 +0200 Subject: [PATCH 107/180] python312Packages.plotly: add `orca` optional dependency set --- pkgs/development/python-modules/plotly/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index 1d1fe4401ac98..f13f4504ed95a 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -20,6 +20,8 @@ which, nbformat, scikit-image, + orca, + psutil, }: buildPythonPackage rec { @@ -51,6 +53,15 @@ buildPythonPackage rec { kaleido ]; + # packages/python/plotly/optional-requirements.txt + optional-dependencies = { + orca = [ + orca + requests + psutil + ]; + }; + nativeCheckInputs = [ pytestCheckHook pandas From 58a132db394d1f54aaa5e99a5bec9388bda2a37c Mon Sep 17 00:00:00 2001 From: Wulfsta Date: Fri, 11 Oct 2024 17:38:02 -0400 Subject: [PATCH 108/180] ao: move to aliases --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc7f0f6fc1ae1..737b79ee5adaa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -112,6 +112,7 @@ mapAliases { antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10 + ao = libfive; # Added 2024-10-11 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d91fa9593ee5b..76eecb14b887b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28105,8 +28105,6 @@ with pkgs; anytone-emu = callPackage ../applications/radio/anytone-emu { }; - ao = libfive; - apache-directory-studio = callPackage ../applications/networking/apache-directory-studio { }; apkeep = callPackage ../tools/misc/apkeep { From c307ae10cab54de454256a88169ee32e09685e8b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 11 Oct 2024 23:41:11 +0200 Subject: [PATCH 109/180] welle-io: apply nixfmt --- pkgs/applications/radio/welle-io/default.nix | 43 ++++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 5917aed42a8fb..b2b2bd86434ff 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,7 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config,wrapQtAppsHook -, qtbase, qtcharts, qtmultimedia, qtdeclarative, qt5compat -, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 -} : +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + wrapQtAppsHook, + qtbase, + qtcharts, + qtmultimedia, + qtdeclarative, + qt5compat, + faad2, + rtl-sdr, + soapysdr-with-plugins, + libusb-compat-0_1, + fftwSinglePrec, + lame, + mpg123, +}: stdenv.mkDerivation rec { pname = "welle-io"; @@ -14,7 +30,11 @@ stdenv.mkDerivation rec { hash = "sha256-sSknzZiD9/MLyO+gAYopogOQu5HRcqaRcfqwq4Rld7A="; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ faad2 @@ -31,14 +51,21 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DRTLSDR=true" "-DSOAPYSDR=true" + "-DRTLSDR=true" + "-DSOAPYSDR=true" ]; meta = with lib; { description = "DAB/DAB+ Software Radio"; homepage = "https://www.welle.io/"; - maintainers = with maintainers; [ ck3d markuskowa ]; + maintainers = with maintainers; [ + ck3d + markuskowa + ]; license = licenses.gpl2Only; - platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin; + platforms = [ + "x86_64-linux" + "i686-linux" + ] ++ platforms.darwin; }; } From aa15d45adf57d41ce3727e8e7088525188f04e7a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 11 Oct 2024 23:44:20 +0200 Subject: [PATCH 110/180] welle-io: remove nested "with lib" in meta. --- pkgs/applications/radio/welle-io/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index b2b2bd86434ff..5a4ce6a9bca1e 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -55,17 +55,17 @@ stdenv.mkDerivation rec { "-DSOAPYSDR=true" ]; - meta = with lib; { + meta = { description = "DAB/DAB+ Software Radio"; homepage = "https://www.welle.io/"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ ck3d markuskowa ]; - license = licenses.gpl2Only; + license = lib.licenses.gpl2Only; platforms = [ "x86_64-linux" "i686-linux" - ] ++ platforms.darwin; + ] ++ lib.platforms.darwin; }; } From f53387e15a15891957971706df1d70321533a79b Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Tue, 8 Oct 2024 13:04:07 +0300 Subject: [PATCH 111/180] ipu6: update packages This updates the ipu6 driver and firmware to a more recent version, which seems to at least work in Chrom{e,ium}. ipu6-drivers now relies on the in-kernel ipu6 kernel driver, so we update our logic and metadata for it. --- nixos/modules/hardware/video/webcam/ipu6.nix | 6 ++--- .../gstreamer/icamerasrc/default.nix | 11 +++++--- .../libraries/ipu6-camera-hal/default.nix | 26 ++++++++++++++----- .../firmware/ipu6-camera-bins/default.nix | 15 ++++++----- .../linux/firmware/ivsc-firmware/default.nix | 6 ++--- .../linux/ipu6-drivers/default.nix | 14 +++++----- .../os-specific/linux/ivsc-driver/default.nix | 6 ++--- pkgs/top-level/linux-kernels.nix | 5 +--- 8 files changed, 52 insertions(+), 37 deletions(-) diff --git a/nixos/modules/hardware/video/webcam/ipu6.nix b/nixos/modules/hardware/video/webcam/ipu6.nix index ae54e24ee2daa..803902530dd92 100644 --- a/nixos/modules/hardware/video/webcam/ipu6.nix +++ b/nixos/modules/hardware/video/webcam/ipu6.nix @@ -26,9 +26,9 @@ in config = mkIf cfg.enable { - # Module is upstream as of 6.10 - boot.extraModulePackages = with config.boot.kernelPackages; - optional (kernelOlder "6.10") ipu6-drivers; + # Module is upstream as of 6.10, + # but still needs various out-of-tree i2c and the `intel-ipu6-psys` kernel driver + boot.extraModulePackages = with config.boot.kernelPackages; [ ipu6-drivers ]; hardware.firmware = with pkgs; [ ipu6-camera-bins diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index 68485f7e7454a..4bbb20c6e41a4 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -6,17 +6,18 @@ , gst_all_1 , ipu6-camera-hal , libdrm +, libva }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "icamerasrc-${ipu6-camera-hal.ipuVersion}"; - version = "unstable-2023-10-23"; + version = "unstable-2024-09-29"; src = fetchFromGitHub { owner = "intel"; repo = "icamerasrc"; - rev = "528a6f177732def4d5ebc17927220d8823bc8fdc"; - hash = "sha256-Ezcm5OpF/NKvJf5sFeJyvNc2Uq0166GukC9MuNUV2Fs="; + rev = "refs/tags/20240926_1446"; + hash = "sha256-BpIZxkPmSVKqPntwBJjGmCaMSYFCEZHJa4soaMAJRWE="; }; nativeBuildInputs = [ @@ -34,8 +35,10 @@ stdenv.mkDerivation { buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-bad ipu6-camera-hal libdrm + libva ]; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/libraries/ipu6-camera-hal/default.nix b/pkgs/development/libraries/ipu6-camera-hal/default.nix index 9c6cc585f9b32..0bbed96ca3af7 100644 --- a/pkgs/development/libraries/ipu6-camera-hal/default.nix +++ b/pkgs/development/libraries/ipu6-camera-hal/default.nix @@ -11,6 +11,7 @@ , ipu6-camera-bins , libtool , gst_all_1 +, libdrm # Pick one of # - ipu6 (Tiger Lake) @@ -27,13 +28,13 @@ let in stdenv.mkDerivation { pname = "${ipuVersion}-camera-hal"; - version = "unstable-2023-09-25"; + version = "unstable-2024-09-29"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-camera-hal"; - rev = "9fa05a90886d399ad3dda4c2ddc990642b3d20c9"; - hash = "sha256-yS1D7o6dsQ4FQkjfwcisOxcP7Majb+4uQ/iW5anMb5c="; + rev = "f98f72b156563fe8373e4f8d017a9f609676bb33"; + hash = "sha256-zVcgKW7/GHYd1oMvsaI77cPyj3G68dL+OXBJDz5+Td4="; }; nativeBuildInputs = [ @@ -41,12 +42,16 @@ stdenv.mkDerivation { pkg-config ]; - PKG_CONFIG_PATH = "${lib.makeLibraryPath [ ipu6-camera-bins ]}/${ipuTarget}/pkgconfig"; cmakeFlags = [ "-DIPU_VER=${ipuVersion}" + "-DTARGET_SUFFIX=-${ipuVersion}" # missing libiacss "-DUSE_PG_LITE_PIPE=ON" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_SUB_PATH=${ipuTarget}" + "-DCMAKE_INSTALL_LIBDIR=lib" ]; NIX_CFLAGS_COMPILE = [ @@ -61,21 +66,28 @@ stdenv.mkDerivation { libtool gst_all_1.gstreamer gst_all_1.gst-plugins-base + libdrm ]; postPatch = '' substituteInPlace src/platformdata/PlatformData.h \ - --replace '/usr/share/' "${placeholder "out"}/share/" + --replace '/usr/share/' "${placeholder "out"}/share/" \ + --replace '#define CAMERA_DEFAULT_CFG_PATH "/etc/camera/"' '#define CAMERA_DEFAULT_CFG_PATH "${placeholder "out"}/etc/camera/"' + ''; + + postInstall = '' + mkdir -p $out/include/${ipuTarget}/ + cp -r $src/include $out/include/${ipuTarget}/libcamhal ''; postFixup = '' for lib in $out/lib/*.so; do - patchelf --add-rpath "${lib.makeLibraryPath [ ipu6-camera-bins ]}/${ipuTarget}" $lib + patchelf --add-rpath "${ipu6-camera-bins}/lib" $lib done ''; passthru = { - inherit ipuVersion; + inherit ipuVersion ipuTarget; }; meta = with lib; { diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 4c3bede4fba23..873e0c971d670 100644 --- a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -6,15 +6,15 @@ , zlib }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: rec { pname = "ipu6-camera-bins"; - version = "unstable-2023-10-26"; + version = "unstable-2024-09-27"; src = fetchFromGitHub { - owner = "intel"; repo = "ipu6-camera-bins"; - rev = "af5ba0cb4a763569ac7514635013e9d870040bcf"; - hash = "sha256-y0pT5M7AKACbquQWLZPYpTPXRC5hipLNL61nhs+cst4="; + owner = "intel"; + rev = "98ca6f2a54d20f171628055938619972514f7a07"; + hash = "sha256-DAjAzHMqX41mrfQVpDUJLw4Zjb9pz6Uy3TJjTGIkd6o="; }; nativeBuildInputs = [ @@ -33,13 +33,14 @@ stdenv.mkDerivation (finalAttrs: { include \ $out/ - install -m 0644 -D LICENSE $out/share/doc/LICENSE + # There is no LICENSE file in the src + # install -m 0644 -D LICENSE $out/share/doc/LICENSE runHook postInstall ''; postFixup = '' - for pcfile in $out/lib/*/pkgconfig/*.pc; do + for pcfile in $out/lib/pkgconfig/*.pc; do substituteInPlace $pcfile \ --replace 'prefix=/usr' "prefix=$out" done diff --git a/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix index 9674cea2226ff..931c854708218 100644 --- a/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "ivsc-firmware"; - version = "unstable-2023-08-11"; + version = "unstable-2024-06-14"; src = fetchFromGitHub { owner = "intel"; repo = "ivsc-firmware"; - rev = "10c214fea5560060d387fbd2fb8a1af329cb6232"; - hash = "sha256-kEoA0yeGXuuB+jlMIhNm+SBljH+Ru7zt3PzGb+EPBPw="; + rev = "74a01d1208a352ed85d76f959c68200af4ead918"; + hash = "sha256-kHYfeftMtoOsOtVN6+XoDMDHP7uTEztbvjQLpCnKCh0="; }; dontBuild = true; diff --git a/pkgs/os-specific/linux/ipu6-drivers/default.nix b/pkgs/os-specific/linux/ipu6-drivers/default.nix index 304f27dfb43cd..d6aafa53a52f8 100644 --- a/pkgs/os-specific/linux/ipu6-drivers/default.nix +++ b/pkgs/os-specific/linux/ipu6-drivers/default.nix @@ -5,17 +5,19 @@ , kernel }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ipu6-drivers"; - version = "unstable-2023-11-24"; + version = "unstable-2024-10-10"; src = fetchFromGitHub { owner = "intel"; repo = "ipu6-drivers"; - rev = "07f0612eabfdc31df36f5e316a9eae115807804f"; - hash = "sha256-8JRZG6IKJT0qtoqJHm8641kSQMLc4Z+DRzK6FpL9Euk="; + rev = "118952d49ec598f56add50d93fa7bc3ac4a05643"; + hash = "sha256-xdMwINoKrdRHCPMpdZQn86ATi1dAXncMU39LLXS16mc="; }; + patches = [ "${src}/patches/0001-v6.10-IPU6-headers-used-by-PSYS.patch" ]; + postPatch = '' cp --no-preserve=mode --recursive --verbose \ ${ivsc-driver.src}/backport-include \ @@ -47,7 +49,7 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Only; maintainers = [ ]; platforms = [ "x86_64-linux" ]; - # requires 6.1.7 https://github.com/intel/ipu6-drivers/pull/84 - broken = kernel.kernelOlder "6.1.7"; + # requires 6.10 + broken = kernel.kernelOlder "6.10"; }; } diff --git a/pkgs/os-specific/linux/ivsc-driver/default.nix b/pkgs/os-specific/linux/ivsc-driver/default.nix index 74ad354a984f4..d9fa513ede878 100644 --- a/pkgs/os-specific/linux/ivsc-driver/default.nix +++ b/pkgs/os-specific/linux/ivsc-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "ivsc-driver"; - version = "unstable-2023-11-09"; + version = "unstable-2024-09-18"; src = fetchFromGitHub { owner = "intel"; repo = "ivsc-driver"; - rev = "73a044d9633212fac54ea96cdd882ff5ab40573e"; - hash = "sha256-vE5pOtVqjiWovlUMSEoBKTk/qvs8K8T5oY2r7njh0wQ="; + rev = "10f440febe87419d5c82d8fe48580319ea135b54"; + hash = "sha256-jc+8geVquRtaZeIOtadCjY9F162Rb05ptE7dk8kuof0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 4255d0c036e83..b1e4cbd2d53fd 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -367,10 +367,7 @@ in { intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; - ipu6-drivers = - if kernelOlder "6.10" - then callPackage ../os-specific/linux/ipu6-drivers {} - else null; + ipu6-drivers = callPackage ../os-specific/linux/ipu6-drivers {}; ivsc-driver = callPackage ../os-specific/linux/ivsc-driver {}; From 54af826daea855fda808b7fce05b85e51072f67e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 11 Oct 2024 23:58:31 +0200 Subject: [PATCH 112/180] burpsuite: 2024.8.2 -> 2024.8.4 --- pkgs/tools/networking/burpsuite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 8bf1f080f2320..0880780eb65b8 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -9,20 +9,20 @@ }: let - version = "2024.8.2"; + version = "2024.8.4"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-8CCe/x++0djfLPc/hgDl4hkKexpIcf1tVU7c+kKXdBo="; + hash = "sha256-JWG0iNnQJgMqNsMSZIzFCmss6JhvZ9r7lFHuX46+3Mg="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-amaDDHIsdX+8j8ELbFu/etaXWS04XsrHGslJeg04uKU="; + hash = "sha256-a+TozSXpwyBlxPztASb4fqGZGn8Asg2/GxKzhIpEuyE="; }; src = fetchurl { From b09274abf6c7a65789c06935eefa1915ddb21413 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Fri, 11 Oct 2024 14:04:03 -0500 Subject: [PATCH 113/180] legcord: init at 1.0.0 https://github.com/Legcord/Legcord/releases/tag/v1.0.0 --- pkgs/by-name/le/legcord/package.nix | 84 +++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 pkgs/by-name/le/legcord/package.nix diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix new file mode 100644 index 0000000000000..0dcad5b24399c --- /dev/null +++ b/pkgs/by-name/le/legcord/package.nix @@ -0,0 +1,84 @@ +{ lib +, stdenv +, fetchFromGitHub +, pnpm +, nodejs +, electron_32 +, makeWrapper +, copyDesktopItems +, makeDesktopItem +}: +stdenv.mkDerivation rec { + pname = "legcord"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Legcord"; + repo = "Legcord"; + rev = "v${version}"; + hash = "sha256-/HwKxl3wiLSS7gmEQSddBkE2z1mmcexMgacUynLhdtg="; + }; + + nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; + + pnpmDeps = pnpm.fetchDeps { + inherit pname version src; + hash = "sha256-e6plwWf5eFaGsP3/cvIkGTV1nbcw8VRM30E5rwVX1RI="; + }; + + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + buildPhase = '' + runHook preBuild + + pnpm build + + npm exec electron-builder -- \ + --dir \ + -c.electronDist="${electron_32.dist}" \ + -c.electronVersion="${electron_32.version}" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/lib/legcord" + cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/legcord" + + install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/legcord.png" + + makeShellWrapper "${lib.getExe electron_32}" "$out/bin/legcord" \ + --add-flags "$out/share/lib/legcord/resources/app.asar" \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "legcord"; + desktopName = "Legcord"; + exec = "legcord %U"; + icon = "legcord"; + comment = meta.description; + categories = [ "Network" ]; + startupWMClass = "Legcord"; + terminal = false; + }) + ]; + + meta = with lib; { + description = "Lightweight, alternative desktop client for Discord"; + homepage = "https://legcord.app"; + downloadPage = "https://github.com/Legcord/Legcord"; + license = licenses.osl3; + maintainers = with maintainers; [ wrmilling water-sucks ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "legcord"; + }; +} From cda7f752c25492322eb38c54dddb38fa381b9d85 Mon Sep 17 00:00:00 2001 From: "Winston R. Milling" Date: Fri, 11 Oct 2024 14:05:12 -0500 Subject: [PATCH 114/180] armcord: remove, add throw with migration details https://github.com/Legcord/Legcord/releases/tag/v1.0.0 --- .../instant-messengers/armcord/default.nix | 84 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 - 3 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/armcord/default.nix diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix deleted file mode 100644 index 1c0ad5aa361a9..0000000000000 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pnpm -, nodejs -, electron_31 -, makeWrapper -, copyDesktopItems -, makeDesktopItem -}: -stdenv.mkDerivation rec { - pname = "armcord"; - version = "3.3.1"; - - src = fetchFromGitHub { - owner = "ArmCord"; - repo = "ArmCord"; - rev = "v${version}"; - hash = "sha256-rCcjanmr4s9Nc5QB3Rb5ptKF/Ge8PSZt0WvgIul3RGs="; - }; - - nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; - - pnpmDeps = pnpm.fetchDeps { - inherit pname version src; - hash = "sha256-ZfErOj03NdkviNXV4bvZC8uPOk29RhgmSez/Qvw1sGo="; - }; - - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - - buildPhase = '' - runHook preBuild - - pnpm build - - npm exec electron-builder -- \ - --dir \ - -c.electronDist="${electron_31.dist}" \ - -c.electronVersion="${electron_31.version}" - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/lib/armcord" - cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/armcord" - - install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/armcord.png" - - makeShellWrapper "${lib.getExe electron_31}" "$out/bin/armcord" \ - --add-flags "$out/share/lib/armcord/resources/app.asar" \ - "''${gappsWrapperArgs[@]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set-default ELECTRON_IS_DEV 0 \ - --inherit-argv0 - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "armcord"; - desktopName = "ArmCord"; - exec = "armcord %U"; - icon = "armcord"; - comment = meta.description; - categories = [ "Network" ]; - startupWMClass = "ArmCord"; - terminal = false; - }) - ]; - - meta = with lib; { - description = "Lightweight, alternative desktop client for Discord"; - homepage = "https://armcord.app"; - downloadPage = "https://github.com/ArmCord/ArmCord"; - license = licenses.osl3; - maintainers = with maintainers; [ wrmilling water-sucks ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "armcord"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d1d639ee3af94..7b09a3cd16388 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -127,6 +127,7 @@ mapAliases { archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aria = aria2; # Added 2024-03-26 + armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 asterisk_16 = throw "asterisk_16: Asterisk 16 is end of life and has been removed"; # Added 2023-04-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fe85eaf0f77f..cea2ba2261986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28259,9 +28259,6 @@ with pkgs; boost = boost175; }; - - armcord = callPackage ../applications/networking/instant-messengers/armcord { }; - autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; From f4c6e1174c8ece4de32fcee3ab7ccb267b640ea7 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 12 Oct 2024 06:03:46 +0800 Subject: [PATCH 115/180] ci/request-reviews: fix headRef to point to the PR head Previously, headRef points to the master branch of Nixpkgs, which basically means no code owner review will be requested. The problem can be verified using the following command. $ DRY_MODE=1 ./ci/request-reviews/request-reviews.sh NixOS/nixpkgs 347973 ci/OWNERS [...] This PR touches 0 files Requesting reviews from: { "reviewers": [] } [...] Additionally, the comment about conflicts is removed thanks to the unambiguous way of specifying ref. --- ci/request-reviews/request-reviews.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/request-reviews/request-reviews.sh b/ci/request-reviews/request-reviews.sh index 8a3d78a50d5f4..b21354560242a 100755 --- a/ci/request-reviews/request-reviews.sh +++ b/ci/request-reviews/request-reviews.sh @@ -60,9 +60,8 @@ git -C "$tmp/nixpkgs.git" remote add fork https://github.com/"$prRepo".git git -C "$tmp/nixpkgs.git" config remote.fork.partialclonefilter tree:0 git -C "$tmp/nixpkgs.git" config remote.fork.promisor true -# Our local branches mirror Nixpkgs, so make sure to not try to update any to avoid conflicts git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch" -headRef=$(git -C "$tmp/nixpkgs.git" rev-parse HEAD) +headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch") log "Checking correctness of the base branch" if ! "$SCRIPT_DIR"/verify-base-branch.sh "$tmp/nixpkgs.git" "$headRef" "$baseRepo" "$baseBranch" "$prRepo" "$prBranch" | tee "$tmp/invalid-base-error" >&2; then From 9393653b30543198a96e9daa1e7317252fead8ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 00:13:07 +0200 Subject: [PATCH 116/180] python312Packages.python-jsonrpc-server: refactor --- .../python-jsonrpc-server/default.nix | 42 +++++++++++-------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index dd82fbca2cb46..729d98a9e0ceb 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -2,46 +2,54 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, mock, - pytest-cov, - coverage, - future, + pytest-cov-stub, + pytestCheckHook, + pythonOlder, + setuptools, ujson, + versioneer, }: buildPythonPackage rec { pname = "python-jsonrpc-server"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "palantir"; repo = "python-jsonrpc-server"; - rev = version; - sha256 = "0pcf50qvcxqnz3db58whqd8z89cdph19pfs1whgfm0zmwbwk0lw6"; + rev = "refs/tags/${version}"; + hash = "sha256-hlMw+eL1g+oe5EG7mwK8jSX0UcOQo7La+BZ3tjEojl0="; }; postPatch = '' - sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py + # Remove vendorized versioneer.py + rm versioneer.py ''; + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ ujson ]; + nativeCheckInputs = [ - pytestCheckHook mock - pytest-cov - coverage + pytest-cov-stub + pytestCheckHook ]; - propagatedBuildInputs = [ - future - ujson - ]; + pythonImportsCheck = [ "pyls_jsonrpc" ]; meta = with lib; { + description = "Module for erver implementation of the JSON RPC 2.0 protocol"; homepage = "https://github.com/palantir/python-jsonrpc-server"; - description = "Python 2 and 3 asynchronous JSON RPC server"; + changelog = "https://github.com/palantir/python-jsonrpc-server/releases/tag/${version}"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } From 8824e5f5b0017552a7f1510e00d3bfc20ccb0d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Sat, 12 Oct 2024 01:22:05 +0300 Subject: [PATCH 117/180] protonvpn-gui_legacy: deprecate application The source code for this project was removed a while ago and there is no method to build this from scratch anymore. The erase decission was probably done by the Proton developers as they are currently focussing all efforts on the protonvpn-gui app. --- .../networking/protonvpn-gui/legacy.nix | 81 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 pkgs/applications/networking/protonvpn-gui/legacy.nix diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix deleted file mode 100644 index 19a2fe7288e92..0000000000000 --- a/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - buildPythonApplication, - fetchFromGitHub, - setuptools, - wrapGAppsHook3, - gdk-pixbuf, - glib-networking, - gobject-introspection, - imagemagick, - librsvg, - pango, - python3, - webkitgtk, - # Python libs - protonvpn-nm-lib, - psutil, - # Optionals - withIndicator ? true, - libappindicator-gtk3, -}: - -buildPythonApplication rec { - pname = "protonvpn-gui"; - version = "1.12.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "linux-app"; - rev = "refs/tags/${version}"; - sha256 = "sha256-MPS4d/yNkccsc/j85h7/4k4xL8uSCvhj/9JWPa7ezLY="; - }; - - nativeBuildInputs = [ - gdk-pixbuf - gobject-introspection - imagemagick - setuptools - wrapGAppsHook3 - ]; - - propagatedBuildInputs = [ - glib-networking # needed for the login captcha - protonvpn-nm-lib - psutil - ]; - - buildInputs = [ - librsvg - pango - webkitgtk - ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; - - postInstall = '' - # Setting icons - for size in 16 32 48 64 72 96 128 192 512 1024; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize $size'x'$size \ - protonvpn_gui/assets/icons/protonvpn-logo.png \ - $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png - done - - install -Dm644 protonvpn.desktop -t $out/share/applications/ - chmod 644 $out/${python3.sitePackages}/protonvpn_gui/assets/icons/plus-server.png - substituteInPlace $out/share/applications/protonvpn.desktop \ - --replace 'protonvpn-logo' protonvpn - ''; - - # Project has a dummy test - doCheck = false; - - meta = with lib; { - description = "Official ProtonVPN Linux app"; - homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = [ ]; - license = licenses.gpl3Plus; - mainProgram = "protonvpn"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc7f0f6fc1ae1..02040de3cab29 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1325,6 +1325,7 @@ mapAliases { protobuf3_23 = protobuf_23; protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 + protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f482f2e6503d..ed8c04cabb978 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31991,7 +31991,6 @@ with pkgs; protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { }; - protonvpn-gui_legacy = python3Packages.callPackage ../applications/networking/protonvpn-gui/legacy.nix { }; ps2client = callPackage ../applications/networking/ps2client { }; From 75e144253792ace493b218c9be7585fdb70fc43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20=C5=BDlender?= Date: Sat, 12 Oct 2024 00:28:50 +0200 Subject: [PATCH 118/180] redocly: 1.18.1 -> 1.25.5 --- pkgs/by-name/re/redocly/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix index 198d502702592..fe53529c18b9a 100644 --- a/pkgs/by-name/re/redocly/package.nix +++ b/pkgs/by-name/re/redocly/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "redocly"; - version = "1.18.1"; + version = "1.25.5"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-Y09tGm3Sje8gd+6tUyBTCt7HjL2CQ/vo/ExLDnywvcQ="; + hash = "sha256-pVSmrORa6KcAwllYepwra8QpnlfFoB9+noevLSmoWzY="; }; - npmDepsHash = "sha256-WzMFKMW/YyAH3ZoOeIcXIum15cJmPGp96xSYb9QCaWI="; + npmDepsHash = "sha256-nFRKC3xM+vq9SDeIelUqE/ZSSCSke0G0Qm629/s6WO8="; npmBuildScript = "prepare"; From 32a4de4339d263c013e2584ed5798fdda1122745 Mon Sep 17 00:00:00 2001 From: lordkekz Date: Fri, 11 Oct 2024 23:46:04 +0200 Subject: [PATCH 119/180] zenmonitor: inherit meta.homepage from new src --- pkgs/os-specific/linux/zenmonitor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix index bf9ddbc5fec57..837785c4d5a22 100644 --- a/pkgs/os-specific/linux/zenmonitor/default.nix +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { + inherit (src.meta) homepage; description = "Monitoring software for AMD Zen-based CPUs"; mainProgram = "zenmonitor"; - homepage = "https://github.com/Ta180m/zenmonitor3"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ alexbakker artturin ]; From c7739bb95e1665e2c77da99c82a6542decdde334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 30 Sep 2024 17:19:09 -0600 Subject: [PATCH 120/180] webkitgtk: refactor top-level to deprecate default ABI version --- pkgs/top-level/all-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9d389fa512ae..844574c1f3b4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23530,21 +23530,23 @@ with pkgs; wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; - webkitgtk = callPackage ../development/libraries/webkitgtk { + webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; inherit (darwin) apple_sdk; }; - webkitgtk_4_1 = webkitgtk.override { + webkitgtk_4_1 = webkitgtk_4_0.override { libsoup = libsoup_3; }; - webkitgtk_6_0 = webkitgtk.override { + webkitgtk_6_0 = webkitgtk_4_0.override { libsoup = libsoup_3; gtk3 = gtk4; }; + webkitgtk = webkitgtk_4_0; + webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader { }; websocketpp = callPackage ../development/libraries/websocket++ { }; From ccec93c1c748f8e1e879edc42e3562999a3f20d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 4 Oct 2024 19:00:54 -0600 Subject: [PATCH 121/180] treewide: replace webkitgtk to webkitgtk_4_0 sed -i 's/ webkitgtk\b/ webkitgtk_4_0/g' pkgs/**.nix sed -i 's/(webkitgtk\b/(webkitgtk_4_0/g' pkgs/**.nix sed -i 's/\.webkitgtk\b/.webkitgtk_4_0/g' pkgs/**.nix webkitgtk is currently pointing to that specific ABI version but the alias is going to start warning --- .../audio/bespokesynth/default.nix | 4 +- pkgs/applications/audio/exaile/default.nix | 4 +- pkgs/applications/audio/plugdata/default.nix | 4 +- pkgs/applications/audio/quodlibet/default.nix | 4 +- pkgs/applications/audio/rymcast/default.nix | 4 +- pkgs/applications/audio/sonobus/default.nix | 4 +- .../audio/tonelib-zoom/default.nix | 4 +- pkgs/applications/audio/tunefish/default.nix | 4 +- pkgs/applications/audio/vocal/default.nix | 4 +- .../blockchains/alfis/default.nix | 4 +- .../editors/eclipse/build-eclipse.nix | 6 +-- pkgs/applications/editors/eclipse/default.nix | 4 +- .../applications/editors/emacs/make-emacs.nix | 4 +- pkgs/applications/editors/formiko/default.nix | 4 +- .../editors/gnome-inform7/default.nix | 4 +- .../editors/rednotebook/default.nix | 4 +- .../file-managers/xplorer/default.nix | 4 +- pkgs/applications/graphics/gthumb/default.nix | 4 +- .../graphics/komorebi/default.nix | 4 +- .../misc/bambu-studio/default.nix | 4 +- .../misc/holochain-launcher/default.nix | 4 +- pkgs/applications/misc/insulator2/default.nix | 4 +- pkgs/applications/misc/lutris/default.nix | 4 +- pkgs/applications/misc/lutris/fhsenv.nix | 2 +- pkgs/applications/misc/minigalaxy/default.nix | 4 +- pkgs/applications/misc/pdfpc/default.nix | 4 +- pkgs/applications/misc/pytrainer/default.nix | 4 +- pkgs/applications/misc/skytemple/default.nix | 4 +- pkgs/applications/misc/ulauncher/default.nix | 4 +- .../apache-directory-studio/default.nix | 4 +- .../networking/browsers/badwolf/default.nix | 4 +- .../networking/browsers/eolie/default.nix | 4 +- .../networking/browsers/ephemeral/default.nix | 4 +- .../networking/browsers/luakit/default.nix | 4 +- .../networking/browsers/midori/default.nix | 4 +- .../networking/browsers/nyxt/default.nix | 4 +- .../networking/browsers/surf/default.nix | 6 +-- .../networking/browsers/vimb/default.nix | 4 +- .../feedreaders/newsflash/default.nix | 4 +- pkgs/applications/networking/geph/default.nix | 4 +- .../applications/networking/giara/default.nix | 4 +- .../trillian-im/default.nix | 4 +- .../whatsapp-for-linux/default.nix | 4 +- .../mailreaders/astroid/default.nix | 4 +- .../networking/mailreaders/balsa/default.nix | 4 +- .../mailreaders/claws-mail/default.nix | 4 +- .../newsreaders/liferea/default.nix | 8 +-- .../remote/citrix-workspace/generic.nix | 4 +- .../networking/weather/meteo/default.nix | 4 +- pkgs/applications/office/bookworm/default.nix | 4 +- pkgs/applications/office/notes-up/default.nix | 4 +- pkgs/applications/office/osmo/default.nix | 4 +- .../science/math/nasc/default.nix | 4 +- .../obs-studio/plugins/obs-webkitgtk.nix | 4 +- pkgs/by-name/am/am2rlauncher/package.nix | 4 +- pkgs/by-name/ap/apvlv/package.nix | 4 +- pkgs/by-name/aw/aws-workspaces/package.nix | 4 +- pkgs/by-name/ca/cargo-tauri/package.nix | 4 +- pkgs/by-name/ca/cargo-tauri/test-app.nix | 4 +- .../ca/catppuccinifier-gui/package.nix | 4 +- pkgs/by-name/ch/chow-kick/package.nix | 4 +- pkgs/by-name/ch/chow-tape-model/package.nix | 4 +- pkgs/by-name/ci/cinny-desktop/package.nix | 4 +- pkgs/by-name/cl/clash-verge-rev/service.nix | 4 +- pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 4 +- pkgs/by-name/db/dbeaver-bin/package.nix | 4 +- pkgs/by-name/de/desktop-postflop/package.nix | 4 +- pkgs/by-name/do/dorion/package.nix | 4 +- pkgs/by-name/en/en-croissant/package.nix | 4 +- pkgs/by-name/en/ente-auth/package.nix | 4 +- pkgs/by-name/fo/font-manager/package.nix | 6 +-- pkgs/by-name/gi/gitbutler/package.nix | 4 +- pkgs/by-name/gn/gnome-notes/package.nix | 4 +- pkgs/by-name/gn/gnucash/package.nix | 4 +- pkgs/by-name/gp/gpauth/package.nix | 4 +- .../by-name/he/headphones-toolbox/package.nix | 4 +- pkgs/by-name/in/intune-portal/package.nix | 4 +- pkgs/by-name/ki/kiwitalk/package.nix | 4 +- pkgs/by-name/lr/lrcget/package.nix | 4 +- pkgs/by-name/mi/mihomo-party/package.nix | 4 +- .../mo/modrinth-app-unwrapped/package.nix | 4 +- pkgs/by-name/mo/mouse-actions-gui/package.nix | 4 +- pkgs/by-name/oi/oidc-agent/package.nix | 4 +- pkgs/by-name/ov/overlayed/package.nix | 4 +- pkgs/by-name/po/portfolio/package.nix | 4 +- pkgs/by-name/po/pot/package.nix | 4 +- .../by-name/sn/snippetexpandergui/package.nix | 4 +- pkgs/by-name/sq/squirreldisk/package.nix | 4 +- pkgs/by-name/tr/treedome/package.nix | 4 +- pkgs/by-name/xi/xiphos/package.nix | 4 +- .../compilers/chicken/5/overrides.nix | 2 +- .../haskell-modules/hackage-packages.nix | 54 +++++++++---------- .../libraries/rnnoise-plugin/default.nix | 4 +- .../libraries/wxwidgets/wxGTK31.nix | 4 +- .../libraries/wxwidgets/wxGTK32.nix | 4 +- pkgs/development/lisp-modules/ql.nix | 2 +- pkgs/development/misc/juce/default.nix | 4 +- .../python-modules/wxpython/4.2.nix | 4 +- pkgs/development/tools/devpod/default.nix | 4 +- .../development/tools/eclipse-mat/default.nix | 6 +-- pkgs/development/tools/wails/default.nix | 6 +-- pkgs/development/web/cog/default.nix | 4 +- pkgs/games/gamehub/default.nix | 4 +- pkgs/tools/misc/archi/default.nix | 4 +- pkgs/tools/misc/birdfont/default.nix | 4 +- pkgs/tools/networking/gp-saml-gui/default.nix | 4 +- pkgs/top-level/all-packages.nix | 20 +++---- pkgs/top-level/release-small.nix | 2 +- 108 files changed, 248 insertions(+), 256 deletions(-) diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 83c5af0a53fce..01b98999ce25f 100644 --- a/pkgs/applications/audio/bespokesynth/default.nix +++ b/pkgs/applications/audio/bespokesynth/default.nix @@ -24,7 +24,7 @@ , xcbutilkeysyms , xcb-util-cursor , gtk3 -, webkitgtk +, webkitgtk_4_0 , python3 , curl , pcre @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { libXScrnSaver curl gtk3 - webkitgtk + webkitgtk_4_0 freetype libGL libusb1 diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix index 9d5c69858aef9..5387069072f5f 100644 --- a/pkgs/applications/audio/exaile/default.nix +++ b/pkgs/applications/audio/exaile/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , gobject-introspection, makeWrapper, wrapGAppsHook3 , gtk3, gst_all_1, python3 -, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk +, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk_4_0 , iconTheme ? adwaita-icon-theme , deviceDetectionSupport ? true , documentationSupport ? true @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ++ lib.optional multimediaKeySupport keybinder3 ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs ++ lib.optional podcastSupport python3.pkgs.feedparser - ++ lib.optional wikipediaSupport webkitgtk; + ++ lib.optional wikipediaSupport webkitgtk_4_0; nativeCheckInputs = with python3.pkgs; [ pytest diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/applications/audio/plugdata/default.nix index e58e5aabcd81a..6998cb00eaebb 100644 --- a/pkgs/applications/audio/plugdata/default.nix +++ b/pkgs/applications/audio/plugdata/default.nix @@ -8,7 +8,7 @@ , pkg-config , alsa-lib , freetype -, webkitgtk +, webkitgtk_4_0 , zenity , curl , xorg @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib curl freetype - webkitgtk + webkitgtk_4_0 xorg.libX11 xorg.libXcursor xorg.libXext diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index a47b01b8cf585..7a0063238d492 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -21,7 +21,7 @@ libmodplug, librsvg, libsoup, - webkitgtk, + webkitgtk_4_0, # optional features withDbusPython ? false, @@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication { libappindicator-gtk3 libmodplug libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals (withXineBackend) [ xine-lib ] ++ lib.optionals (withGstreamerBackend) ( diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix index 06e711941a637..4fecaf3737260 100644 --- a/pkgs/applications/audio/rymcast/default.nix +++ b/pkgs/applications/audio/rymcast/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper -, alsa-lib, curl, gtk3, webkitgtk, zenity }: +, alsa-lib, curl, gtk3, webkitgtk_4_0, zenity }: stdenv.mkDerivation rec { pname = "rymcast"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ]; + buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix index d8a69ecd9a0b7..bbf52c11b9903 100644 --- a/pkgs/applications/audio/sonobus/default.nix +++ b/pkgs/applications/audio/sonobus/default.nix @@ -16,7 +16,7 @@ , libopus , curl , gtk3 -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation (finalAttrs: { @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libopus curl gtk3 - webkitgtk + webkitgtk_4_0 ]; runtimeDependencies = [ diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index e5adc356b6973..af5dd750c50a7 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -12,7 +12,7 @@ , libXrandr , libXrender , libjack2 -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { alsa-lib freetype libglvnd - webkitgtk + webkitgtk_4_0 ] ++ runtimeDependencies; runtimeDependencies = map lib.getLib [ diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix index df7564abcf02b..8c2855d732828 100644 --- a/pkgs/applications/audio/tunefish/default.nix +++ b/pkgs/applications/audio/tunefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3 -, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk +, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk_4_0 }: stdenv.mkDerivation { @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkg-config python3 ]; - buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; + buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk_4_0 ]; postPatch = '' patchShebangs src/tunefish4/generate-lv2-ttl.py diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index ee97a92ac3283..7633ab22e26a7 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -12,7 +12,7 @@ , glib , glib-networking , libxml2 -, webkitgtk +, webkitgtk_4_0 , clutter-gtk , clutter-gst , libunity @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libunity pantheon.granite sqlite - webkitgtk + webkitgtk_4_0 glib-networking ]; diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 7e9981cc39ec2..50a100254e999 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pkg-config, makeWrapper, - webkitgtk, + webkitgtk_4_0, zenity, Cocoa, Security, @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security - ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0 ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [ Cocoa WebKit diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 46642d6755f76..dfb2fd38b9978 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk_4_0 , makeWrapper, perl, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 libXrender libXtst libsecret zlib - ] ++ lib.optional (webkitgtk != null) webkitgtk; + ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0; buildCommand = '' # Unpack tarball. @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0)} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 9c1963554c3fa..2e1501d635cd9 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXrender, zlib , glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas -, webkitgtk ? null # for internal web browser +, webkitgtk_4_0 ? null # for internal web browser , buildEnv, runCommand , callPackage }: @@ -29,7 +29,7 @@ in rec { # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3 buildEclipseUnversioned = callPackage ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk + jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk_4_0 makeWrapper; }; buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; }); diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 8c53805978340..e7fe2ccac6585 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -55,7 +55,7 @@ , systemd , tree-sitter , texinfo -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , zlib @@ -274,7 +274,7 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals withXinput2 [ libXi ] ++ lib.optionals withXwidgets [ - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] ++ lib.optionals withNS [ diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix index 40c7fba0be82e..1fa92679f651d 100644 --- a/pkgs/applications/editors/formiko/default.nix +++ b/pkgs/applications/editors/formiko/default.nix @@ -9,7 +9,7 @@ , gtkspell3 , librsvg , pygobject3 -, webkitgtk +, webkitgtk_4_0 }: buildPythonApplication rec { @@ -36,7 +36,7 @@ buildPythonApplication rec { gtkspell3 librsvg pygobject3 - webkitgtk + webkitgtk_4_0 ]; # Needs a display diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix index df1baa997a217..e4cc850579285 100644 --- a/pkgs/applications/editors/gnome-inform7/default.nix +++ b/pkgs/applications/editors/gnome-inform7/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison , texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons , inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc -, webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib +, webkitgtk_4_0, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib , gst_all_1 }: # Neither gnome-inform7 nor its dependencies ratify and chimara have tagged releases in the GTK3 branch yet. @@ -92,7 +92,7 @@ in stdenv.mkDerivation { gtk3 gtksourceview3 gspell - webkitgtk + webkitgtk_4_0 libxml2 goocanvas2 libplist diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 679cde8b50377..e977ae20687ab 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub -, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk +, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk_4_0 , pygobject3, pyyaml, setuptools }: @@ -23,7 +23,7 @@ buildPythonApplication rec { build-system = [ setuptools ]; propagatedBuildInputs = [ - gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk + gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk_4_0 pygobject3 pyyaml ]; diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/applications/file-managers/xplorer/default.nix index 9c3a04e8dde3b..6af5e5da6cf1d 100644 --- a/pkgs/applications/file-managers/xplorer/default.nix +++ b/pkgs/applications/file-managers/xplorer/default.nix @@ -13,7 +13,7 @@ , openssl , pkg-config , rustPlatform -, webkitgtk +, webkitgtk_4_0 }: let @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage { ''; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk ]; + buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ]; checkFlags = [ # tries to mutate the parent directory diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 5b56ce7585614..f2666b3ee1076 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -31,7 +31,7 @@ , python3 , desktop-file-utils , itstool -, withWebservices ? true, webkitgtk +, withWebservices ? true, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { libtiff libwebp libX11 - ] ++ lib.optional withWebservices webkitgtk; + ] ++ lib.optional withWebservices webkitgtk_4_0; mesonFlags = [ "-Dlibchamplain=true" diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/applications/graphics/komorebi/default.nix index f98549cb14ffb..91e4ad570ef83 100644 --- a/pkgs/applications/graphics/komorebi/default.nix +++ b/pkgs/applications/graphics/komorebi/default.nix @@ -7,7 +7,7 @@ , glib , gtk3 , libgee -, webkitgtk +, webkitgtk_4_0 , clutter-gtk , clutter-gst , ninja @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 libgee - webkitgtk + webkitgtk_4_0 clutter-gtk clutter-gst ]; diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index b1ff6eb0a2f58..4084734aa58e8 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -39,7 +39,7 @@ pcre, systemd, tbb_2021_11, - webkitgtk, + webkitgtk_4_0, wxGTK31, xorg, withSystemd ? stdenv.hostPlatform.isLinux, @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { openvdb_tbb_2021_8 pcre tbb_2021_11 - webkitgtk + webkitgtk_4_0 wxGTK31' xorg.libX11 ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs; diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index b438f6c6d5dfc..85109890fb8ee 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -4,7 +4,7 @@ , autoPatchelfHook , dpkg , openssl -, webkitgtk +, webkitgtk_4_0 , libappindicator , wrapGAppsHook3 , shared-mime-info @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 libappindicator glib-networking diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix index 2fb8b15e3e947..423a773026846 100644 --- a/pkgs/applications/misc/insulator2/default.nix +++ b/pkgs/applications/misc/insulator2/default.nix @@ -7,7 +7,7 @@ , freetype , libsoup , gtk3 -, webkitgtk +, webkitgtk_4_0 , perl , cyrus_sasl , stdenv @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { freetype libsoup gtk3 - webkitgtk + webkitgtk_4_0 ]; meta = with lib; { diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 2583663fb6f86..f01be485ae05c 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -13,7 +13,7 @@ , gtk3 , libnotify , pango -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 # check inputs @@ -93,7 +93,7 @@ buildPythonApplication rec { gtk3 libnotify pango - webkitgtk + webkitgtk_4_0 ] ++ (with gst_all_1; [ gst-libav gst-plugins-bad diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 0f2f1e9c08602..683b45ccbf210 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk_4_0 ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index d98ecb21daafb..a20ed2d48b841 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -9,7 +9,7 @@ , steam-run , substituteAll , unzip -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ python3Packages.pygobject3 python3Packages.requests - webkitgtk + webkitgtk_4_0 ]; dontWrapGApps = true; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index cae71f785978d..f7fa1223a34c6 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3 -, qrencode, webkitgtk, discount, json-glib, fetchpatch }: +, qrencode, webkitgtk_4_0, discount, json-glib, fetchpatch }: stdenv.mkDerivation rec { pname = "pdfpc"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { (gst-plugins-good.override { gtkSupport = true; }) gst-libav qrencode - webkitgtk + webkitgtk_4_0 discount json-glib ]; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index d2340b15f1b71..5f226752ccd31 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -11,7 +11,7 @@ , perl , sqlite , tzdata -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , xvfb-run }: @@ -54,7 +54,7 @@ in python.pkgs.buildPythonApplication rec { buildInputs = [ sqlite gtk3 - webkitgtk + webkitgtk_4_0 glib-networking adwaita-icon-theme gdk-pixbuf diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index c510e88537083..903839049d0d6 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , gtk3 , gtksourceview4 -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , python3Packages }: @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { # webkitgtk is used for rendering interactive statistics graph which # can be seen by opening a ROM, entering Pokemon section, selecting # any Pokemon, and clicking Stats and Moves tab. - webkitgtk + webkitgtk_4_0 ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index cf3a6a46f9dec..bcad8be29b584 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -8,7 +8,7 @@ , gobject-introspection , gtk3 , wrapGAppsHook3 -, webkitgtk +, webkitgtk_4_0 , libnotify , keybinder3 , libappindicator @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { libappindicator libnotify librsvg - webkitgtk + webkitgtk_4_0 wmctrl ]; diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 596ba95b7450b..7a051db5363e1 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk }: +{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk_4_0 }: stdenv.mkDerivation rec { pname = "apache-directory-studio"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { makeWrapper "$dest/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \ --prefix PATH : "${jdk}/bin" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; diff --git a/pkgs/applications/networking/browsers/badwolf/default.nix b/pkgs/applications/networking/browsers/badwolf/default.nix index dabbdf8981923..1c56fedfbdf0e 100644 --- a/pkgs/applications/networking/browsers/badwolf/default.nix +++ b/pkgs/applications/networking/browsers/badwolf/default.nix @@ -5,7 +5,7 @@ , pkg-config , ed , wrapGAppsHook3 -, webkitgtk +, webkitgtk_4_0 , libxml2 , glib-networking , gettext @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 libxml2 gettext glib-networking diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 1c82fa7d8612e..6b68cbb4a0272 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,5 +1,5 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script -, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib +, python3, gtk3, libsecret, gst_all_1, webkitgtk_4_0, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { gtkspell3 hunspell libsecret - webkitgtk + webkitgtk_4_0 glib ]; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 0cd58bbd25a2f..5036f0c6265e1 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -13,7 +13,7 @@ , pantheon , pkg-config , python3 -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , glib-networking }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libdazzle libgee pantheon.granite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 6011755e3892e..95b6958cd51cb 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -10,7 +10,7 @@ , luafilesystem , luajit , sqlite -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { luafilesystem luajit sqlite - webkitgtk + webkitgtk_4_0 ] ++ ( with gst_all_1; [ gstreamer gst-plugins-base diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index f937f690b5820..3a2a670353285 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -9,7 +9,7 @@ , gcr , libpeas , gtk3 -, webkitgtk +, webkitgtk_4_0 , sqlite , gsettings-desktop-schemas , libsoup @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 libpeas sqlite - webkitgtk + webkitgtk_4_0 json-glib libarchive ]; diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 16231815c426a..b8d17500db27d 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -15,7 +15,7 @@ , gdk-pixbuf , cairo , pango -, webkitgtk +, webkitgtk_4_0 , openssl , gstreamer , gst-libav @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { cairo pango gtk3 - webkitgtk + webkitgtk_4_0 openssl libfixposix ]; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index ec31a8d1a39c6..990036a8045e6 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , pkg-config, wrapGAppsHook3 -, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk +, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0 , xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk libsoup - webkitgtk + webkitgtk_4_0 ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView gstreamer @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://surf.suckless.org"; license = licenses.mit; - platforms = webkitgtk.meta.platforms; + platforms = webkitgtk_4_0.meta.platforms; maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index e76b79f9d09ff..e02e07419ea16 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk_4_0, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; - buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; + buildInputs = [ gtk3 libsoup webkitgtk_4_0 glib-networking gsettings-desktop-schemas ]; passthru = { inherit gtk3; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index f751c13329176..6f75e836ab0ed 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -18,7 +18,7 @@ libxml2, openssl, sqlite, - webkitgtk, + webkitgtk_6_0, glib-networking, librsvg, gst_all_1, @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 openssl sqlite - webkitgtk + webkitgtk_6_0 # TLS support for loading external content in webkitgtk WebView glib-networking diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index 43761b659b82f..1a8fa7d547aba 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -11,7 +11,7 @@ perl, pkg-config, glib, - webkitgtk, + webkitgtk_4_0, libayatana-appindicator, cairo, openssl, @@ -88,7 +88,7 @@ in buildInputs = [ glib - webkitgtk + webkitgtk_4_0 libayatana-appindicator cairo openssl diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 872c869f1691d..110d5c04767a3 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -8,7 +8,7 @@ , wrapGAppsHook4 , gtk4 , gdk-pixbuf -, webkitgtk +, webkitgtk_4_0 , gtksourceview5 , glib-networking , libadwaita @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk4 gdk-pixbuf - webkitgtk + webkitgtk_4_0 gtksourceview5 glib-networking libadwaita diff --git a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/pkgs/applications/networking/instant-messengers/trillian-im/default.nix index 0d4a6299adfce..a31adac9568f3 100644 --- a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/trillian-im/default.nix @@ -16,7 +16,7 @@ , librsvg , libzip , openssl -, webkitgtk +, webkitgtk_4_0 , libappindicator-gtk3 }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { librsvg libzip openssl - webkitgtk + webkitgtk_4_0 libappindicator-gtk3 ]; diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 0925bae8a6956..47b1ccfd49e1e 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -20,7 +20,7 @@ , pcre , pcre2 , pkg-config -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , xorg }: @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { pcre pcre2 sqlite - webkitgtk + webkitgtk_4_0 xorg.libXdmcp xorg.libXtst ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index a1e6177f72783..559c17bd7467b 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk_4_0, ronn , libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtkmm3 gmime3 webkitgtk libsass libpeas + gtkmm3 gmime3 webkitgtk_4_0 libsass libpeas python3 notmuch boost gsettings-desktop-schemas adwaita-icon-theme glib-networking protobuf diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index e6453e377d935..acec1b5cf0fae 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -18,7 +18,7 @@ , openssl , pkg-config , sqlite -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { libsecret openssl sqlite - webkitgtk + webkitgtk_4_0 ]; configureFlags = [ diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index d0345f946600b..523d6971dfdb5 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -31,7 +31,7 @@ , enablePluginBsfilter ? true , enablePluginClamd ? true , enablePluginDillo ? true -, enablePluginFancy ? true, webkitgtk +, enablePluginFancy ? true, webkitgtk_4_0 , enablePluginFetchInfo ? true , enablePluginKeywordWarner ? true , enablePluginLibravatar ? enablePluginRavatar @@ -67,7 +67,7 @@ let { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; } { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; } { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } - { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk ]; } + { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk_4_0 ]; } { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 9713389954a7e..e117549d57563 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -8,8 +8,8 @@ , libxml2 , libxslt , sqlite -, libsoup -, webkitgtk +, libsoup_3 +, webkitgtk_4_1 , json-glib , gst_all_1 , libnotify @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - webkitgtk + webkitgtk_4_1 libxml2 libxslt sqlite - libsoup + libsoup_3 libpeas gsettings-desktop-schemas json-glib diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index b59a82f720dce..dd4a8113cc290 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more -, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 +, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { gdk-pixbuf gnome2.gtkglext glib-networking - webkitgtk + webkitgtk_4_0 gtk2 gtk2-x11 gtk3 diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 92ccc8f46ed20..e62d4edfe97fe 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -16,7 +16,7 @@ , json-glib , libappindicator , libsoup -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { json-glib libappindicator libsoup - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index f35a0e515897a..48ad4ce47244e 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -23,7 +23,7 @@ , unar , unzip , vala -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { poppler python3 sqlite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 4bc6060cfa6b2..4541f77dc3d5a 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -17,7 +17,7 @@ , libgee , pantheon , sqlite -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libgee pantheon.granite sqlite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index c49d9bc2c4259..de1086f1f53d1 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify -, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook3 }: +, libarchive, gspell, webkitgtk_4_0, libgringotts, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "osmo"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive - gspell webkitgtk libgringotts ]; + gspell webkitgtk_4_0 libgringotts ]; meta = with lib; { description = "Handy personal organizer"; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index b544d5fc6b145..cd96b1d669a10 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -11,7 +11,7 @@ , gtksourceview , libgee , nix-update-script -, webkitgtk +, webkitgtk_4_0 , libqalculate , intltool , gnuplot @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gtksourceview libgee pantheon.granite - webkitgtk + webkitgtk_4_0 # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix index 41b33b528a9fc..51fcb7468b03e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , obs-studio -, webkitgtk +, webkitgtk_4_0 , glib-networking , meson , cmake @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ obs-studio - webkitgtk + webkitgtk_4_0 glib-networking ]; diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index 33dde993cd8f8..cf2f5ebc71676 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -4,7 +4,7 @@ , glibc , gtk3 , libappindicator -, webkitgtk +, webkitgtk_4_0 , e2fsprogs , libnotify , libgit2 @@ -63,7 +63,7 @@ buildDotnetModule { glibc gtk3 libappindicator - webkitgtk + webkitgtk_4_0 e2fsprogs libnotify libgit2 diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix index 0e5b60fd4a857..29be062652088 100644 --- a/pkgs/by-name/ap/apvlv/package.nix +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -20,7 +20,7 @@ poppler, stdenv, testers, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, }: @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libxshmfence # otherwise warnings in compilation pcre poppler - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index bffc25ca48292..fad93e74d47f6 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -11,7 +11,7 @@ , gtk3 , openssl_1_1 , icu70 -, webkitgtk +, webkitgtk_4_0 , librsvg , gdk-pixbuf , libsoup @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 openssl_1_1.out icu70 - webkitgtk + webkitgtk_4_0 librsvg gdk-pixbuf libsoup diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 867dff3b7c4f4..1746042b42876 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -9,7 +9,7 @@ libsoup, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index d9304e38910d0..1cfa3eee9c38e 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -8,7 +8,7 @@ libsoup, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, }: @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ glib-networking libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index d4dbc5b39094e..101ba9bb74ceb 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -11,7 +11,7 @@ libsoup, fetchzip, openssl_3, - webkitgtk, + webkitgtk_4_0, gdk-pixbuf, pkg-config, makeDesktopItem, @@ -39,7 +39,7 @@ stdenv.mkDerivation { buildInputs = [ curl wget - webkitgtk + webkitgtk_4_0 gtk3 cairo gdk-pixbuf diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index 25eae2931c034..435b8e0c9b0b9 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -32,7 +32,7 @@ , sqlite , stdenv , util-linuxMinimal -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation (finalAttrs: { @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { python3 sqlite util-linuxMinimal - webkitgtk + webkitgtk_4_0 ]; cmakeFlags = [ diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index e080ee6c05b83..9e9e3ae6b3417 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -32,7 +32,7 @@ , python3 , sqlite , gcc11Stdenv -, webkitgtk +, webkitgtk_4_0 }: let # JUCE version in submodules is incompatible with GCC12 @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { pcre2 python3 sqlite - webkitgtk + webkitgtk_4_0 ]; # Link-time-optimization fails without these diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index e333f1cda4237..0db5ab04ae635 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -14,7 +14,7 @@ glib, glib-networking, libayatana-appindicator, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libayatana-appindicator - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 21baad40d3f73..3c8575f5b1e10 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -5,7 +5,7 @@ pkg-config, openssl, pname, - webkitgtk, + webkitgtk_4_0, service-cargo-hash, meta, }: @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 ]; env = { diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 64386c552dceb..966efa763d190 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -9,7 +9,7 @@ rustPlatform, makeDesktopItem, meta, - webkitgtk, + webkitgtk_4_0, openssl, }: rustPlatform.buildRustPackage { @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 ]; postInstall = '' diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 9b5bf26200fb7..d8f5a5362c36e 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -11,7 +11,7 @@ gtk3, swt, glib, - webkitgtk, + webkitgtk_4_0, glib-networking, }: @@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { swt gtk3 glib - webkitgtk + webkitgtk_4_0 glib-networking ] }" diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix index 4f81bfa4943fb..0eb643a44b041 100644 --- a/pkgs/by-name/de/desktop-postflop/package.nix +++ b/pkgs/by-name/de/desktop-postflop/package.nix @@ -7,7 +7,7 @@ , pkg-config , gtk3 , libsoup -, webkitgtk +, webkitgtk_4_0 }: rustPlatform.buildRustPackage rec { @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 libsoup - webkitgtk + webkitgtk_4_0 ]; postInstall = '' diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index a60a03c393677..859d509b25b67 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -7,7 +7,7 @@ , gst_all_1 , libappindicator , libayatana-appindicator -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 81489925d19f8..71b2de66590cb 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -14,7 +14,7 @@ openssl, libsoup, - webkitgtk, + webkitgtk_4_0, gst_all_1, darwin, }: @@ -66,7 +66,7 @@ buildRustPackage rec { lib.optionals stdenv.hostPlatform.isLinux [ openssl libsoup - webkitgtk + webkitgtk_4_0 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index e39d908668133..268ffdf2b5075 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -2,7 +2,7 @@ lib, flutter324, fetchFromGitHub, - webkitgtk, + webkitgtk_4_0, sqlite, libayatana-appindicator, makeDesktopItem, @@ -52,7 +52,7 @@ flutter324.buildFlutterApplication rec { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 sqlite libayatana-appindicator ]; diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix index aff880f06d2d5..dc9b27fdd3af5 100644 --- a/pkgs/by-name/fo/font-manager/package.nix +++ b/pkgs/by-name/fo/font-manager/package.nix @@ -20,7 +20,7 @@ , wrapGAppsHook4 , gobject-introspection # withWebkit enables the "webkit" feature, also known as Google Fonts -, withWebkit ? true, glib-networking, libsoup, webkitgtk +, withWebkit ? true, glib-networking, libsoup_3, webkitgtk_6_0 }: stdenv.mkDerivation rec { @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { adwaita-icon-theme ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load - libsoup - webkitgtk + libsoup_3 + webkitgtk_6_0 ]; mesonFlags = [ diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 68679cfcfea4d..af81f5021fca7 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -19,7 +19,7 @@ moreutils, openssl, rust, - webkitgtk, + webkitgtk_4_0, nix-update-script, cacert, }: @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index 0f4c8dbfc5dc2..888f5285938e1 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -19,7 +19,7 @@ libuuid, curl, libhandy, - webkitgtk, + webkitgtk_4_0, gnome, adwaita-icon-theme, libxml2, @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { libuuid curl libhandy - webkitgtk + webkitgtk_4_0 tracker gnome-online-accounts gsettings-desktop-schemas diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 9f7ca7364604b..c7d7e6c51380e 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -22,7 +22,7 @@ , perlPackages , pkg-config , swig -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libxml2 libxslt swig - webkitgtk + webkitgtk_4_0 ] ++ (with perlPackages; [ JSONParse diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index e1199c9ed372b..c54be41b2f06e 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -6,7 +6,7 @@ openssl, pkg-config, perl, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsoup openssl - webkitgtk + webkitgtk_4_0 ]; meta = with lib; { diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix index 2b71ad126eff0..2eb5257fee250 100644 --- a/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/pkgs/by-name/he/headphones-toolbox/package.nix @@ -3,7 +3,7 @@ , dpkg , fetchurl , autoPatchelfHook -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 8fa8aa976e345..f9ff4b6119ca3 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -7,7 +7,7 @@ , curlMinimal , openssl , libsecret -, webkitgtk +, webkitgtk_4_0 , libsoup , gtk3 , atk @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { curlMinimal openssl libsecret - webkitgtk + webkitgtk_4_0 libsoup gtk3 atk diff --git a/pkgs/by-name/ki/kiwitalk/package.nix b/pkgs/by-name/ki/kiwitalk/package.nix index b700b198bc372..74639a6fbb509 100644 --- a/pkgs/by-name/ki/kiwitalk/package.nix +++ b/pkgs/by-name/ki/kiwitalk/package.nix @@ -8,7 +8,7 @@ , desktop-file-utils , openssl , libayatana-appindicator -, webkitgtk +, webkitgtk_4_0 , pkg-config , pnpm , nodejs @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl libayatana-appindicator - webkitgtk + webkitgtk_4_0 ]; postInstall = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index 0d77c2d09f226..8ec4bfc21e21f 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -2,7 +2,7 @@ dbus, openssl, gtk3, - webkitgtk, + webkitgtk_4_0, pkg-config, wrapGAppsHook3, fetchFromGitHub, @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { gtk3 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - webkitgtk + webkitgtk_4_0 alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 66584bcbfa693..80df07cd6cb17 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -9,7 +9,7 @@ nspr, alsa-lib, openssl, - webkitgtk, + webkitgtk_4_0, udev, libayatana-appindicator, libGL, @@ -36,7 +36,7 @@ stdenv.mkDerivation { nspr alsa-lib openssl - webkitgtk + webkitgtk_4_0 stdenv.cc.cc.lib ]; diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index c53296c3b0270..3d43797b9b1b1 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -19,7 +19,7 @@ nodejs, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage { pname = "modrinth-app-unwrapped"; @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 01478b8015b19..5fcb4126cf87b 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -18,7 +18,7 @@ libevdev, gtk3, libsoup, - webkitgtk, + webkitgtk_4_0, }: stdenv.mkDerivation (finalAttrs: { @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # Tauri deps gtk3 libsoup - webkitgtk + webkitgtk_4_0 ]; npmDeps = fetchNpmDeps { diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index bfcc2accc9add..60d0c2b972a76 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, curl, - webkitgtk, + webkitgtk_4_0, libmicrohttpd, libsecret, qrencode, @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl - webkitgtk + webkitgtk_4_0 libmicrohttpd libsecret qrencode diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix index 19452d768d5b3..215b205d78eac 100644 --- a/pkgs/by-name/ov/overlayed/package.nix +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -5,7 +5,7 @@ pkg-config, openssl, libsoup, - webkitgtk, + webkitgtk_4_0, fetchFromGitHub, libayatana-appindicator, }: @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 libsoup ]; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 468d56e8d418e..c73b6985f341b 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -10,7 +10,7 @@ openjdk17, stdenvNoCC, swt, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, gitUpdater, }: @@ -30,7 +30,7 @@ let gtk3 libsecret swt - webkitgtk + webkitgtk_4_0 ]; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index 72f6dd5e28896..bd1c7c4974726 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -14,7 +14,7 @@ buildGoModule, libayatana-appindicator, gtk3, - webkitgtk, + webkitgtk_4_0, libsoup, openssl, xdotool, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup libayatana-appindicator openssl - webkitgtk + webkitgtk_4_0 xdotool ]; diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index 8434f86723051..5e5e6a60cda7e 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -6,7 +6,7 @@ , installShellFiles , xorg , gtk3 -, webkitgtk +, webkitgtk_4_0 , snippetexpanderd , snippetexpanderx }: @@ -32,7 +32,7 @@ buildGoModule rec { buildInputs = [ xorg.libX11 gtk3 - webkitgtk + webkitgtk_4_0 snippetexpanderd snippetexpanderx ]; diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index f394cce79ada7..4ed9647730635 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -4,7 +4,7 @@ freetype, libsoup, gtk3, - webkitgtk, + webkitgtk_4_0, pkg-config, wrapGAppsHook3, parallel-disk-usage, @@ -66,7 +66,7 @@ in ''; nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems]; - buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk]; + buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk_4_0]; # Disable checkPhase, since the project doesn't contain tests doCheck = false; diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index 045823a5836e6..67023591b2b7f 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -15,7 +15,7 @@ , openssl , pkg-config , rustPlatform -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , sqlite }: @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage { freetype libsoup gtk3 - webkitgtk + webkitgtk_4_0 gsettings-desktop-schemas sqlite ]; diff --git a/pkgs/by-name/xi/xiphos/package.nix b/pkgs/by-name/xi/xiphos/package.nix index d3aaa70fc9af1..b6b01ae0770f6 100644 --- a/pkgs/by-name/xi/xiphos/package.nix +++ b/pkgs/by-name/xi/xiphos/package.nix @@ -22,7 +22,7 @@ , minizip , pkg-config , sword -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , yelp-tools , zip @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { libuuid minizip sword - webkitgtk + webkitgtk_4_0 ]; cmakeFlags = [ diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 0f9c89140a9a2..ec465aa8d7834 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -139,7 +139,7 @@ in addToNativeBuildInputs pkgs.taglib old ); uuid-lib = addToBuildInputs pkgs.libuuid; - webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk; + webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; yaml = addToBuildInputs pkgs.libyaml; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5502eb1703785..885e78c922d2f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -124113,7 +124113,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk + , text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-javascriptcore"; @@ -124124,11 +124124,11 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-javascriptcore_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -124469,7 +124469,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk + , haskell-gi-overloading, text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit"; @@ -124484,17 +124484,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk + , haskell-gi-overloading, text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit2"; @@ -124509,17 +124509,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers, webkitgtk + , transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit2webextension"; @@ -124534,13 +124534,13 @@ self: { gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit2-WebExtension bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkitwebprocessextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk @@ -309518,7 +309518,7 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkitgtk, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk_4_0, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { @@ -309537,7 +309537,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkitgtk ]; + executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -309550,7 +309550,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "tianbar"; broken = true; - }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec @@ -332056,30 +332056,30 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; - description = "JavaScriptCore FFI from webkitgtk"; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.4.6"; sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "JavaScriptCore FFI from webkitgtk"; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk + , webkitgtk_4_0 }: mkDerivation { pname = "webkitgtk3"; @@ -332090,27 +332090,27 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "JavaScriptCore FFI from webkitgtk"; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webmention" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, either diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index 13107bfcb13be..4cf983add42b0 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -6,7 +6,7 @@ , gtk3-x11 , pcre , pkg-config -, webkitgtk +, webkitgtk_4_0 , xorg , WebKit , MetalKit @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit MetalKit diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 21333afe5e8ee..1379a15801e6c 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -20,7 +20,7 @@ , withEGL ? true , withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? stdenv.hostPlatform.isDarwin -, webkitgtk +, webkitgtk_4_0 , setfile , AGL , Carbon @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk + ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0 ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit ++ lib.optionals stdenv.hostPlatform.isDarwin [ setfile diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 055000cfa68c7..fed9c53306108 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -22,7 +22,7 @@ , unicode ? true , withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? true -, webkitgtk +, webkitgtk_4_0 , setfile , AGL , Carbon @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0 ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index af6334671230e..9ce7655903a70 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -65,7 +65,7 @@ let nativeLibs = [ pkgs.sqlite ]; }); cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: { - nativeLibs = [ pkgs.webkitgtk ]; + nativeLibs = [ pkgs.webkitgtk_4_0 ]; }); dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: { nativeLibs = [ pkgs.mariadb.client ]; diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index cbb5411314f01..610434dfe624b 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -13,7 +13,7 @@ , freetype , curl , libglvnd -, webkitgtk +, webkitgtk_4_0 , pcre , darwin }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so libglvnd # libGL.so - webkitgtk # webkit2gtk-4.0 + webkitgtk_4_0 # webkit2gtk-4.0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.MetalKit diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index be3a181da9aaf..89eac63a4a7e6 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -30,7 +30,7 @@ mesa, pango, SDL, - webkitgtk, + webkitgtk_4_0, wxGTK, xorgproto, @@ -93,7 +93,7 @@ buildPythonPackage rec { libXxf86vm libglvnd mesa - webkitgtk + webkitgtk_4_0 xorgproto ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 057c0d1e9df57..2236d27be2b36 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -18,7 +18,7 @@ , rustPlatform , stdenv , testers -, webkitgtk +, webkitgtk_4_0 }: let @@ -146,7 +146,7 @@ rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libayatana-appindicator - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 5aea91699a22e..6c698c3a517f7 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -14,7 +14,7 @@ , shared-mime-info , stdenv , unzip -, webkitgtk +, webkitgtk_4_0 , zlib }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/ makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_0 ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libXtst zlib shared-mime-info - webkitgtk + webkitgtk_4_0 ]; dontBuild = true; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index de73c6b637641..4ae5a8bd63a57 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -9,7 +9,7 @@ , zlib # Linux specific dependencies , gtk3 -, webkitgtk +, webkitgtk_4_0 }: buildGoModule rec { @@ -48,7 +48,7 @@ buildGoModule rec { nodejs ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 - webkitgtk + webkitgtk_4_0 ]; ldflags = [ @@ -60,7 +60,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/wails \ --prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk ])}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk_4_0 ])}" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" ''; diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index e9352822b3bb8..7de90857c06e9 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -8,7 +8,7 @@ , libwpe , libwpe-fdo , glib-networking -, webkitgtk +, webkitgtk_4_0 , makeWrapper , wrapGAppsHook3 , adwaita-icon-theme @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wayland libwpe libwpe-fdo - webkitgtk + webkitgtk_4_0 glib-networking gdk-pixbuf adwaita-icon-theme diff --git a/pkgs/games/gamehub/default.nix b/pkgs/games/gamehub/default.nix index 3bfbe71c3c0e8..4367de30f5d95 100644 --- a/pkgs/games/gamehub/default.nix +++ b/pkgs/games/gamehub/default.nix @@ -13,7 +13,7 @@ , libsoup , json-glib , sqlite -, webkitgtk +, webkitgtk_4_0 , libmanette , libXtst , wrapGAppsHook3 @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libsoup libXtst sqlite - webkitgtk + webkitgtk_4_0 ]; meta = with lib; { diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 7afbce58c1066..9f3edad29a3b0 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -4,7 +4,7 @@ , makeWrapper , jdk , libsecret -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , _7zz , nixosTests @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { install -D -m755 Archi $out/libexec/Archi makeWrapper $out/libexec/Archi $out/bin/Archi \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} \ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin '' diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 7b92c9e3e86b1..866d56b156ea0 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, python3, xmlbird, -cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, +cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk_4_0, libnotify, sqlite, vala, gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook3, autoPatchelfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook3 autoPatchelfHook ]; - buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; + buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk_4_0 libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' substituteInPlace install.py \ diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix index f28306880f629..1426d13ed22b2 100644 --- a/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/pkgs/tools/networking/gp-saml-gui/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , buildPythonPackage -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , glib-networking , gobject-introspection @@ -29,7 +29,7 @@ buildPythonPackage rec { requests pygobject3 openconnect - ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk; + ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_0; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844574c1f3b4c..f227b0fbaec3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29155,11 +29155,6 @@ with pkgs; foliate = callPackage ../applications/office/foliate { }; - font-manager = callPackage ../by-name/fo/font-manager/package.nix { - libsoup = libsoup_3; - webkitgtk = webkitgtk_6_0; - }; - fontfinder = callPackage ../applications/misc/fontfinder { }; fontpreview = callPackage ../applications/misc/fontpreview { }; @@ -30749,10 +30744,7 @@ with pkgs; lifelines = callPackage ../applications/misc/lifelines { }; - liferea = callPackage ../applications/networking/newsreaders/liferea { - libsoup = libsoup_3; - webkitgtk = webkitgtk_4_1; - }; + liferea = callPackage ../applications/networking/newsreaders/liferea { }; lightworks = callPackage ../applications/video/lightworks { }; @@ -31307,9 +31299,7 @@ with pkgs; netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];}; netmaker-full = callPackage ../applications/networking/netmaker { }; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { - webkitgtk = webkitgtk_6_0; - }; + newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; @@ -32176,7 +32166,7 @@ with pkgs; }; quodlibet-full = quodlibet.override { - inherit gtksourceview webkitgtk; + inherit gtksourceview webkitgtk_4_0; kakasi = kakasi; keybinder3 = keybinder3; libappindicator-gtk3 = libappindicator-gtk3; @@ -38181,7 +38171,9 @@ with pkgs; wcalc = callPackage ../applications/misc/wcalc { }; - webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; + webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { + webkitgtk = webkitgtk_4_0; + }; websocketd = callPackage ../applications/networking/websocketd { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 57c07c1bde4cc..d2a1f8a25887e 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -143,7 +143,7 @@ in util-linux = linux; util-linuxMinimal = linux; w3m = all; - webkitgtk = linux; + webkitgtk_4_0 = linux; wget = all; which = all; wirelesstools = linux; From b9a93b632915e8a5064e5c46e4a11360a79e1e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 11 Oct 2024 16:33:06 -0600 Subject: [PATCH 122/180] webkitgtk: move webkitgtk to aliases with a warning --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 448909ee840f0..ba4795bcae2d7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1696,6 +1696,7 @@ mapAliases { waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24 wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29 webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 + webkitgtk = lib.warn "Explicitly set the ABI version of 'webkitgtk'" webkitgtk_4_0; wineWayland = wine-wayland; win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 win-virtio = virtio-win; # Added 2023-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f227b0fbaec3c..502826074add1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23545,8 +23545,6 @@ with pkgs; gtk3 = gtk4; }; - webkitgtk = webkitgtk_4_0; - webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader { }; websocketpp = callPackage ../development/libraries/websocket++ { }; From 210efe767da1e71af512bdda57c11664a52a31a5 Mon Sep 17 00:00:00 2001 From: Julius Michaelis Date: Sat, 12 Oct 2024 09:28:35 +0900 Subject: [PATCH 123/180] lls: add self as maintainer --- pkgs/applications/networking/lls/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/applications/networking/lls/default.nix index 77535a4f4b15c..91733f7d24888 100644 --- a/pkgs/applications/networking/lls/default.nix +++ b/pkgs/applications/networking/lls/default.nix @@ -19,7 +19,10 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Tool to list listening sockets"; license = licenses.mit; - maintainers = [ maintainers.k900 ]; + maintainers = [ + maintainers.k900 + maintainers.jcaesar + ]; platforms = platforms.linux; homepage = "https://github.com/jcaesar/lls"; mainProgram = "lls"; From 18ede919a2604fef8e309935804ca993baebf60c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 12 Oct 2024 03:02:16 +0200 Subject: [PATCH 124/180] python312Packages.homeassistant-stubs: 2024.10.1 -> 2024.10.2 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.10.2 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index c99bedad54a63..25f33e9fb3212 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.10.1"; + version = "2024.10.2"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uPB9ge7oUjGwKKvg2V+Yf7l2KiwgLLIBH/CKP2erAHY="; + hash = "sha256-6aFZiJKPuUdnC3YzSHyJgn2iTHfP8MCwx17I7uxVTNg="; }; build-system = [ From 5c4a77a6ef209ec877cd4e25a813c7b96445ade8 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 11 Oct 2024 21:05:13 -0400 Subject: [PATCH 125/180] terraform-providers.deno: init at 0.1.0 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 35ba84a27c26a..801d71935ced2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -307,6 +307,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-ZmOuk2uNnFQzXSfRp6Lz/1bplEm0AuB/M94+dRnqhHU=" }, + "deno": { + "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", + "homepage": "https://registry.terraform.io/providers/denoland/deno", + "owner": "denoland", + "repo": "terraform-provider-deno", + "rev": "v0.1.0", + "spdx": "MPL-2.0", + "vendorHash": "sha256-mJXQVfCmW7ssFCrrRSiNb5Vg2QnS9NoBCgZlDDPMoEU=" + }, "dexidp": { "hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", From 7f9d2978386dab504c7129359c9c0aa34b44eb6c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 10 Oct 2024 20:01:46 +0200 Subject: [PATCH 126/180] workflows/nixpkgs-vet: Make merge check script reusable This is useful for other workflows as well. Originally I thought it couldn't be put in the repo, but it can (just needs another checkout) --- .github/workflows/nixpkgs-vet.yml | 48 +++++---------------------- ci/get-merge-commit.sh | 55 +++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 39 deletions(-) create mode 100755 ci/get-merge-commit.sh diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index 7bfe973a8c364..f08af86822cab 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -26,52 +26,22 @@ jobs: # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. timeout-minutes: 10 steps: - # This step has to be in this file, because it's needed to determine which revision of the repository to fetch, and we can only use other files from the repository once it's fetched. + # This checks out the base branch because of pull_request_target + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 + with: + path: base + sparse-checkout: ci - name: Resolving the merge commit env: GH_TOKEN: ${{ github.token }} run: | - # This checks for mergeability of a pull request as recommended in - # https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests - - # Retry the API query this many times - retryCount=5 - # Start with 5 seconds, but double every retry - retryInterval=5 - while true; do - echo "Checking whether the pull request can be merged" - prInfo=$(gh api \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/"$GITHUB_REPOSITORY"/pulls/${{ github.event.pull_request.number }}) - mergeable=$(jq -r .mergeable <<< "$prInfo") - mergedSha=$(jq -r .merge_commit_sha <<< "$prInfo") - - if [[ "$mergeable" == "null" ]]; then - if (( retryCount == 0 )); then - echo "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/" - exit 1 - else - (( retryCount -= 1 )) || true - - # null indicates that GitHub is still computing whether it's mergeable - # Wait a couple seconds before trying again - echo "GitHub is still computing whether this PR can be merged, waiting $retryInterval seconds before trying again ($retryCount retries left)" - sleep "$retryInterval" - - (( retryInterval *= 2 )) || true - fi - else - break - fi - done - - if [[ "$mergeable" == "true" ]]; then - echo "The PR can be merged, checking the merge commit $mergedSha" + if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then + echo "Checking the merge commit $mergedSha" echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" else - echo "The PR cannot be merged, it has a merge conflict, skipping the rest.." + echo "Skipping the rest..." fi + rm -rf base - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 if: env.mergedSha with: diff --git a/ci/get-merge-commit.sh b/ci/get-merge-commit.sh new file mode 100755 index 0000000000000..8d4877ecc4c36 --- /dev/null +++ b/ci/get-merge-commit.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +# This checks for mergeability of a pull request as recommended in +# https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests + +set -euo pipefail + +log() { + echo "$@" >&2 +} + +if (( $# < 2 )); then + log "Usage: $0 GITHUB_REPO PR_NUMBER" + exit 99 +fi +repo=$1 +prNumber=$2 + +# Retry the API query this many times +retryCount=5 +# Start with 5 seconds, but double every retry +retryInterval=5 + +while true; do + log "Checking whether the pull request can be merged" + prInfo=$(gh api \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/$repo/pulls/$prNumber") + mergeable=$(jq -r .mergeable <<< "$prInfo") + if [[ "$mergeable" == "null" ]]; then + if (( retryCount == 0 )); then + log "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/" + exit 1 + else + (( retryCount -= 1 )) || true + + # null indicates that GitHub is still computing whether it's mergeable + # Wait a couple seconds before trying again + log "GitHub is still computing whether this PR can be merged, waiting $retryInterval seconds before trying again ($retryCount retries left)" + sleep "$retryInterval" + + (( retryInterval *= 2 )) || true + fi + else + break + fi +done + +if [[ "$mergeable" == "true" ]]; then + log "The PR can be merged" + jq -r .merge_commit_sha <<< "$prInfo" +else + log "The PR has a merge conflict" + exit 1 +fi From 048f4aa537ec81b23454d61f559e31477e4f7af2 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 10 Oct 2024 20:11:56 +0200 Subject: [PATCH 127/180] ci/get-merge-commit.sh: Exit for non-open PRs If PRs aren't open (either merged or closed), GitHub never computes whether the PR is mergeable, so we'd wait forever, which has been happening: https://github.com/NixOS/nixpkgs/actions/runs/11279197077/job/31369348101#step:2:59 --- ci/get-merge-commit.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/get-merge-commit.sh b/ci/get-merge-commit.sh index 8d4877ecc4c36..75fc7fcbe60f6 100755 --- a/ci/get-merge-commit.sh +++ b/ci/get-merge-commit.sh @@ -26,6 +26,14 @@ while true; do -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ "/repos/$repo/pulls/$prNumber") + + # Non-open PRs won't have their mergeability computed no matter what + state=$(jq -r .state <<< "$prInfo") + if [[ "$state" != open ]]; then + log "PR is not open anymore" + exit 2 + fi + mergeable=$(jq -r .mergeable <<< "$prInfo") if [[ "$mergeable" == "null" ]]; then if (( retryCount == 0 )); then From e6a8855a14cb86c461df1c1f8585a19c71ac90c1 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 10 Oct 2024 20:40:46 +0200 Subject: [PATCH 128/180] ci/get-merge-commit.sh: Add documentation And distinguish exit codes --- ci/README.md | 55 ++++++++++++++++++++++++++++++++++++++++++ ci/get-merge-commit.sh | 9 +++---- 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/ci/README.md b/ci/README.md index 40c3d0ed344b5..11b53c6095e6e 100644 --- a/ci/README.md +++ b/ci/README.md @@ -41,3 +41,58 @@ Why not just build the tooling right from the PRs Nixpkgs version? - Because it improves security, since we don't have to build potentially untrusted code from PRs. The tool only needs a very minimal Nix evaluation at runtime, which can work with [readonly-mode](https://nixos.org/manual/nix/stable/command-ref/opt-common.html#opt-readonly-mode) and [restrict-eval](https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-restrict-eval). +## `get-merge-commit.sh GITHUB_REPO PR_NUMBER` + +Check whether a PR is mergeable and return the test merge commit as +[computed by GitHub](https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests). + +Arguments: +- `GITHUB_REPO`: The repository of the PR, e.g. `NixOS/nixpkgs` +- `PR_NUMBER`: The PR number, e.g. `1234` + +Exit codes: +- 0: The PR can be merged, the test merge commit hash is returned on stdout +- 1: The PR cannot be merged because it's not open anymore +- 2: The PR cannot be merged because it has a merge conflict +- 3: The merge commit isn't being computed, GitHub is likely having internal issues, unknown if the PR is mergeable + +### Usage + +This script can be used in GitHub Actions workflows as follows: + +```yaml +on: pull_request_target + +# We need a token to query the API, but it doesn't need any special permissions +permissions: {} + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + # Important: Because of `pull_request_target`, this doesn't check out the PR, + # but rather the base branch of the PR, which is needed so we don't run untrusted code + - uses: actions/checkout@ + with: + path: base + sparse-checkout: ci + - name: Resolving the merge commit + env: + GH_TOKEN: ${{ github.token }} + run: | + if mergedSha=$(base/ci/get-merge-commit.sh ${{ github.repository }} ${{ github.event.number }}); then + echo "Checking the merge commit $mergedSha" + echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" + else + # Skipping so that no notifications are sent + echo "Skipping the rest..." + fi + rm -rf base + - uses: actions/checkout@ + # Add this to _all_ subsequent steps to skip them + if: env.mergedSha + with: + ref: ${{ env.mergedSha }} + - ... +``` diff --git a/ci/get-merge-commit.sh b/ci/get-merge-commit.sh index 75fc7fcbe60f6..c62bb56dd993e 100755 --- a/ci/get-merge-commit.sh +++ b/ci/get-merge-commit.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -# This checks for mergeability of a pull request as recommended in -# https://docs.github.com/en/rest/guides/using-the-rest-api-to-interact-with-your-git-database?apiVersion=2022-11-28#checking-mergeability-of-pull-requests +# See ./README.md for docs set -euo pipefail @@ -31,14 +30,14 @@ while true; do state=$(jq -r .state <<< "$prInfo") if [[ "$state" != open ]]; then log "PR is not open anymore" - exit 2 + exit 1 fi mergeable=$(jq -r .mergeable <<< "$prInfo") if [[ "$mergeable" == "null" ]]; then if (( retryCount == 0 )); then log "Not retrying anymore. It's likely that GitHub is having internal issues: check https://www.githubstatus.com/" - exit 1 + exit 3 else (( retryCount -= 1 )) || true @@ -59,5 +58,5 @@ if [[ "$mergeable" == "true" ]]; then jq -r .merge_commit_sha <<< "$prInfo" else log "The PR has a merge conflict" - exit 1 + exit 2 fi From e612b89953ca26d1bff9b1a731e453389639cc10 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 12 Oct 2024 05:27:01 +0200 Subject: [PATCH 129/180] ci/request-reviews: Avoid duplicates with different casings It's possible to have different casings in OWNERS, so we need to handle that --- ci/request-reviews/get-reviewers.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/request-reviews/get-reviewers.sh b/ci/request-reviews/get-reviewers.sh index be0fd10c5b22f..1107edd9e6f16 100755 --- a/ci/request-reviews/get-reviewers.sh +++ b/ci/request-reviews/get-reviewers.sh @@ -35,6 +35,7 @@ log "This PR touches ${#touchedFiles[@]} files" git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners # Associative array with the user as the key for easy de-duplication +# Make sure to always lowercase keys to avoid duplicates with different casings declare -A users=() for file in "${touchedFiles[@]}"; do @@ -87,20 +88,20 @@ for file in "${touchedFiles[@]}"; do log "Team $entry has these members: ${members[*]}" for user in "${members[@]}"; do - users[$user]= + users[${user,,}]= done else # Everything else is a user - users[$entry]= + users[${entry,,}]= fi done done # Cannot request a review from the author -if [[ -v users[$prAuthor] ]]; then +if [[ -v users[${prAuthor,,}] ]]; then log "One or more files are owned by the PR author, ignoring" - unset 'users[$prAuthor]' + unset 'users[${prAuthor,,}]' fi gh api \ @@ -111,9 +112,9 @@ gh api \ # And we don't want to rerequest reviews from people who already reviewed while read -r user; do - if [[ -v users[$user] ]]; then + if [[ -v users[${user,,}] ]]; then log "User $user is a code owner but has already left a review, ignoring" - unset 'users[$user]' + unset 'users[${user,,}]' fi done < "$tmp/already-reviewed-by" From 83ee7ea281ff2a6c5f927fe74dd430b6ee2e71f0 Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 12 Oct 2024 04:19:14 +0000 Subject: [PATCH 130/180] hop-cli: move throw to top-level/aliases.nix Also fixed the spacing in the comment for consistency. --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 448909ee840f0..05ef395227b3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -712,6 +712,7 @@ mapAliases { hip-common = throw "'hip-common' has been replaced with 'rocmPackages.hip-common'"; # Added 2023-10-08 hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21 + hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13 ht-rust = xh; # Added 2021-02-13 hydra_unstable = hydra; # Added 2024-08-22 hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9430e2154f9f..5bbbe0efb96ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15000,8 +15000,6 @@ with pkgs; hop = callPackage ../development/compilers/hop { }; - hop-cli = throw "hop-cli has been removed as the service has been shut-down"; #Added 2024-08-13 - falcon = callPackage ../development/interpreters/falcon { stdenv = gcc10Stdenv; }; From ac8067158bf8163169b60877ab3fd049b1f0f9d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Sep 2024 10:42:48 +0200 Subject: [PATCH 131/180] python312Packages.azure-mgmt-billing: 6.0.0 -> 7.0.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-billing_7.0.0/sdk/billing/azure-mgmt-billing/CHANGELOG.md --- .../azure-mgmt-billing/default.nix | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index db243f5857594..dfef1554ecc4f 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -1,45 +1,46 @@ { lib, - buildPythonPackage, - fetchPypi, - msrestazure, azure-common, azure-mgmt-core, - azure-mgmt-nspkg, + buildPythonPackage, + fetchPypi, + isodate, + pythonOlder, + setuptools, + typing-extensions, }: buildPythonPackage rec { pname = "azure-mgmt-billing"; - version = "6.0.0"; # pypi's 0.2.0 doesn't build ootb - format = "setuptools"; + version = "7.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - sha256 = "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f"; - extension = "zip"; + pname = "azure_mgmt_billing"; + inherit version; + hash = "sha256-jgplxlEQtTpCk35b7WrgDvydYgaXLZa/1KdOgMhcLXs="; }; - propagatedBuildInputs = [ - msrestazure + build-system = [ setuptools ]; + + dependencies = [ azure-common azure-mgmt-core - azure-mgmt-nspkg + isodate + typing-extensions ]; - preBuild = '' - rm -rf azure_bdist_wheel.py - substituteInPlace setup.cfg \ - --replace "azure-namespace-package = azure-mgmt-nspkg" "" - ''; - pythonNamespaces = [ "azure.mgmt" ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { description = "This is the Microsoft Azure Billing Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/billing/azure-mgmt-billing"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-billing_${version}/sdk/billing/azure-mgmt-billing/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; From b364b9fdcf37df5fc1d351f261fa62b9b6756f7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 08:47:45 +0200 Subject: [PATCH 132/180] azure-cli: override azure-mgmt-billing --- pkgs/by-name/az/azure-cli/python-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 5bde74450419b..0b09811647bcc 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -119,6 +119,17 @@ let overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; + azure-mgmt-billing = + (overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" + "sha256-1PXFpBiKRW/h6zK2xF9VyiBpx0vkHrdpIYQLOfL1wH8=" + ).overridePythonAttrs + (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ + self.msrest + self.msrestazure + ]; + }); + # AttributeError: type object 'CustomDomainsOperations' has no attribute 'disable_custom_https' azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" From 92ed25c8c1fa216f39f80d56a9a5a8119dae990b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 09:01:13 +0200 Subject: [PATCH 133/180] python312Packages.aiortm: 0.9.11 -> 0.9.12 Diff: https://github.com/MartinHjelmare/aiortm/compare/refs/tags/v0.9.11...v0.9.12 Changelog: https://github.com/MartinHjelmare/aiortm/blob/v0.9.12/CHANGELOG.md --- pkgs/development/python-modules/aiortm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index 1760e816fc05b..b02e418a1ddb2 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.9.11"; + version = "0.9.12"; pyproject = true; disabled = pythonOlder "3.12"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiortm"; rev = "refs/tags/v${version}"; - hash = "sha256-uP+nQZA6ZdCAy3E4a1jcm+3X1Fe6n+7v/6unX423jfw="; + hash = "sha256-PTg+/Iqjj5V5XJNDAJva/BvaOl6qyjeqrjxy0RLAvEc="; }; pythonRelaxDeps = [ "typer" ]; From 08248ac3bfff189f6a525533471e51c500ce9459 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 09:16:04 +0200 Subject: [PATCH 134/180] python312Packages.pylint-django: refactor --- pkgs/development/python-modules/pylint-django/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 0bac1f4037cea..170fb0af1d606 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "2.6.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "PyCQA"; @@ -26,9 +26,9 @@ buildPythonPackage rec { hash = "sha256-Rnty8ryKd5PxFFVYcvB8p9VS3qlHCprxR8+/ySY5qC8="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ pylint-plugin-utils ]; + dependencies = [ pylint-plugin-utils ]; optional-dependencies = { with_django = [ django ]; From 0d8aa070f82b18e4812add4638de198752034c04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 09:19:07 +0200 Subject: [PATCH 135/180] python312Packages.tika-client: refactor --- .../python-modules/tika-client/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index ce6bfb6db1429..7b1614e9c2568 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -6,10 +6,11 @@ hatchling, httpx, }: + buildPythonPackage rec { pname = "tika-client"; version = "0.7.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -20,11 +21,12 @@ buildPythonPackage rec { hash = "sha256-0cv2HaquIUQOb5CPkCxSYvXDzu3OV7WKIT80jI+pjpY="; }; - propagatedBuildInputs = [ - hatchling - httpx - ]; + build-system = [ hatchling ]; + + dependencies = [ httpx ]; + pythonImportsCheck = [ "tika_client" ]; + # Almost all of the tests (all except one in 0.1.0) fail since there # is no tika http API endpoint reachable. Since tika is not yet # packaged for nixpkgs, it seems like an unreasonable amount of effort From ca82458e77271dd01ed2f01c96fd5b2be0164457 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 12 Oct 2024 10:32:59 +0300 Subject: [PATCH 136/180] nixos/tests/nixos-rebuild-target-host: fix test Fixes #348043 --- nixos/tests/nixos-rebuild-target-host.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/nixos-rebuild-target-host.nix b/nixos/tests/nixos-rebuild-target-host.nix index bf80b2fa66062..4a210f94fd22a 100644 --- a/nixos/tests/nixos-rebuild-target-host.nix +++ b/nixos/tests/nixos-rebuild-target-host.nix @@ -24,6 +24,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { system.build.privateKey = snakeOilPrivateKey; system.build.publicKey = snakeOilPublicKey; + # needed to provide STC implementation for target + system.switch.enable = true; }; target = { nodes, lib, ... }: let From fba9ad044b021b287d09db7cc163570563eedb31 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 10 Oct 2024 07:53:08 +0200 Subject: [PATCH 137/180] alpaca: 2.0.6 -> 2.6.0 --- pkgs/by-name/al/alpaca/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index ab0bb3a833315..88a3dc8fc5021 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -13,18 +13,19 @@ gtksourceview5, xdg-utils, ollama, + vte-gtk4, }: python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "2.0.6"; + version = "2.6.0"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; rev = "refs/tags/${version}"; - hash = "sha256-4c6pisd3o7mycivHd1QZ2N7s8pYzrQXiZMbVvl5ciPA="; + hash = "sha256-XXxfbchQ1l6L8KflqjlGIiyRbG/dI5ok0ExlROavXYg="; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ libadwaita gtksourceview5 + vte-gtk4 ]; dependencies = with python3Packages; [ From 97f0c067f3d10b7dff87881de8bbc9710ab8a51e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:07:37 +0000 Subject: [PATCH 138/180] telegraf: 1.32.0 -> 1.32.1 Diff: https://github.com/influxdata/telegraf/compare/v1.32.0...v1.32.1 Changelog: https://github.com/influxdata/telegraf/blob/v1.32.1/CHANGELOG.md --- pkgs/by-name/te/telegraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index cb98c85bf45bf..d2fac70039691 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -9,7 +9,7 @@ buildGo123Module rec { pname = "telegraf"; - version = "1.32.0"; + version = "1.32.1"; subPackages = [ "cmd/telegraf" ]; @@ -17,10 +17,10 @@ buildGo123Module rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-ITTlHsoWPXHbGtmNOE0x1sCbeADWi4liOEqXXKQUeGU="; + hash = "sha256-CtfPREsU2LU7Ptn3FzEDlPeWVWP/OdtIITdUL7qKbgI="; }; - vendorHash = "sha256-wKl6Rutt2QrF4nLxB5Ic6QlekrPUfHwdFZyTTdbK0HU="; + vendorHash = "sha256-WQbgGsGfyUGcgjXWjuyyCapeKgujoZD6HpKoFiIA//M="; proxyVendor = true; ldflags = [ From 6950adc1b089757a45275f3a0d4453d3d52784ba Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Oct 2024 09:57:37 +0200 Subject: [PATCH 139/180] nextcloud28: 28.0.10 -> 28.0.11 ChangeLog: https://github.com/nextcloud/server/releases/tag/v28.0.11 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 7cdda6534d451..174c1c38e4a85 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -59,8 +59,8 @@ let in { nextcloud28 = generic { - version = "28.0.10"; - hash = "sha256-LoAVJtKJHBhf6sWYXL084pLOcKQl9Tb5GfkBuftMwhA="; + version = "28.0.11"; + hash = "sha256-S6rs7GpvFFgy28PGNdcuIM1IBKytmmZOanS5CnmB40g="; packages = nextcloud28Packages; }; From 587e18003e646528b10798e851d21b3e1ed57754 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 10:05:21 +0200 Subject: [PATCH 140/180] python312Packages.flow-record: 3.15 -> 3.17 Changelog: https://github.com/fox-it/flow.record/releases/tag/3.17 --- .../python-modules/flow-record/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index b926605875494..268c7387502bc 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -1,30 +1,35 @@ { lib, buildPythonPackage, + duckdb, + elastic-transport, elasticsearch, fastavro, fetchFromGitHub, + httpx, lz4, + maxminddb, msgpack, pytest7CheckHook, pythonOlder, - setuptools, + pytz, setuptools-scm, + setuptools, zstandard, }: buildPythonPackage rec { pname = "flow-record"; - version = "3.15"; + version = "3.17"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-j5N66p7feB9Ae+Fu5RhVzh8XCHiq55jJMg0Fe+C6Jvg="; + hash = "sha256-fFP2bdO4wTR9Y+9no3FabtVmLicTD76Jw5aWDMPOB0w="; }; build-system = [ @@ -39,11 +44,18 @@ buildPythonPackage rec { lz4 zstandard ]; + duckdb = [ + duckdb + pytz + ]; elastic = [ elasticsearch ]; + geoip = [ maxminddb ]; avro = [ fastavro ] ++ fastavro.optional-dependencies.snappy; + splunk = [ httpx ]; }; nativeCheckInputs = [ + elastic-transport pytest7CheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies); From 257c05192f13b804a365f79bc31349d031ebdaea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 10:06:58 +0200 Subject: [PATCH 141/180] python312Packages.dissect-volume: 3.11 -> 3.12 Changelog: https://github.com/fox-it/dissect.volume/releases/tag/3.12 --- .../python-modules/dissect-volume/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 3a094cbd78801..0fb8e92a7cfe0 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -12,24 +12,24 @@ buildPythonPackage rec { pname = "dissect-volume"; - version = "3.11"; + version = "3.12"; pyproject = true; - disabled = pythonOlder "3.11"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "fox-it"; repo = "dissect.volume"; rev = "refs/tags/${version}"; - hash = "sha256-eHIInoquuyukKuPVvVB6qtovx1NloHHVGKfFBHxVd+o="; + hash = "sha256-IhG2FZdCmYrGxHc2i+ERhphxP/uGgOY67epHEWnQXb0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ dissect-cstruct dissect-util ]; @@ -44,6 +44,7 @@ buildPythonPackage rec { "test_dm_thin" "test_lvm_mirro" "test_lvm_thin" + "test_lvm" "test_md_raid0_zones" "test_md_read" ]; From 31248ef3bd8f0639b3bf832b667c034a5700d98f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 10:08:52 +0200 Subject: [PATCH 142/180] python312Packages.dissect-target: 3.18 -> 3.19 Changelog: https://github.com/fox-it/dissect.target/releases/tag/3.19 --- pkgs/development/python-modules/dissect-target/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 409f8444c33d5..259d2e7d077d1 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "dissect-target"; - version = "3.18"; + version = "3.19"; pyproject = true; disabled = pythonOlder "3.9"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.target"; rev = "refs/tags/${version}"; - hash = "sha256-jR+f4t0QXmm007lrGdMyF9vFa3NW35gZxs7pe9sdjfg="; + hash = "sha256-D5YgCAKcnPyBrZTpcSuvKfWfIIcCxKGxn+mj8Jqzmws="; }; postPatch = '' @@ -138,6 +138,8 @@ buildPythonPackage rec { "test_systemd_basic_syntax" "test_target_cli_unicode_argparse" "test_target_query" + "test_target_info" + "test_yara" ] ++ # test is broken on Darwin From 62b1b234491e3118547ea41381a90e41e4d4432e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Oct 2024 10:10:14 +0200 Subject: [PATCH 143/180] nextcloud29: 29.0.7 -> 29.0.8 ChangeLog: https://github.com/nextcloud/server/releases/tag/v29.0.8 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 174c1c38e4a85..a63ee485fec75 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -65,8 +65,8 @@ in }; nextcloud29 = generic { - version = "29.0.7"; - hash = "sha256-9TL/wxvlqDdLXgcrhv/4dl7Bn9oMhQnO45hzCB2yxUQ="; + version = "29.0.8"; + hash = "sha256-CrVLUX92zSbyvTi2/hhLn7rtMvc0JGxYwaz4NHPApLk="; packages = nextcloud29Packages; }; From 2882ed3e676cdc5f942de777e951314b651fb10c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Oct 2024 10:10:44 +0200 Subject: [PATCH 144/180] nextcloud28Packages: update --- pkgs/servers/nextcloud/packages/28.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index 834225e95e52a..ef62ba34d4fbb 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-OqqorHVWCDicQKnTxEJjeXzDrsj98vWvtWYyaRmDsUs=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.2.4/forms-v4.2.4.tar.gz", - "version": "4.2.4", + "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", + "version": "4.3.1", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-eMdFS5yQWJNsTVuHBZX4v0PSocP/nT+JaS7RSTYF8p0=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.11/spreed-v18.0.11.tar.gz", - "version": "18.0.11", + "hash": "sha256-pOnL5uz8FcuHUFn7otp9NQinOqm+oCmXRHx4TM2NukI=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.12/spreed-v18.0.12.tar.gz", + "version": "18.0.12", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -311,7 +311,7 @@ }, "unsplash": { "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.2/unsplash.tar.gz", "version": "3.0.1", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", @@ -330,9 +330,9 @@ ] }, "user_saml": { - "hash": "sha256-+oeTDRomjmfSLIM6eyP6MHg+qtOs8IPqIWUzBofahYQ=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.2.0/user_saml-v6.2.0.tar.gz", - "version": "6.2.0", + "hash": "sha256-xxabQU8kZhgI7Q9D0n7hrFygvfZWZDnAQWnB8+A1xwE=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.3.0/user_saml-v6.3.0.tar.gz", + "version": "6.3.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ From 53cf077bf945a97df7b036529f33930d58426c34 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Oct 2024 10:10:52 +0200 Subject: [PATCH 145/180] nextcloud29Packages: update --- pkgs/servers/nextcloud/packages/29.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index df265671698da..52a805aed8d38 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -70,9 +70,9 @@ ] }, "forms": { - "hash": "sha256-OqqorHVWCDicQKnTxEJjeXzDrsj98vWvtWYyaRmDsUs=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.2.4/forms-v4.2.4.tar.gz", - "version": "4.2.4", + "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", + "version": "4.3.1", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -140,8 +140,8 @@ ] }, "maps": { - "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", + "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-cZYE528jSNnPFgJSnqosoPyo/7V3zdUAIxnFpcOuvh4=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz", - "version": "19.0.9", + "hash": "sha256-CWmVARbiZAjgMpZKofWU9FTy/LCz8zXuQdGM6UMHjZ4=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.10/spreed-v19.0.10.tar.gz", + "version": "19.0.10", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -311,7 +311,7 @@ }, "unsplash": { "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.2/unsplash.tar.gz", "version": "3.0.1", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", @@ -330,9 +330,9 @@ ] }, "user_saml": { - "hash": "sha256-+oeTDRomjmfSLIM6eyP6MHg+qtOs8IPqIWUzBofahYQ=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.2.0/user_saml-v6.2.0.tar.gz", - "version": "6.2.0", + "hash": "sha256-xxabQU8kZhgI7Q9D0n7hrFygvfZWZDnAQWnB8+A1xwE=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.3.0/user_saml-v6.3.0.tar.gz", + "version": "6.3.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ From 1967ddf64ec8329de0616a76f3851a526bb87e30 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Oct 2024 10:10:58 +0200 Subject: [PATCH 146/180] nextcloud30Packages: update --- pkgs/servers/nextcloud/packages/30.json | 28 +++++++++++++++++-------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json index f4620a76062e1..8d32cb8e59aa5 100644 --- a/pkgs/servers/nextcloud/packages/30.json +++ b/pkgs/servers/nextcloud/packages/30.json @@ -69,6 +69,16 @@ "agpl" ] }, + "forms": { + "hash": "sha256-JhLaTXll2kh/TaWXR1DfUCHuxaJlUMU1oY9ry9yoTTg=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.3.1/forms-v4.3.1.tar.gz", + "version": "4.3.1", + "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", + "homepage": "https://github.com/nextcloud/forms", + "licenses": [ + "agpl" + ] + }, "gpoddersync": { "hash": "sha256-OMH/pnDS/icDVUb56mzxowAhBCaVY60bMGJmwsjEc0k=", "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.10.0/gpoddersync.tar.gz", @@ -120,9 +130,9 @@ ] }, "mail": { - "hash": "sha256-ldrGgqgeRLjYmtWiSAcllaIkTeeUmhjQiXrcpwgb/wk=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.0/mail-v4.0.0.tar.gz", - "version": "4.0.0", + "hash": "sha256-u0h9zCT/l9cUUFppKazx4oLkHYzlgGcb0OBOy1CXOG8=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v4.0.1/mail-v4.0.1.tar.gz", + "version": "4.0.1", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -240,9 +250,9 @@ ] }, "spreed": { - "hash": "sha256-p0m4s4ZbWEyiPPBRKvEGFk/0xN+IiYPETDegm/8QDWY=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.0.0/spreed-v20.0.0.tar.gz", - "version": "20.0.0", + "hash": "sha256-mUJmbOMMIkm/83a+7xcW59TTar58D4l0Ek+kZoRdxG8=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v20.0.1/spreed-v20.0.1.tar.gz", + "version": "20.0.1", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -290,9 +300,9 @@ ] }, "user_saml": { - "hash": "sha256-+oeTDRomjmfSLIM6eyP6MHg+qtOs8IPqIWUzBofahYQ=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.2.0/user_saml-v6.2.0.tar.gz", - "version": "6.2.0", + "hash": "sha256-xxabQU8kZhgI7Q9D0n7hrFygvfZWZDnAQWnB8+A1xwE=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.3.0/user_saml-v6.3.0.tar.gz", + "version": "6.3.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ From 9e5b1494060bd31fd3caff7642abee19abe9a31a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 10:22:16 +0200 Subject: [PATCH 147/180] python312Packages.jalali-core: init at 1.0.0 Module to convert Gregorian to Jalali and inverse dates https://pypi.org/project/jalali-core/ --- .../python-modules/jalali-core/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/jalali-core/default.nix diff --git a/pkgs/development/python-modules/jalali-core/default.nix b/pkgs/development/python-modules/jalali-core/default.nix new file mode 100644 index 0000000000000..69c613d0417c0 --- /dev/null +++ b/pkgs/development/python-modules/jalali-core/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "jalali-core"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "jalali_core"; + inherit version; + hash = "sha256-9Ch8cMYwMj3PCjqybfkFuk1FHiMKwfZbO7L3d5eJSis="; + }; + + build-system = [ setuptools ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "jalali_core" ]; + + meta = { + description = "Module to convert Gregorian to Jalali and inverse dates"; + homepage = "https://pypi.org/project/jalali-core/"; + license = lib.licenses.lgpl2Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9993849c1234b..a7b7b2892cd2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6333,6 +6333,8 @@ self: super: with self; { jaeger-client = callPackage ../development/python-modules/jaeger-client { }; + jalali-core = callPackage ../development/python-modules/jalali-core { }; + jamo = callPackage ../development/python-modules/jamo { }; janus = callPackage ../development/python-modules/janus { }; From 28c0dcd4469c2376390b9fd8fbf5a80570e6c90f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 10:23:02 +0200 Subject: [PATCH 148/180] python312Packages.jdatetime: refactor --- .../development/python-modules/jdatetime/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 553500c47be67..acc5dca6a825c 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -2,29 +2,33 @@ lib, buildPythonPackage, fetchPypi, - six, + jalali-core, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "jdatetime"; version = "5.0.0"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; hash = "sha256-LMYD2RPA2OMokoRU09KVJhywN+mVAif2fJYpq0cQ/fk="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ jalali-core ]; pythonImportsCheck = [ "jdatetime" ]; meta = with lib; { description = "Jalali datetime binding"; homepage = "https://github.com/slashmili/python-jalali"; + changelog = "https://github.com/slashmili/python-jalali/blob/v${version}/CHANGELOG.md"; license = licenses.psfl; maintainers = [ ]; }; From 1ea0000c9613186f692c235b6fb3e5606333af43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 10:28:24 +0200 Subject: [PATCH 149/180] mitmproxy2swagger: refactor --- .../security/mitmproxy2swagger/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 6731d7c21c53b..baf318573ee70 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -1,29 +1,29 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; version = "0.13.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "alufers"; - repo = pname; + repo = "mitmproxy2swagger"; rev = "refs/tags/${version}"; hash = "sha256-VHxqxee5sQWRS13V4SfY4LWaN0oxxWsNVDOEqUyKHfg="; }; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; - pythonRelaxDeps = [ + "mitmproxy" "ruamel.yaml" ]; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; + + dependencies = with python3.pkgs; [ json-stream mitmproxy ruamel-yaml @@ -32,16 +32,14 @@ python3.pkgs.buildPythonApplication rec { # No tests available doCheck = false; - pythonImportsCheck = [ - "mitmproxy2swagger" - ]; + pythonImportsCheck = [ "mitmproxy2swagger" ]; meta = with lib; { description = "Tool to automagically reverse-engineer REST APIs"; - mainProgram = "mitmproxy2swagger"; homepage = "https://github.com/alufers/mitmproxy2swagger"; changelog = "https://github.com/alufers/mitmproxy2swagger/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "mitmproxy2swagger"; }; } From 1becabfc8fc0815d3596db1bbaace8849fee9770 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 10:31:36 +0200 Subject: [PATCH 150/180] python312Packages.azure-storage-file-share: 12.18.0 -> 12.19.0 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-file-share_12.19.0/sdk/storage/azure-storage-file-share/CHANGELOG.md --- .../python-modules/azure-storage-file-share/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 5169b9a733662..04e4ee8bf5a81 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.18.0"; + version = "12.19.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_storage_file_share"; inherit version; - hash = "sha256-CoHa7l4TWYrM3jxzsa7Mxu39zsXpV79AFQwGIvuV3HY="; + hash = "sha256-6npBdNxsUvUKyMMPIoFZ/MNnXR+Lp3G40O/LwxB0Ang="; }; build-system = [ setuptools ]; From 875f00ed4034d0c973b8194f7f0b958702d77839 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 12 Oct 2024 10:34:27 +0200 Subject: [PATCH 151/180] gogs: remove Upstream development has stalled and several critical vulnerabilities that weren't addressed within a year[1][2]. Back then it was fair to mark it as insecure, but given nothing has happened since, it's time to remove it. [1] https://forgejo.org/2023-11-release-v1-20-5-1/ [2] https://github.com/gogs/gogs/issues/7777 --- .../manual/release-notes/rl-2411.section.md | 4 + nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/services/misc/gogs.nix | 271 ------------------ .../version-management/gogs/default.nix | 54 ---- pkgs/top-level/aliases.nix | 6 + pkgs/top-level/all-packages.nix | 2 - 7 files changed, 12 insertions(+), 330 deletions(-) delete mode 100644 nixos/modules/services/misc/gogs.nix delete mode 100644 pkgs/applications/version-management/gogs/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 46fe89bff5a4d..1223555261a18 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -207,6 +207,10 @@ - `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release). +- `gogs` has been removed. Upstream development has stalled and it has several + [critical vulnerabilities](https://github.com/gogs/gogs/issues/7777) that weren't addressed + within a year. Consider migrating to `forgejo` or `gitea`. + - `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes. - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema. diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index ed016b552edc7..8b0127dc29f74 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -296,7 +296,7 @@ in sickbeard = 265; headphones = 266; # couchpotato = 267; # unused, removed 2022-01-01 - gogs = 268; + # gogs = 268; # unused, removed in 2024-10-12 #pdns-recursor = 269; # dynamically allocated as of 2020-20-18 #kresd = 270; # switched to "knot-resolver" with dynamic ID rpc = 271; @@ -607,7 +607,7 @@ in sickbeard = 265; headphones = 266; # couchpotato = 267; # unused, removed 2022-01-01 - gogs = 268; + # gogs = 268; # unused, removed in 2024-10-12 #kresd = 270; # switched to "knot-resolver" with dynamic ID #rpc = 271; # unused #geoip = 272; # unused diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6910458baf401..6f5357382dc56 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -759,7 +759,6 @@ ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gitweb.nix - ./services/misc/gogs.nix ./services/misc/gollum.nix ./services/misc/gotenberg.nix ./services/misc/gpsd.nix diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix deleted file mode 100644 index a2c1ad0779e15..0000000000000 --- a/nixos/modules/services/misc/gogs.nix +++ /dev/null @@ -1,271 +0,0 @@ -{ config, lib, options, pkgs, ... }: -let - cfg = config.services.gogs; - opt = options.services.gogs; - configFile = pkgs.writeText "app.ini" '' - BRAND_NAME = ${cfg.appName} - RUN_USER = ${cfg.user} - RUN_MODE = prod - - [database] - TYPE = ${cfg.database.type} - HOST = ${cfg.database.host}:${toString cfg.database.port} - NAME = ${cfg.database.name} - USER = ${cfg.database.user} - PASSWORD = #dbpass# - PATH = ${cfg.database.path} - - [repository] - ROOT = ${cfg.repositoryRoot} - - [server] - DOMAIN = ${cfg.domain} - HTTP_ADDR = ${cfg.httpAddress} - HTTP_PORT = ${toString cfg.httpPort} - EXTERNAL_URL = ${cfg.rootUrl} - - [session] - COOKIE_NAME = session - COOKIE_SECURE = ${lib.boolToString cfg.cookieSecure} - - [security] - SECRET_KEY = #secretkey# - INSTALL_LOCK = true - - [log] - ROOT_PATH = ${cfg.stateDir}/log - - ${cfg.extraConfig} - ''; -in - -{ - options = { - services.gogs = { - enable = lib.mkOption { - default = false; - type = lib.types.bool; - description = "Enable Go Git Service."; - }; - - useWizard = lib.mkOption { - default = false; - type = lib.types.bool; - description = "Do not generate a configuration and use Gogs' installation wizard instead. The first registered user will be administrator."; - }; - - stateDir = lib.mkOption { - default = "/var/lib/gogs"; - type = lib.types.str; - description = "Gogs data directory."; - }; - - user = lib.mkOption { - type = lib.types.str; - default = "gogs"; - description = "User account under which Gogs runs."; - }; - - group = lib.mkOption { - type = lib.types.str; - default = "gogs"; - description = "Group account under which Gogs runs."; - }; - - database = { - type = lib.mkOption { - type = lib.types.enum [ "sqlite3" "mysql" "postgres" ]; - example = "mysql"; - default = "sqlite3"; - description = "Database engine to use."; - }; - - host = lib.mkOption { - type = lib.types.str; - default = "127.0.0.1"; - description = "Database host address."; - }; - - port = lib.mkOption { - type = lib.types.port; - default = 3306; - description = "Database host port."; - }; - - name = lib.mkOption { - type = lib.types.str; - default = "gogs"; - description = "Database name."; - }; - - user = lib.mkOption { - type = lib.types.str; - default = "gogs"; - description = "Database user."; - }; - - password = lib.mkOption { - type = lib.types.str; - default = ""; - description = '' - The password corresponding to {option}`database.user`. - Warning: this is stored in cleartext in the Nix store! - Use {option}`database.passwordFile` instead. - ''; - }; - - passwordFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - example = "/run/keys/gogs-dbpassword"; - description = '' - A file containing the password corresponding to - {option}`database.user`. - ''; - }; - - path = lib.mkOption { - type = lib.types.str; - default = "${cfg.stateDir}/data/gogs.db"; - defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/data/gogs.db"''; - description = "Path to the sqlite3 database file."; - }; - }; - - appName = lib.mkOption { - type = lib.types.str; - default = "Gogs: Go Git Service"; - description = "Application name."; - }; - - repositoryRoot = lib.mkOption { - type = lib.types.str; - default = "${cfg.stateDir}/repositories"; - defaultText = lib.literalExpression ''"''${config.${opt.stateDir}}/repositories"''; - description = "Path to the git repositories."; - }; - - domain = lib.mkOption { - type = lib.types.str; - default = "localhost"; - description = "Domain name of your server."; - }; - - rootUrl = lib.mkOption { - type = lib.types.str; - default = "http://localhost:3000/"; - description = "Full public URL of Gogs server."; - }; - - httpAddress = lib.mkOption { - type = lib.types.str; - default = "0.0.0.0"; - description = "HTTP listen address."; - }; - - httpPort = lib.mkOption { - type = lib.types.port; - default = 3000; - description = "HTTP listen port."; - }; - - cookieSecure = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Marks session cookies as "secure" as a hint for browsers to only send - them via HTTPS. This option is recommend, if Gogs is being served over HTTPS. - ''; - }; - - extraConfig = lib.mkOption { - type = lib.types.str; - default = ""; - description = "Configuration lines appended to the generated Gogs configuration file."; - }; - }; - }; - - config = lib.mkIf cfg.enable { - - systemd.services.gogs = { - description = "Gogs (Go Git Service)"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gogs ]; - - preStart = let - runConfig = "${cfg.stateDir}/custom/conf/app.ini"; - secretKey = "${cfg.stateDir}/custom/conf/secret_key"; - in '' - mkdir -p ${cfg.stateDir} - - # copy custom configuration and generate a random secret key if needed - ${lib.optionalString (cfg.useWizard == false) '' - mkdir -p ${cfg.stateDir}/custom/conf - cp -f ${configFile} ${runConfig} - - if [ ! -e ${secretKey} ]; then - head -c 16 /dev/urandom | base64 > ${secretKey} - fi - - KEY=$(head -n1 ${secretKey}) - DBPASS=$(head -n1 ${cfg.database.passwordFile}) - sed -e "s,#secretkey#,$KEY,g" \ - -e "s,#dbpass#,$DBPASS,g" \ - -i ${runConfig} - ''} - - mkdir -p ${cfg.repositoryRoot} - # update all hooks' binary paths - HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") - if [ "$HOOKS" ] - then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs}/bin/gogs,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS - fi - ''; - - serviceConfig = { - Type = "simple"; - User = cfg.user; - Group = cfg.group; - WorkingDirectory = cfg.stateDir; - ExecStart = "${pkgs.gogs}/bin/gogs web"; - Restart = "always"; - UMask = "0027"; - }; - - environment = { - USER = cfg.user; - HOME = cfg.stateDir; - GOGS_WORK_DIR = cfg.stateDir; - }; - }; - - users = lib.mkIf (cfg.user == "gogs") { - users.gogs = { - description = "Go Git Service"; - uid = config.ids.uids.gogs; - group = "gogs"; - home = cfg.stateDir; - createHome = true; - shell = pkgs.bash; - }; - groups.gogs.gid = config.ids.gids.gogs; - }; - - warnings = lib.optional (cfg.database.password != "") - ''config.services.gogs.database.password will be stored as plaintext - in the Nix store. Use database.passwordFile instead.''; - - # Create database passwordFile default when password is configured. - services.gogs.database.passwordFile = - (lib.mkDefault (toString (pkgs.writeTextFile { - name = "gogs-database-password"; - text = cfg.database.password; - }))); - }; -} diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix deleted file mode 100644 index 5b7a986cf2069..0000000000000 --- a/pkgs/applications/version-management/gogs/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper -, git, bash, gzip, openssh, pam -, sqliteSupport ? true -, pamSupport ? true -}: - -buildGoModule rec { - pname = "gogs"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "gogs"; - repo = "gogs"; - rev = "v${version}"; - sha256 = "sha256-UfxE+NaqDr3XUXpvlV989Iwjq/lsAwpMTDAPkcOmma8="; - }; - - vendorHash = "sha256-ISJOEJ1DWO4nnMpDuZ36Nq528LhgekDh3XUF8adlj2w="; - - subPackages = [ "." ]; - - postPatch = '' - patchShebangs . - ''; - - nativeBuildInputs = [ makeWrapper openssh ]; - - buildInputs = lib.optional pamSupport pam; - - tags = - ( lib.optional sqliteSupport "sqlite" - ++ lib.optional pamSupport "pam"); - - postInstall = '' - - wrapProgram $out/bin/gogs \ - --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} - ''; - - meta = with lib; { - description = "Painless self-hosted Git service"; - homepage = "https://gogs.io"; - license = licenses.mit; - maintainers = [ maintainers.schneefux ]; - mainProgram = "gogs"; - knownVulnerabilities = [ '' - Gogs has known unpatched vulnerabilities and upstream maintainers appears to be unresponsive. - - More information can be found in forgejo's blogpost: https://forgejo.org/2023-11-release-v1-20-5-1/ - - You might want to consider migrating to Gitea or forgejo. - '' ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index df8c9c50bc39b..e9f08fe3c06e7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -561,6 +561,12 @@ mapAliases { gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18 gnu-cobol = gnucobol; # Added 2024-09-17 + gogs = throw '' + Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that + weren't addressed within a year: https://github.com/gogs/gogs/issues/7777 + + Consider migrating to forgejo or gitea. + ''; # Added 2024-10-12 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3903f1b5a3c2..06f38792564c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7893,8 +7893,6 @@ with pkgs; gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { }; - gogs = callPackage ../applications/version-management/gogs { }; - git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; gokart = callPackage ../development/tools/gokart { }; From 0c0658507b5af653fe7485451eb21d5e5cf8fcbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 11:25:14 +0200 Subject: [PATCH 152/180] python312Packages.tableauserverclient: 0.31 -> 0.33 Changelog: https://github.com/tableau/server-client-python/releases/tag/v0.33 --- .../python-modules/tableauserverclient/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tableauserverclient/default.nix b/pkgs/development/python-modules/tableauserverclient/default.nix index 032b4e189b70f..910fd59d06837 100644 --- a/pkgs/development/python-modules/tableauserverclient/default.nix +++ b/pkgs/development/python-modules/tableauserverclient/default.nix @@ -9,19 +9,20 @@ requests, requests-mock, setuptools, + typing-extensions, versioneer, }: buildPythonPackage rec { pname = "tableauserverclient"; - version = "0.31"; + version = "0.33"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e00/+yVKg7dGGq3Os+oWu/F93j5e9dnwWZxKwm+soqM="; + hash = "sha256-7yj/Ey3mIR2GZ0gtNkrrtoKEmuA5LihZlM9qPhbROQw="; }; postPatch = '' @@ -29,7 +30,10 @@ buildPythonPackage rec { rm versioneer.py ''; - pythonRelaxDeps = [ "urllib3" ]; + pythonRelaxDeps = [ + "defusedxml" + "urllib3" + ]; nativeBuildInputs = [ setuptools @@ -40,6 +44,7 @@ buildPythonPackage rec { defusedxml requests packaging + typing-extensions ]; nativeCheckInputs = [ From 9c3eafa2d44d7d33c43c3b848d333b9ff57ac451 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 11:30:53 +0200 Subject: [PATCH 153/180] python312Packages.connexion: disable failing tests --- .../python-modules/connexion/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index a43fccb0170ec..bd19ae31caa2e 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -37,18 +37,18 @@ buildPythonPackage rec { version = "3.1.0"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "spec-first"; - repo = pname; + repo = "connexion"; rev = "refs/tags/${version}"; hash = "sha256-rngQDU9kXw/Z+Al0SCVnWN8xnphueTtZ0+xPBR5MbEM="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ asgiref httpx inflection @@ -80,6 +80,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "connexion" ]; disabledTests = [ + "test_build_example" + "test_mock_resolver_no_example" + # Tests require network access + "test_remote_api" # AssertionError "test_headers" # waiter.acquire() deadlock @@ -91,9 +95,10 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; - mainProgram = "connexion"; homepage = "https://github.com/spec-first/connexion"; changelog = "https://github.com/spec-first/connexion/releases/tag/${version}"; license = licenses.asl20; + maintainers = [ ]; + mainProgram = "connexion"; }; } From d9984214d81e7b535f2240147d1f41404c2b5c75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 11:37:02 +0200 Subject: [PATCH 154/180] python312Packages.hypothesis-auto: relax dependencies --- .../python-modules/hypothesis-auto/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index eca2ca1014572..7dcaf5cd05785 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -5,7 +5,6 @@ hypothesis, poetry-core, pydantic, - pytest, pytestCheckHook, pythonOlder, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "hypothesis-auto"; version = "1.1.5"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -23,12 +22,16 @@ buildPythonPackage rec { hash = "sha256-U0vcOB9jXmUV5v2IwybVu2arY1FpPnKkP7m2kbD1kRw="; }; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ + "hypothesis" + "pydantic" + ]; - propagatedBuildInputs = [ - pydantic + build-system = [ poetry-core ]; + + dependencies = [ hypothesis - pytest + pydantic ]; pythonImportsCheck = [ "hypothesis_auto" ]; @@ -38,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enables fully automatic tests for type annotated functions"; homepage = "https://github.com/timothycrosley/hypothesis-auto/"; + changelog = "https://github.com/timothycrosley/hypothesis-auto/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = [ ]; }; From 76e8a95910cfecfe4409125cb99485c787540eeb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 11:39:50 +0200 Subject: [PATCH 155/180] python312Packages.hypothesis-auto: add optional-dependencies --- pkgs/development/python-modules/hypothesis-auto/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix index 7dcaf5cd05785..13457576cdb4b 100644 --- a/pkgs/development/python-modules/hypothesis-auto/default.nix +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -5,6 +5,7 @@ hypothesis, poetry-core, pydantic, + pytest, pytestCheckHook, pythonOlder, }: @@ -34,6 +35,10 @@ buildPythonPackage rec { pydantic ]; + optional-dependencies = { + pytest = [ pytest ]; + }; + pythonImportsCheck = [ "hypothesis_auto" ]; nativeCheckInputs = [ pytestCheckHook ]; From 7005cf7193feee43b9b0e1d2237e66e05ee870ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 11:49:16 +0200 Subject: [PATCH 156/180] python312Packages.import-expression: refactor --- .../import-expression/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix index 369495b96e29a..6be9824a37a1b 100644 --- a/pkgs/development/python-modules/import-expression/default.nix +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -3,38 +3,43 @@ buildPythonPackage, fetchPypi, pytestCheckHook, - astunparse, + pythonOlder, setuptools, + typing-extensions, }: + buildPythonPackage rec { pname = "import-expression"; version = "2.0.0"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchPypi { - inherit version; pname = "import_expression"; + inherit version; hash = "sha256-Biw7dIOPKbDcqYJSCyeqC/seREcVihSZuaKNFfgjTew="; }; build-system = [ setuptools ]; - dependencies = [ astunparse ]; + + dependencies = [ typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests.py" ]; - pythonImportsCheck = [ - "import_expression" - "import_expression._codec" - ]; + pythonImportsCheck = [ "import_expression" ]; meta = { description = "Transpiles a superset of python to allow easy inline imports"; homepage = "https://github.com/ioistired/import-expression-parser"; + changelog = "https://github.com/ioistired/import-expression/releases/tag/v${version}"; license = with lib.licenses; [ mit psfl ]; - mainProgram = "import-expression"; maintainers = with lib.maintainers; [ ]; + mainProgram = "import-expression"; }; } From 69151ff73d838b6844f085550d3957278cb63446 Mon Sep 17 00:00:00 2001 From: Alexandru Nechita <45104896+alexandru0-dev@users.noreply.github.com> Date: Sat, 12 Oct 2024 12:38:46 +0200 Subject: [PATCH 157/180] aerospace: init at 0.14.2-Beta (#344015) * maintainers: add alexandru0-dev * aerospace: init at 0.14.2-Beta --- maintainers/maintainer-list.nix | 6 +++ pkgs/by-name/ae/aerospace/package.nix | 58 +++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 pkgs/by-name/ae/aerospace/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 54df38a31a9f7..171c9d180d179 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -960,6 +960,12 @@ githubId = 49609151; name = "Popa Ioan Alexandru"; }; + alexandru0-dev = { + email = "alexandru.italia32+nixpkgs@gmail.com"; + github = "alexandru0-dev"; + githubId = 45104896; + name = "Alexandru Nechita"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix new file mode 100644 index 0000000000000..f62116273a633 --- /dev/null +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -0,0 +1,58 @@ +{ + fetchzip, + gitUpdater, + installShellFiles, + lib, + stdenv, + versionCheckHook, +}: + +let + appName = "AeroSpace.app"; + version = "0.14.2-Beta"; +in +stdenv.mkDerivation { + pname = "aerospace"; + + inherit version; + + src = fetchzip { + url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; + hash = "sha256-v2D/IV9Va0zbGHEwSGt6jvDqQYqha290Lm6u+nZTS3A="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + mv ${appName} $out/Applications + cp -R bin $out + mkdir -p $out/share + runHook postInstall + ''; + + postInstall = '' + installManPage manpage/* + installShellCompletion --bash shell-completion/bash/aerospace + installShellCompletion --fish shell-completion/fish/aerospace.fish + installShellCompletion --zsh shell-completion/zsh/_aerospace + ''; + + passthru.tests.can-print-version = [ versionCheckHook ]; + + passthru.updateScript = gitUpdater { + url = "https://github.com/nikitabobko/AeroSpace.git"; + rev-prefix = "v"; + }; + + meta = { + license = lib.licenses.mit; + mainProgram = "aerospace"; + homepage = "https://github.com/nikitabobko/AeroSpace"; + description = "i3-like tiling window manager for macOS"; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ alexandru0-dev ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} From 562995272c6557ab647a16ab76330e21623a3e86 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 11 Oct 2024 21:18:47 +0200 Subject: [PATCH 158/180] fop: apply patch for CVE-2024-28168 https://www.openwall.com/lists/oss-security/2024/10/09/1 --- pkgs/tools/typesetting/fop/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 94a24211f9a39..4981ec2a7a0ce 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , ant , jdk , jre @@ -17,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-b7Av17wu6Ar/npKOiwYqzlvBFSIuXTpqTacM1sxtBvc="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-28168.patch"; + url = "https://github.com/apache/xmlgraphics-fop/commit/d96ba9a11710d02716b6f4f6107ebfa9ccec7134.patch"; + hash = "sha256-zmUA1Tq6iZtvNECCiXebXodp6AikBn10NTZnVHpPMlw="; + }) + ]; + nativeBuildInputs = [ ant jdk From bc5a71d9d480a9290ecde223b33b5798223d4dcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Oct 2024 11:06:08 +0000 Subject: [PATCH 159/180] memorado: 0.3 -> 0.4 --- pkgs/by-name/me/memorado/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/memorado/package.nix b/pkgs/by-name/me/memorado/package.nix index e7282d01d90e6..924c906a5ee65 100644 --- a/pkgs/by-name/me/memorado/package.nix +++ b/pkgs/by-name/me/memorado/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "memorado"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "wbernard"; repo = "Memorado"; rev = "refs/tags/${version}"; - hash = "sha256-bArcYUHSfpjYsySGZco4fmb6bKRFtG6efhzNSqUROX0="; + hash = "sha256-yWu2+VAa5FkpLs/KLI0lcNzFLGN/kiq6frtW8SHN+W4="; }; nativeBuildInputs = [ From db1e65fd771e58e6339e7e91c9c6ab70ffd2c250 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Oct 2024 12:19:46 +0000 Subject: [PATCH 160/180] smug: 0.3.3 -> 0.3.5 --- pkgs/tools/misc/smug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/smug/default.nix b/pkgs/tools/misc/smug/default.nix index e528b21287593..8caf8e4b3f3d8 100644 --- a/pkgs/tools/misc/smug/default.nix +++ b/pkgs/tools/misc/smug/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "smug"; - version = "0.3.3"; + version = "0.3.5"; subPackages = [ "." ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "ivaaaan"; repo = "smug"; rev = "v${version}"; - sha256 = "sha256-dQp9Ov8Si9DfziVtX3dXsJg+BNKYOoL9/WwdalQ5TVw="; + sha256 = "sha256-5n4EmkcHv6pw1gd9VUtJRR3QdRJsu5DYYsozJ25uggs="; }; vendorHash = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU="; From 55e1c93f72dd2b4efa65d157c3d6436c0c9f981d Mon Sep 17 00:00:00 2001 From: Sander Date: Sat, 12 Oct 2024 12:49:27 +0000 Subject: [PATCH 161/180] gptcommit: patch `Cargo.lock` to fix compilation with rust 1.80 --- .../tools/gptcommit/0001-update-time.patch | 60 +++++++++++++++++++ pkgs/development/tools/gptcommit/default.nix | 8 ++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/gptcommit/0001-update-time.patch diff --git a/pkgs/development/tools/gptcommit/0001-update-time.patch b/pkgs/development/tools/gptcommit/0001-update-time.patch new file mode 100644 index 0000000000000..eb6f9692f4011 --- /dev/null +++ b/pkgs/development/tools/gptcommit/0001-update-time.patch @@ -0,0 +1,60 @@ +From 203afecca3717787628eab30b550ba25389cb188 Mon Sep 17 00:00:00 2001 +From: Sander +Date: Sat, 12 Oct 2024 12:26:51 +0000 +Subject: [PATCH] deps: bump time to fix compilation error + +--- + Cargo.lock | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 9ce33e5..785764d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1420,6 +1420,12 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num_cpus" + version = "1.16.0" +@@ -2219,13 +2225,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", + "powerfmt", + "serde", +@@ -2241,10 +2248,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +-- +2.44.1 + diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 2c97533a26965..9aabb2ef50589 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -23,7 +23,13 @@ rustPlatform.buildRustPackage { hash = "sha256-JhMkK2zw3VL9o7j8DJmjY/im+GyCjfV2TJI3GDo8T8c="; }; - cargoHash = "sha256-ye9MAfG3m24ofV95Kr+KTP4FEqfrsm3aTQ464hG9q08="; + cargoPatches = [ + # Bump `time` and friends to fix compilation with rust 1.80. + # See https://github.com/NixOS/nixpkgs/issues/332957 + ./0001-update-time.patch + ]; + + cargoHash = "sha256-0UAttCCbSH91Dn7IvEX+Klp/bSYZM4rml7/dD3a208A="; nativeBuildInputs = [ pkg-config ]; From 4d18808ed816860f3d9f7ee5ea12b4b6af9d27b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:06:39 +0200 Subject: [PATCH 162/180] python311Packages.pyannotate: refactor - disable failing tests --- .../python-modules/pyannotate/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index 6c81a3f081b8f..d77b60248132b 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -4,14 +4,16 @@ fetchPypi, mypy-extensions, pytestCheckHook, + pythonAtLeast, pythonOlder, + setuptools, six, }: buildPythonPackage rec { pname = "pyannotate"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-BO1YBLqzgVPVmB/JLYPc9qIog0U3aFYfBX53flwFdZk="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ six mypy-extensions ]; @@ -32,11 +36,20 @@ buildPythonPackage rec { "pyannotate_tools" ]; + disabledTestPaths = + [ + "pyannotate_runtime/tests/test_collect_types.py" + ] + ++ lib.optionals (pythonAtLeast "3.11") [ + # Tests are using lib2to3 + "pyannotate_tools/fixes/tests/test_annotate*.py" + ]; + meta = with lib; { description = "Auto-generate PEP-484 annotations"; - mainProgram = "pyannotate"; homepage = "https://github.com/dropbox/pyannotate"; license = licenses.mit; maintainers = [ ]; + mainProgram = "pyannotate"; }; } From 12b1a23c6e40105796d2713f7ccb42441ef7e464 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 21:13:06 +0200 Subject: [PATCH 163/180] release-lib: add exception to build olm on hydra Olm was marked as vulnerable in e4767b47. The issue, however, is controversial and the practical ability to exploit its vulnerabilities has not been demostrated: ultimately the users are invited to decide for themselves. Given that, hydra should still build and distribute the packages depending on olm to avoid expensive builds in the event the users decide it's acceptable to continue using these packages. --- pkgs/top-level/release.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 0f5974d83cb84..bf69d13c98f1a 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -31,6 +31,11 @@ , nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; + # Exceptional unsafe packages that we still build and distribute, + # so users choosing to allow don't have to rebuild them every time. + permittedInsecurePackages = [ + "olm-3.2.16" # see PR #347899 + ]; }; } # This flag, if set to true, will inhibit the use of `mapTestOn` From 54c14e4e858fa94503ba6a6a0225414ffcb07854 Mon Sep 17 00:00:00 2001 From: romner-set Date: Fri, 4 Oct 2024 02:25:59 +0200 Subject: [PATCH 164/180] vpp: init at 24.06 --- pkgs/by-name/vp/vpp/package.nix | 126 ++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 pkgs/by-name/vp/vpp/package.nix diff --git a/pkgs/by-name/vp/vpp/package.nix b/pkgs/by-name/vp/vpp/package.nix new file mode 100644 index 0000000000000..fafcb1784bc95 --- /dev/null +++ b/pkgs/by-name/vp/vpp/package.nix @@ -0,0 +1,126 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + cmake, + pkg-config, + check, + openssl, + python3, + subunit, + mbedtls_2, + libpcap, + libnl, + libmnl, + libelf, + dpdk, + jansson, + zlib, + rdma-core, + libbpf, + xdp-tools, + enableDpdk ? true, + enableRdma ? true, + # FIXME: broken: af_xdp plugins - no working libbpf found - af_xdp plugin disabled + enableAfXdp ? false, +}: + +let + dpdk' = dpdk.overrideAttrs (old: { + mesonFlags = old.mesonFlags ++ [ "-Denable_driver_sdk=true" ]; + }); + + rdma-core' = rdma-core.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags ++ [ + "-DENABLE_STATIC=1" + "-DBUILD_SHARED_LIBS:BOOL=false" + ]; + }); + + xdp-tools' = xdp-tools.overrideAttrs (old: { + postInstall = ""; + dontDisableStatic = true; + }); +in +stdenv.mkDerivation rec { + pname = "vpp"; + version = "24.06"; + + src = fetchFromGitHub { + owner = "FDio"; + repo = "vpp"; + rev = "v${version}"; + hash = "sha256-AbdtH3ha/Bzj9tAkp4OhjRcUZilUEt+At0LukWN2LJU="; + }; + + postPatch = '' + patchShebangs scripts/ + substituteInPlace CMakeLists.txt \ + --replace "plugins tools/vppapigen tools/g2 tools/perftool cmake pkg" \ + "plugins tools/vppapigen tools/g2 tools/perftool cmake" + ''; + + preConfigure = '' + echo "${version}-nixos" > scripts/.version + scripts/version + ''; + + postConfigure = '' + patchShebangs ../tools/ + patchShebangs ../vpp-api/ + ''; + + sourceRoot = "source/src"; + + enableParallelBuilding = true; + env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized"; + + cmakeFlags = [ + "-DVPP_PLATFORM=default" + "-DVPP_LIBRARY_DIR=lib" + ] ++ lib.optional enableDpdk "-DVPP_USE_SYSTEM_DPDK=ON"; + + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optional enableDpdk dpdk' ++ lib.optional enableRdma rdma-core'.dev; + + buildInputs = + [ + check + openssl + (python3.withPackages (ps: [ ps.ply ])) + + subunit # vapi tests + mbedtls_2 # tlsmbed plugin + libpcap # bpf_trace_filter plugin + + # linux-cp plugin + libnl + libmnl + ] + ++ lib.optionals enableDpdk [ + # dpdk plugin + libelf + jansson + zlib + ] + ++ lib.optionals enableAfXdp [ + # af_xdp plugin + libelf + libbpf + xdp-tools' + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, scalable layer 2-4 multi-platform network stack running in user space"; + homepage = "https://s3-docs.fd.io/vpp/${version}/"; + license = [ lib.licenses.asl20 ]; + maintainers = with lib.maintainers; [ romner-set ]; + mainProgram = "vpp"; + platforms = lib.platforms.linux; + }; +} From adcc088cb97aa88ecd14e57c5e657c2d11a8820f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 12 Oct 2024 16:08:04 +0100 Subject: [PATCH 165/180] faiss: restore `passthru` attributes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the `python3Packages.faiss.passthru` are broken: $ nix repl -f. nix-repl> python3Packages.faiss.passthru cudaPackages = «error: attribute 'cudaPackages' missing»; cudaSupport = «error: attribute 'cudaSupport' missing»; pythonSupport = «error: attribute 'pythonSupport' missing»; --- pkgs/development/libraries/science/math/faiss/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 689349fb05acd..750735ba67869 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -105,6 +105,10 @@ stdenv.mkDerivation { cp faiss/python/dist/*.whl "$dist/" ''; + passthru = { + inherit cudaSupport cudaPackages pythonSupport; + }; + meta = { description = "Library for efficient similarity search and clustering of dense vectors by Facebook Research"; mainProgram = "demo_ivfpq_indexing"; From 58cd045b17f588c0897f44201e1168845668ae1e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Oct 2024 11:21:58 +0200 Subject: [PATCH 166/180] catboost: move to by-name --- .../catboost/default.nix => by-name/ca/catboost/package.nix} | 0 .../libraries => by-name/ca}/catboost/remove-conan.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries/catboost/default.nix => by-name/ca/catboost/package.nix} (100%) rename pkgs/{development/libraries => by-name/ca}/catboost/remove-conan.patch (100%) diff --git a/pkgs/development/libraries/catboost/default.nix b/pkgs/by-name/ca/catboost/package.nix similarity index 100% rename from pkgs/development/libraries/catboost/default.nix rename to pkgs/by-name/ca/catboost/package.nix diff --git a/pkgs/development/libraries/catboost/remove-conan.patch b/pkgs/by-name/ca/catboost/remove-conan.patch similarity index 100% rename from pkgs/development/libraries/catboost/remove-conan.patch rename to pkgs/by-name/ca/catboost/remove-conan.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca6653f586c2..2f572ac6db3b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19071,7 +19071,7 @@ with pkgs; captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; - catboost = callPackage ../development/libraries/catboost { + catboost = callPackage ../by-name/ca/catboost/package.nix { # https://github.com/catboost/catboost/issues/2540 cudaPackages = cudaPackages_11; }; From 5d2c1a9655ab765314e35a05d423cbac49743b9e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Oct 2024 11:23:26 +0200 Subject: [PATCH 167/180] catboost: format --- pkgs/by-name/ca/catboost/package.nix | 101 ++++++++++++++++----------- 1 file changed, 60 insertions(+), 41 deletions(-) diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index ca0d22ff002cd..1c36c6de4a837 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -1,20 +1,21 @@ -{ lib -, config -, fetchFromGitHub -, cmake -, cctools -, libiconv -, llvmPackages -, ninja -, openssl -, python3Packages -, ragel -, yasm -, zlib -, cudaSupport ? config.cudaSupport -, cudaPackages ? {} -, llvmPackages_12 -, pythonSupport ? false +{ + lib, + config, + fetchFromGitHub, + cmake, + cctools, + libiconv, + llvmPackages, + ninja, + openssl, + python3Packages, + ragel, + yasm, + zlib, + cudaSupport ? config.cudaSupport, + cudaPackages ? { }, + llvmPackages_12, + pythonSupport ? false, }: let inherit (llvmPackages) stdenv; @@ -50,31 +51,46 @@ stdenv.mkDerivation (finalAttrs: { done ''; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; - nativeBuildInputs = [ - cmake - llvmPackages.bintools - ninja - (python3Packages.python.withPackages (ps: with ps; [ six ])) - ragel - yasm - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); + nativeBuildInputs = + [ + cmake + llvmPackages.bintools + ninja + (python3Packages.python.withPackages (ps: with ps; [ six ])) + ragel + yasm + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_nvcc + ] + ); - buildInputs = [ - openssl - zlib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - cuda_cccl - libcublas - ]); + buildInputs = + [ + openssl + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + ] + ++ lib.optionals cudaSupport ( + with cudaPackages; + [ + cuda_cudart + cuda_cccl + libcublas + ] + ); env = { # catboost requires clang 14+ for build, but does clang 12 for cuda build. @@ -115,7 +131,10 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.asl20; platforms = platforms.unix; homepage = "https://catboost.ai"; - maintainers = with maintainers; [ PlushBeaver natsukium ]; + maintainers = with maintainers; [ + PlushBeaver + natsukium + ]; mainProgram = "catboost"; }; }) From 8ff97cbeb128f796ae6de76bc5e44470161ca111 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Oct 2024 11:28:26 +0200 Subject: [PATCH 168/180] catboost: 1.2.5 -> 1.2.7 Diff: https://github.com/catboost/catboost/compare/v1.2.5...v1.2.7 Changelog: https://github.com/catboost/catboost/releases/tag/v1.2.7 --- pkgs/by-name/ca/catboost/package.nix | 7 +++++-- pkgs/by-name/ca/catboost/remove-conan.patch | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index 1c36c6de4a837..0bbfe4671d3a3 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -23,13 +23,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "catboost"; - version = "1.2.5"; + version = "1.2.7"; src = fetchFromGitHub { owner = "catboost"; repo = "catboost"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-2dfCCCa0LheytkLRbYuBd25M320f1kbhBWKIVjslor0="; + hash = "sha256-I3geFdVQ1Pm61eRXi+ueaxel3QRb8EJV9f4zV2Q7kk4="; }; patches = [ @@ -93,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: { ); env = { + PROGRAM_VERSION = finalAttrs.version; + # catboost requires clang 14+ for build, but does clang 12 for cuda build. # after bumping the default version of llvm, check for compatibility with the cuda backend and pin it. # see https://catboost.ai/en/docs/installation/build-environment-setup-for-cmake#compilers,-linkers-and-related-tools @@ -128,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { library, used for ranking, classification, regression and other machine learning tasks for Python, R, Java, C++. Supports computation on CPU and GPU. ''; + changelog = "https://github.com/catboost/catboost/releases/tag/v${finalAttrs.version}"; license = licenses.asl20; platforms = platforms.unix; homepage = "https://catboost.ai"; diff --git a/pkgs/by-name/ca/catboost/remove-conan.patch b/pkgs/by-name/ca/catboost/remove-conan.patch index 44411ad4160ba..4e3ab6f436f95 100644 --- a/pkgs/by-name/ca/catboost/remove-conan.patch +++ b/pkgs/by-name/ca/catboost/remove-conan.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed6c53b220..5c6fb8f157 100644 +index 24ffd1225a..700adcc246 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -29,7 +29,6 @@ include(cmake/global_flags.cmake) +@@ -39,7 +39,6 @@ include(cmake/global_flags.cmake) include(cmake/global_vars.cmake) include(cmake/archive.cmake) include(cmake/common.cmake) --include(cmake/conan.cmake) +-include(cmake/conan1_deprecated.cmake) include(cmake/cuda.cmake) include(cmake/cython.cmake) include(cmake/fbs.cmake) -@@ -38,21 +37,6 @@ include(cmake/recursive_library.cmake) +@@ -48,21 +47,6 @@ include(cmake/recursive_library.cmake) include(cmake/shared_libs.cmake) include(cmake/swig.cmake) @@ -24,11 +24,16 @@ index ed6c53b220..5c6fb8f157 100644 - BUILD missing - REMOTE conancenter - SETTINGS ${settings} -- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" -- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" +- ENV "CONAN_CMAKE_GENERATOR=${CMAKE_GENERATOR}" +- CONF "tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}" - ) -endif() - + if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT HAVE_CUDA) include(CMakeLists.linux-x86_64.txt) - elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND HAVE_CUDA) +@@ -93,4 +77,3 @@ elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86") + elseif (ANDROID AND CMAKE_ANDROID_ARCH STREQUAL "x86_64") + include(CMakeLists.android-x86_64.txt) + endif() +- From dbd3d28e558bda0430e9ae97a9ef73af727b2014 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Oct 2024 17:17:38 +0200 Subject: [PATCH 169/180] catboost: mark as broken on x86_64-darwin --- pkgs/by-name/ca/catboost/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index 0bbfe4671d3a3..1d0ef404a667b 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -139,5 +139,7 @@ stdenv.mkDerivation (finalAttrs: { natsukium ]; mainProgram = "catboost"; + # /nix/store/hzxiynjmmj35fpy3jla7vcqwmzj9i449-Libsystem-1238.60.2/include/sys/_types/_mbstate_t.h:31:9: error: unknown type name '__darwin_mbstate_t' + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) From bf171746655a97d46cc7a1037749d9e2f15e5889 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Oct 2024 17:25:19 +0200 Subject: [PATCH 170/180] python312Packages.catboost: clean derivation --- .../python-modules/catboost/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 98e4f0869ccb8..d0fc77b700383 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -3,15 +3,18 @@ buildPythonPackage, catboost, python, + + # build-system + setuptools, + + # dependencies graphviz, matplotlib, numpy, pandas, plotly, scipy, - setuptools, six, - wheel, }: buildPythonPackage rec { @@ -21,16 +24,15 @@ buildPythonPackage rec { src meta ; - format = "pyproject"; + pyproject = true; sourceRoot = "${src.name}/catboost/python-package"; - nativeBuildInputs = [ + build-system = [ setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ graphviz matplotlib numpy From e740696edc7ba0ec621c4059ec01d83bca66750c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 10 Oct 2024 08:20:14 +0000 Subject: [PATCH 171/180] python3Packages.opentelemetry-instrumentation-botocore: init at 0.47b0 --- .../default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix new file mode 100644 index 0000000000000..caa6d327dfebc --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-botocore/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + botocore, + moto, + opentelemetry-test-utils, + opentelemetry-propagator-aws-xray, + pytestCheckHook, + aws-xray-sdk, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-botocore"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-botocore"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-propagator-aws-xray + opentelemetry-semantic-conventions + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + checkInputs = [ + aws-xray-sdk + moto + ]; + + optional-dependencies = { + instruments = [ botocore ]; + }; + + pythonImportsCheck = [ "opentelemetry.instrumentation.botocore" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-botocore"; + description = "Botocore instrumentation for OpenTelemetry"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7b7b2892cd2f..56a6ea35693a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9401,6 +9401,8 @@ self: super: with self; { opentelemetry-instrumentation-celery = callPackage ../development/python-modules/opentelemetry-instrumentation-celery { }; + opentelemetry-instrumentation-botocore = callPackage ../development/python-modules/opentelemetry-instrumentation-botocore { }; + opentelemetry-instrumentation-dbapi = callPackage ../development/python-modules/opentelemetry-instrumentation-dbapi { }; opentelemetry-instrumentation-django = callPackage ../development/python-modules/opentelemetry-instrumentation-django { }; From a9e9dccf6b576ed9d19439eb956ce3d5f6eb1866 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 7 Oct 2024 08:43:00 +0000 Subject: [PATCH 172/180] python3Packages.opentelemetry-propagator-aws-xray: init at 0.47b0 --- .../default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix diff --git a/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix b/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix new file mode 100644 index 0000000000000..47d67c2b100ad --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-propagator-aws-xray/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-semantic-conventions, + opentelemetry-instrumentation-botocore, + opentelemetry-test-utils, + pytestCheckHook, + requests, + pytest-benchmark, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-propagator-aws-xray"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/propagator/opentelemetry-propagator-aws-xray"; + + build-system = [ hatchling ]; + + dependencies = [ opentelemetry-api ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + checkInputs = [ + pytest-benchmark + requests + ]; + + pythonImportsCheck = [ "opentelemetry.propagators.aws" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/propagator/opentelemetry-propagator-aws-xray"; + description = "AWS X-Ray Propagator for OpenTelemetry"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7b7b2892cd2f..6260d4411ed59 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9419,6 +9419,8 @@ self: super: with self; { opentelemetry-instrumentation-wsgi = callPackage ../development/python-modules/opentelemetry-instrumentation-wsgi { }; + opentelemetry-propagator-aws-xray = callPackage ../development/python-modules/opentelemetry-propagator-aws-xray { }; + opentelemetry-proto = callPackage ../development/python-modules/opentelemetry-proto { }; opentelemetry-semantic-conventions = callPackage ../development/python-modules/opentelemetry-semantic-conventions { }; From ba5676fc4236228ca5dee5ff6bc1b52ac3428864 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Oct 2024 18:07:41 +0000 Subject: [PATCH 173/180] python312Packages.ffmpeg-progress-yield: 0.7.8 -> 0.9.1 --- .../python-modules/ffmpeg-progress-yield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 288389dea8372..4f3baf7fe8dbe 100644 --- a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.7.8"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-muauX4Mq58ew9lGPE0H+bu4bqPydNADLocujjy6qRh4="; + hash = "sha256-n6zHi6M9SyrNm8MhQ9xvBo2OIzoQYJ4yhgujW5C6QWY="; }; propagatedBuildInputs = [ From 9e447b48546c8ccf80ad039cbb56cc936fd82889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 8 Oct 2024 20:56:00 +0200 Subject: [PATCH 174/180] hamster: fix install * Tell the build system where it can install Python files, with the PYTHONDIR environment variable. Without this it tries to install to the existing python3 store path, which fails: waflib.Errors.WafError: Could not create the directory /nix/store/HASH-python3-VERSION/lib/pythonX.Y/site-packages/hamster * Add setuptools as runtime dependency to prevent this fatal runtime error since Python 3.12: ModuleNotFoundError: No module named 'distutils' --- pkgs/applications/misc/hamster/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index bdab5d71e9ef2..e6e9fbea7722d 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -35,9 +35,12 @@ python3Packages.buildPythonApplication rec { pygobject3 pycairo pyxdg + setuptools dbus-python ]; + PYTHONDIR = "${placeholder "out"}/${python3Packages.python.sitePackages}"; + dontWrapGApps = true; # Arguments to be passed to `makeWrapper`, only used by buildPython* From 555a42d6d8abdce993762ca62a3a5677a241f017 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Oct 2024 10:37:14 +0200 Subject: [PATCH 175/180] czkawka: 7.0.0 -> 8.0.0 Diff: https://github.com/qarmin/czkawka/compare/7.0.0...8.0.0 Changelog: https://github.com/qarmin/czkawka/releases/tag/8.0.0 --- pkgs/by-name/cz/czkawka/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 934b6d1dcafac..818978bd7eec6 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -26,21 +26,16 @@ let self = buildRustPackage' { pname = "czkawka"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; - rev = self.version; - hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; + rev = "refs/tags/${self.version}"; + hash = "sha256-Uxko2TRIjqQvd7n9C+P7oMUrm3YY5j7TVzvijEjDwOM="; }; - cargoPatches = [ - # Updates time and time-macros from Cargo.lock - ./0000-time.diff - ]; - - cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es="; + cargoHash = "sha256-DR2JU+QcGWliNoRMjSjJns7FsicpNAX5gTariFuQ/dw="; nativeBuildInputs = [ gobject-introspection From 963540ad3515e23fe5016eba9ad81235a1d229f0 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 11 Oct 2024 17:10:54 +0200 Subject: [PATCH 176/180] czkawka: add versionCheckHook --- pkgs/by-name/cz/czkawka/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 818978bd7eec6..0ec3c8d6d00f4 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -17,6 +17,7 @@ testers, wrapGAppsHook4, xvfb-run, + versionCheckHook, }: let @@ -80,6 +81,13 @@ let install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/czkawka_cli"; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { tests.version = testers.testVersion { package = self; From 2b39be23b1b09200b6ddc4680bc15502be6ea341 Mon Sep 17 00:00:00 2001 From: ben9986 <38633150+Ben9986@users.noreply.github.com> Date: Sat, 12 Oct 2024 20:44:16 +0100 Subject: [PATCH 177/180] krohnkite: 0.9.7 -> 0.9.8.2 --- pkgs/kde/third-party/krohnkite/default.nix | 6 +- .../third-party/krohnkite/package-lock.json | 121 ++++++++++++++---- 2 files changed, 97 insertions(+), 30 deletions(-) diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix index 03b3e64adcfe9..3229e1ec8473c 100644 --- a/pkgs/kde/third-party/krohnkite/default.nix +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -9,16 +9,16 @@ }: buildNpmPackage rec { pname = "krohnkite"; - version = "0.9.7"; + version = "0.9.8.2"; src = fetchFromGitHub { owner = "anametologin"; repo = "krohnkite"; rev = "refs/tags/${version}"; - hash = "sha256-8A3zW5tK8jK9fSxYx28b8uXGsvxEoUYybU0GaMD2LNw="; + hash = "sha256-chADfJ1zaufnwi4jHbEN1Oec3XFNw0YsZxLFhnY3T9w="; }; - npmDepsHash = "sha256-My1goFEoZW9kFA3zb8xKPxAPXm6bypyq+ajPM8zVOHQ="; + npmDepsHash = "sha256-3yE2gyyVkLn/dPDG9zDdkHAEb4/hqTJdyMXE5Y6Z5pM="; dontWrapQtApps = true; diff --git a/pkgs/kde/third-party/krohnkite/package-lock.json b/pkgs/kde/third-party/krohnkite/package-lock.json index 2ac91ccab8757..91884ce5f4c63 100644 --- a/pkgs/kde/third-party/krohnkite/package-lock.json +++ b/pkgs/kde/third-party/krohnkite/package-lock.json @@ -18,6 +18,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -27,6 +28,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -36,6 +38,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -51,6 +54,7 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -63,19 +67,22 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -88,6 +95,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -97,6 +105,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.1.1" }, @@ -108,13 +117,15 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -127,6 +138,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -143,6 +155,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -155,6 +168,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -179,6 +193,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -190,6 +205,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -201,15 +217,17 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/debug": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", - "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", + "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", "dev": true, + "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -220,17 +238,12 @@ } } }, - "node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/decamelize": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -243,6 +256,7 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } @@ -251,13 +265,15 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -267,6 +283,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -279,6 +296,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -291,6 +309,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -307,6 +326,7 @@ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -315,7 +335,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", @@ -323,6 +344,7 @@ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -336,6 +358,7 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -346,6 +369,7 @@ "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -365,6 +389,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -377,6 +402,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -386,6 +412,7 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, + "license": "MIT", "bin": { "he": "bin/he" } @@ -396,6 +423,7 @@ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -405,13 +433,15 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -424,6 +454,7 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -433,6 +464,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -442,6 +474,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -454,6 +487,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -463,6 +497,7 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -472,6 +507,7 @@ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -484,6 +520,7 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -496,6 +533,7 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -511,6 +549,7 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -527,6 +566,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -539,6 +579,7 @@ "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.7.3.tgz", "integrity": "sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^4.1.3", "browser-stdout": "^1.3.1", @@ -573,13 +614,15 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -589,6 +632,7 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -598,6 +642,7 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -613,6 +658,7 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -628,6 +674,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -637,6 +684,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -649,6 +697,7 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } @@ -658,6 +707,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -670,6 +720,7 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -692,13 +743,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/serialize-javascript": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } @@ -708,6 +761,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -722,6 +776,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -734,6 +789,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -746,6 +802,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -761,6 +818,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -769,10 +827,11 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -785,13 +844,15 @@ "version": "6.5.1", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz", "integrity": "sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -808,13 +869,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -824,6 +887,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -842,6 +906,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -851,6 +916,7 @@ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, + "license": "MIT", "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -866,6 +932,7 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, From cd1c8e9e20ad15ffd5a85f033ad04943f935b01b Mon Sep 17 00:00:00 2001 From: ben9986 <38633150+Ben9986@users.noreply.github.com> Date: Sat, 12 Oct 2024 20:46:26 +0100 Subject: [PATCH 178/180] krohnkite: simplify installPhase Makes it easier to override version --- pkgs/kde/third-party/krohnkite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/third-party/krohnkite/default.nix b/pkgs/kde/third-party/krohnkite/default.nix index 3229e1ec8473c..d9c85dd224cb5 100644 --- a/pkgs/kde/third-party/krohnkite/default.nix +++ b/pkgs/kde/third-party/krohnkite/default.nix @@ -40,8 +40,8 @@ buildNpmPackage rec { runHook preInstall substituteInPlace Makefile --replace-fail '7z a -tzip' 'zip -r' - make krohnkite-${version}.kwinscript - kpackagetool6 --type=KWin/Script --install=krohnkite-${version}.kwinscript --packageroot=$out/share/kwin/scripts + make KWINPKG_FILE=krohnkite.kwinscript krohnkite.kwinscript + kpackagetool6 --type=KWin/Script --install=krohnkite.kwinscript --packageroot=$out/share/kwin/scripts runHook postInstall ''; From b791360ec6c5d96e7c6bdb6f3e1867b47fed7bb9 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Wed, 9 Oct 2024 22:37:40 +0700 Subject: [PATCH 179/180] vimPlugins.langmapper-nvim: init at 2024-09-19 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 582cda171e71e..6f984e8404754 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5534,6 +5534,18 @@ final: prev: meta.homepage = "https://github.com/qnighy/lalrpop.vim/"; }; + langmapper-nvim = buildVimPlugin { + pname = "langmapper.nvim"; + version = "2024-09-19"; + src = fetchFromGitHub { + owner = "Wansmer"; + repo = "langmapper.nvim"; + rev = "ac74a80cb86e8b51e4a13ccb2ee540d544fe1c62"; + sha256 = "1b2sjsi81r7m1pxxkisl4b2w2cag3v2i4andhn89gv6afzakvzka"; + }; + meta.homepage = "https://github.com/Wansmer/langmapper.nvim/"; + }; + last256 = buildVimPlugin { pname = "last256"; version = "2020-12-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 987772e36724f..870650142a6e6 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -463,6 +463,7 @@ https://github.com/b3nj5m1n/kommentary/,, https://github.com/udalov/kotlin-vim/,, https://github.com/mistweaverco/kulala.nvim/,HEAD, https://github.com/qnighy/lalrpop.vim/,, +https://github.com/Wansmer/langmapper.nvim/,HEAD, https://github.com/sk1418/last256/,, https://github.com/latex-box-team/latex-box/,, https://github.com/dundalek/lazy-lsp.nvim/,HEAD, From bd3bca3e9735ccadc66ec00ccef741c33a92b077 Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Sat, 5 Oct 2024 09:08:55 +0800 Subject: [PATCH 180/180] vimPlugins.vim-afterglow: init at 2024-03-31 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6f984e8404754..53b3c3285b0ce 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12966,6 +12966,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-after-object/"; }; + vim-afterglow = buildVimPlugin { + pname = "vim-afterglow"; + version = "2024-03-31"; + src = fetchFromGitHub { + owner = "danilo-augusto"; + repo = "vim-afterglow"; + rev = "fe3a0c4d2acf13ed6f7f0f1fede0a2570f13b06e"; + sha256 = "0z61jfdhhajw5k7y8msk8nj5nljwygmw3s6vsqq9qgczaixqh968"; + }; + meta.homepage = "https://github.com/danilo-augusto/vim-afterglow/"; + }; + vim-agda = buildVimPlugin { pname = "vim-agda"; version = "2024-05-17"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 870650142a6e6..641c73997736c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1093,6 +1093,7 @@ https://github.com/MarcWeber/vim-addon-syntax-checker/,, https://github.com/MarcWeber/vim-addon-toggle-buffer/,, https://github.com/MarcWeber/vim-addon-xdebug/,, https://github.com/junegunn/vim-after-object/,, +https://github.com/danilo-augusto/vim-afterglow/,HEAD, https://github.com/msuperdock/vim-agda/,HEAD, https://github.com/vim-airline/vim-airline/,, https://github.com/enricobacis/vim-airline-clock/,,