From 32ac87459e003f6f323c4f3e0087c92a931abb70 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 14 Nov 2022 00:08:58 +1100 Subject: [PATCH 001/337] flutter: Add dependencies for Linux desktop compilation --- .../development/compilers/flutter/flutter.nix | 113 ++++++++++++++---- 1 file changed, 87 insertions(+), 26 deletions(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index c9b8a211349..9d53f4ba3a4 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -3,18 +3,31 @@ , patches , dart , src +, supportsLinuxDesktop ? true }: { bash , buildFHSUserEnv , cacert , git -, runCommand +, runCommandLocal +, writeShellScript +, makeWrapper , stdenv , lib , alsa-lib +, atk +, cairo +, clang +, cmake , dbus , expat +, gdk-pixbuf +, glib +, gtk3 +, harfbuzz +, libepoxy +, libGL , libpulseaudio , libuuid , libX11 @@ -22,16 +35,19 @@ , libXcomposite , libXcursor , libXdamage +, libXext , libXfixes +, libXi , libXrender , libXtst -, libXi -, libXext -, libGL +, ninja , nspr , nss +, pango +, pkg-config , systemd , which +, xorgproto , callPackage }: let @@ -100,18 +116,34 @@ let # Wrap flutter inside an fhs user env to allow execution of binary, # like adb from $ANDROID_HOME or java from android-studio. + # + # Also provide libraries at hardcoded locations for Linux desktop target + # compilation and execution. fhsEnv = buildFHSUserEnv { name = "${drvName}-fhs-env"; - multiPkgs = pkgs: [ - # Flutter only use these certificates - (runCommand "fedoracert" { } '' - mkdir -p $out/etc/pki/tls/ - ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs - '') - pkgs.zlib - ]; + multiPkgs = pkgs: + with pkgs; ([ + # Flutter only use these certificates + (runCommandLocal "fedoracert" { } '' + mkdir -p $out/etc/pki/tls/ + ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs + '') + zlib + ] ++ pkgs.lib.lists.optionals supportsLinuxDesktop [ + atk + cairo + gdk-pixbuf + glib + gtk3 + harfbuzz + libepoxy + pango + xorg.libX11 + xorg.libX11.dev + xorg.xorgproto + ]); targetPkgs = pkgs: - with pkgs; [ + with pkgs; ([ bash curl dart @@ -143,22 +175,39 @@ let nspr nss systemd - ]; + ]); + profile = '' + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/share/pkgconfig" + ''; }; in let self = (self: -runCommand drvName +runCommandLocal drvName { - startScript = '' - #!${bash}/bin/bash + flutterWithCorrectedCache = writeShellScript "flutter_corrected_cache" '' export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 - ${fhsEnv}/bin/${drvName}-fhs-env ${flutter}/bin/flutter --no-version-check "$@" + ${flutter}/bin/flutter "$@" ''; - preferLocalBuild = true; - allowSubstitutes = false; + buildInputs = [ + makeWrapper + pkg-config + ] ++ lib.lists.optionals supportsLinuxDesktop (let + # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 + deps = pkg: (pkg.buildInputs or []) ++ (pkg.propagatedBuildInputs or []); + collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ lib.concatMap collect (deps pkg)); + in + collect atk.dev ++ + collect cairo.dev ++ + collect gdk-pixbuf.dev ++ + collect glib.dev ++ + collect gtk3.dev ++ + collect harfbuzz.dev ++ + collect libepoxy.dev ++ + collect pango.dev ++ + collect libX11.dev ++ + collect xorgproto); passthru = { unwrapped = flutter; inherit dart; @@ -178,13 +227,25 @@ runCommand drvName maintainers = with maintainers; [ babariviere ericdallo ]; }; } '' - mkdir -p $out/bin + mkdir -p $out/bin - mkdir -p $out/bin/cache/ - ln -sf ${dart} $out/bin/cache/dart-sdk + mkdir -p $out/bin/cache/ + ln -sf ${dart} $out/bin/cache/dart-sdk - echo -n "$startScript" > $out/bin/${pname} - chmod +x $out/bin/${pname} + mkdir -p $out/libexec + makeWrapper "$flutterWithCorrectedCache" $out/libexec/flutter_launcher \ + --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ + --prefix PATH : ${lib.makeBinPath (lib.lists.optionals supportsLinuxDesktop [ + pkg-config + cmake + ninja + clang + ])} \ + --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH_FOR_TARGET" \ + --add-flags --no-version-check + + makeWrapper ${fhsEnv}/bin/${drvName}-fhs-env $out/bin/${pname} \ + --add-flags $out/libexec/flutter_launcher '') self; in self From 7fd5a33393a196d12769d5d10cd5972ac2d68d93 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 14 Nov 2022 00:22:10 +1100 Subject: [PATCH 002/337] flutter: Move runtime libraries out of FHS using LD_LIBRARY_PATH --- .../development/compilers/flutter/flutter.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 9d53f4ba3a4..680ea6d9488 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -130,15 +130,6 @@ let '') zlib ] ++ pkgs.lib.lists.optionals supportsLinuxDesktop [ - atk - cairo - gdk-pixbuf - glib - gtk3 - harfbuzz - libepoxy - pango - xorg.libX11 xorg.libX11.dev xorg.xorgproto ]); @@ -242,6 +233,17 @@ runCommandLocal drvName clang ])} \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH_FOR_TARGET" \ + --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (lib.lists.optionals supportsLinuxDesktop [ + atk + cairo + gdk-pixbuf + glib + gtk3 + harfbuzz + libepoxy + pango + libX11 + ])} \ --add-flags --no-version-check makeWrapper ${fhsEnv}/bin/${drvName}-fhs-env $out/bin/${pname} \ From c6b044c101523efbe699373fdf449fdd60390cf4 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 14 Nov 2022 11:24:38 +1100 Subject: [PATCH 003/337] flutter: Use RPATH and CFLAGS to remove Linux desktop compilation and runtime FHS dependency --- .../development/compilers/flutter/flutter.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 680ea6d9488..c8fc23492ba 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -116,9 +116,6 @@ let # Wrap flutter inside an fhs user env to allow execution of binary, # like adb from $ANDROID_HOME or java from android-studio. - # - # Also provide libraries at hardcoded locations for Linux desktop target - # compilation and execution. fhsEnv = buildFHSUserEnv { name = "${drvName}-fhs-env"; multiPkgs = pkgs: @@ -129,9 +126,6 @@ let ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs '') zlib - ] ++ pkgs.lib.lists.optionals supportsLinuxDesktop [ - xorg.libX11.dev - xorg.xorgproto ]); targetPkgs = pkgs: with pkgs; ([ @@ -167,9 +161,6 @@ let nss systemd ]); - profile = '' - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/share/pkgconfig" - ''; }; in @@ -233,7 +224,8 @@ runCommandLocal drvName clang ])} \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH_FOR_TARGET" \ - --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (lib.lists.optionals supportsLinuxDesktop [ + --prefix CXXFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-isystem ${libX11.dev}/include -isystem ${xorgproto}/include"}' \ + --prefix LDFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-rpath ${lib.makeLibraryPath [ atk cairo gdk-pixbuf @@ -243,7 +235,12 @@ runCommandLocal drvName libepoxy pango libX11 - ])} \ + ]}"}' \ + --suffix LD_LIBRARY_PATH : '${lib.optionalString supportsLinuxDesktop (lib.makeLibraryPath [ + # The prebuilt flutter_linux_gtk library shipped in the Flutter SDK does not have an appropriate RUNPATH. + # Its dependencies must be added here. + libepoxy + ])}' \ --add-flags --no-version-check makeWrapper ${fhsEnv}/bin/${drvName}-fhs-env $out/bin/${pname} \ From ea48c7c9b68add8b1b7f8a8926d9fec3df12301f Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 14 Nov 2022 13:11:49 +1100 Subject: [PATCH 004/337] flutter: Modularize unwrapped, wrapped, and FHS components --- .../development/compilers/flutter/default.nix | 10 +- pkgs/development/compilers/flutter/fhs.nix | 71 +++++ .../development/compilers/flutter/flutter.nix | 283 ++++-------------- .../development/compilers/flutter/wrapper.nix | 89 ++++++ pkgs/top-level/all-packages.nix | 8 +- 5 files changed, 232 insertions(+), 229 deletions(-) create mode 100644 pkgs/development/compilers/flutter/fhs.nix create mode 100644 pkgs/development/compilers/flutter/wrapper.nix diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 676ef78e3b3..50752b01ec7 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,11 +1,13 @@ { callPackage, fetchurl, dart }: let mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; + wrapFlutter = flutter: callPackage (import ./wrapper.nix) { flutter = flutter; }; + mkFlutterFHS = flutter: callPackage (import ./fhs.nix) { flutter = flutter; }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - flutterDrv = { version, pname, dartVersion, hash, dartHash, patches }: mkFlutter { - inherit version pname patches; + flutterDrv = { version, dartVersion, hash, dartHash, patches }: mkFlutter { + inherit version patches; dart = dart.override { version = dartVersion; sources = { @@ -26,9 +28,8 @@ let }; in { - inherit mkFlutter; + inherit mkFlutter wrapFlutter mkFlutterFHS flutterDrv; stable = flutterDrv { - pname = "flutter"; version = "3.3.3"; dartVersion = "2.18.2"; hash = "sha256-MTZeWQUp4/TcPzYIT6eqIKSPUPvn2Mp/thOQzNgpTXg="; @@ -40,7 +41,6 @@ in }; v2 = flutterDrv { - pname = "flutter"; version = "2.10.5"; dartVersion = "2.16.2"; hash = "sha256-DTZwxlMUYk8NS1SaWUJolXjD+JnRW73Ps5CdRHDGnt0="; diff --git a/pkgs/development/compilers/flutter/fhs.nix b/pkgs/development/compilers/flutter/fhs.nix new file mode 100644 index 00000000000..025d94665b5 --- /dev/null +++ b/pkgs/development/compilers/flutter/fhs.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, flutter +, buildFHSUserEnv +, runCommandLocal +, supportsAndroidEmulator ? stdenv.isLinux +}: + +# Wrap flutter inside an fhs user env to allow execution of binary, +# like adb from $ANDROID_HOME or java from android-studio. +buildFHSUserEnv { + name = flutter.name; + + multiPkgs = pkgs: with pkgs; ([ + # Flutter only use these certificates + (runCommandLocal "fedoracert" { } '' + mkdir -p $out/etc/pki/tls/ + ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs + '') + zlib + ]); + + targetPkgs = pkgs: with pkgs; ([ + flutter + + # General ecosystem dependencies + bash + curl + git + unzip + which + xz + + # flutter test requires this lib + libGLU + ] ++ lib.optional supportsAndroidEmulator [ + # for android emulator + alsa-lib + dbus + expat + libpulseaudio + libuuid + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + libGL + nspr + nss + systemd + ]); + + runScript = "flutter"; + + passthru = { + inherit flutter; + }; + + meta = flutter.meta // { + longDescription = '' + ${flutter.meta.longDescription} + Wrapped in a FHS environment to improve compatibility with internal tools and tools in the ecosystem. + ''; + }; +} diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index c8fc23492ba..1cbbe66509e 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -1,202 +1,80 @@ -{ pname -, version +{ version , patches , dart , src -, supportsLinuxDesktop ? true }: -{ bash -, buildFHSUserEnv -, cacert +{ lib , git -, runCommandLocal -, writeShellScript -, makeWrapper , stdenv -, lib -, alsa-lib -, atk -, cairo -, clang -, cmake -, dbus -, expat -, gdk-pixbuf -, glib -, gtk3 -, harfbuzz -, libepoxy -, libGL -, libpulseaudio -, libuuid -, libX11 -, libxcb -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrender -, libXtst -, ninja -, nspr -, nss -, pango -, pkg-config -, systemd , which -, xorgproto -, callPackage }: -let - drvName = "flutter-${version}"; - flutter = stdenv.mkDerivation { - name = "${drvName}-unwrapped"; - buildInputs = [ git ]; +stdenv.mkDerivation { + name = "$flutter-${version}-unwrapped"; - inherit src patches version; + buildInputs = [ git ]; - postPatch = '' - patchShebangs --build ./bin/ - ''; + inherit src patches version; - buildPhase = '' - export FLUTTER_ROOT="$(pwd)" - export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" - export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" - - export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" - export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" - - export DART_SDK_PATH="${dart}" - - HOME=../.. # required for pub upgrade --offline, ~/.pub-cache - # path is relative otherwise it's replaced by /build/flutter - - pushd "$FLUTTER_TOOLS_DIR" - ${dart}/bin/dart pub get --offline - popd - - local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" - ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH" - echo "$revision" > "$STAMP_PATH" - echo -n "${version}" > version - - rm -r bin/cache/{artifacts,dart-sdk,downloads} - rm bin/cache/*.stamp - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r . $out - mkdir -p $out/bin/cache/ - ln -sf ${dart} $out/bin/cache/dart-sdk - - runHook postInstall - ''; - - doInstallCheck = true; - installCheckInputs = [ which ]; - installCheckPhase = '' - runHook preInstallCheck - - export HOME="$(mktemp -d)" - $out/bin/flutter config --android-studio-dir $HOME - $out/bin/flutter config --android-sdk $HOME - $out/bin/flutter --version | fgrep -q '${version}' - - runHook postInstallCheck - ''; - }; - - # Wrap flutter inside an fhs user env to allow execution of binary, - # like adb from $ANDROID_HOME or java from android-studio. - fhsEnv = buildFHSUserEnv { - name = "${drvName}-fhs-env"; - multiPkgs = pkgs: - with pkgs; ([ - # Flutter only use these certificates - (runCommandLocal "fedoracert" { } '' - mkdir -p $out/etc/pki/tls/ - ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs - '') - zlib - ]); - targetPkgs = pkgs: - with pkgs; ([ - bash - curl - dart - git - unzip - which - xz - - # flutter test requires this lib - libGLU - - # for android emulator - alsa-lib - dbus - expat - libpulseaudio - libuuid - libX11 - libxcb - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrender - libXtst - libGL - nspr - nss - systemd - ]); - }; - -in -let -self = (self: -runCommandLocal drvName -{ - flutterWithCorrectedCache = writeShellScript "flutter_corrected_cache" '' - export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - ${flutter}/bin/flutter "$@" + postPatch = '' + patchShebangs --build ./bin/ ''; - buildInputs = [ - makeWrapper - pkg-config - ] ++ lib.lists.optionals supportsLinuxDesktop (let - # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 - deps = pkg: (pkg.buildInputs or []) ++ (pkg.propagatedBuildInputs or []); - collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ lib.concatMap collect (deps pkg)); - in - collect atk.dev ++ - collect cairo.dev ++ - collect gdk-pixbuf.dev ++ - collect glib.dev ++ - collect gtk3.dev ++ - collect harfbuzz.dev ++ - collect libepoxy.dev ++ - collect pango.dev ++ - collect libX11.dev ++ - collect xorgproto); + + buildPhase = '' + export FLUTTER_ROOT="$(pwd)" + export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" + export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" + + export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" + export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" + + export DART_SDK_PATH="${dart}" + + HOME=../.. # required for pub upgrade --offline, ~/.pub-cache + # path is relative otherwise it's replaced by /build/flutter + + pushd "$FLUTTER_TOOLS_DIR" + ${dart}/bin/dart pub get --offline + popd + + local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" + ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH" + echo "$revision" > "$STAMP_PATH" + echo -n "${version}" > version + + rm -r bin/cache/{artifacts,dart-sdk,downloads} + rm bin/cache/*.stamp + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r . $out + mkdir -p $out/bin/cache/ + ln -sf ${dart} $out/bin/cache/dart-sdk + + runHook postInstall + ''; + + doInstallCheck = true; + installCheckInputs = [ which ]; + installCheckPhase = '' + runHook preInstallCheck + + export HOME="$(mktemp -d)" + $out/bin/flutter config --android-studio-dir $HOME + $out/bin/flutter config --android-sdk $HOME + $out/bin/flutter --version | fgrep -q '${version}' + + runHook postInstallCheck + ''; + passthru = { - unwrapped = flutter; inherit dart; - mkFlutterApp = callPackage ../../../build-support/flutter { - flutter = self; - }; }; + meta = with lib; { description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; longDescription = '' @@ -208,43 +86,4 @@ runCommandLocal drvName platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ babariviere ericdallo ]; }; -} '' - mkdir -p $out/bin - - mkdir -p $out/bin/cache/ - ln -sf ${dart} $out/bin/cache/dart-sdk - - mkdir -p $out/libexec - makeWrapper "$flutterWithCorrectedCache" $out/libexec/flutter_launcher \ - --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --prefix PATH : ${lib.makeBinPath (lib.lists.optionals supportsLinuxDesktop [ - pkg-config - cmake - ninja - clang - ])} \ - --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH_FOR_TARGET" \ - --prefix CXXFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-isystem ${libX11.dev}/include -isystem ${xorgproto}/include"}' \ - --prefix LDFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-rpath ${lib.makeLibraryPath [ - atk - cairo - gdk-pixbuf - glib - gtk3 - harfbuzz - libepoxy - pango - libX11 - ]}"}' \ - --suffix LD_LIBRARY_PATH : '${lib.optionalString supportsLinuxDesktop (lib.makeLibraryPath [ - # The prebuilt flutter_linux_gtk library shipped in the Flutter SDK does not have an appropriate RUNPATH. - # Its dependencies must be added here. - libepoxy - ])}' \ - --add-flags --no-version-check - - makeWrapper ${fhsEnv}/bin/${drvName}-fhs-env $out/bin/${pname} \ - --add-flags $out/libexec/flutter_launcher -'') self; -in -self +} diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix new file mode 100644 index 00000000000..05a64f17028 --- /dev/null +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -0,0 +1,89 @@ +{ lib +, flutter +, supportsLinuxDesktop ? true +, makeWrapper +, runCommandLocal +, writeShellScript +, pkg-config +, atk +, cairo +, gdk-pixbuf +, glib +, gtk3 +, harfbuzz +, libepoxy +, pango +, libX11 +, xorgproto +, cmake +, ninja +, clang +}: + +runCommandLocal "flutter" +{ + flutterWithCorrectedCache = writeShellScript "flutter_corrected_cache" '' + export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} + ${flutter}/bin/flutter "$@" + ''; + + buildInputs = [ + makeWrapper + pkg-config + ] ++ lib.lists.optionals supportsLinuxDesktop ( + let + # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 + deps = pkg: (pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ]); + collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ lib.concatMap collect (deps pkg)); + in + collect atk.dev ++ + collect cairo.dev ++ + collect gdk-pixbuf.dev ++ + collect glib.dev ++ + collect gtk3.dev ++ + collect harfbuzz.dev ++ + collect libepoxy.dev ++ + collect pango.dev ++ + collect libX11.dev ++ + collect xorgproto + ); + + passthru = flutter.passthru // { + unwrapped = flutter; + }; + + inherit (flutter) meta; +} '' + mkdir -p $out/bin + + mkdir -p $out/bin/cache/ + ln -sf ${flutter.dart} $out/bin/cache/dart-sdk + + makeWrapper "$flutterWithCorrectedCache" $out/bin/flutter \ + --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ + --prefix PATH : ${lib.makeBinPath (lib.lists.optionals supportsLinuxDesktop [ + pkg-config + cmake + ninja + clang + ])} \ + --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH_FOR_TARGET" \ + --prefix CXXFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-isystem ${libX11.dev}/include -isystem ${xorgproto}/include"}' \ + --prefix LDFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-rpath ${lib.makeLibraryPath [ + atk + cairo + gdk-pixbuf + glib + gtk3 + harfbuzz + libepoxy + pango + libX11 + ]}"}' \ + --suffix LD_LIBRARY_PATH : '${lib.optionalString supportsLinuxDesktop (lib.makeLibraryPath [ + # The prebuilt flutter_linux_gtk library shipped in the Flutter SDK does not have an appropriate RUNPATH. + # Its dependencies must be added here. + libepoxy + ])}' \ + --add-flags --no-version-check +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e493af7aa0a..91e81acf393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13699,8 +13699,12 @@ with pkgs; flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); - flutter = flutterPackages.stable; - flutter2 = flutterPackages.v2; + flutter-unwrapped = flutterPackages.stable; + flutter2-unwrapped = flutterPackages.v2; + flutter-wrapped = flutterPackages.wrapFlutter flutter-unwrapped; + flutter2-wrapped = flutterPackages.wrapFlutter flutter2-unwrapped; + flutter = flutterPackages.mkFlutterFHS flutter-wrapped; + flutter2 = flutterPackages.mkFlutterFHS flutter2-wrapped; fnm = callPackage ../development/tools/fnm { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; From e2adc5d8997a8a63cd3e69d9ac21b94a34c7f536 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 14 Nov 2022 13:28:45 +1100 Subject: [PATCH 005/337] flutter: Only enable Linux desktop support by default on Linux --- pkgs/development/compilers/flutter/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 05a64f17028..e20bc049751 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -1,6 +1,7 @@ { lib +, stdenv , flutter -, supportsLinuxDesktop ? true +, supportsLinuxDesktop ? stdenv.isLinux , makeWrapper , runCommandLocal , writeShellScript From e4df8739b7dc5d2b327669aa3edeff6f2be32c05 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 14 Nov 2022 21:17:36 +1100 Subject: [PATCH 006/337] flutter: Implement mkFlutter function using barebones FHS environment --- pkgs/development/compilers/flutter/fhs.nix | 119 +++++++++++---------- 1 file changed, 63 insertions(+), 56 deletions(-) diff --git a/pkgs/development/compilers/flutter/fhs.nix b/pkgs/development/compilers/flutter/fhs.nix index 025d94665b5..bbba89843e8 100644 --- a/pkgs/development/compilers/flutter/fhs.nix +++ b/pkgs/development/compilers/flutter/fhs.nix @@ -1,71 +1,78 @@ { lib , stdenv +, callPackage , flutter , buildFHSUserEnv , runCommandLocal , supportsAndroidEmulator ? stdenv.isLinux }: -# Wrap flutter inside an fhs user env to allow execution of binary, -# like adb from $ANDROID_HOME or java from android-studio. -buildFHSUserEnv { - name = flutter.name; +let + # Wrap flutter inside an fhs user env to allow execution of binary, + # like adb from $ANDROID_HOME or java from android-studio. + self = buildFHSUserEnv { + name = flutter.name; - multiPkgs = pkgs: with pkgs; ([ - # Flutter only use these certificates - (runCommandLocal "fedoracert" { } '' - mkdir -p $out/etc/pki/tls/ - ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs - '') - zlib - ]); + multiPkgs = pkgs: with pkgs; ([ + # Flutter only use these certificates + (runCommandLocal "fedoracert" { } '' + mkdir -p $out/etc/pki/tls/ + ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs + '') + zlib + ]); - targetPkgs = pkgs: with pkgs; ([ - flutter + targetPkgs = pkgs: with pkgs; ([ + flutter - # General ecosystem dependencies - bash - curl - git - unzip - which - xz + # General ecosystem dependencies + bash + curl + git + unzip + which + xz - # flutter test requires this lib - libGLU - ] ++ lib.optional supportsAndroidEmulator [ - # for android emulator - alsa-lib - dbus - expat - libpulseaudio - libuuid - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - libGL - nspr - nss - systemd - ]); + # flutter test requires this lib + libGLU + ] ++ lib.optional supportsAndroidEmulator [ + # for android emulator + alsa-lib + dbus + expat + libpulseaudio + libuuid + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + libGL + nspr + nss + systemd + ]); - runScript = "flutter"; + runScript = "flutter"; - passthru = { - inherit flutter; + passthru = flutter.passthru // { + wrapped = flutter; + mkFlutterApp = callPackage ../../../build-support/flutter { + flutter = callPackage ./fhs.nix { supportsAndroidEmulator = false; }; + }; + }; + + meta = flutter.meta // { + longDescription = '' + ${flutter.meta.longDescription} + Wrapped in a FHS environment to improve compatibility with internal tools and tools in the ecosystem. + ''; + }; }; - - meta = flutter.meta // { - longDescription = '' - ${flutter.meta.longDescription} - Wrapped in a FHS environment to improve compatibility with internal tools and tools in the ecosystem. - ''; - }; -} +in +self From b180cb467bbf3b4ec8f8f488647753081f3af72a Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 14 Nov 2022 21:20:34 +1100 Subject: [PATCH 007/337] flutter.mkFlutterApp: Use wrapped Flutter package during build This ensures that all runtime dependencies are supplied. --- pkgs/build-support/flutter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 691b2c5c6e6..64017e2bd65 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -45,7 +45,7 @@ let getAttrsOrNull = names: attrs: lib.genAttrs names (name: if attrs ? ${name} then attrs.${name} else null); flutterDeps = [ # flutter deps - flutter.unwrapped + flutter.wrapped bash curl flutter.dart From 43d1e2ebf49cfb1b96c9ec82c0de3dd6b2b3935c Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 14 Nov 2022 21:21:22 +1100 Subject: [PATCH 008/337] flutter.mkFlutterApp: Don't use .packages This file is deprecated, unused, and not generated in newer Flutter versions. --- pkgs/build-support/flutter/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 64017e2bd65..cd10acb4a01 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -88,7 +88,7 @@ let # so we can use lock, diff yaml cp "pubspec.yaml" "$RES" cp "pubspec.lock" "$RES" - mv .dart_tool .flutter-plugins .flutter-plugins-dependencies .packages "$RES/f" + mv .dart_tool .flutter-plugins .flutter-plugins-dependencies "$RES/f" # replace paths with placeholders find "$RES" -type f -exec sed -i \ @@ -119,7 +119,6 @@ let find "$RES/.pub-cache" -iname "*.json" -exec sed -r 's|.*_fetchedAt.*| "_fetchedAt": "'"$DART_DATE"'",|g' -i {} + replace_line_matching "$RES/f/.dart_tool/package_config.json" '"generated"' '"generated": "'"$DART_DATE"'",' replace_line_matching "$RES/f/.flutter-plugins-dependencies" '"date_created"' '"date_created": "'"$DART_DATE"'",' - remove_line_matching "$RES/f/.packages" "Generated by pub" # nuke refs find "$RES" -type f -exec nuke-refs {} + From 9c6c81dc4914cc40db32f2ebd351b80f0f9e6576 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 17 Nov 2022 01:26:25 +1100 Subject: [PATCH 009/337] flutter: Add fake SDK derivation --- pkgs/development/compilers/flutter/default.nix | 3 ++- pkgs/development/compilers/flutter/fake-sdk.nix | 15 +++++++++++++++ pkgs/development/compilers/flutter/fhs.nix | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/flutter/fake-sdk.nix diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 50752b01ec7..ab91e946cbb 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -3,6 +3,7 @@ let mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; wrapFlutter = flutter: callPackage (import ./wrapper.nix) { flutter = flutter; }; mkFlutterFHS = flutter: callPackage (import ./fhs.nix) { flutter = flutter; }; + mkFakeSdk = flutter: callPackage (import ./fake-sdk.nix) { flutter = flutter; }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; @@ -28,7 +29,7 @@ let }; in { - inherit mkFlutter wrapFlutter mkFlutterFHS flutterDrv; + inherit mkFlutter wrapFlutter mkFlutterFHS mkFakeSdk flutterDrv; stable = flutterDrv { version = "3.3.3"; dartVersion = "2.18.2"; diff --git a/pkgs/development/compilers/flutter/fake-sdk.nix b/pkgs/development/compilers/flutter/fake-sdk.nix new file mode 100644 index 00000000000..e540cf1fa1c --- /dev/null +++ b/pkgs/development/compilers/flutter/fake-sdk.nix @@ -0,0 +1,15 @@ +{ flutter, symlinkJoin }: + +symlinkJoin { + name = "flutter-fake-${flutter.name}"; + paths = [ flutter flutter.unwrapped ]; + + inherit (flutter) passthru; + + meta = flutter.meta // { + longDescription = '' + ${flutter.meta.longDescription} + Modified binaries are linked into the original SDK directory for use with tools that use the whole SDK. + ''; + }; +} diff --git a/pkgs/development/compilers/flutter/fhs.nix b/pkgs/development/compilers/flutter/fhs.nix index bbba89843e8..9488e2724a7 100644 --- a/pkgs/development/compilers/flutter/fhs.nix +++ b/pkgs/development/compilers/flutter/fhs.nix @@ -65,6 +65,7 @@ let mkFlutterApp = callPackage ../../../build-support/flutter { flutter = callPackage ./fhs.nix { supportsAndroidEmulator = false; }; }; + fakeSdk = callPackage ./fake-sdk.nix { flutter = self; }; }; meta = flutter.meta // { From fd46552867e2ce5fdb27a1c8fb27deea227c9050 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Wed, 8 Feb 2023 15:27:18 +1100 Subject: [PATCH 010/337] flutter: Add libdeflate to build environment --- .../flutter/packages/libdeflate/default.nix | 17 +++++++++++++++++ pkgs/development/compilers/flutter/wrapper.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/compilers/flutter/packages/libdeflate/default.nix diff --git a/pkgs/development/compilers/flutter/packages/libdeflate/default.nix b/pkgs/development/compilers/flutter/packages/libdeflate/default.nix new file mode 100644 index 00000000000..c0b3cabbc9d --- /dev/null +++ b/pkgs/development/compilers/flutter/packages/libdeflate/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libdeflate"; + version = "1.17"; + + src = fetchFromGitHub { + owner = "ebiggers"; + repo = pname; + rev = "v${version}"; + hash = "sha256-tKs8feGbeodOID8FPIUc/1LfBz1p0oN1Jfkv2OnA2qc="; + }; + + nativeBuildInputs = [ cmake ]; + + outputs = [ "bin" "dev" "out" ]; +} diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index e20bc049751..38ac1243e8a 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -1,5 +1,6 @@ { lib , stdenv +, callPackage , flutter , supportsLinuxDesktop ? stdenv.isLinux , makeWrapper @@ -46,6 +47,7 @@ runCommandLocal "flutter" collect libepoxy.dev ++ collect pango.dev ++ collect libX11.dev ++ + collect (callPackage ./packages/libdeflate { }).dev ++ collect xorgproto ); From 1d547baee0f502f91a67153ee3a9355d0eb31c61 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Wed, 8 Feb 2023 16:11:26 +1100 Subject: [PATCH 011/337] flutter: Do not rely on pkg-config setup hook to build search path --- .../development/compilers/flutter/wrapper.nix | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 38ac1243e8a..c6f9b324147 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -29,27 +29,7 @@ runCommandLocal "flutter" ${flutter}/bin/flutter "$@" ''; - buildInputs = [ - makeWrapper - pkg-config - ] ++ lib.lists.optionals supportsLinuxDesktop ( - let - # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 - deps = pkg: (pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ]); - collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ lib.concatMap collect (deps pkg)); - in - collect atk.dev ++ - collect cairo.dev ++ - collect gdk-pixbuf.dev ++ - collect glib.dev ++ - collect gtk3.dev ++ - collect harfbuzz.dev ++ - collect libepoxy.dev ++ - collect pango.dev ++ - collect libX11.dev ++ - collect (callPackage ./packages/libdeflate { }).dev ++ - collect xorgproto - ); + buildInputs = [ makeWrapper ]; passthru = flutter.passthru // { unwrapped = flutter; @@ -64,13 +44,33 @@ runCommandLocal "flutter" makeWrapper "$flutterWithCorrectedCache" $out/bin/flutter \ --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --prefix PATH : ${lib.makeBinPath (lib.lists.optionals supportsLinuxDesktop [ + --prefix PATH : ${lib.makeBinPath (lib.optionals supportsLinuxDesktop [ pkg-config cmake ninja clang ])} \ - --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH_FOR_TARGET" \ + --prefix PKG_CONFIG_PATH : "${ + let + # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 + deps = pkg: builtins.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ])); + collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ builtins.concatMap collect (deps pkg)); + libraries = builtins.concatMap (pkg: collect (lib.getOutput "dev" pkg)) (lib.optionals supportsLinuxDesktop[ + atk + cairo + gdk-pixbuf + glib + gtk3 + harfbuzz + libepoxy + pango + libX11 + (callPackage ./packages/libdeflate { }) + xorgproto + ]); + pkgconfigLib = builtins.filter (library: builtins.pathExists "${library}/lib/pkgconfig") libraries; + pkgconfigShare = builtins.filter (library: builtins.pathExists "${library}/share/pkgconfig") libraries; + in "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" pkgconfigLib}:${lib.makeSearchPathOutput "dev" "share/pkgconfig" pkgconfigShare}"}" \ --prefix CXXFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-isystem ${libX11.dev}/include -isystem ${xorgproto}/include"}' \ --prefix LDFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-rpath ${lib.makeLibraryPath [ atk From 240d9bdf436a460dab587a0ff391d5029c1f8fb4 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 17 Feb 2023 22:48:41 +1100 Subject: [PATCH 012/337] flutter: Properly set linker flags in wrapper --- .../development/compilers/flutter/wrapper.nix | 61 +++++++++---------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index c6f9b324147..834702d4eac 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -22,6 +22,26 @@ , clang }: +let + linuxDesktopRuntimeDeps = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + harfbuzz + libepoxy + pango + libX11 + (callPackage ./packages/libdeflate { }) + ]; + + linuxDesktopBuildDeps = let + # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 + deps = pkg: builtins.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ])); + collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ builtins.concatMap collect (deps pkg)); + in builtins.concatMap collect linuxDesktopRuntimeDeps; +in runCommandLocal "flutter" { flutterWithCorrectedCache = writeShellScript "flutter_corrected_cache" '' @@ -44,45 +64,20 @@ runCommandLocal "flutter" makeWrapper "$flutterWithCorrectedCache" $out/bin/flutter \ --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --prefix PATH : ${lib.makeBinPath (lib.optionals supportsLinuxDesktop [ + --prefix PATH : '${lib.makeBinPath (lib.optionals supportsLinuxDesktop [ pkg-config cmake ninja clang - ])} \ - --prefix PKG_CONFIG_PATH : "${ + ])}' \ + --prefix PKG_CONFIG_PATH : '${ let - # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 - deps = pkg: builtins.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ])); - collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ builtins.concatMap collect (deps pkg)); - libraries = builtins.concatMap (pkg: collect (lib.getOutput "dev" pkg)) (lib.optionals supportsLinuxDesktop[ - atk - cairo - gdk-pixbuf - glib - gtk3 - harfbuzz - libepoxy - pango - libX11 - (callPackage ./packages/libdeflate { }) - xorgproto - ]); - pkgconfigLib = builtins.filter (library: builtins.pathExists "${library}/lib/pkgconfig") libraries; - pkgconfigShare = builtins.filter (library: builtins.pathExists "${library}/share/pkgconfig") libraries; - in "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" pkgconfigLib}:${lib.makeSearchPathOutput "dev" "share/pkgconfig" pkgconfigShare}"}" \ + makePkgConfigSearchPath = pkgs: builtins.concatStringsSep ":" (builtins.filter builtins.pathExists (builtins.concatMap (pkg: map (dir: "${lib.getOutput "dev" pkg}/${dir}/pkgconfig") [ "lib" "share" ]) pkgs)); + in makePkgConfigSearchPath linuxDesktopBuildDeps}' \ --prefix CXXFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-isystem ${libX11.dev}/include -isystem ${xorgproto}/include"}' \ - --prefix LDFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-rpath ${lib.makeLibraryPath [ - atk - cairo - gdk-pixbuf - glib - gtk3 - harfbuzz - libepoxy - pango - libX11 - ]}"}' \ + ${let linkerFlags = map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") (lib.optionals supportsLinuxDesktop linuxDesktopRuntimeDeps); in '' + --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' \ + ''} \ --suffix LD_LIBRARY_PATH : '${lib.optionalString supportsLinuxDesktop (lib.makeLibraryPath [ # The prebuilt flutter_linux_gtk library shipped in the Flutter SDK does not have an appropriate RUNPATH. # Its dependencies must be added here. From aa33cb995640cf2dcc4ff8751125fa92f4c742d1 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 17 Feb 2023 23:49:10 +1100 Subject: [PATCH 013/337] flutter: Reorganize the wrapper code --- .../development/compilers/flutter/wrapper.nix | 83 +++++++++++-------- 1 file changed, 50 insertions(+), 33 deletions(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 834702d4eac..63651069d82 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -23,7 +23,15 @@ }: let - linuxDesktopRuntimeDeps = [ + # By default, Flutter stores downloaded files (such as the Pub cache) in the SDK directory. + # Wrap it to ensure that it does not do that, preferring home directories instead. + immutableFlutter = writeShellScript "flutter_immutable" '' + export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} + ${flutter}/bin/flutter --no-version-check "$@" + ''; + + # Libraries that Flutter apps depend on at runtime. + appRuntimeDeps = lib.optionals supportsLinuxDesktop [ atk cairo gdk-pixbuf @@ -36,19 +44,43 @@ let (callPackage ./packages/libdeflate { }) ]; - linuxDesktopBuildDeps = let - # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 - deps = pkg: builtins.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ])); - collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ builtins.concatMap collect (deps pkg)); - in builtins.concatMap collect linuxDesktopRuntimeDeps; + # Development packages required for compilation. + appBuildDeps = + let + # https://discourse.nixos.org/t/handling-transitive-c-dependencies/5942/3 + deps = pkg: builtins.filter lib.isDerivation ((pkg.buildInputs or [ ]) ++ (pkg.propagatedBuildInputs or [ ])); + collect = pkg: lib.unique ([ pkg ] ++ deps pkg ++ builtins.concatMap collect (deps pkg)); + in + builtins.concatMap collect appRuntimeDeps; + + # Some header files are not properly located by the Flutter SDK. + # They must be manually included. + appStaticBuildDeps = lib.optionals supportsLinuxDesktop [ libX11 xorgproto ]; + + # Some runtime components are prebuilt, and do not know where to find their dependencies. + # Ideally, these prebuilt components would be patched by the SDK derivation, but this + # is tricky as they are tyically downloaded from Google on-demand. + # Building the Engine manually should solve this issue: https://github.com/NixOS/nixpkgs/issues/201574 + appPrebuiltDeps = lib.optionals supportsLinuxDesktop [ + # flutter_linux_gtk.so + libepoxy + ]; + + # Tools used by the Flutter SDK to compile applications. + buildTools = lib.optionals supportsLinuxDesktop [ + pkg-config + cmake + ninja + clang + ]; + + # Nix-specific compiler configuration. + pkgConfigDirectories = builtins.filter builtins.pathExists (builtins.concatMap (pkg: map (dir: "${lib.getOutput "dev" pkg}/${dir}/pkgconfig") [ "lib" "share" ]) appBuildDeps); + cppFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") appStaticBuildDeps; + linkerFlags = map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps; in runCommandLocal "flutter" { - flutterWithCorrectedCache = writeShellScript "flutter_corrected_cache" '' - export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - ${flutter}/bin/flutter "$@" - ''; - buildInputs = [ makeWrapper ]; passthru = flutter.passthru // { @@ -62,26 +94,11 @@ runCommandLocal "flutter" mkdir -p $out/bin/cache/ ln -sf ${flutter.dart} $out/bin/cache/dart-sdk - makeWrapper "$flutterWithCorrectedCache" $out/bin/flutter \ - --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --prefix PATH : '${lib.makeBinPath (lib.optionals supportsLinuxDesktop [ - pkg-config - cmake - ninja - clang - ])}' \ - --prefix PKG_CONFIG_PATH : '${ - let - makePkgConfigSearchPath = pkgs: builtins.concatStringsSep ":" (builtins.filter builtins.pathExists (builtins.concatMap (pkg: map (dir: "${lib.getOutput "dev" pkg}/${dir}/pkgconfig") [ "lib" "share" ]) pkgs)); - in makePkgConfigSearchPath linuxDesktopBuildDeps}' \ - --prefix CXXFLAGS "''\t" '${lib.optionalString supportsLinuxDesktop "-isystem ${libX11.dev}/include -isystem ${xorgproto}/include"}' \ - ${let linkerFlags = map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") (lib.optionals supportsLinuxDesktop linuxDesktopRuntimeDeps); in '' - --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' \ - ''} \ - --suffix LD_LIBRARY_PATH : '${lib.optionalString supportsLinuxDesktop (lib.makeLibraryPath [ - # The prebuilt flutter_linux_gtk library shipped in the Flutter SDK does not have an appropriate RUNPATH. - # Its dependencies must be added here. - libepoxy - ])}' \ - --add-flags --no-version-check + makeWrapper '${immutableFlutter}' $out/bin/flutter \ + --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ + --prefix PATH : '${lib.makeBinPath buildTools}' \ + --prefix PKG_CONFIG_PATH : '${builtins.concatStringsSep ":" pkgConfigDirectories}' \ + --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " cppFlags}' \ + --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' \ + --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath appPrebuiltDeps}' '' From 341fa709ffca3d4c850e64bbbaec5d2a93c234fb Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 18 Feb 2023 00:43:17 +1100 Subject: [PATCH 014/337] flutter: Redesign wrapping architecture The following principles are now in place: - All wrappers will include SDK file symlinks. There is not much of a reason to not do so, and removing the option to omit it makes it easier to understand what each wrapper does. - There is no longer a way to get the previous derivation from a wrapper. This could yield unexpected results based on the wrapping order. Instead, "sdk", "unwrapped", and "noFHS" passthru attributes are provided where appropriate. --- .../development/compilers/flutter/default.nix | 3 +- .../compilers/flutter/fake-sdk.nix | 15 -- pkgs/development/compilers/flutter/fhs.nix | 126 ++++++++--------- .../development/compilers/flutter/flutter.nix | 128 ++++++++++-------- .../compilers/flutter/sdk-symlink.nix | 24 ++++ .../development/compilers/flutter/wrapper.nix | 8 +- 6 files changed, 161 insertions(+), 143 deletions(-) delete mode 100644 pkgs/development/compilers/flutter/fake-sdk.nix create mode 100644 pkgs/development/compilers/flutter/sdk-symlink.nix diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index ab91e946cbb..50752b01ec7 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -3,7 +3,6 @@ let mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; wrapFlutter = flutter: callPackage (import ./wrapper.nix) { flutter = flutter; }; mkFlutterFHS = flutter: callPackage (import ./fhs.nix) { flutter = flutter; }; - mkFakeSdk = flutter: callPackage (import ./fake-sdk.nix) { flutter = flutter; }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; @@ -29,7 +28,7 @@ let }; in { - inherit mkFlutter wrapFlutter mkFlutterFHS mkFakeSdk flutterDrv; + inherit mkFlutter wrapFlutter mkFlutterFHS flutterDrv; stable = flutterDrv { version = "3.3.3"; dartVersion = "2.18.2"; diff --git a/pkgs/development/compilers/flutter/fake-sdk.nix b/pkgs/development/compilers/flutter/fake-sdk.nix deleted file mode 100644 index e540cf1fa1c..00000000000 --- a/pkgs/development/compilers/flutter/fake-sdk.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ flutter, symlinkJoin }: - -symlinkJoin { - name = "flutter-fake-${flutter.name}"; - paths = [ flutter flutter.unwrapped ]; - - inherit (flutter) passthru; - - meta = flutter.meta // { - longDescription = '' - ${flutter.meta.longDescription} - Modified binaries are linked into the original SDK directory for use with tools that use the whole SDK. - ''; - }; -} diff --git a/pkgs/development/compilers/flutter/fhs.nix b/pkgs/development/compilers/flutter/fhs.nix index 9488e2724a7..e89bddc9772 100644 --- a/pkgs/development/compilers/flutter/fhs.nix +++ b/pkgs/development/compilers/flutter/fhs.nix @@ -7,73 +7,77 @@ , supportsAndroidEmulator ? stdenv.isLinux }: -let - # Wrap flutter inside an fhs user env to allow execution of binary, - # like adb from $ANDROID_HOME or java from android-studio. - self = buildFHSUserEnv { - name = flutter.name; - multiPkgs = pkgs: with pkgs; ([ - # Flutter only use these certificates - (runCommandLocal "fedoracert" { } '' - mkdir -p $out/etc/pki/tls/ - ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs - '') - zlib - ]); +# Wrap flutter inside an fhs user env to allow execution of binary, +# like adb from $ANDROID_HOME or java from android-studio. +(callPackage ./sdk-symlink.nix { }) (buildFHSUserEnv rec { + name = "${flutter.name}-fhs"; - targetPkgs = pkgs: with pkgs; ([ - flutter + multiPkgs = pkgs: with pkgs; ([ + # Flutter only use these certificates + (runCommandLocal "fedoracert" { } '' + mkdir -p $out/etc/pki/tls/ + ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs + '') + zlib + ]); - # General ecosystem dependencies - bash - curl - git - unzip - which - xz + targetPkgs = pkgs: with pkgs; ([ + flutter - # flutter test requires this lib - libGLU - ] ++ lib.optional supportsAndroidEmulator [ - # for android emulator - alsa-lib - dbus - expat - libpulseaudio - libuuid - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - libGL - nspr - nss - systemd - ]); + # General ecosystem dependencies + bash + curl + git + unzip + which + xz - runScript = "flutter"; + # flutter test requires this lib + libGLU + ] ++ lib.optional supportsAndroidEmulator [ + # for android emulator + alsa-lib + dbus + expat + libpulseaudio + libuuid + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + libGL + nspr + nss + systemd + ]); - passthru = flutter.passthru // { - wrapped = flutter; - mkFlutterApp = callPackage ../../../build-support/flutter { - flutter = callPackage ./fhs.nix { supportsAndroidEmulator = false; }; - }; - fakeSdk = callPackage ./fake-sdk.nix { flutter = self; }; - }; + runScript = "flutter"; - meta = flutter.meta // { - longDescription = '' - ${flutter.meta.longDescription} - Wrapped in a FHS environment to improve compatibility with internal tools and tools in the ecosystem. - ''; + extraInstallCommands = '' + # By default, the derivation name is used as the binary name. + # This is not the desired behaviour in this case. + # https://github.com/NixOS/nixpkgs/blob/cb4536bf3606a7b6b54b69afe22ccd82e2906d92/pkgs/build-support/build-fhs-userenv/default.nix#L43 + mv $out/bin/${name} $out/bin/flutter + ''; + + passthru = flutter.passthru // { + nonFHS = flutter; + mkFlutterApp = callPackage ../../../build-support/flutter { + flutter = callPackage ./fhs.nix { supportsAndroidEmulator = false; }; }; }; -in -self + + meta = flutter.meta // { + longDescription = '' + ${flutter.meta.longDescription} + Wrapped in a FHS environment to improve compatibility with internal tools and tools in the ecosystem. + ''; + }; +}) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 1cbbe66509e..6df6fe2ba13 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -10,80 +10,90 @@ , which }: -stdenv.mkDerivation { - name = "$flutter-${version}-unwrapped"; +let + self = + stdenv.mkDerivation { + name = "$flutter-${version}-unwrapped"; - buildInputs = [ git ]; + buildInputs = [ git ]; - inherit src patches version; + inherit src patches version; - postPatch = '' - patchShebangs --build ./bin/ - ''; + postPatch = '' + patchShebangs --build ./bin/ + ''; - buildPhase = '' - export FLUTTER_ROOT="$(pwd)" - export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" - export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" + buildPhase = '' + export FLUTTER_ROOT="$(pwd)" + export FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools" + export SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart" - export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" - export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" + export SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot" + export STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp" - export DART_SDK_PATH="${dart}" + export DART_SDK_PATH="${dart}" - HOME=../.. # required for pub upgrade --offline, ~/.pub-cache - # path is relative otherwise it's replaced by /build/flutter + HOME=../.. # required for pub upgrade --offline, ~/.pub-cache + # path is relative otherwise it's replaced by /build/flutter - pushd "$FLUTTER_TOOLS_DIR" - ${dart}/bin/dart pub get --offline - popd + pushd "$FLUTTER_TOOLS_DIR" + ${dart}/bin/dart pub get --offline + popd - local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" - ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH" - echo "$revision" > "$STAMP_PATH" - echo -n "${version}" > version + local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" + ${dart}/bin/dart --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.dart_tool/package_config.json" "$SCRIPT_PATH" + echo "$revision" > "$STAMP_PATH" + echo -n "${version}" > version - rm -r bin/cache/{artifacts,dart-sdk,downloads} - rm bin/cache/*.stamp - ''; + rm -r bin/cache/{artifacts,dart-sdk,downloads} + rm bin/cache/*.stamp + ''; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p $out - cp -r . $out - mkdir -p $out/bin/cache/ - ln -sf ${dart} $out/bin/cache/dart-sdk + mkdir -p $out + cp -r . $out + mkdir -p $out/bin/cache/ + ln -sf ${dart} $out/bin/cache/dart-sdk - runHook postInstall - ''; + runHook postInstall + ''; - doInstallCheck = true; - installCheckInputs = [ which ]; - installCheckPhase = '' - runHook preInstallCheck + doInstallCheck = true; + installCheckInputs = [ which ]; + installCheckPhase = '' + runHook preInstallCheck - export HOME="$(mktemp -d)" - $out/bin/flutter config --android-studio-dir $HOME - $out/bin/flutter config --android-sdk $HOME - $out/bin/flutter --version | fgrep -q '${version}' + export HOME="$(mktemp -d)" + $out/bin/flutter config --android-studio-dir $HOME + $out/bin/flutter config --android-sdk $HOME + $out/bin/flutter --version | fgrep -q '${version}' - runHook postInstallCheck - ''; + runHook postInstallCheck + ''; - passthru = { - inherit dart; - }; + passthru = { + inherit dart; - meta = with lib; { - description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; - longDescription = '' - Flutter is Google’s UI toolkit for building beautiful, - natively compiled applications for mobile, web, and desktop from a single codebase. - ''; - homepage = "https://flutter.dev"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ babariviere ericdallo ]; - }; -} + # The derivation containing the original Flutter SDK files. + # When other derivations wrap this one, any unmodified files + # found here should be included as-is, for tooling compatibility. + sdk = self; + }; + + meta = with lib; { + description = "Flutter is Google's SDK for building mobile, web and desktop with Dart"; + longDescription = '' + Flutter is Google’s UI toolkit for building beautiful, + natively compiled applications for mobile, web, and desktop from a single codebase. + ''; + homepage = "https://flutter.dev"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ babariviere ericdallo ]; + }; + } + ; +in +self diff --git a/pkgs/development/compilers/flutter/sdk-symlink.nix b/pkgs/development/compilers/flutter/sdk-symlink.nix new file mode 100644 index 00000000000..6fb4f5edc0e --- /dev/null +++ b/pkgs/development/compilers/flutter/sdk-symlink.nix @@ -0,0 +1,24 @@ +{ symlinkJoin }: flutter: + +let + self = + symlinkJoin { + name = "${flutter.name}-sdk-links"; + paths = [ flutter flutter.sdk ]; + + passthru = flutter.passthru // { + # Update the SDK attribute. + # This allows any modified SDK files to be included + # in future invocations. + sdk = self; + }; + + meta = flutter.meta // { + longDescription = '' + ${flutter.meta.longDescription} + Modified binaries are linked into the original SDK directory for use with tools that use the whole SDK. + ''; + }; + }; +in +self diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 63651069d82..7b6fd464e35 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -79,7 +79,7 @@ let cppFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") appStaticBuildDeps; linkerFlags = map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps; in -runCommandLocal "flutter" +(callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped" { buildInputs = [ makeWrapper ]; @@ -90,10 +90,6 @@ runCommandLocal "flutter" inherit (flutter) meta; } '' mkdir -p $out/bin - - mkdir -p $out/bin/cache/ - ln -sf ${flutter.dart} $out/bin/cache/dart-sdk - makeWrapper '${immutableFlutter}' $out/bin/flutter \ --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --prefix PATH : '${lib.makeBinPath buildTools}' \ @@ -101,4 +97,4 @@ runCommandLocal "flutter" --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " cppFlags}' \ --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' \ --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath appPrebuiltDeps}' -'' +'') From b48f6118c489beda224223dc66589195b387a9d0 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Mon, 21 Nov 2022 19:37:02 +0100 Subject: [PATCH 015/337] desktopToDarwinBundle: Return at most 1 literal match from desktop file This fixes multiple entries being returned from getDesktopParam, e.g. in the case of localized key names: 'Name', 'Name[de]', and makes this function to match this key exactly instead of a pattern for the same reason. --- .../setup-hooks/desktop-to-darwin-bundle.sh | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index 83ea7de3ee2..f52b50608f9 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -2,12 +2,25 @@ fixupOutputHooks+=('convertDesktopFiles $prefix') # Get a param out of a desktop file. First parameter is the file and the second -# is a pattern of the key who's value we should fetch. +# is the key who's value we should fetch. getDesktopParam() { - local file="$1"; - local pattern="$2"; + local file="$1" + local key="$2" + local line k v - awk -F "=" "/${pattern}/ {print \$2}" "${file}" + while read -r line; do + if [[ "$line" = *=* ]]; then + k="${line%%=*}" + v="${line#*=}" + + if [[ "$k" = "$key" ]]; then + echo "$v" + return + fi + fi + done < "$file" + + return 1 } # Convert a freedesktop.org icon theme for a given app to a .icns file. When possible, missing @@ -190,14 +203,14 @@ processExecFieldCodes() { convertDesktopFile() { local -r file=$1 local -r sharePath=$(dirname "$(dirname "$file")") - local -r name=$(getDesktopParam "${file}" "^Name") + local -r name=$(getDesktopParam "${file}" "Name") local -r macOSExec=$(getDesktopParam "${file}" "X-macOS-Exec") if [[ "$macOSExec" ]]; then local -r exec="$macOSExec" else local -r exec=$(processExecFieldCodes "${file}") fi - local -r iconName=$(getDesktopParam "${file}" "^Icon") + local -r iconName=$(getDesktopParam "${file}" "Icon") local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon") mkdir -p "${!outputBin}/Applications/${name}.app/Contents/MacOS" From d9a07bcd41135f2b9653ba934fc5867856196f78 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Sat, 25 Mar 2023 22:09:41 +0100 Subject: [PATCH 016/337] desktopToDarwinBundle: Add debug outputs for icon conversion --- pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index f52b50608f9..f05a8fb5140 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -81,6 +81,7 @@ convertIconTheme() { local density=$((72 * scale))x$((72 * scale)) local dim=$((iconSize * scale)) + echo "desktopToDarwinBundle: resizing icon $in to $out, size $dim" >&2 magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out" } @@ -93,6 +94,8 @@ convertIconTheme() { if [[ $in != '-' ]]; then local density=$((72 * scale))x$((72 * scale)) local dim=$((iconSize * scale)) + + echo "desktopToDarwinBundle: rasterizing svg $in to $out, size $dim" >&2 rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out" magick convert -density "$density" -units PixelsPerInch "$out" "$out" else @@ -134,6 +137,7 @@ convertIconTheme() { local icon=${iconResult#* } local scaleSuffix=${scales[$scale]} local result=${resultdir}/${iconSize}x${iconSize}${scales[$scale]}${scaleSuffix:+x}.png + echo "desktopToDarwinBundle: using $type icon $icon for size $iconSize$scaleSuffix" >&2 case $type in fixed) local density=$((72 * scale))x$((72 * scale)) From f78175ad35e0fa7eb5183b756cfa988b783fed77 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Sat, 25 Mar 2023 22:09:57 +0100 Subject: [PATCH 017/337] desktopToDarwinBundle: Fix icon selection algorithm Now, the fallback icon is only used after considering all possible icons instead of only the first one. --- .../setup-hooks/desktop-to-darwin-bundle.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh index f05a8fb5140..e4e7fba8477 100644 --- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh +++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh @@ -54,21 +54,30 @@ convertIconTheme() { $((iconSize - 2))x$((iconSize - 2))${scaleSuffix} ) + local fallbackIcon= + for iconIndex in "${!candidateIcons[@]}"; do for maybeSize in "${validSizes[@]}"; do icon=${candidateIcons[$iconIndex]} if [[ $icon = */$maybeSize/* ]]; then if [[ $maybeSize = $exactSize ]]; then echo "fixed $icon" + return 0 else echo "threshold $icon" + return 0 fi - elif [[ -a $icon ]]; then - echo "fallback $icon" + elif [[ -a $icon && -z "$fallbackIcon" ]]; then + fallbackIcon="$icon" fi - return 0 done done + + if [[ -n "$fallbackIcon" ]]; then + echo "fallback $fallbackIcon" + return 0 + fi + echo "scalable" } From 71e8e2148d920ba6a1db6f64e94cf135620c4923 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 30 Mar 2023 11:22:07 -0400 Subject: [PATCH 018/337] python310Packages.accelerate: init at 0.18.0 --- .../python-modules/accelerate/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/accelerate/default.nix diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix new file mode 100644 index 00000000000..be841e9bb4d --- /dev/null +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, numpy +, packaging +, psutil +, pyyaml +, torch +, evaluate +, parameterized +, transformers +}: + +buildPythonPackage rec { + pname = "accelerate"; + version = "0.18.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-fCIvVbMaWAWzRfPc5/1CZq3gZ8kruuk9wBt8mzLHmyw="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + numpy + packaging + psutil + pyyaml + torch + ]; + + nativeCheckInputs = [ + evaluate + parameterized + pytestCheckHook + transformers + ]; + preCheck = '' + export HOME=$(mktemp -d) + export PATH=$out/bin:$PATH + ''; + pytestFlagsArray = [ "tests" ]; + disabledTests = [ + # try to download data: + "FeatureExamplesTests" + "test_infer_auto_device_map_on_t0pp" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly + "CheckpointTest" + ]; + # numerous instances of torch.multiprocessing.spawn.ProcessRaisedException: + doCheck = !stdenv.isDarwin; + pythonImportsCheck = [ + "accelerate" + ]; + + meta = with lib; { + homepage = "https://huggingface.co/docs/accelerate"; + description = "A simple way to train and use PyTorch models with multi-GPU, TPU, mixed-precision"; + changelog = "https://github.com/huggingface/accelerate/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "accelerate"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ed831a95ad..711758a558c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22,6 +22,8 @@ self: super: with self; { accessible-pygments = callPackage ../development/python-modules/accessible-pygments { }; + accelerate = callPackage ../development/python-modules/accelerate { }; + accuweather = callPackage ../development/python-modules/accuweather { }; accupy = callPackage ../development/python-modules/accupy { }; From e4f3b21d4d2e7f0d74df878d98f2f49a47533535 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 30 Mar 2023 11:22:27 -0400 Subject: [PATCH 019/337] python310Packages.peft: init at 0.2.0 --- .../python-modules/peft/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/peft/default.nix diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix new file mode 100644 index 00000000000..24a0fe78064 --- /dev/null +++ b/pkgs/development/python-modules/peft/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, setuptools +, numpy +, packaging +, psutil +, pyyaml +, torch +, transformers +, accelerate +}: + +buildPythonPackage rec { + pname = "peft"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-NPpY29HMQe5KT0JdlLAXY9MVycDslbP2i38NSTirB3I="; + }; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + numpy + packaging + psutil + pyyaml + torch + transformers + accelerate + ]; + + doCheck = false; # tried to download pretrained model + pythonImportsCheck = [ + "peft" + ]; + + meta = with lib; { + homepage = "https://github.com/huggingface/peft"; + description = "State-of-the art parameter-efficient fine tuning"; + changelog = "https://github.com/huggingface/peft/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 711758a558c..bfb7e944409 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7119,6 +7119,8 @@ self: super: with self; { pefile = callPackage ../development/python-modules/pefile { }; + peft = callPackage ../development/python-modules/peft { }; + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; From 3e68a27822eb3e2a27282e32289a13f5b988c08d Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 5 Dec 2022 20:15:49 -0500 Subject: [PATCH 020/337] prefetch-npm-deps: refactor This splits prefetch-npm-deps into multiple files, as well as making a few small changes along the way, such as going from a `HashMap` to a `Vec` as the container for packages, to deduplicate them more efficently. --- .../node/fetch-npm-deps/src/main.rs | 429 +++--------------- .../node/fetch-npm-deps/src/parse/lock.rs | 191 ++++++++ .../node/fetch-npm-deps/src/parse/mod.rs | 311 +++++++++++++ .../node/fetch-npm-deps/src/tests.rs | 141 ------ 4 files changed, 577 insertions(+), 495 deletions(-) create mode 100644 pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs create mode 100644 pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs delete mode 100644 pkgs/build-support/node/fetch-npm-deps/src/tests.rs diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 3d2204071a6..068a6d2bcd6 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -1,250 +1,18 @@ #![warn(clippy::pedantic)] use crate::cacache::Cache; -use anyhow::{anyhow, Context}; +use anyhow::anyhow; use rayon::prelude::*; -use serde::Deserialize; use serde_json::{Map, Value}; use std::{ - collections::{HashMap, HashSet}, - env, fmt, fs, io, + env, fs, path::Path, - process::{self, Command, Stdio}, + process::{self, Command}, }; use tempfile::tempdir; -use url::Url; mod cacache; -#[cfg(test)] -mod tests; - -#[derive(Deserialize)] -struct PackageLock { - #[serde(rename = "lockfileVersion")] - version: u8, - dependencies: Option>, - packages: Option>, -} - -#[derive(Deserialize)] -struct OldPackage { - version: UrlOrString, - #[serde(default)] - bundled: bool, - resolved: Option, - integrity: Option, - dependencies: Option>, -} - -#[derive(Debug, Deserialize, PartialEq, Eq)] -struct Package { - resolved: Option, - integrity: Option, -} - -#[derive(Debug, Deserialize, PartialEq, Eq)] -#[serde(untagged)] -enum UrlOrString { - Url(Url), - String(String), -} - -impl fmt::Display for UrlOrString { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match self { - UrlOrString::Url(url) => url.fmt(f), - UrlOrString::String(string) => string.fmt(f), - } - } -} - -#[allow(clippy::case_sensitive_file_extension_comparisons)] -fn to_new_packages( - old_packages: HashMap, - initial_url: &Url, -) -> anyhow::Result> { - let mut new = HashMap::new(); - - for (name, mut package) in old_packages { - // In some cases, a bundled dependency happens to have the same version as a non-bundled one, causing - // the bundled one without a URL to override the entry for the non-bundled instance, which prevents the - // dependency from being downloaded. - if package.bundled { - continue; - } - - if let UrlOrString::Url(v) = &package.version { - for (scheme, host) in [ - ("github", "github.com"), - ("bitbucket", "bitbucket.org"), - ("gitlab", "gitlab.com"), - ] { - if v.scheme() == scheme { - package.version = { - let mut new_url = initial_url.clone(); - - new_url.set_host(Some(host))?; - - if v.path().ends_with(".git") { - new_url.set_path(v.path()); - } else { - new_url.set_path(&format!("{}.git", v.path())); - } - - new_url.set_fragment(v.fragment()); - - UrlOrString::Url(new_url) - }; - - break; - } - } - } - - new.insert( - format!("{name}-{}", package.version), - Package { - resolved: if matches!(package.version, UrlOrString::Url(_)) { - Some(package.version) - } else { - package.resolved - }, - integrity: package.integrity, - }, - ); - - if let Some(dependencies) = package.dependencies { - new.extend(to_new_packages(dependencies, initial_url)?); - } - } - - Ok(new) -} - -#[allow(clippy::case_sensitive_file_extension_comparisons)] -fn get_hosted_git_url(url: &Url) -> Option { - if ["git", "http", "git+ssh", "git+https", "ssh", "https"].contains(&url.scheme()) { - let mut s = url.path_segments()?; - - match url.host_str()? { - "github.com" => { - let user = s.next()?; - let mut project = s.next()?; - let typ = s.next(); - let mut commit = s.next(); - - if typ.is_none() { - commit = url.fragment(); - } else if typ.is_some() && typ != Some("tree") { - return None; - } - - if project.ends_with(".git") { - project = project.strip_suffix(".git")?; - } - - let commit = commit.unwrap(); - - Some( - Url::parse(&format!( - "https://codeload.github.com/{user}/{project}/tar.gz/{commit}" - )) - .ok()?, - ) - } - "bitbucket.org" => { - let user = s.next()?; - let mut project = s.next()?; - let aux = s.next(); - - if aux == Some("get") { - return None; - } - - if project.ends_with(".git") { - project = project.strip_suffix(".git")?; - } - - let commit = url.fragment()?; - - Some( - Url::parse(&format!( - "https://bitbucket.org/{user}/{project}/get/{commit}.tar.gz" - )) - .ok()?, - ) - } - "gitlab.com" => { - let path = &url.path()[1..]; - - if path.contains("/~/") || path.contains("/archive.tar.gz") { - return None; - } - - let user = s.next()?; - let mut project = s.next()?; - - if project.ends_with(".git") { - project = project.strip_suffix(".git")?; - } - - let commit = url.fragment()?; - - Some( - Url::parse(&format!( - "https://gitlab.com/{user}/{project}/repository/archive.tar.gz?ref={commit}" - )) - .ok()?, - ) - } - "git.sr.ht" => { - let user = s.next()?; - let mut project = s.next()?; - let aux = s.next(); - - if aux == Some("archive") { - return None; - } - - if project.ends_with(".git") { - project = project.strip_suffix(".git")?; - } - - let commit = url.fragment()?; - - Some( - Url::parse(&format!( - "https://git.sr.ht/{user}/{project}/archive/{commit}.tar.gz" - )) - .ok()?, - ) - } - _ => None, - } - } else { - None - } -} - -fn get_ideal_hash(integrity: &str) -> anyhow::Result<&str> { - let split: Vec<_> = integrity.split_ascii_whitespace().collect(); - - if split.len() == 1 { - Ok(split[0]) - } else { - for hash in ["sha512-", "sha1-"] { - if let Some(h) = split.iter().find(|s| s.starts_with(hash)) { - return Ok(h); - } - } - - Err(anyhow!("not sure which hash to select out of {split:?}")) - } -} - -fn get_initial_url() -> anyhow::Result { - Url::parse("git+ssh://git@a.b").context("initial url should be valid") -} +mod parse; /// `fixup_lockfile` removes the `integrity` field from Git dependencies. /// @@ -294,7 +62,6 @@ fn fixup_lockfile(mut lock: Map) -> anyhow::Result anyhow::Result<()> { let args = env::args().collect::>(); @@ -319,7 +86,6 @@ fn main() -> anyhow::Result<()> { } let lock_content = fs::read_to_string(&args[1])?; - let lock: PackageLock = serde_json::from_str(&lock_content)?; let out_tempdir; @@ -331,128 +97,27 @@ fn main() -> anyhow::Result<()> { (out_tempdir.path(), true) }; - let agent = ureq::agent(); - - eprintln!("lockfile version: {}", lock.version); - - let packages = match lock.version { - 1 => { - let initial_url = get_initial_url()?; - - lock.dependencies - .map(|p| to_new_packages(p, &initial_url)) - .transpose()? - } - 2 | 3 => lock.packages, - _ => panic!( - "We don't support lockfile version {}, please file an issue.", - lock.version - ), - }; - - if packages.is_none() { - return Ok(()); - } - - let packages = { - let mut seen = HashSet::new(); - let mut new_packages = HashMap::new(); - - for (dep, package) in packages.unwrap().drain() { - if let (false, Some(UrlOrString::Url(resolved))) = (dep.is_empty(), &package.resolved) { - if !seen.contains(resolved) { - seen.insert(resolved.clone()); - new_packages.insert(dep, package); - } - } - } - - new_packages - }; + let packages = parse::lockfile(&lock_content)?; let cache = Cache::new(out.join("_cacache")); - packages - .into_par_iter() - .try_for_each(|(dep, mut package)| { - eprintln!("{dep}"); + packages.into_par_iter().try_for_each(|package| { + eprintln!("{}", package.name); - let mut resolved = match package.resolved { - Some(UrlOrString::Url(url)) => url, - _ => unreachable!(), - }; + let tarball = package.tarball()?; + let integrity = package.integrity(); - let mut hosted = false; + cache + .put( + format!("make-fetch-happen:request-cache:{}", package.url), + package.url, + &tarball, + integrity, + ) + .map_err(|e| anyhow!("couldn't insert cache entry for {}: {e:?}", package.name))?; - if let Some(hosted_git_url) = get_hosted_git_url(&resolved) { - resolved = hosted_git_url; - package.integrity = None; - hosted = true; - } - - let mut data = Vec::new(); - - let mut body = agent.get(resolved.as_str()).call()?.into_reader(); - - if hosted { - let workdir = tempdir()?; - - let tar_path = workdir.path().join("package"); - - fs::create_dir(&tar_path)?; - - let mut cmd = Command::new("tar") - .args(["--extract", "--gzip", "--strip-components=1", "-C"]) - .arg(&tar_path) - .stdin(Stdio::piped()) - .spawn()?; - - io::copy(&mut body, &mut cmd.stdin.take().unwrap())?; - - let exit = cmd.wait()?; - - if !exit.success() { - return Err(anyhow!( - "failed to extract tarball for {dep}: tar exited with status code {}", - exit.code().unwrap() - )); - } - - data = Command::new("tar") - .args([ - "--sort=name", - "--mtime=@0", - "--owner=0", - "--group=0", - "--numeric-owner", - "--format=gnu", - "-I", - "gzip -n -9", - "--create", - "-C", - ]) - .arg(workdir.path()) - .arg("package") - .output()? - .stdout; - } else { - body.read_to_end(&mut data)?; - } - - cache - .put( - format!("make-fetch-happen:request-cache:{resolved}"), - resolved, - &data, - package - .integrity - .map(|i| Ok::(get_ideal_hash(&i)?.to_string())) - .transpose()?, - ) - .map_err(|e| anyhow!("couldn't insert cache entry for {dep}: {e:?}"))?; - - Ok::<_, anyhow::Error>(()) - })?; + Ok::<_, anyhow::Error>(()) + })?; fs::write(out.join("package-lock.json"), lock_content)?; @@ -465,3 +130,59 @@ fn main() -> anyhow::Result<()> { Ok(()) } + +#[cfg(test)] +mod tests { + use super::fixup_lockfile; + use serde_json::json; + + #[test] + fn lockfile_fixup() -> anyhow::Result<()> { + let input = json!({ + "lockfileVersion": 2, + "name": "foo", + "packages": { + "": { + + }, + "foo": { + "resolved": "https://github.com/NixOS/nixpkgs", + "integrity": "aaa" + }, + "bar": { + "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", + "integrity": "bbb" + } + } + }); + + let expected = json!({ + "lockfileVersion": 2, + "name": "foo", + "packages": { + "": { + + }, + "foo": { + "resolved": "https://github.com/NixOS/nixpkgs", + "integrity": "aaa" + }, + "bar": { + "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", + } + } + }); + + assert_eq!( + fixup_lockfile(input.as_object().unwrap().clone())?, + Some(expected.as_object().unwrap().clone()) + ); + + assert_eq!( + fixup_lockfile(json!({"lockfileVersion": 1}).as_object().unwrap().clone())?, + None + ); + + Ok(()) + } +} diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs new file mode 100644 index 00000000000..99bd3020b52 --- /dev/null +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs @@ -0,0 +1,191 @@ +use anyhow::{bail, Context}; +use rayon::slice::ParallelSliceMut; +use serde::Deserialize; +use std::{collections::HashMap, fmt}; +use url::Url; + +pub(super) fn packages(content: &str) -> anyhow::Result> { + let lockfile: Lockfile = serde_json::from_str(content)?; + + let mut packages = match lockfile.version { + 1 => { + let initial_url = get_initial_url()?; + + lockfile + .dependencies + .map(|p| to_new_packages(p, &initial_url)) + .transpose()? + } + 2 | 3 => lockfile.packages.map(|pkgs| { + pkgs.into_iter() + .filter(|(n, p)| !n.is_empty() && matches!(p.resolved, Some(UrlOrString::Url(_)))) + .map(|(n, p)| Package { name: Some(n), ..p }) + .collect() + }), + _ => bail!( + "We don't support lockfile version {}, please file an issue.", + lockfile.version + ), + } + .expect("lockfile should have packages"); + + packages.par_sort_by(|x, y| { + x.resolved + .partial_cmp(&y.resolved) + .expect("resolved should be comparable") + }); + + packages.dedup_by(|x, y| x.resolved == y.resolved); + + Ok(packages) +} + +#[derive(Deserialize)] +struct Lockfile { + #[serde(rename = "lockfileVersion")] + version: u8, + dependencies: Option>, + packages: Option>, +} + +#[derive(Deserialize)] +struct OldPackage { + version: UrlOrString, + #[serde(default)] + bundled: bool, + resolved: Option, + integrity: Option, + dependencies: Option>, +} + +#[derive(Debug, Deserialize, PartialEq, Eq)] +pub(super) struct Package { + #[serde(default)] + pub(super) name: Option, + pub(super) resolved: Option, + pub(super) integrity: Option, +} + +#[derive(Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord)] +#[serde(untagged)] +pub(super) enum UrlOrString { + Url(Url), + String(String), +} + +impl fmt::Display for UrlOrString { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + UrlOrString::Url(url) => url.fmt(f), + UrlOrString::String(string) => string.fmt(f), + } + } +} + +#[allow(clippy::case_sensitive_file_extension_comparisons)] +fn to_new_packages( + old_packages: HashMap, + initial_url: &Url, +) -> anyhow::Result> { + let mut new = Vec::new(); + + for (name, mut package) in old_packages { + // In some cases, a bundled dependency happens to have the same version as a non-bundled one, causing + // the bundled one without a URL to override the entry for the non-bundled instance, which prevents the + // dependency from being downloaded. + if package.bundled { + continue; + } + + if let UrlOrString::Url(v) = &package.version { + for (scheme, host) in [ + ("github", "github.com"), + ("bitbucket", "bitbucket.org"), + ("gitlab", "gitlab.com"), + ] { + if v.scheme() == scheme { + package.version = { + let mut new_url = initial_url.clone(); + + new_url.set_host(Some(host))?; + + if v.path().ends_with(".git") { + new_url.set_path(v.path()); + } else { + new_url.set_path(&format!("{}.git", v.path())); + } + + new_url.set_fragment(v.fragment()); + + UrlOrString::Url(new_url) + }; + + break; + } + } + } + + new.push(Package { + name: Some(name), + resolved: if matches!(package.version, UrlOrString::Url(_)) { + Some(package.version) + } else { + package.resolved + }, + integrity: package.integrity, + }); + + if let Some(dependencies) = package.dependencies { + new.append(&mut to_new_packages(dependencies, initial_url)?); + } + } + + Ok(new) +} + +fn get_initial_url() -> anyhow::Result { + Url::parse("git+ssh://git@a.b").context("initial url should be valid") +} + +#[cfg(test)] +mod tests { + use super::{get_initial_url, to_new_packages, OldPackage, Package, UrlOrString}; + use std::collections::HashMap; + use url::Url; + + #[test] + fn git_shorthand_v1() -> anyhow::Result<()> { + let old = { + let mut o = HashMap::new(); + o.insert( + String::from("sqlite3"), + OldPackage { + version: UrlOrString::Url( + Url::parse( + "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a", + ) + .unwrap(), + ), + bundled: false, + resolved: None, + integrity: None, + dependencies: None, + }, + ); + o + }; + + let initial_url = get_initial_url()?; + + let new = to_new_packages(old, &initial_url)?; + + assert_eq!(new.len(), 1, "new packages map should contain 1 value"); + assert_eq!(new[0], Package { + name: Some(String::from("sqlite3")), + resolved: Some(UrlOrString::Url(Url::parse("git+ssh://git@github.com/mapbox/node-sqlite3.git#593c9d498be2510d286349134537e3bf89401c4a").unwrap())), + integrity: None + }); + + Ok(()) + } +} diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs new file mode 100644 index 00000000000..95f876017bd --- /dev/null +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs @@ -0,0 +1,311 @@ +use anyhow::{anyhow, bail, Context}; +use lock::UrlOrString; +use rayon::prelude::*; +use std::{ + fs, io, + process::{Command, Stdio}, +}; +use tempfile::{tempdir, TempDir}; +use url::Url; + +mod lock; + +pub fn lockfile(lockfile: &str) -> anyhow::Result> { + let packages = lock::packages(lockfile).context("failed to extract packages from lockfile")?; + + packages + .into_par_iter() + .map(|p| { + let n = p.name.clone().unwrap(); + + Package::from_lock(p).with_context(|| format!("failed to parse data for {n}")) + }) + .collect() +} + +#[derive(Debug)] +pub struct Package { + pub name: String, + pub url: Url, + specifics: Specifics, +} + +#[derive(Debug)] +enum Specifics { + Registry { integrity: String }, + Git { workdir: TempDir }, +} + +impl Package { + fn from_lock(pkg: lock::Package) -> anyhow::Result { + let mut resolved = match pkg + .resolved + .expect("at this point, packages should have URLs") + { + UrlOrString::Url(u) => u, + UrlOrString::String(_) => panic!("at this point, all packages should have URLs"), + }; + + let specifics = match get_hosted_git_url(&resolved) { + Some(hosted) => { + let mut body = ureq::get(hosted.as_str()).call()?.into_reader(); + + let workdir = tempdir()?; + + let tar_path = workdir.path().join("package"); + + fs::create_dir(&tar_path)?; + + let mut cmd = Command::new("tar") + .args(["--extract", "--gzip", "--strip-components=1", "-C"]) + .arg(&tar_path) + .stdin(Stdio::piped()) + .spawn()?; + + io::copy(&mut body, &mut cmd.stdin.take().unwrap())?; + + let exit = cmd.wait()?; + + if !exit.success() { + bail!( + "failed to extract tarball for {}: tar exited with status code {}", + pkg.name.unwrap(), + exit.code().unwrap() + ); + } + + resolved = hosted; + + Specifics::Git { workdir } + } + None => Specifics::Registry { + integrity: get_ideal_hash( + &pkg.integrity + .expect("non-git dependencies should have assosciated integrity"), + )? + .to_string(), + }, + }; + + Ok(Package { + name: pkg.name.unwrap(), + url: resolved, + specifics, + }) + } + + pub fn tarball(&self) -> anyhow::Result> { + match &self.specifics { + Specifics::Registry { .. } => { + let mut body = Vec::new(); + + ureq::get(self.url.as_str()) + .call()? + .into_reader() + .read_to_end(&mut body)?; + + Ok(body) + } + Specifics::Git { workdir } => Ok(Command::new("tar") + .args([ + "--sort=name", + "--mtime=@0", + "--owner=0", + "--group=0", + "--numeric-owner", + "--format=gnu", + "-I", + "gzip -n -9", + "--create", + "-C", + ]) + .arg(workdir.path()) + .arg("package") + .output()? + .stdout), + } + } + + pub fn integrity(&self) -> Option { + match &self.specifics { + Specifics::Registry { integrity } => Some(integrity.clone()), + Specifics::Git { .. } => None, + } + } +} + +#[allow(clippy::case_sensitive_file_extension_comparisons)] +fn get_hosted_git_url(url: &Url) -> Option { + if ["git", "http", "git+ssh", "git+https", "ssh", "https"].contains(&url.scheme()) { + let mut s = url.path_segments()?; + + match url.host_str()? { + "github.com" => { + let user = s.next()?; + let mut project = s.next()?; + let typ = s.next(); + let mut commit = s.next(); + + if typ.is_none() { + commit = url.fragment(); + } else if typ.is_some() && typ != Some("tree") { + return None; + } + + if project.ends_with(".git") { + project = project.strip_suffix(".git")?; + } + + let commit = commit.unwrap(); + + Some( + Url::parse(&format!( + "https://codeload.github.com/{user}/{project}/tar.gz/{commit}" + )) + .ok()?, + ) + } + "bitbucket.org" => { + let user = s.next()?; + let mut project = s.next()?; + let aux = s.next(); + + if aux == Some("get") { + return None; + } + + if project.ends_with(".git") { + project = project.strip_suffix(".git")?; + } + + let commit = url.fragment()?; + + Some( + Url::parse(&format!( + "https://bitbucket.org/{user}/{project}/get/{commit}.tar.gz" + )) + .ok()?, + ) + } + "gitlab.com" => { + let path = &url.path()[1..]; + + if path.contains("/~/") || path.contains("/archive.tar.gz") { + return None; + } + + let user = s.next()?; + let mut project = s.next()?; + + if project.ends_with(".git") { + project = project.strip_suffix(".git")?; + } + + let commit = url.fragment()?; + + Some( + Url::parse(&format!( + "https://gitlab.com/{user}/{project}/repository/archive.tar.gz?ref={commit}" + )) + .ok()?, + ) + } + "git.sr.ht" => { + let user = s.next()?; + let mut project = s.next()?; + let aux = s.next(); + + if aux == Some("archive") { + return None; + } + + if project.ends_with(".git") { + project = project.strip_suffix(".git")?; + } + + let commit = url.fragment()?; + + Some( + Url::parse(&format!( + "https://git.sr.ht/{user}/{project}/archive/{commit}.tar.gz" + )) + .ok()?, + ) + } + _ => None, + } + } else { + None + } +} + +fn get_ideal_hash(integrity: &str) -> anyhow::Result<&str> { + let split: Vec<_> = integrity.split_ascii_whitespace().collect(); + + if split.len() == 1 { + Ok(split[0]) + } else { + for hash in ["sha512-", "sha1-"] { + if let Some(h) = split.iter().find(|s| s.starts_with(hash)) { + return Ok(h); + } + } + + Err(anyhow!("not sure which hash to select out of {split:?}")) + } +} + +#[cfg(test)] +mod tests { + use super::{get_hosted_git_url, get_ideal_hash}; + use url::Url; + + #[test] + fn hosted_git_urls() { + for (input, expected) in [ + ( + "git+ssh://git@github.com/castlabs/electron-releases.git#fc5f78d046e8d7cdeb66345a2633c383ab41f525", + Some("https://codeload.github.com/castlabs/electron-releases/tar.gz/fc5f78d046e8d7cdeb66345a2633c383ab41f525"), + ), + ( + "https://user@github.com/foo/bar#fix/bug", + Some("https://codeload.github.com/foo/bar/tar.gz/fix/bug") + ), + ( + "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz", + None + ), + ( + "git+ssh://bitbucket.org/foo/bar#branch", + Some("https://bitbucket.org/foo/bar/get/branch.tar.gz") + ), + ( + "ssh://git@gitlab.com/foo/bar.git#fix/bug", + Some("https://gitlab.com/foo/bar/repository/archive.tar.gz?ref=fix/bug") + ), + ( + "git+ssh://git.sr.ht/~foo/bar#branch", + Some("https://git.sr.ht/~foo/bar/archive/branch.tar.gz") + ), + ] { + assert_eq!( + get_hosted_git_url(&Url::parse(input).unwrap()), + expected.map(|u| Url::parse(u).unwrap()) + ); + } + } + + #[test] + fn ideal_hashes() { + for (input, expected) in [ + ("sha512-foo sha1-bar", Some("sha512-foo")), + ("sha1-bar md5-foo", Some("sha1-bar")), + ("sha1-bar", Some("sha1-bar")), + ("sha512-foo", Some("sha512-foo")), + ("foo-bar sha1-bar", Some("sha1-bar")), + ("foo-bar baz-foo", None), + ] { + assert_eq!(get_ideal_hash(input).ok(), expected); + } + } +} diff --git a/pkgs/build-support/node/fetch-npm-deps/src/tests.rs b/pkgs/build-support/node/fetch-npm-deps/src/tests.rs deleted file mode 100644 index a3317207c42..00000000000 --- a/pkgs/build-support/node/fetch-npm-deps/src/tests.rs +++ /dev/null @@ -1,141 +0,0 @@ -use super::{ - fixup_lockfile, get_hosted_git_url, get_ideal_hash, get_initial_url, to_new_packages, - OldPackage, Package, UrlOrString, -}; -use serde_json::json; -use std::collections::HashMap; -use url::Url; - -#[test] -fn hosted_git_urls() { - for (input, expected) in [ - ( - "git+ssh://git@github.com/castlabs/electron-releases.git#fc5f78d046e8d7cdeb66345a2633c383ab41f525", - Some("https://codeload.github.com/castlabs/electron-releases/tar.gz/fc5f78d046e8d7cdeb66345a2633c383ab41f525"), - ), - ( - "https://user@github.com/foo/bar#fix/bug", - Some("https://codeload.github.com/foo/bar/tar.gz/fix/bug") - ), - ( - "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz", - None - ), - ( - "git+ssh://bitbucket.org/foo/bar#branch", - Some("https://bitbucket.org/foo/bar/get/branch.tar.gz") - ), - ( - "ssh://git@gitlab.com/foo/bar.git#fix/bug", - Some("https://gitlab.com/foo/bar/repository/archive.tar.gz?ref=fix/bug") - ), - ( - "git+ssh://git.sr.ht/~foo/bar#branch", - Some("https://git.sr.ht/~foo/bar/archive/branch.tar.gz") - ), - ] { - assert_eq!( - get_hosted_git_url(&Url::parse(input).unwrap()), - expected.map(|u| Url::parse(u).unwrap()) - ); - } -} - -#[test] -fn ideal_hashes() { - for (input, expected) in [ - ("sha512-foo sha1-bar", Some("sha512-foo")), - ("sha1-bar md5-foo", Some("sha1-bar")), - ("sha1-bar", Some("sha1-bar")), - ("sha512-foo", Some("sha512-foo")), - ("foo-bar sha1-bar", Some("sha1-bar")), - ("foo-bar baz-foo", None), - ] { - assert_eq!(get_ideal_hash(input).ok(), expected); - } -} - -#[test] -fn git_shorthand_v1() -> anyhow::Result<()> { - let old = { - let mut o = HashMap::new(); - o.insert( - String::from("sqlite3"), - OldPackage { - version: UrlOrString::Url( - Url::parse( - "github:mapbox/node-sqlite3#593c9d498be2510d286349134537e3bf89401c4a", - ) - .unwrap(), - ), - bundled: false, - resolved: None, - integrity: None, - dependencies: None, - }, - ); - o - }; - - let initial_url = get_initial_url()?; - - let new = to_new_packages(old, &initial_url)?; - - assert_eq!(new.len(), 1, "new packages map should contain 1 value"); - assert_eq!(new.into_values().next().unwrap(), Package { - resolved: Some(UrlOrString::Url(Url::parse("git+ssh://git@github.com/mapbox/node-sqlite3.git#593c9d498be2510d286349134537e3bf89401c4a").unwrap())), - integrity: None - }); - - Ok(()) -} - -#[test] -fn lockfile_fixup() -> anyhow::Result<()> { - let input = json!({ - "lockfileVersion": 2, - "name": "foo", - "packages": { - "": { - - }, - "foo": { - "resolved": "https://github.com/NixOS/nixpkgs", - "integrity": "aaa" - }, - "bar": { - "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", - "integrity": "bbb" - } - } - }); - - let expected = json!({ - "lockfileVersion": 2, - "name": "foo", - "packages": { - "": { - - }, - "foo": { - "resolved": "https://github.com/NixOS/nixpkgs", - "integrity": "aaa" - }, - "bar": { - "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", - } - } - }); - - assert_eq!( - fixup_lockfile(input.as_object().unwrap().clone())?, - Some(expected.as_object().unwrap().clone()) - ); - - assert_eq!( - fixup_lockfile(json!({"lockfileVersion": 1}).as_object().unwrap().clone())?, - None - ); - - Ok(()) -} From 7e247e6fecdb539911ddc7fafdbcf6db18506b84 Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 12 Dec 2022 22:33:43 -0500 Subject: [PATCH 021/337] prefetch-npm-deps: download dev deps for git deps with install scripts Git dependencies with install scripts are built isolated from the main package, so their development dependencies are required. To take advantage of this, #206477 is needed. --- .../node/build-npm-package/default.nix | 5 +- .../node/fetch-npm-deps/default.nix | 11 +++- .../node/fetch-npm-deps/src/main.rs | 2 +- .../node/fetch-npm-deps/src/parse/mod.rs | 65 +++++++++++++++++-- 4 files changed, 73 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 26cc678c571..1c3fb6a74ef 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -12,6 +12,9 @@ # The output hash of the dependencies for this project. # Can be calculated in advance with prefetch-npm-deps. , npmDepsHash ? "" + # Whether to force the usage of Git dependencies that have install scripts, but not a lockfile. + # Use with care. +, forceGitDeps ? false # Whether to make the cache writable prior to installing dependencies. # Don't set this unless npm tries to write to the cache directory, as it can slow down the build. , makeCacheWritable ? false @@ -32,7 +35,7 @@ let npmDeps = fetchNpmDeps { - inherit src srcs sourceRoot prePatch patches postPatch; + inherit forceGitDeps src srcs sourceRoot prePatch patches postPatch; name = "${name}-npm-deps"; hash = npmDepsHash; }; diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix index d87071d8559..41cad9d12ee 100644 --- a/pkgs/build-support/node/fetch-npm-deps/default.nix +++ b/pkgs/build-support/node/fetch-npm-deps/default.nix @@ -36,8 +36,8 @@ ''; }; - makeTest = { name, src, hash }: testers.invalidateFetcherByDrvHash fetchNpmDeps { - inherit name hash; + makeTest = { name, src, hash, forceGitDeps ? false }: testers.invalidateFetcherByDrvHash fetchNpmDeps { + inherit name hash forceGitDeps; src = makeTestSrc { inherit name src; }; }; @@ -108,6 +108,8 @@ }; hash = "sha256-+KA8/orSBJ4EhuSyQO8IKSxsN/FAsYU3lOzq+awuxNQ="; + + forceGitDeps = true; }; }; @@ -121,6 +123,7 @@ fetchNpmDeps = { name ? "npm-deps" , hash ? "" + , forceGitDeps ? false , ... } @ args: let @@ -131,6 +134,8 @@ outputHash = ""; outputHashAlgo = "sha256"; }; + + forceGitDeps_ = lib.optionalAttrs forceGitDeps { FORCE_GIT_DEPS = true; }; in stdenvNoCC.mkDerivation (args // { inherit name; @@ -161,5 +166,5 @@ dontInstall = true; outputHashMode = "recursive"; - } // hash_); + } // hash_ // forceGitDeps_); } diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 068a6d2bcd6..57725a922df 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -97,7 +97,7 @@ fn main() -> anyhow::Result<()> { (out_tempdir.path(), true) }; - let packages = parse::lockfile(&lock_content)?; + let packages = parse::lockfile(&lock_content, env::var("FORCE_GIT_DEPS").is_ok())?; let cache = Cache::new(out.join("_cacache")); diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs index 95f876017bd..9ed4bbecc21 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs @@ -1,6 +1,7 @@ use anyhow::{anyhow, bail, Context}; use lock::UrlOrString; use rayon::prelude::*; +use serde_json::{Map, Value}; use std::{ fs, io, process::{Command, Stdio}, @@ -10,17 +11,71 @@ use url::Url; mod lock; -pub fn lockfile(lockfile: &str) -> anyhow::Result> { - let packages = lock::packages(lockfile).context("failed to extract packages from lockfile")?; - - packages +pub fn lockfile(content: &str, force_git_deps: bool) -> anyhow::Result> { + let mut packages = lock::packages(content) + .context("failed to extract packages from lockfile")? .into_par_iter() .map(|p| { let n = p.name.clone().unwrap(); Package::from_lock(p).with_context(|| format!("failed to parse data for {n}")) }) - .collect() + .collect::>>()?; + + let mut new = Vec::new(); + + for pkg in packages + .iter() + .filter(|p| matches!(p.specifics, Specifics::Git { .. })) + { + let dir = match &pkg.specifics { + Specifics::Git { workdir } => workdir, + Specifics::Registry { .. } => unimplemented!(), + }; + + let path = dir.path().join("package"); + + let lockfile_contents = fs::read_to_string(path.join("package-lock.json")); + + let package_json_path = path.join("package.json"); + let mut package_json: Map = + serde_json::from_str(&fs::read_to_string(package_json_path)?)?; + + if let Some(scripts) = package_json + .get_mut("scripts") + .and_then(Value::as_object_mut) + { + // https://github.com/npm/pacote/blob/272edc1bac06991fc5f95d06342334bbacfbaa4b/lib/git.js#L166-L172 + for typ in [ + "postinstall", + "build", + "preinstall", + "install", + "prepack", + "prepare", + ] { + if scripts.contains_key(typ) && lockfile_contents.is_err() && !force_git_deps { + bail!("Git dependency {} contains install scripts, but has no lockfile, which is something that will probably break. Open an issue if you can't feasibly patch this dependency out, and we'll come up with a workaround.\nIf you'd like to attempt to try to use this dependency anyways, set `forceGitDeps = true`.", pkg.name); + } + } + } + + if let Ok(lockfile_contents) = lockfile_contents { + new.append(&mut lockfile(&lockfile_contents, force_git_deps)?); + } + } + + packages.append(&mut new); + + packages.par_sort_by(|x, y| { + x.url + .partial_cmp(&y.url) + .expect("resolved should be comparable") + }); + + packages.dedup_by(|x, y| x.url == y.url); + + Ok(packages) } #[derive(Debug)] From e1d64c19411e38790765338ac0e68f290f43bbe2 Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 28 Jan 2023 14:17:27 -0500 Subject: [PATCH 022/337] prefetch-npm-deps: throw better error when unsupported git service is used See https://github.com/NixOS/nixpkgs/pull/206476#discussion_r1058689383. --- .../node/fetch-npm-deps/src/parse/mod.rs | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs index 9ed4bbecc21..387b3add7ec 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs @@ -101,7 +101,7 @@ impl Package { UrlOrString::String(_) => panic!("at this point, all packages should have URLs"), }; - let specifics = match get_hosted_git_url(&resolved) { + let specifics = match get_hosted_git_url(&resolved)? { Some(hosted) => { let mut body = ureq::get(hosted.as_str()).call()?.into_reader(); @@ -190,11 +190,13 @@ impl Package { } #[allow(clippy::case_sensitive_file_extension_comparisons)] -fn get_hosted_git_url(url: &Url) -> Option { - if ["git", "http", "git+ssh", "git+https", "ssh", "https"].contains(&url.scheme()) { - let mut s = url.path_segments()?; +fn get_hosted_git_url(url: &Url) -> anyhow::Result> { + if ["git", "git+ssh", "git+https", "ssh"].contains(&url.scheme()) { + let mut s = url + .path_segments() + .ok_or_else(|| anyhow!("bad URL: {url}"))?; - match url.host_str()? { + let mut get_url = || match url.host_str()? { "github.com" => { let user = s.next()?; let mut project = s.next()?; @@ -243,7 +245,7 @@ fn get_hosted_git_url(url: &Url) -> Option { ) } "gitlab.com" => { - let path = &url.path()[1..]; + /* let path = &url.path()[1..]; if path.contains("/~/") || path.contains("/archive.tar.gz") { return None; @@ -263,7 +265,10 @@ fn get_hosted_git_url(url: &Url) -> Option { "https://gitlab.com/{user}/{project}/repository/archive.tar.gz?ref={commit}" )) .ok()?, - ) + ) */ + + // lmao: https://github.com/npm/hosted-git-info/pull/109 + None } "git.sr.ht" => { let user = s.next()?; @@ -288,9 +293,14 @@ fn get_hosted_git_url(url: &Url) -> Option { ) } _ => None, + }; + + match get_url() { + Some(u) => Ok(Some(u)), + None => Err(anyhow!("This lockfile either contains a Git dependency with an unsupported host, or a malformed URL in the lockfile: {url}")) } } else { - None + Ok(None) } } @@ -322,32 +332,26 @@ mod tests { "git+ssh://git@github.com/castlabs/electron-releases.git#fc5f78d046e8d7cdeb66345a2633c383ab41f525", Some("https://codeload.github.com/castlabs/electron-releases/tar.gz/fc5f78d046e8d7cdeb66345a2633c383ab41f525"), ), - ( - "https://user@github.com/foo/bar#fix/bug", - Some("https://codeload.github.com/foo/bar/tar.gz/fix/bug") - ), - ( - "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz", - None - ), ( "git+ssh://bitbucket.org/foo/bar#branch", Some("https://bitbucket.org/foo/bar/get/branch.tar.gz") ), - ( - "ssh://git@gitlab.com/foo/bar.git#fix/bug", - Some("https://gitlab.com/foo/bar/repository/archive.tar.gz?ref=fix/bug") - ), ( "git+ssh://git.sr.ht/~foo/bar#branch", Some("https://git.sr.ht/~foo/bar/archive/branch.tar.gz") ), ] { assert_eq!( - get_hosted_git_url(&Url::parse(input).unwrap()), + get_hosted_git_url(&Url::parse(input).unwrap()).unwrap(), expected.map(|u| Url::parse(u).unwrap()) ); } + + assert!( + get_hosted_git_url(&Url::parse("ssh://git@gitlab.com/foo/bar.git#fix/bug").unwrap()) + .is_err(), + "GitLab URLs should be marked as invalid (lol)" + ); } #[test] From faa3de1bf57a78e8df814e06f05c0b7e038656b7 Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 30 Jan 2023 22:08:08 -0500 Subject: [PATCH 023/337] prefetch-npm-deps: fix clippy lint --- pkgs/build-support/node/fetch-npm-deps/src/cacache.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs b/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs index 715e115e723..5326c3e858b 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs @@ -72,7 +72,7 @@ impl Cache { &mut p, &hash .into_iter() - .map(|x| format!("{:02x}", x)) + .map(|n| format!("{n:02x}")) .collect::(), ); From a7391ddbe6c7403f6537020b0f143a267b6e41a0 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Thu, 6 Apr 2023 11:35:49 -0400 Subject: [PATCH 024/337] mongosh: fix hash now that all git deps are fetched This FOD hash changed becuase it the fetcher was not downloading dev dependencies from https://github.com/mongodb-js/saslprep/tree/v1.0.4 (a transitive dependency) and so since including git dep lockfiles is the purpose of these changes this change is intended and the hash should be updated. Generally a package was unable to build without these so I did not expect this to be a breaking change (since there would be no existing FODs), but mongosh seems to have been an exception. I think just changing the hash here is more appropriate for this exception rather than working in machinery for supporting old and new FODs (since it's rather unlikely these prefetch-npm-deps changes will break downstream code as it should not have worked in the first place if it needed this). --- pkgs/development/tools/mongosh/source.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index fda52f4e77c..9f590bcb9b2 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -2,5 +2,5 @@ "version": "1.8.0", "integrity": "sha512-9pHLqfYMWwP1L2t83TK5k6ho1faz+jFD9zXxnTtgnyu0c/uC39nx+tJT9AsxNZpY+GlhshDu1YcJm45f8l3gIw==", "filename": "mongosh-1.8.0.tgz", - "deps": "sha256-8v4E9wNv3+JCGm7mUEA+z+g/4X37ACwVsn+9Cv7N+4o=" + "deps": "sha256-ewl5q6ZxlQN030AmObP42E5KpUisrdYHOsg8whUIUZA=" } From 23dfa9c2f994d8f9dde1be8d9fe75fd95e1a14f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Apr 2023 01:25:11 +0000 Subject: [PATCH 025/337] fluxcd: 0.41.2 -> 2.0.0-rc.1 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 1497876c384..29ada04281b 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "0.41.2"; - sha256 = "0c4in6k6l9kjskcapi6gap9jkbrrfd106z6nbs48afr30cv2wp24"; - manifestsSha256 = "0kc9s5289s5b1slk2w3sr28yk9hg3lmrpy00mw3im3k6aqgrk9j0"; + version = "2.0.0-rc.1"; + sha256 = "0hy8jphb6pd24qifnjgzm2jwz93c5rsk08p8k9kl1fzlz7bivg9g"; + manifestsSha256 = "0v6skn065hqk0pq5k7c48g68pnpj5har8cfhgbc8xjzg149a22wa"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-ez4yaFZ5JROdu9boN5wI/XGMqLo8OKW6b0FZsJeFw4w="; + vendorSha256 = "sha256-ifzzNEFXq2VzidaxCTdz7VZOCoA0zPcK6uL0CyBNrE4="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 7840f2055a183e93ac69e73b5fc63fcfa9c47a18 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 00:09:42 +1000 Subject: [PATCH 026/337] flutter: Create the flutter derivation with callPackage alone --- pkgs/development/compilers/flutter/default.nix | 6 +++--- pkgs/development/compilers/flutter/flutter.nix | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 50752b01ec7..0b44460fe04 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,8 +1,8 @@ { callPackage, fetchurl, dart }: let - mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; - wrapFlutter = flutter: callPackage (import ./wrapper.nix) { flutter = flutter; }; - mkFlutterFHS = flutter: callPackage (import ./fhs.nix) { flutter = flutter; }; + mkFlutter = { version, patches, dart, src }: callPackage ./flutter.nix { inherit version patches dart src; }; + wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; + mkFlutterFHS = flutter: callPackage ./fhs.nix { inherit flutter; }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 6df6fe2ba13..bd59edb8516 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -2,9 +2,8 @@ , patches , dart , src -}: -{ lib +, lib , git , stdenv , which From cda91ab26974f5848ec919142855872695b1f994 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 02:40:44 +1000 Subject: [PATCH 027/337] flutter: Add cache output and preload pub cache when necessary Co-authored-by: FlafyDev Co-authored-by: gilice Co-authored-by: hacker1024 --- .../development/compilers/flutter/flutter.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index bd59edb8516..8192184108f 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -13,11 +13,12 @@ let self = stdenv.mkDerivation { name = "$flutter-${version}-unwrapped"; + inherit src patches version; + + outputs = [ "out" "cache" ]; buildInputs = [ git ]; - inherit src patches version; - postPatch = '' patchShebangs --build ./bin/ ''; @@ -32,8 +33,23 @@ let export DART_SDK_PATH="${dart}" - HOME=../.. # required for pub upgrade --offline, ~/.pub-cache - # path is relative otherwise it's replaced by /build/flutter + # The Flutter tool compilation requires dependencies to be cached, as there is no Internet access. + # Dart expects package caches to be mutable, and does not support composing cache directories. + # The packages cached during the build therefore cannot be easily used. They are provided through + # the derivation's "cache" output, though, in case they are needed. + # + # Note that non-cached packages will normally be fetched from the Internet when they are needed, so Flutter + # will function without an existing package cache as long as it has an Internet connection. + export PUB_CACHE="$cache" + + if [ -d .pub-preload-cache ]; then + ${dart}/bin/dart pub cache preload .pub-preload-cache/* + elif [ -d .pub-cache ]; then + mv .pub-cache "$PUB_CACHE" + else + echo 'ERROR: Failed to locate the Dart package cache required to build the Flutter tool.' + exit 1 + fi pushd "$FLUTTER_TOOLS_DIR" ${dart}/bin/dart pub get --offline From 65708c3360e6b2a01f42d2784f36983908e2c706 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 14:53:17 +1000 Subject: [PATCH 028/337] flutter: Don't delete SDK artifacts Co-authored-by: FlafyDev Co-authored-by: gilice Co-authored-by: hacker1024 --- pkgs/development/compilers/flutter/flutter.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 8192184108f..de6f2930676 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -60,8 +60,7 @@ let echo "$revision" > "$STAMP_PATH" echo -n "${version}" > version - rm -r bin/cache/{artifacts,dart-sdk,downloads} - rm bin/cache/*.stamp + rm -r bin/cache/dart-sdk ''; installPhase = '' From 94a34aadf6d3f7a78cad181a555d4d162a7e7914 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 16:14:22 +1000 Subject: [PATCH 029/337] flutter: Use autoPatchelfHook for SDK artifacts This allows SDK artifacts (including build tools and libraries) to use the right interpreter and library locations, abolishing the need for a FHS or post-build patches. `autoPatchelf` has been used through `autoPatchelfHook`, instead of the `autoPatchelf` command on just the artifact directory, due to the latter method not patching interpreter paths (https://discourse.nixos.org/t/trying-to-use-autopatchelf/24003). Co-authored-by: FlafyDev Co-authored-by: gilice Co-authored-by: hacker1024 --- pkgs/development/compilers/flutter/flutter.nix | 18 ++++++++++++++++-- pkgs/development/compilers/flutter/wrapper.nix | 3 +-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index de6f2930676..dd76600edb5 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -4,12 +4,25 @@ , src , lib -, git , stdenv +, autoPatchelfHook +, git , which +, atk +, glib +, gtk3 +, libepoxy }: let + # Libraries that Flutter artifacts depend on at runtime. + artifactRuntimeDeps = [ + atk + glib + gtk3 + libepoxy + ]; + self = stdenv.mkDerivation { name = "$flutter-${version}-unwrapped"; @@ -17,7 +30,8 @@ let outputs = [ "out" "cache" ]; - buildInputs = [ git ]; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ git ] ++ artifactRuntimeDeps; postPatch = '' patchShebangs --build ./bin/ diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 7b6fd464e35..7d7747217ad 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -95,6 +95,5 @@ in --prefix PATH : '${lib.makeBinPath buildTools}' \ --prefix PKG_CONFIG_PATH : '${builtins.concatStringsSep ":" pkgConfigDirectories}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " cppFlags}' \ - --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' \ - --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath appPrebuiltDeps}' + --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' '') From 9e33e35589ac026ba535c8d8e68a6e66beeac048 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 16:15:08 +1000 Subject: [PATCH 030/337] flutter: Add zlib to the linker search path --- pkgs/development/compilers/flutter/wrapper.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 7d7747217ad..b9341bdb1b1 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -17,6 +17,7 @@ , pango , libX11 , xorgproto +, zlib , cmake , ninja , clang @@ -53,9 +54,9 @@ let in builtins.concatMap collect appRuntimeDeps; - # Some header files are not properly located by the Flutter SDK. + # Some header files and libraries are not properly located by the Flutter SDK. # They must be manually included. - appStaticBuildDeps = lib.optionals supportsLinuxDesktop [ libX11 xorgproto ]; + appStaticBuildDeps = lib.optionals supportsLinuxDesktop [ libX11 xorgproto zlib ]; # Some runtime components are prebuilt, and do not know where to find their dependencies. # Ideally, these prebuilt components would be patched by the SDK derivation, but this @@ -94,6 +95,7 @@ in --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --prefix PATH : '${lib.makeBinPath buildTools}' \ --prefix PKG_CONFIG_PATH : '${builtins.concatStringsSep ":" pkgConfigDirectories}' \ + --prefix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " cppFlags}' \ --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' '') From e5529593957fae3006388b08826651ec9993af1e Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 16:37:12 +1000 Subject: [PATCH 031/337] flutter: Remove the FHS wrapper Now that Flutter artifacts are patched, there is no need for a FHS at runtime or any stage of the build process. Those relying on it for the Android SDK should look at https://github.com/tadfisher/android-nixpkgs. --- .../development/compilers/flutter/default.nix | 3 +- pkgs/development/compilers/flutter/fhs.nix | 83 ------------------- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 3 insertions(+), 89 deletions(-) delete mode 100644 pkgs/development/compilers/flutter/fhs.nix diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 0b44460fe04..6c34ef44024 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -2,7 +2,6 @@ let mkFlutter = { version, patches, dart, src }: callPackage ./flutter.nix { inherit version patches dart src; }; wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; - mkFlutterFHS = flutter: callPackage ./fhs.nix { inherit flutter; }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; @@ -28,7 +27,7 @@ let }; in { - inherit mkFlutter wrapFlutter mkFlutterFHS flutterDrv; + inherit mkFlutter wrapFlutter flutterDrv; stable = flutterDrv { version = "3.3.3"; dartVersion = "2.18.2"; diff --git a/pkgs/development/compilers/flutter/fhs.nix b/pkgs/development/compilers/flutter/fhs.nix deleted file mode 100644 index e89bddc9772..00000000000 --- a/pkgs/development/compilers/flutter/fhs.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib -, stdenv -, callPackage -, flutter -, buildFHSUserEnv -, runCommandLocal -, supportsAndroidEmulator ? stdenv.isLinux -}: - - -# Wrap flutter inside an fhs user env to allow execution of binary, -# like adb from $ANDROID_HOME or java from android-studio. -(callPackage ./sdk-symlink.nix { }) (buildFHSUserEnv rec { - name = "${flutter.name}-fhs"; - - multiPkgs = pkgs: with pkgs; ([ - # Flutter only use these certificates - (runCommandLocal "fedoracert" { } '' - mkdir -p $out/etc/pki/tls/ - ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs - '') - zlib - ]); - - targetPkgs = pkgs: with pkgs; ([ - flutter - - # General ecosystem dependencies - bash - curl - git - unzip - which - xz - - # flutter test requires this lib - libGLU - ] ++ lib.optional supportsAndroidEmulator [ - # for android emulator - alsa-lib - dbus - expat - libpulseaudio - libuuid - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrender - xorg.libXtst - libGL - nspr - nss - systemd - ]); - - runScript = "flutter"; - - extraInstallCommands = '' - # By default, the derivation name is used as the binary name. - # This is not the desired behaviour in this case. - # https://github.com/NixOS/nixpkgs/blob/cb4536bf3606a7b6b54b69afe22ccd82e2906d92/pkgs/build-support/build-fhs-userenv/default.nix#L43 - mv $out/bin/${name} $out/bin/flutter - ''; - - passthru = flutter.passthru // { - nonFHS = flutter; - mkFlutterApp = callPackage ../../../build-support/flutter { - flutter = callPackage ./fhs.nix { supportsAndroidEmulator = false; }; - }; - }; - - meta = flutter.meta // { - longDescription = '' - ${flutter.meta.longDescription} - Wrapped in a FHS environment to improve compatibility with internal tools and tools in the ecosystem. - ''; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91e81acf393..12fbbf2bfbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13701,10 +13701,8 @@ with pkgs; recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter-unwrapped = flutterPackages.stable; flutter2-unwrapped = flutterPackages.v2; - flutter-wrapped = flutterPackages.wrapFlutter flutter-unwrapped; - flutter2-wrapped = flutterPackages.wrapFlutter flutter2-unwrapped; - flutter = flutterPackages.mkFlutterFHS flutter-wrapped; - flutter2 = flutterPackages.mkFlutterFHS flutter2-wrapped; + flutter = flutterPackages.wrapFlutter flutter-unwrapped; + flutter2 = flutterPackages.wrapFlutter flutter2-unwrapped; fnm = callPackage ../development/tools/fnm { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation Security; From d6ce0dafcfccbd2c93c3af9428671384deeb05b8 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 16:53:48 +1000 Subject: [PATCH 032/337] flutter: Don't use an external artifact cache The internal artifacts should be used, as they have been patched to use Nix libraries. Co-authored-by: FlafyDev Co-authored-by: gilice Co-authored-by: hacker1024 --- .../flutter/patches/flutter2/move-cache.patch | 41 +---- .../flutter/patches/flutter3/move-cache.patch | 161 ------------------ 2 files changed, 3 insertions(+), 199 deletions(-) diff --git a/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch index a81d2def242..efab81d2fc0 100644 --- a/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/flutter2/move-cache.patch @@ -1,31 +1,5 @@ -diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index ed42baea29..12941f733a 100644 ---- a/packages/flutter_tools/lib/src/asset.dart -+++ b/packages/flutter_tools/lib/src/asset.dart -@@ -11,11 +11,11 @@ import 'base/file_system.dart'; - import 'base/logger.dart'; - import 'base/platform.dart'; - import 'build_info.dart'; --import 'cache.dart'; - import 'convert.dart'; - import 'dart/package_map.dart'; - import 'devfs.dart'; - import 'flutter_manifest.dart'; -+import 'globals.dart' as globals; - import 'license_collector.dart'; - import 'project.dart'; - -@@ -504,7 +504,7 @@ class ManifestAssetBundle implements AssetBundle { - } - final Uri entryUri = _fileSystem.path.toUri(asset); - result.add(_Asset( -- baseDir: _fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'artifacts', 'material_fonts'), -+ baseDir: _fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts'), - relativeUri: Uri(path: entryUri.pathSegments.last), - entryUri: entryUri, - package: null, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart -index defc86cc20..7fdf14d112 100644 +index dd80b1e46e..8e54517765 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -22,6 +22,7 @@ import 'base/user_messages.dart'; @@ -36,7 +10,7 @@ index defc86cc20..7fdf14d112 100644 const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo) const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo) -@@ -322,8 +323,13 @@ class Cache { +@@ -318,8 +319,13 @@ class Cache { return; } assert(_lock == null); @@ -51,7 +25,7 @@ index defc86cc20..7fdf14d112 100644 try { _lock = lockFile.openSync(mode: FileMode.write); } on FileSystemException catch (e) { -@@ -382,8 +388,7 @@ class Cache { +@@ -378,8 +384,7 @@ class Cache { String get devToolsVersion { if (_devToolsVersion == null) { @@ -61,12 +35,3 @@ index defc86cc20..7fdf14d112 100644 if (!devToolsDir.existsSync()) { throw Exception('Could not find directory at ${devToolsDir.path}'); } -@@ -536,7 +541,7 @@ class Cache { - if (_rootOverride != null) { - return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); - } else { -- return _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin', 'cache')); -+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); - } - } - diff --git a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch index 008c5959e5b..efab81d2fc0 100644 --- a/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch +++ b/pkgs/development/compilers/flutter/patches/flutter3/move-cache.patch @@ -1,26 +1,3 @@ -diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart -diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart -index 9dd7272fbe..642c8e48e4 100644 ---- a/packages/flutter_tools/lib/src/asset.dart -+++ b/packages/flutter_tools/lib/src/asset.dart -@@ -16,6 +16,7 @@ import 'convert.dart'; - import 'dart/package_map.dart'; - import 'devfs.dart'; - import 'flutter_manifest.dart'; -+import 'globals.dart' as globals; - import 'license_collector.dart'; - import 'project.dart'; - -@@ -530,8 +531,7 @@ class ManifestAssetBundle implements AssetBundle { - final Uri entryUri = _fileSystem.path.toUri(asset); - result.add(_Asset( - baseDir: _fileSystem.path.join( -- Cache.flutterRoot!, -- 'bin', 'cache', 'artifacts', 'material_fonts', -+ globals.fsUtils.homeDirPath!, '.cache', 'flutter', 'artifacts', 'material_fonts', - ), - relativeUri: Uri(path: entryUri.pathSegments.last), - entryUri: entryUri, diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index dd80b1e46e..8e54517765 100644 --- a/packages/flutter_tools/lib/src/cache.dart @@ -58,141 +35,3 @@ index dd80b1e46e..8e54517765 100644 if (!devToolsDir.existsSync()) { throw Exception('Could not find directory at ${devToolsDir.path}'); } -@@ -532,7 +537,7 @@ class Cache { - if (_rootOverride != null) { - return _fileSystem.directory(_fileSystem.path.join(_rootOverride!.path, 'bin', 'cache')); - } else { -- return _fileSystem.directory(_fileSystem.path.join(flutterRoot!, 'bin', 'cache')); -+ return _fileSystem.directory(_fileSystem.path.join(globals.fsUtils.homeDirPath!, '.cache', 'flutter')); - } - } - -index c539d67156..4e0a64f7a9 100644 ---- a/packages/flutter_tools/lib/src/artifacts.dart -+++ b/packages/flutter_tools/lib/src/artifacts.dart -@@ -346,10 +346,10 @@ class CachedArtifacts implements Artifacts { - ) { - switch (artifact) { - case HostArtifact.engineDartSdkPath: -- final String path = _dartSdkPath(_cache); -+ final String path = _dartSdkPath(_fileSystem); - return _fileSystem.directory(path); - case HostArtifact.engineDartBinary: -- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', _hostArtifactToFileName(artifact, _platform)); -+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', _hostArtifactToFileName(artifact, _platform)); - return _fileSystem.file(path); - case HostArtifact.flutterWebSdk: - final String path = _getFlutterWebSdkPath(); -@@ -398,7 +398,7 @@ class CachedArtifacts implements Artifacts { - case HostArtifact.dart2jsSnapshot: - case HostArtifact.dartdevcSnapshot: - case HostArtifact.kernelWorkerSnapshot: -- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform)); -+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform)); - return _fileSystem.file(path); - case HostArtifact.iosDeploy: - final String artifactFileName = _hostArtifactToFileName(artifact, _platform); -@@ -465,11 +465,13 @@ class CachedArtifacts implements Artifacts { - String _getAndroidArtifactPath(Artifact artifact, TargetPlatform platform, BuildMode mode) { - final String engineDir = _getEngineArtifactsPath(platform, mode)!; - switch (artifact) { -+ case Artifact.frontendServerSnapshotForEngineDartSdk: -+ assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.'); -+ return _fileSystem.path.join(engineDir, _artifactToFileName(artifact)); - case Artifact.genSnapshot: - assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.'); - final String hostPlatform = getNameForHostPlatform(getCurrentHostPlatform()); - return _fileSystem.path.join(engineDir, hostPlatform, _artifactToFileName(artifact)); -- case Artifact.frontendServerSnapshotForEngineDartSdk: - case Artifact.constFinder: - case Artifact.flutterFramework: - case Artifact.flutterMacOSFramework: -@@ -497,13 +499,13 @@ class CachedArtifacts implements Artifacts { - switch (artifact) { - case Artifact.genSnapshot: - case Artifact.flutterXcframework: -+ case Artifact.frontendServerSnapshotForEngineDartSdk: - final String artifactFileName = _artifactToFileName(artifact)!; - final String engineDir = _getEngineArtifactsPath(platform, mode)!; - return _fileSystem.path.join(engineDir, artifactFileName); - case Artifact.flutterFramework: - final String engineDir = _getEngineArtifactsPath(platform, mode)!; - return _getIosEngineArtifactPath(engineDir, environmentType, _fileSystem); -- case Artifact.frontendServerSnapshotForEngineDartSdk: - case Artifact.constFinder: - case Artifact.flutterMacOSFramework: - case Artifact.flutterPatchedSdkPath: -@@ -586,14 +588,10 @@ class CachedArtifacts implements Artifacts { - // For script snapshots any gen_snapshot binary will do. Returning gen_snapshot for - // android_arm in profile mode because it is available on all supported host platforms. - return _getAndroidArtifactPath(artifact, TargetPlatform.android_arm, BuildMode.profile); -- case Artifact.frontendServerSnapshotForEngineDartSdk: -- return _fileSystem.path.join( -- _dartSdkPath(_cache), 'bin', 'snapshots', -- _artifactToFileName(artifact), -- ); - case Artifact.flutterTester: - case Artifact.vmSnapshotData: - case Artifact.isolateSnapshotData: -+ case Artifact.frontendServerSnapshotForEngineDartSdk: - case Artifact.icuData: - final String engineArtifactsPath = _cache.getArtifactDirectory('engine').path; - final String platformDirName = _enginePlatformDirectoryName(platform); -@@ -776,7 +774,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts { - final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform)); - return _fileSystem.file(path); - case HostArtifact.dartdevcSnapshot: -- final String path = _fileSystem.path.join(_dartSdkPath(_cache), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform)); -+ final String path = _fileSystem.path.join(_dartSdkPath(_fileSystem), 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform)); - return _fileSystem.file(path); - case HostArtifact.kernelWorkerSnapshot: - final String path = _fileSystem.path.join(_hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', _hostArtifactToFileName(artifact, _platform)); -@@ -901,9 +899,7 @@ class CachedLocalEngineArtifacts implements LocalEngineArtifacts { - case Artifact.windowsCppClientWrapper: - return _fileSystem.path.join(_hostEngineOutPath, artifactFileName); - case Artifact.frontendServerSnapshotForEngineDartSdk: -- return _fileSystem.path.join( -- _hostEngineOutPath, 'dart-sdk', 'bin', 'snapshots', artifactFileName, -- ); -+ return _fileSystem.path.join(_hostEngineOutPath, 'gen', artifactFileName); - } - } - -@@ -1011,8 +1007,8 @@ class OverrideArtifacts implements Artifacts { - } - - /// Locate the Dart SDK. --String _dartSdkPath(Cache cache) { -- return cache.getRoot().childDirectory('dart-sdk').path; -+String _dartSdkPath(FileSystem fileSystem) { -+ return fileSystem.path.join(Cache.flutterRoot!, 'bin', 'cache', 'dart-sdk'); - } - - class _TestArtifacts implements Artifacts { -diff --git a/packages/flutter_tools/test/general.shard/artifacts_test.dart b/packages/flutter_tools/test/general.shard/artifacts_test.dart -index aed3eb9285..81b8362648 100644 ---- a/packages/flutter_tools/test/general.shard/artifacts_test.dart -+++ b/packages/flutter_tools/test/general.shard/artifacts_test.dart -@@ -141,10 +141,6 @@ void main() { - artifacts.getArtifactPath(Artifact.flutterTester, platform: TargetPlatform.linux_arm64), - fileSystem.path.join('root', 'bin', 'cache', 'artifacts', 'engine', 'linux-arm64', 'flutter_tester'), - ); -- expect( -- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), -- fileSystem.path.join('root', 'bin', 'cache', 'dart-sdk', 'bin', 'snapshots', 'frontend_server.dart.snapshot') -- ); - }); - - testWithoutContext('precompiled web artifact paths are correct', () { -@@ -310,11 +306,6 @@ void main() { - artifacts.getHostArtifact(HostArtifact.engineDartSdkPath).path, - fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk'), - ); -- expect( -- artifacts.getArtifactPath(Artifact.frontendServerSnapshotForEngineDartSdk), -- fileSystem.path.join('/out', 'host_debug_unopt', 'dart-sdk', 'bin', -- 'snapshots', 'frontend_server.dart.snapshot') -- ); - expect( - artifacts.getHostArtifact(HostArtifact.impellerc).path, - fileSystem.path.join('/out', 'host_debug_unopt', 'impellerc'), From 9497627b15ce079b0fb89fff46220bfbdfd3b510 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 16:54:19 +1000 Subject: [PATCH 033/337] flutter: Don't try to update the immutable artifact cache Co-authored-by: FlafyDev Co-authored-by: gilice Co-authored-by: hacker1024 --- .../patches/flutter2/disable-auto-update.patch | 13 +++++++++++++ .../patches/flutter3/disable-auto-update.patch | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch index e799f6e1550..33805b7a54d 100644 --- a/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/flutter2/disable-auto-update.patch @@ -34,3 +34,16 @@ index 396756808e..d324a6df59 100644 // See if the user specified a specific device. globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?; + +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index defc86cc20..6c0824c965 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -666,6 +666,7 @@ class Cache { + + /// Update the cache to contain all `requiredArtifacts`. + Future updateAll(Set requiredArtifacts) async { ++ return; + if (!_lockEnabled) { + return; + } diff --git a/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch index 21b676a2af3..87461904613 100644 --- a/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch +++ b/pkgs/development/compilers/flutter/patches/flutter3/disable-auto-update.patch @@ -34,3 +34,16 @@ index 738fef987d..03a152e64f 100644 // See if the user specified a specific device. globals.deviceManager?.specifiedDeviceId = topLevelResults['device-id'] as String?; + +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index dd80b1e46e..8e54517765 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -668,6 +668,7 @@ + + /// Update the cache to contain all `requiredArtifacts`. + Future updateAll(Set requiredArtifacts, {bool offline = false}) async { ++ return; + if (!_lockEnabled) { + return; + } From 7f01352e6513ea425d8ed026445f24f7234a8502 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 17:08:58 +1000 Subject: [PATCH 034/337] flutter: Don't preserve prebuilt SDK asset file permissions See: https://github.com/flutter/flutter/issues/119961 Co-authored-by: FlafyDev Co-authored-by: gilice Co-authored-by: hacker1024 --- .../patches/flutter2/copy-without-perms.patch | 17 +++++++++++++++++ .../patches/flutter3/copy-without-perms.patch | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch create mode 100644 pkgs/development/compilers/flutter/patches/flutter3/copy-without-perms.patch diff --git a/pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch b/pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch new file mode 100644 index 00000000000..f262f04bc94 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/flutter2/copy-without-perms.patch @@ -0,0 +1,17 @@ +diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart +index 68a4cd0257..1e212b9b0d 100644 +--- a/packages/flutter_tools/lib/src/build_system/targets/assets.dart ++++ b/packages/flutter_tools/lib/src/build_system/targets/assets.dart +@@ -101,7 +101,11 @@ Future copyAssets(Environment environment, Directory outputDirectory, { + outputPath: file.path, + relativePath: entry.key, + )) { +- await (content.file as File).copy(file.path); ++ // Not using File.copy because it preserves permissions. ++ final sourceFile = content.file as File; ++ final destinationFile = file; ++ ++ await destinationFile.writeAsBytes(await sourceFile.readAsBytes(), flush: true); + } + } else { + await file.writeAsBytes(await entry.value.contentsAsBytes()); diff --git a/pkgs/development/compilers/flutter/patches/flutter3/copy-without-perms.patch b/pkgs/development/compilers/flutter/patches/flutter3/copy-without-perms.patch new file mode 100644 index 00000000000..281b3840891 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/flutter3/copy-without-perms.patch @@ -0,0 +1,17 @@ +diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart +index 5f458bd53e..7a6c59f98d 100644 +--- a/packages/flutter_tools/lib/src/build_system/targets/assets.dart ++++ b/packages/flutter_tools/lib/src/build_system/targets/assets.dart +@@ -128,7 +128,11 @@ Future copyAssets( + break; + } + if (doCopy) { +- await (content.file as File).copy(file.path); ++ // Not using File.copy because it preserves permissions. ++ final sourceFile = content.file as File; ++ final destinationFile = file; ++ ++ await destinationFile.writeAsBytes(await sourceFile.readAsBytes(), flush: true); + } + } else { + await file.writeAsBytes(await entry.value.contentsAsBytes()); From aa9079c678a76354c829d4821e35776db67084ba Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 17:27:10 +1000 Subject: [PATCH 035/337] flutter: Remove prebuilt dependencies from the wrapper These are no longer needed now that the artifacts are patched. --- pkgs/development/compilers/flutter/wrapper.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index b9341bdb1b1..270eb2cd175 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -58,15 +58,6 @@ let # They must be manually included. appStaticBuildDeps = lib.optionals supportsLinuxDesktop [ libX11 xorgproto zlib ]; - # Some runtime components are prebuilt, and do not know where to find their dependencies. - # Ideally, these prebuilt components would be patched by the SDK derivation, but this - # is tricky as they are tyically downloaded from Google on-demand. - # Building the Engine manually should solve this issue: https://github.com/NixOS/nixpkgs/issues/201574 - appPrebuiltDeps = lib.optionals supportsLinuxDesktop [ - # flutter_linux_gtk.so - libepoxy - ]; - # Tools used by the Flutter SDK to compile applications. buildTools = lib.optionals supportsLinuxDesktop [ pkg-config From 0f2848638fef6e708b9488ee7badb3899fa3ab27 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 17:46:14 +1000 Subject: [PATCH 036/337] flutter: 3.3.3 -> 3.7.11 --- pkgs/development/compilers/flutter/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 6c34ef44024..01106aaeefc 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -29,12 +29,12 @@ in { inherit mkFlutter wrapFlutter flutterDrv; stable = flutterDrv { - version = "3.3.3"; - dartVersion = "2.18.2"; - hash = "sha256-MTZeWQUp4/TcPzYIT6eqIKSPUPvn2Mp/thOQzNgpTXg="; + version = "3.7.11"; + dartVersion = "2.19.6"; + hash = "sha256-/vtjoPB4Hn8RtP09uMdUYtDS7lzQvskdrNszEYlpOBc="; dartHash = { - x86_64-linux = "sha256-C3+YjecXLvSmJrLwi9H7TgD9Np0AArRWx3EdBrfQpTU"; - aarch64-linux = "sha256-zyIK1i5/9P2C+sjzdArhFwpVO4P+It+/X50l+n9gekI="; + x86_64-linux = "sha256-D9/yXmrLo9YJQVWn40FjT43jR36Gwv2krUcjLBrfcE8="; + aarch64-linux = "sha256-aRO3wLO3i8FB03LNRz2iF3Hlc3Kxq0XJd84VUMj/C5w="; }; patches = getPatches ./patches/flutter3; }; From 5777f1a122a07e0b63d1eb2dcdb17a7b7d31d196 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 17:49:33 +1000 Subject: [PATCH 037/337] flutter: Don't check executable locations in doctor Flutter 3.5.0 adds a check to make sure that the Flutter and Dart tool executables are inside the SDK directory. This does not play nicely with the wrapping and linking techniques used to package it. It is also impossible for there to be an issue related to binary locations, as everything is set up properly in the derivation. --- .../flutter3/dont-validate-executable-location.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pkgs/development/compilers/flutter/patches/flutter3/dont-validate-executable-location.patch diff --git a/pkgs/development/compilers/flutter/patches/flutter3/dont-validate-executable-location.patch b/pkgs/development/compilers/flutter/patches/flutter3/dont-validate-executable-location.patch new file mode 100644 index 00000000000..5f391265ce1 --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/flutter3/dont-validate-executable-location.patch @@ -0,0 +1,12 @@ +diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart +index 651dc6cf36..236eb370e1 100644 +--- a/packages/flutter_tools/lib/src/doctor.dart ++++ b/packages/flutter_tools/lib/src/doctor.dart +@@ -515,7 +515,6 @@ class FlutterValidator extends DoctorValidator { + final String flutterRoot = _flutterRoot(); + messages.add(_getFlutterVersionMessage(frameworkVersion, versionChannel, flutterRoot)); + +- _validateRequiredBinaries(flutterRoot).forEach(messages.add); + messages.add(_getFlutterUpstreamMessage(version)); + if (gitUrl != null) { + messages.add(ValidationMessage(_userMessages.flutterGitUrl(gitUrl))); From 88b308c1323897b2747cf4593fbaf9cd9aa95f36 Mon Sep 17 00:00:00 2001 From: gilice <104317939+gilice@users.noreply.github.com> Date: Tue, 4 Apr 2023 16:41:05 +0200 Subject: [PATCH 038/337] maintainers: add FlafyDev --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2d1903458b4..d9649b0a108 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5102,6 +5102,12 @@ github = "fkautz"; githubId = 135706; }; + FlafyDev = { + name = "Flafy Arazi"; + email = "flafyarazi@gmail.com"; + github = "FlafyDev"; + githubId = 44374434; + }; Flakebi = { email = "flakebi@t-online.de"; github = "Flakebi"; From bc6e36afdcdba1a58814de7ea87306e2c8b4f8c1 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Wed, 16 Nov 2022 14:14:31 +1100 Subject: [PATCH 039/337] maintainers: add hacker1024 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d9649b0a108..c6604b163d8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5913,6 +5913,12 @@ fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; }]; }; + hacker1024 = { + name = "hacker1024"; + email = "hacker1024@users.sourceforge.net"; + github = "hacker1024"; + githubId = 20849728; + }; hagl = { email = "harald@glie.be"; github = "hagl"; From 4df7d07ab1d829c16e4aa36a012b161825b717d9 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 19:29:42 +1000 Subject: [PATCH 040/337] flutter: Remove stray dollar sign from name string --- pkgs/development/compilers/flutter/flutter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index af2cda1b712..7500f057078 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -25,7 +25,7 @@ let self = stdenv.mkDerivation { - name = "$flutter-${version}-unwrapped"; + name = "flutter-${version}-unwrapped"; inherit src patches version; outputs = [ "out" "cache" ]; From f3aac6e61e6711908073d5eeb6adf2d445f81ccf Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 19:46:45 +1000 Subject: [PATCH 041/337] flutter: Add FlafyDev, gilice, and hacker1024 as maintainers --- pkgs/development/compilers/flutter/flutter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 7500f057078..8471f2f0da8 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -119,7 +119,7 @@ let homepage = "https://flutter.dev"; license = licenses.bsd3; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ babariviere ericdallo ]; + maintainers = with maintainers; [ babariviere ericdallo FlafyDev gilice hacker1024 ]; }; } ; From 4196ddbeb5f1c1f6134a2dfef771c9777be87e86 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 21:55:50 +1000 Subject: [PATCH 042/337] flutter: Add git and which to PATH --- pkgs/development/compilers/flutter/wrapper.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 270eb2cd175..a8018525332 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -6,6 +6,8 @@ , makeWrapper , runCommandLocal , writeShellScript +, git +, which , pkg-config , atk , cairo @@ -31,6 +33,9 @@ let ${flutter}/bin/flutter --no-version-check "$@" ''; + # Tools that the Flutter tool depends on. + tools = [ git which ]; + # Libraries that Flutter apps depend on at runtime. appRuntimeDeps = lib.optionals supportsLinuxDesktop [ atk @@ -84,7 +89,7 @@ in mkdir -p $out/bin makeWrapper '${immutableFlutter}' $out/bin/flutter \ --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --prefix PATH : '${lib.makeBinPath buildTools}' \ + --prefix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ --prefix PKG_CONFIG_PATH : '${builtins.concatStringsSep ":" pkgConfigDirectories}' \ --prefix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " cppFlags}' \ From 6d50bcc4876261de18720e6a867ae959d31018d1 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 22:00:24 +1000 Subject: [PATCH 043/337] mkFlutterApp: Deduplicate build environment setup The build environment is now set up by the Flutter wrapper, and does not need to be done in mkFlutterApp. --- pkgs/build-support/flutter/default.nix | 98 ++++---------------------- 1 file changed, 12 insertions(+), 86 deletions(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 307e2d08c5f..253d9044c18 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -1,36 +1,10 @@ -{ flutter -, lib -, llvmPackages_13 -, cmake -, ninja -, pkg-config -, wrapGAppsHook -, autoPatchelfHook -, util-linux -, libselinux -, libsepol -, libthai -, libdatrie -, libxkbcommon -, at-spi2-core -, libsecret -, jsoncpp -, xorg -, dbus -, gtk3 -, glib -, pcre -, libepoxy +{ lib , stdenvNoCC -, cacert -, git -, dart +, autoPatchelfHook , nukeReferences -, bash -, curl -, unzip -, which -, xz +, llvmPackages_13 +, cacert +, flutter }: # absolutely no mac support for now @@ -42,23 +16,13 @@ let placeholder_flutter = pl "FLUTTER"; fetchAttrs = [ "src" "sourceRoot" "setSourceRoot" "unpackPhase" "patches" ]; getAttrsOrNull = names: attrs: lib.genAttrs names (name: if attrs ? ${name} then attrs.${name} else null); - flutterDeps = [ - # flutter deps - flutter.wrapped - bash - curl - flutter.dart - git - unzip - which - xz - ]; self = (self: llvmPackages_13.stdenv.mkDerivation (args // { deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) { name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz"; - nativeBuildInputs = flutterDeps ++ [ + nativeBuildInputs = [ + flutter nukeReferences ]; @@ -69,10 +33,7 @@ let . ${../fetchgit/deterministic-git} TMP=$(mktemp -d) - export HOME="$TMP" - export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 flutter config --no-analytics &>/dev/null # mute first-run flutter config --enable-linux-desktop @@ -151,44 +112,11 @@ let }); - nativeBuildInputs = flutterDeps ++ [ - # flutter dev tools - cmake - ninja - pkg-config - wrapGAppsHook - # flutter likes dynamic linking - autoPatchelfHook - ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; + nativeBuildInputs = [ flutter autoPatchelfHook ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; - buildInputs = [ - # cmake deps - gtk3 - glib - pcre - util-linux - # also required by cmake, not sure if really needed or dep of all packages - libselinux - libsepol - libthai - libdatrie - xorg.libXdmcp - xorg.libXtst - libxkbcommon - dbus - at-spi2-core - libsecret - jsoncpp - # build deps - xorg.libX11 - # directly required by build - libepoxy - ] ++ lib.optionals (args ? buildInputs) args.buildInputs; + buildInputs = lib.optionals (args ? buildInputs) args.buildInputs; - # TODO: do we need this? - NIX_LDFLAGS = "-rpath ${lib.makeLibraryPath self.buildInputs}"; - env.NIX_CFLAGS_COMPILE = "-I${xorg.libX11}/include"; - LD_LIBRARY_PATH = lib.makeLibraryPath self.buildInputs; + dontAutoPatchelf = true; configurePhase = '' runHook preConfigure @@ -207,7 +135,7 @@ let # after extracting update paths to point to real paths find "$depsFolder" -type f -exec sed -i \ -e s,${placeholder_deps},$depsFolder,g \ - -e s,${placeholder_flutter},${flutter.unwrapped},g \ + -e s,${placeholder_flutter},${flutter},g \ {} + # ensure we're using a lockfile for the right package version @@ -223,9 +151,7 @@ let mv -v $(find $depsFolder/f -type f) . # prepare - export HOME=$depsFolder - export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + export HOME="$depsFolder" # binaries need to be patched autoPatchelf -- "$depsFolder" From 04e7ced7e2ff2013dc6b6fa777e05c76352c0f24 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 22:01:42 +1000 Subject: [PATCH 044/337] mkFlutterApp: Don't fetch prebuilt artifacts Artifacts are now supplied by the Flutter SDK derivation. In addition, they are no longer a factor in the dependency hash calculation. --- pkgs/build-support/flutter/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 253d9044c18..6d756ea188a 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -38,7 +38,6 @@ let flutter config --no-analytics &>/dev/null # mute first-run flutter config --enable-linux-desktop flutter packages get - flutter build linux || true # so it downloads tools ${lib.optionalString (args ? flutterExtraFetchCommands) args.flutterExtraFetchCommands} RES="$TMP" From c59ce54f1d19be4f1f69652b46de72116b1928ed Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 22:02:50 +1000 Subject: [PATCH 045/337] flutter: Add mkFlutterApp as a passthru attribute --- pkgs/development/compilers/flutter/flutter.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 8471f2f0da8..007c10998b3 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -4,6 +4,7 @@ , src , lib +, callPackage , stdenv , autoPatchelfHook , git @@ -108,6 +109,9 @@ let # When other derivations wrap this one, any unmodified files # found here should be included as-is, for tooling compatibility. sdk = self; + mkFlutterApp = callPackage ../../../build-support/flutter { + flutter = callPackage ./wrapper.nix { flutter = self; }; + }; }; meta = with lib; { From 13bbb361325433e0c8d23ec4b4db74a7eef1961b Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 22:52:40 +1000 Subject: [PATCH 046/337] flutter: Move makeWrapper to nativeBuildInputs in wrapper --- pkgs/development/compilers/flutter/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index a8018525332..35514c9cf93 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -78,7 +78,7 @@ let in (callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped" { - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru = flutter.passthru // { unwrapped = flutter; From cedcb0b7729390eb6dc3c32734a58485d2b090ea Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Thu, 13 Apr 2023 23:19:16 +1000 Subject: [PATCH 047/337] flutter: Rename "self" to "unwrapped" in main derivation --- pkgs/development/compilers/flutter/flutter.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 007c10998b3..e332af2e356 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -24,7 +24,7 @@ let libepoxy ]; - self = + unwrapped = stdenv.mkDerivation { name = "flutter-${version}-unwrapped"; inherit src patches version; @@ -108,9 +108,9 @@ let # The derivation containing the original Flutter SDK files. # When other derivations wrap this one, any unmodified files # found here should be included as-is, for tooling compatibility. - sdk = self; + sdk = unwrapped; mkFlutterApp = callPackage ../../../build-support/flutter { - flutter = callPackage ./wrapper.nix { flutter = self; }; + flutter = callPackage ./wrapper.nix { flutter = unwrapped; }; }; }; @@ -128,4 +128,4 @@ let } ; in -self +unwrapped From 8f9aa6b18befaa6bd6f5cb1a328a9528bc4bd761 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 14 Apr 2023 01:41:58 +1000 Subject: [PATCH 048/337] flutter.mkFlutterApp: Don't use autoPatchelf on package cache While this may be beneficial for packages that ship native binaries, this causes issues due to Flutter packages that have inappropriately uploaded build artifacts (such as those from example subprojects) to pub.dev. --- pkgs/build-support/flutter/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 6d756ea188a..379953b6dfc 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -1,6 +1,5 @@ { lib , stdenvNoCC -, autoPatchelfHook , nukeReferences , llvmPackages_13 , cacert @@ -111,12 +110,10 @@ let }); - nativeBuildInputs = [ flutter autoPatchelfHook ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; + nativeBuildInputs = [ flutter ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; buildInputs = lib.optionals (args ? buildInputs) args.buildInputs; - dontAutoPatchelf = true; - configurePhase = '' runHook preConfigure @@ -152,8 +149,6 @@ let # prepare export HOME="$depsFolder" - # binaries need to be patched - autoPatchelf -- "$depsFolder" runHook postConfigure ''; @@ -187,9 +182,6 @@ let ln -s $f $out/bin/$(basename $f) done - # this confuses autopatchelf hook otherwise - rm -rf "$depsFolder" - # make *.so executable find $out/app -iname "*.so" -type f -exec chmod +x {} + From f7e3c19cc8b34f17bd822bf328687b913c1534ad Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 14 Apr 2023 01:49:09 +1000 Subject: [PATCH 049/337] flutter.mkFlutterApp: Don't vendor arbitrary configuration files --- .../misc/yubioath-flutter/default.nix | 12 ++------ pkgs/build-support/flutter/default.nix | 30 +++++++++---------- .../firmware/firmware-updater/default.nix | 6 +--- 3 files changed, 18 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index dde9f3b6986..f1e0094468a 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -2,18 +2,12 @@ , flutter , python3 , fetchFromGitHub -, stdenv , pcre2 , gnome , makeWrapper , removeReferencesTo }: -let - vendorHashes = { - x86_64-linux = "sha256-Upe0cEDG02RJD50Ht9VNMwkelsJHX8zOuJZssAhMuMY="; - aarch64-linux = "sha256-lKER4+gcyFqnCvgBl/qdVBCbUpocWUnXGLXsX82MSy4="; - }; -in + flutter.mkFlutterApp rec { pname = "yubioath-flutter"; version = "6.1.0"; @@ -27,7 +21,7 @@ flutter.mkFlutterApp rec { passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; - vendorHash = vendorHashes.${stdenv.system}; + vendorHash = "sha256-1ast8pm9wrt9nqLt5MJ2LkiZivlm9d+qcKrz/d8VVmI="; postPatch = '' substituteInPlace linux/CMakeLists.txt \ @@ -89,6 +83,6 @@ flutter.mkFlutterApp rec { homepage = "https://github.com/Yubico/yubioath-flutter"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; - platforms = builtins.attrNames vendorHashes; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 379953b6dfc..d63be4d061a 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -86,7 +86,8 @@ let # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ tar --owner=0 --group=0 --numeric-owner --format=gnu \ --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ - -czf "$out" -C "$RES" . + -czf "$out" -C "$RES" \ + pubspec.yaml pubspec.lock f .pub-cache ''; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -120,35 +121,32 @@ let # for some reason fluffychat build breaks without this - seems file gets overriden by some tool cp pubspec.yaml pubspec-backup - # we get this from $depsFolder so disabled for now, but we might need it again once deps are fetched properly - # flutter config --no-analytics >/dev/null 2>/dev/null # mute first-run - # flutter config --enable-linux-desktop + TMP=$(mktemp -d) + export HOME="$TMP" + + flutter config --no-analytics &>/dev/null # mute first-run + flutter config --enable-linux-desktop # extract deps - depsFolder=$(mktemp -d) - tar xzf "$deps" -C "$depsFolder" + tar xzf "$deps" -C "$HOME" # after extracting update paths to point to real paths - find "$depsFolder" -type f -exec sed -i \ - -e s,${placeholder_deps},$depsFolder,g \ + find "$HOME" -type f -exec sed -i \ + -e s,${placeholder_deps},"$HOME",g \ -e s,${placeholder_flutter},${flutter},g \ {} + # ensure we're using a lockfile for the right package version if [ -e pubspec.lock ]; then # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things. - # diff -u pubspec.lock $depsFolder/pubspec.lock + # diff -u pubspec.lock "$HOME/pubspec.lock" true else - cp -v "$depsFolder/pubspec.lock" . + cp -v "$HOME/pubspec.lock" . fi - diff -u pubspec.yaml $depsFolder/pubspec.yaml - - mv -v $(find $depsFolder/f -type f) . - - # prepare - export HOME="$depsFolder" + diff -u pubspec.yaml "$HOME/pubspec.yaml" + mv -v $(find "$HOME/f" -type f) . runHook postConfigure ''; diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 04fb8b0fe37..696704d3c4d 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -1,17 +1,13 @@ { lib , flutter2 , fetchFromGitHub -, stdenv }: flutter2.mkFlutterApp { pname = "firmware-updater"; version = "unstable"; - vendorHash = - if stdenv.system == "aarch64-linux" - then "sha256-+ACmcIKXtGtaYBuwc7jY9hEdIS9qxQCbuxRKJQohX5A=" - else "sha256-nPblucEpNCBJYpIqx1My6SWq8CjXYuHDG/uphdcrWjQ="; + vendorHash = "sha256-QPLAMFL/enMfbmUZx6qQSswI/vxeWgjytRdoNxziQ18="; src = fetchFromGitHub { owner = "canonical"; From 30caca083912d28bcb9cd6f62e505a59afc9cf5d Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 14 Apr 2023 02:16:04 +1000 Subject: [PATCH 050/337] flutter.mkFlutterApp: Add Git to nativeBuildInputs The deterministic Git script depends on it. --- pkgs/build-support/flutter/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index d63be4d061a..c0065d03226 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -4,6 +4,7 @@ , llvmPackages_13 , cacert , flutter +, git }: # absolutely no mac support for now @@ -22,6 +23,7 @@ let nativeBuildInputs = [ flutter + git nukeReferences ]; From 1b2cac51b2941b7e5bee2c10ce10de3f0fb7dc71 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 14 Apr 2023 14:21:38 +1000 Subject: [PATCH 051/337] flutter: Use existing libdeflate derivation --- .../flutter/packages/libdeflate/default.nix | 17 ----------------- pkgs/development/compilers/flutter/wrapper.nix | 3 ++- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/compilers/flutter/packages/libdeflate/default.nix diff --git a/pkgs/development/compilers/flutter/packages/libdeflate/default.nix b/pkgs/development/compilers/flutter/packages/libdeflate/default.nix deleted file mode 100644 index c0b3cabbc9d..00000000000 --- a/pkgs/development/compilers/flutter/packages/libdeflate/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "libdeflate"; - version = "1.17"; - - src = fetchFromGitHub { - owner = "ebiggers"; - repo = pname; - rev = "v${version}"; - hash = "sha256-tKs8feGbeodOID8FPIUc/1LfBz1p0oN1Jfkv2OnA2qc="; - }; - - nativeBuildInputs = [ cmake ]; - - outputs = [ "bin" "dev" "out" ]; -} diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 35514c9cf93..b2e545e4a44 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -19,6 +19,7 @@ , pango , libX11 , xorgproto +, libdeflate , zlib , cmake , ninja @@ -47,7 +48,7 @@ let libepoxy pango libX11 - (callPackage ./packages/libdeflate { }) + libdeflate ]; # Development packages required for compilation. From 7e12e3afaa335816baa2eeb1683787fbd22a3372 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 14 Apr 2023 14:25:33 +1000 Subject: [PATCH 052/337] flutter.mkFlutterApp: Remove the target architecture from the dependency derivation name As the dependency tarballs no longer include SDK artifacts, they are not platform dependent. --- pkgs/build-support/flutter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index c0065d03226..58149525b47 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -19,7 +19,7 @@ let self = (self: llvmPackages_13.stdenv.mkDerivation (args // { deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) { - name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}-${stdenvNoCC.targetPlatform.system}.tar.gz"; + name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}.tar.gz"; nativeBuildInputs = [ flutter From b16e344fae5aedeed4ce66e8f54bb60e6aacb0f7 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 14 Apr 2023 15:11:31 +1000 Subject: [PATCH 053/337] flutter: Remove --no-version-check from the immutable wrapper This is not technically needed anyway, as the feature is removed in disable-auto-update.patch. Prepending this argument causes issues: - https://github.com/kevmoo/completion.dart/issues/33 - https://github.com/flutter/flutter/issues/124793 --- pkgs/development/compilers/flutter/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index b2e545e4a44..c2b1ee19cd5 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -31,7 +31,7 @@ let # Wrap it to ensure that it does not do that, preferring home directories instead. immutableFlutter = writeShellScript "flutter_immutable" '' export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} - ${flutter}/bin/flutter --no-version-check "$@" + ${flutter}/bin/flutter "$@" ''; # Tools that the Flutter tool depends on. From c3797393b70ce507aa47abb2f742bbb355e2c398 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 15 Apr 2023 01:52:30 +1000 Subject: [PATCH 054/337] flutter: Use fetchzip instead of fetchurl for source downloads This allows for speedier re-use of the source archives, and lets files inside be read in Nix. --- .../development/compilers/flutter/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 0c94fbb53c5..56361bbb6ab 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, dart }: +{ callPackage, fetchzip, dart }: let mkFlutter = { version, patches, dart, src }: callPackage ./flutter.nix { inherit version patches dart src; }; wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; @@ -10,17 +10,17 @@ let dart = dart.override { version = dartVersion; sources = { - "${dartVersion}-x86_64-linux" = fetchurl { + "${dartVersion}-x86_64-linux" = fetchzip { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip"; sha256 = dartHash.x86_64-linux; }; - "${dartVersion}-aarch64-linux" = fetchurl { + "${dartVersion}-aarch64-linux" = fetchzip { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip"; sha256 = dartHash.aarch64-linux; }; }; }; - src = fetchurl { + src = fetchzip { url = "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${version}-stable.tar.xz"; sha256 = hash; }; @@ -33,10 +33,10 @@ in stable = flutterDrv { version = "3.7.11"; dartVersion = "2.19.6"; - hash = "sha256-/vtjoPB4Hn8RtP09uMdUYtDS7lzQvskdrNszEYlpOBc="; + hash = "sha256-H2S8nRpTte6ux34jTkCneGbSMQldrnjH1dI+/pzrcNg="; dartHash = { - x86_64-linux = "sha256-D9/yXmrLo9YJQVWn40FjT43jR36Gwv2krUcjLBrfcE8="; - aarch64-linux = "sha256-aRO3wLO3i8FB03LNRz2iF3Hlc3Kxq0XJd84VUMj/C5w="; + x86_64-linux = "sha256-4ezRuwhQHVCxZg5WbzU/tBUDvZVpfCo6coDE4K0UzXo="; + aarch64-linux = "sha256-pYmClIqOo0sRPOkrcF4xQbo0mHlrr1TkhT1fnNyYNck="; }; patches = flutter3Patches; }; @@ -44,10 +44,10 @@ in v2 = flutterDrv { version = "2.10.5"; dartVersion = "2.16.2"; - hash = "sha256-DTZwxlMUYk8NS1SaWUJolXjD+JnRW73Ps5CdRHDGnt0="; + hash = "sha256-MxaWvlcCfXN8gsC116UMzqb4LgixHL3YjrGWy7WYgW4="; dartHash = { - x86_64-linux = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI="; - aarch64-linux = "sha256-vmerjXkUAUnI8FjK+62qLqgETmA+BLPEZXFxwYpI+KY="; + x86_64-linux = "sha256-vxKxysg6e3Qxtlp4dLxOZaBtgHGtl7XYd73zFZd9yJc="; + aarch64-linux = "sha256-ZfpR6fj/a9Bsgrg31Z/uIJaCHIWtcQH3VTTVkDJKkwA="; }; patches = flutter2Patches; }; From 62e50080f39560183c57aa184bf03e47a341444c Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 15 Apr 2023 01:59:31 +1000 Subject: [PATCH 055/337] flutter: Download engine artifacts individually This brings the following benefits: - Artifacts missing in the SDK tarball (such as prebuilts for linux-aarch64) can be obtained - Artifacts can be patched more granularly (e.g. libflutter_linux_gtk is patchelf-ed for GTK3, and the linux-aarch64 assets have a postPatch to add some missing files) - Minimal Flutter packages can be generated (e.g. mkFlutterApp only needs prebuilts for desktop Linux, and developers that don't care for desktop Linux can exclude the artifacts and dependencies) It also paves the way for including manually built engine facts. --- .../flutter/engine-artifacts/default.nix | 127 +++++++++++++++ .../flutter/engine-artifacts/hashes.nix | 144 ++++++++++++++++++ .../development/compilers/flutter/flutter.nix | 99 +++++++++--- 3 files changed, 350 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/compilers/flutter/engine-artifacts/default.nix create mode 100644 pkgs/development/compilers/flutter/engine-artifacts/hashes.nix diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix new file mode 100644 index 00000000000..30ef16bbeca --- /dev/null +++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -0,0 +1,127 @@ +{ lib +, stdenv +, hostPlatform +, engineVersion +, fetchzip +, autoPatchelfHook + +, gtk3 +}: + +let + hashes = (import ./hashes.nix).${engineVersion}; + + artifacts = + { + common = { + flutter_patched_sdk = { archive = "flutter_patched_sdk.zip"; }; + flutter_patched_sdk_product = { archive = "flutter_patched_sdk_product.zip"; }; + }; + platform = { + android = + (lib.genAttrs + [ "arm" "arm64" "x64" ] + (arch: + { + base = [ + { archive = "artifacts.zip"; } + ]; + variants = lib.genAttrs [ "profile" "release" ] + (variant: [ + { archive = "artifacts.zip"; } + { archive = "${lib.toLower hostPlatform.uname.system}-x64.zip"; } + ]); + })) // + { + "x86" = { + base = [ + { archive = "artifacts.zip"; } + ]; + variants.jit-release = [ + { archive = "artifacts.zip"; } + ]; + }; + }; + + linux = lib.genAttrs + [ "arm64" "x64" ] + (arch: + let + linux-flutter-gtk = { + archive = "linux-${arch}-flutter-gtk.zip"; + buildInputs = [ gtk3 ]; + }; + in + { + base = [ + ({ archive = "artifacts.zip"; } // lib.optionalAttrs (arch == "arm64") { + # For some reason, the arm64 artifacts are missing shader code. + postPatch = '' + if [ -d shader_lib ]; then + The shader_lib directory has been included in the artifact archive. + This patch should be removed. + fi + ln -s ${lib.findSingle + (pkg: lib.getName pkg == "flutter-artifact-linux-x64-artifacts") + (throw "Could not find the x64 artifact archive.") + (throw "Could not find the correct x64 artifact archive.") + artifactDerivations.platform.linux.x64.base + }/shader_lib . + ''; + }) + { archive = "font-subset.zip"; } + linux-flutter-gtk + ]; + variants = lib.genAttrs [ "debug" "profile" "release" ] (variant: [ + linux-flutter-gtk + ]); + }); + }; + }; + + mkArtifactDerivation = { platform ? null, variant ? null, archive, ... }@args: + let + artifactDirectory = if platform == null then null else "${platform}${lib.optionalString (variant != null) "-${variant}"}"; + archiveBasename = lib.removeSuffix ".${(lib.last (lib.splitString "." archive))}" archive; + in + stdenv.mkDerivation ({ + pname = "flutter-artifact${lib.optionalString (platform != null) "-${artifactDirectory}"}-${archiveBasename}"; + version = engineVersion; + + src = fetchzip { + url = "https://storage.googleapis.com/flutter_infra_release/flutter/${engineVersion}${lib.optionalString (platform != null) "/${artifactDirectory}"}/${archive}"; + stripRoot = false; + hash = (if artifactDirectory == null then hashes else hashes.${artifactDirectory}).${archive}; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + installPhase = "cp -r . $out"; + } // args); + + artifactDerivations = { + common = builtins.mapAttrs (name: mkArtifactDerivation) artifacts.common; + platform = + builtins.mapAttrs + (os: architectures: + builtins.mapAttrs + (architecture: variants: { + base = map + (args: mkArtifactDerivation ({ + platform = "${os}-${architecture}"; + } // args)) + variants.base; + variants = builtins.mapAttrs + (variant: variantArtifacts: map + (args: mkArtifactDerivation ({ + platform = "${os}-${architecture}"; + inherit variant; + } // args)) + variantArtifacts) + variants.variants; + }) + architectures) + artifacts.platform; + }; +in +artifactDerivations diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix new file mode 100644 index 00000000000..e3453748b05 --- /dev/null +++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -0,0 +1,144 @@ +{ + "1a65d409c7a1438a34d21b60bf30a6fd5db59314" = { + "flutter_patched_sdk.zip" = "sha256-Pvsjttm5OwpJ/pW4UQXvvEiJYCM5CoZZfVXz5jef37k="; + "flutter_patched_sdk_product.zip" = "sha256-fhj2uUOrLwrzHrM6RNVpPNize5Qu6mLQDcSzLT2TbRA="; + "android-arm" = { + "artifacts.zip" = "sha256-KDMiI6SQoZHfFV5LJJZ7VOGyEKC4UxzRc777j4BbXgM="; + }; + "android-arm-profile" = { + "artifacts.zip" = "sha256-MErLoGJWXg4yJ6b6c5bqP8Nat6O7eYSfM71mMNAAQf4="; + "linux-x64.zip" = "sha256-0TZQ05HR7NRqHzeoHZ/sOrjKiSvCpMUH85YXXzV4URg="; + }; + "android-arm-release" = { + "artifacts.zip" = "sha256-hU4S4FOqUGokByZ47nzOqQ4A9QFshruqrpJvJUBHUho="; + "linux-x64.zip" = "sha256-AqNlqjOht+c2sdW5ReoF66ZJWJl1W4vGKbQ3YyderRY="; + }; + "android-arm64" = { + "artifacts.zip" = "sha256-ApNg3Uu9gyGNsx7sdpTCz1yADVAI5ZuNHgvgiuH9IpQ="; + }; + "android-arm64-profile" = { + "artifacts.zip" = "sha256-D/8+WKPIkOaV3PwkCHiJROFlokm4lWWmtPQb93Yqwr0="; + "linux-x64.zip" = "sha256-S0RHLov6/C22VvGdvZV87Ybaxun8YBrw1gTgNklRcM0="; + }; + "android-arm64-release" = { + "artifacts.zip" = "sha256-OoYqHtwmT+VWJ+G+sMXM5+ux3h1Fnyo9Vj2za9cm5eE="; + "linux-x64.zip" = "sha256-NuXclg1a+Ofw5AWJ1tajpn2jYEZw6DluWxrFVL8rPfg="; + }; + "android-x86" = { + "artifacts.zip" = "sha256-nN66nIrcbJHq2S4oIT5e2NCv7mS5Kw+HBv3ReHs+d3Y="; + }; + "android-x86-jit-release" = { + "artifacts.zip" = "sha256-A8F6K78Ykp1rMsUmjD7B9nFFPAubZnqAqgWSzbNCRwk="; + }; + "android-x64" = { + "artifacts.zip" = "sha256-hrBvnzCj/24h5kat96avlgXi6WhMsos5aPlkgxOYo8Q="; + }; + "android-x64-profile" = { + "artifacts.zip" = "sha256-xzSj/2ah9aQoosaNGkSWFP3bMNJqRSFc0+78XEBHwzM="; + "linux-x64.zip" = "sha256-HfBiz1JWlBQ8KEfmf8uDlVzFlDt3+VF2VeY82tsMjHs="; + }; + "android-x64-release" = { + "artifacts.zip" = "sha256-TcfMeA+8Uf9yRrYdEIsjip0cKmSUm2Ow1tkoE9803XY="; + "linux-x64.zip" = "sha256-D6efb6pj9+xjPnJu3O+ZCmwfatBzasuFZEFRntAiU9U="; + }; + "linux-arm64" = { + "artifacts.zip" = "sha256-xyKVaEFb5gVkVrPzDrOql5BmXGO0FnCSeXOoQ10ZFrw="; + "font-subset.zip" = "sha256-Ulwb6q2SzB4suMJhAM3zAwWOzlEImlu9Ha+w5u4QqIU="; + "linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg="; + }; + "linux-arm64-debug" = { + "linux-arm64-flutter-gtk.zip" = "sha256-SiYOH++py4zeoD3BkNayqy/C9Zz9OiYQ5+u+pDLIpWg="; + }; + "linux-arm64-profile" = { + "linux-arm64-flutter-gtk.zip" = "sha256-xB0eqrBYD7vhOwYUgJwNaBftNZJgdwxA9AUpEfX0iFs="; + }; + "linux-arm64-release" = { + "linux-arm64-flutter-gtk.zip" = "sha256-aHLKV129WIRsLUG6xTMwCKB4eXD3jonqinjI8KSsOus="; + }; + "linux-x64" = { + "artifacts.zip" = "sha256-+zIABFXUpiqn3OMoLcU4NDLxZ1y9z0r46iCTNRHAkz8="; + "font-subset.zip" = "sha256-W4SRPvA4rraVqN1ehbY6MFL7ZIWDHVJhjlLtxyUJJKY="; + "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M="; + }; + "linux-x64-debug" = { + "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M="; + }; + "linux-x64-profile" = { + "linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY="; + }; + "linux-x64-release" = { + "linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY="; + }; + }; + "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab" = { + "flutter_patched_sdk.zip" = "sha256-A/y5Y+Aw0CUhXABbdyQcGCSnSbO7Ask+71m8LZDSjH4="; + "flutter_patched_sdk_product.zip" = "sha256-VPxF4NrTUhFbpztyPnLEiC9Cy0kDDbYvy21kA5ES4HM="; + "android-arm" = { + "artifacts.zip" = "sha256-3igOO+rgFh0fNTIIiiucqSmqC+NKFPG5H1CnIa9bDcM="; + }; + "android-arm-profile" = { + "artifacts.zip" = "sha256-qai254LNrQXJBsaoQgXao6mBpzzcYHh4sUESurSyxNA="; + "linux-x64.zip" = "sha256-hBkntf1fX5w752ly6lVUHm6wEM/4ep9guJGma3SKjxU="; + }; + "android-arm-release" = { + "artifacts.zip" = "sha256-7yuXIJyErb1PZyk56+TtlJY0o1EOwmdAvpVfGGAteuA="; + "linux-x64.zip" = "sha256-v/jBnE662XOX/fOhYbve7ZiQwVu0haIMOD532Vdj9Yw="; + }; + "android-arm64" = { + "artifacts.zip" = "sha256-Llxu8+SkYEtnoiMf01rffPpF/AjrlV+QPuAW850oMzo="; + }; + "android-arm64-profile" = { + "artifacts.zip" = "sha256-su4U80supv8Q+2kE/5FTybiA5NFbKNMHqdB0NHCqrVI="; + "linux-x64.zip" = "sha256-yGt0SztNxYHDwZ1DwzLg5REE8rmMRKNn7GfCQ+GEHBw="; + }; + "android-arm64-release" = { + "artifacts.zip" = "sha256-+p1+SXSEglR3jqWc/jKgmtR9nOGgMRGC+anoTs1kRc8="; + "linux-x64.zip" = "sha256-5UiG5gxOso8NO+7nkb6bjxW8e/Tr7mlvPRUagSRTCNs="; + }; + "android-x86" = { + "artifacts.zip" = "sha256-Cbo17VYWaclyO1RLHkwjbqoFVZ283IgGdN0uDdiWvQs="; + }; + "android-x86-jit-release" = { + "artifacts.zip" = "sha256-gSPm2tClTj2vEYtGKgobD/mebWLNlDp8nEoFX0rhEOk="; + }; + "android-x64" = { + "artifacts.zip" = "sha256-PVb1aKMMTlDT41O2MZRAUjCq8h+m/s2h5qOnEFPd77w="; + }; + "android-x64-profile" = { + "artifacts.zip" = "sha256-gZSSRCDy42AMLMiu/KH7YsDuFVaxRcoyXzUgV8V025Y="; + "linux-x64.zip" = "sha256-9+LCjeI18u/GlPDMIl6Jx6b++lc90fJ5tVBlDR+ctDs="; + }; + "android-x64-release" = { + "artifacts.zip" = "sha256-rsS08VP86/b2S0TEYusCEJBvS4BuevsmV9REAxRgJIc="; + "linux-x64.zip" = "sha256-H4nFCJ+iCUzIwHogYzS+h33eDMaFnz71dcDLSQW1aPg="; + }; + "linux-arm64" = { + "artifacts.zip" = "sha256-kCxsKQQQX6wzhD46bfoflKdz3AYYkoSyavhfyTDuHLU="; + "font-subset.zip" = "sha256-Yk6JsNWe7ftEQU/TsjDUZSFeLzeIbcS63lhl8fsWsdk="; + "linux-arm64-flutter-gtk.zip" = "sha256-girVdkXrTO5tssoi+eKwG9ykstCR/VOx8zWtcAz8AKM="; + }; + "linux-arm64-debug" = { + "linux-arm64-flutter-gtk.zip" = "sha256-girVdkXrTO5tssoi+eKwG9ykstCR/VOx8zWtcAz8AKM="; + }; + "linux-arm64-profile" = { + "linux-arm64-flutter-gtk.zip" = "sha256-VL5cwYaZ1FOJ3TwJzbgvHDQwkU9NrHGnf/tQhZ/dAGg="; + }; + "linux-arm64-release" = { + "linux-arm64-flutter-gtk.zip" = "sha256-27hy7mLFCLkqJbn+5p5eJdYnfBKTyfFe98iUMmKyz4g="; + }; + "linux-x64" = { + "artifacts.zip" = "sha256-JgEX+rKxdcWBBaxyR42eC7qOAvaawF9M2+rfaD4IgeA="; + "font-subset.zip" = "sha256-5EoxBrxSjaLLd+rKrxVYNoUZaejk0qcQ5LVsmqtKc2g="; + "linux-x64-flutter-gtk.zip" = "sha256-MH5HDPoXXi/KpQLQ0U1tQzZ0sbZx1RVhZtQ7L+WhZgk="; + }; + "linux-x64-debug" = { + "linux-x64-flutter-gtk.zip" = "sha256-MH5HDPoXXi/KpQLQ0U1tQzZ0sbZx1RVhZtQ7L+WhZgk="; + }; + "linux-x64-profile" = { + "linux-x64-flutter-gtk.zip" = "sha256-r2hB/AKrB5vNga2fve4tTM4j+Zp9KDqNlTjKQhQvbaI="; + }; + "linux-x64-release" = { + "linux-x64-flutter-gtk.zip" = "sha256-muREs2iUiHCZM+SGN5q3HRRGnejJapKN582Aeog49MI="; + }; + }; +} diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index e332af2e356..5a4b3ee018d 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -2,27 +2,75 @@ , patches , dart , src +, includedEngineArtifacts ? { + common = [ + "flutter_patched_sdk" + "flutter_patched_sdk_product" + ]; + platform = { + android = lib.optionalAttrs stdenv.hostPlatform.isx86_64 + ((lib.genAttrs [ "arm" "arm64" "x64" ] (architecture: [ "profile" "release" ])) // { x86 = [ "jit-release" ]; }); + linux = lib.optionals stdenv.hostPlatform.isLinux + (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) + (architecture: [ "debug" "profile" "release" ])); + }; + } , lib , callPackage , stdenv -, autoPatchelfHook +, runCommandLocal +, symlinkJoin +, lndir , git , which -, atk -, glib -, gtk3 -, libepoxy -}: +}@args: let - # Libraries that Flutter artifacts depend on at runtime. - artifactRuntimeDeps = [ - atk - glib - gtk3 - libepoxy - ]; + engineArtifactDirectory = + let + engineArtifacts = callPackage ./engine-artifacts { + engineVersion = lib.removeSuffix "\n" (builtins.readFile (src + /bin/internal/engine.version)); + }; + in + runCommandLocal "flutter-engine-artifacts-${version}" { } + ( + let + mkCommonArtifactLinkCommand = { artifact }: + '' + mkdir -p $out/common + ${lndir}/bin/lndir -silent ${artifact} $out/common + ''; + mkPlatformArtifactLinkCommand = { artifact, os, architecture, variant ? null }: + let + artifactDirectory = "${os}-${architecture}${lib.optionalString (variant != null) "-${variant}"}"; + in + '' + mkdir -p $out/${artifactDirectory} + ${lndir}/bin/lndir -silent ${artifact} $out/${artifactDirectory} + ''; + in + '' + ${ + builtins.concatStringsSep "\n" + ((map (name: mkCommonArtifactLinkCommand { + artifact = engineArtifacts.common.${name}; + }) (if includedEngineArtifacts ? common then includedEngineArtifacts.common else [ ])) ++ + (builtins.foldl' (commands: os: commands ++ + (builtins.foldl' (commands: architecture: commands ++ + (builtins.foldl' (commands: variant: commands ++ + (map (artifact: mkPlatformArtifactLinkCommand { + inherit artifact os architecture variant; + }) engineArtifacts.platform.${os}.${architecture}.variants.${variant})) + (map (artifact: mkPlatformArtifactLinkCommand { + inherit artifact os architecture; + }) engineArtifacts.platform.${os}.${architecture}.base) + includedEngineArtifacts.platform.${os}.${architecture})) + [] (builtins.attrNames includedEngineArtifacts.platform.${os}))) + [] (builtins.attrNames (if includedEngineArtifacts ? platform then includedEngineArtifacts.platform else { })))) + } + '' + ); unwrapped = stdenv.mkDerivation { @@ -31,8 +79,7 @@ let outputs = [ "out" "cache" ]; - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ git ] ++ artifactRuntimeDeps; + buildInputs = [ git ]; postPatch = '' patchShebangs --build ./bin/ @@ -75,7 +122,10 @@ let echo "$revision" > "$STAMP_PATH" echo -n "${version}" > version - rm -r bin/cache/dart-sdk + # Certain prebuilts should be replaced with Nix-built (or at least Nix-patched) equivalents. + rm -r \ + bin/cache/dart-sdk \ + bin/cache/artifacts/engine ''; installPhase = '' @@ -83,8 +133,8 @@ let mkdir -p $out cp -r . $out - mkdir -p $out/bin/cache/ ln -sf ${dart} $out/bin/cache/dart-sdk + ln -sf ${engineArtifactDirectory} $out/bin/cache/artifacts/engine runHook postInstall ''; @@ -110,7 +160,17 @@ let # found here should be included as-is, for tooling compatibility. sdk = unwrapped; mkFlutterApp = callPackage ../../../build-support/flutter { - flutter = callPackage ./wrapper.nix { flutter = unwrapped; }; + # Package a minimal version of Flutter that only uses Linux desktop release artifacts. + flutter = callPackage ./wrapper.nix { + flutter = callPackage ./flutter.nix (args // { + includedEngineArtifacts = { + common = [ "flutter_patched_sdk_product" ]; + platform.linux = lib.optionals stdenv.hostPlatform.isLinux + (lib.genAttrs ((lib.optional stdenv.hostPlatform.isx86_64 "x64") ++ (lib.optional stdenv.hostPlatform.isAarch64 "arm64")) + (architecture: [ "release" ])); + }; + }); + }; }; }; @@ -125,7 +185,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ babariviere ericdallo FlafyDev gilice hacker1024 ]; }; - } - ; + }; in unwrapped From fdce3f30c4bde2ed4f7bef3f65f5dfc2a673f0ff Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 15 Apr 2023 03:18:56 +1000 Subject: [PATCH 056/337] flutter.mkFlutterApp: Don't hash more unstable files Files and directories such as .dart_tool, .flutter-plugins, .packages and .pub-cache/hosted/*/.cache will be happily regenerated by the SDK in an offline environment. The patches being made to these files and directories to remove non-determinism were flawed: They did not handle cases where files only appeared in one run, or cases where tooling versions had an effect on the output. --- .../misc/yubioath-flutter/default.nix | 2 +- pkgs/build-support/flutter/default.nix | 28 +++---------------- .../firmware/firmware-updater/default.nix | 2 +- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index f1e0094468a..3e2f8116a88 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -21,7 +21,7 @@ flutter.mkFlutterApp rec { passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; - vendorHash = "sha256-1ast8pm9wrt9nqLt5MJ2LkiZivlm9d+qcKrz/d8VVmI="; + vendorHash = "sha256-/WP6oN5avAILZd3SkC/jmsqNL+BxdQGUjNwsjLF9RB4="; postPatch = '' substituteInPlace linux/CMakeLists.txt \ diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 58149525b47..f83998f3f9f 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -43,13 +43,9 @@ let RES="$TMP" - mkdir -p "$RES/f" - # so we can use lock, diff yaml cp "pubspec.yaml" "$RES" cp "pubspec.lock" "$RES" - [[ -e .packages ]] && mv .packages "$RES/f" - mv .dart_tool .flutter-plugins .flutter-plugins-dependencies "$RES/f" # replace paths with placeholders find "$RES" -type f -exec sed -i \ @@ -57,30 +53,16 @@ let -e s,${flutter.unwrapped},${placeholder_flutter},g \ {} + - remove_line_matching() { - replace_line_matching "$1" "$2" "" - } - - replace_line_matching() { - sed "s|.*$2.*|$3|g" -r -i "$1" - } - # nuke nondeterminism - # clientId is random - remove_line_matching "$RES/.flutter" clientId - # deterministic git repos find "$RES" -iname .git -type d | while read -r repoGit; do make_deterministic_repo "$(dirname "$repoGit")" done - # dart _fetchedAt, etc - DART_DATE=$(date --date="@$SOURCE_DATE_EPOCH" -In | sed "s|,|.|g" | sed "s|+.*||g") - find "$RES/.pub-cache" -iname "*.json" -exec sed -r 's|.*_fetchedAt.*| "_fetchedAt": "'"$DART_DATE"'",|g' -i {} + - replace_line_matching "$RES/f/.dart_tool/package_config.json" '"generated"' '"generated": "'"$DART_DATE"'",' - replace_line_matching "$RES/f/.flutter-plugins-dependencies" '"date_created"' '"date_created": "'"$DART_DATE"'",' - [[ -e "$RES/f/.packages" ]] && remove_line_matching "$RES/f/.packages" "Generated by pub" + # Impure Pub files + rm -rf "$RES"/.pub-cache/hosted/*/.cache # Not pinned by pubspec.lock + rm -f "$RES"/.pub-cache/README.md # May change with different Dart versions # nuke refs find "$RES" -type f -exec nuke-refs {} + @@ -89,7 +71,7 @@ let tar --owner=0 --group=0 --numeric-owner --format=gnu \ --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ -czf "$out" -C "$RES" \ - pubspec.yaml pubspec.lock f .pub-cache + pubspec.yaml pubspec.lock .pub-cache ''; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -148,8 +130,6 @@ let fi diff -u pubspec.yaml "$HOME/pubspec.yaml" - mv -v $(find "$HOME/f" -type f) . - runHook postConfigure ''; diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 696704d3c4d..12f5fe13a6a 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -7,7 +7,7 @@ flutter2.mkFlutterApp { pname = "firmware-updater"; version = "unstable"; - vendorHash = "sha256-QPLAMFL/enMfbmUZx6qQSswI/vxeWgjytRdoNxziQ18="; + vendorHash = "sha256-Pj6CU2W5juk4YE8oq+v7Z8CzuSwpyA3YqscoWGDaI4o="; src = fetchFromGitHub { owner = "canonical"; From bc95b98495fe5310ffa9e122af0b83aae0690eef Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 15 Apr 2023 08:34:56 +0200 Subject: [PATCH 057/337] nawk: unstable-2021-02-15 -> 20220122 --- pkgs/tools/text/nawk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix index 580d30a5833..e9ae489a02e 100644 --- a/pkgs/tools/text/nawk/default.nix +++ b/pkgs/tools/text/nawk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nawk"; - version = "unstable-2021-02-15"; + version = "20220122"; src = fetchFromGitHub { owner = "onetrueawk"; repo = "awk"; - rev = "c0f4e97e4561ff42544e92512bbaf3d7d1f6a671"; - sha256 = "kQCvItpSJnDJMDvlB8ruY+i0KdjmAphRDqCKw8f0m/8="; + rev = version; + hash = "sha256-W5WkGk4WY3g1qSFjJxFBa8KY1k13oK6WAMg5GH6kKU4="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From 8c2f6a1d9e21236251dfde2e9ae0a23ab9266e38 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Wed, 12 Apr 2023 13:03:33 +0200 Subject: [PATCH 058/337] dokuwiki: 2022-07-31a -> 2023-04-04 See changelog at for list of (significant) changes. --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/servers/web-apps/dokuwiki/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 8b7cb61855b..86c60313bb4 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -168,6 +168,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name. +- `dokuwiki` has been updated from 2023-07-31a (Igor) to 2023-04-04 (Jack Jackrum), which has [completely removed](https://www.dokuwiki.org/changes#release_2023-04-04_jack_jackrum) the options to embed HTML and PHP for security reasons. The [htmlok plugin](https://www.dokuwiki.org/plugin:htmlok) can be used to regain this functionality. + - The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead. - The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead. diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index b3a485113fa..888ca6ca239 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dokuwiki"; - version = "2022-07-31a"; + version = "2023-04-04"; src = fetchFromGitHub { - owner = "splitbrain"; + owner = "dokuwiki"; repo = pname; - rev = "release_stable_${version}"; - sha256 = "sha256-gtWEtc3kbMokKycTx71XXblkDF39i926uN2kU3oOeVw="; + rev = "release-${version}"; + sha256 = "sha256-QJnXKsEhvEcE88wvfMZR2j7X/pW8+28zlEnxhvhl+44="; }; preload = writeText "preload.php" '' From b187edb802c25abd103aa71eb7f00663e25333d4 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 15 Apr 2023 19:25:01 +1000 Subject: [PATCH 059/337] flutter: Pass through the version attribute in the wrapper --- pkgs/development/compilers/flutter/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index c2b1ee19cd5..fe7d95b6180 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -82,6 +82,7 @@ in nativeBuildInputs = [ makeWrapper ]; passthru = flutter.passthru // { + inherit (flutter) version; unwrapped = flutter; }; From c3a87421ae381ee68cd8f64f0be29616df8bdb25 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 15 Apr 2023 19:52:12 +1000 Subject: [PATCH 060/337] flutter: Don't tarball the package cache Co-authored-by: FlafyDev The dependency fixed-output derivation now uses the recursive hash mode to avoid tarballing and copying all the files. https://github.com/NixOS/nix/issues/6660 was ran into during the development of this change. Input references were found in the Git package cache before nukeReferences was used. It turns out that the mirrors in the Git package cache do not actually need to be preserved, as the SDK does not use them during the build process. They are therefore deleted in the dependency derivation and re-created as blank repositories in the main derivation. A description of the Git package cache layout can be found here: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L339 --- .../misc/yubioath-flutter/default.nix | 2 +- pkgs/build-support/flutter/default.nix | 95 ++++++++++--------- .../firmware/firmware-updater/default.nix | 2 +- 3 files changed, 53 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index 3e2f8116a88..fc1d366fa60 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -21,7 +21,7 @@ flutter.mkFlutterApp rec { passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; - vendorHash = "sha256-/WP6oN5avAILZd3SkC/jmsqNL+BxdQGUjNwsjLF9RB4="; + vendorHash = "sha256-OU433z6Cz+jNJAjIiPO6cxySyejQ4SpSvuUHJsdT8TA="; postPatch = '' substituteInPlace linux/CMakeLists.txt \ diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index f83998f3f9f..f40c2736f24 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -1,6 +1,5 @@ { lib , stdenvNoCC -, nukeReferences , llvmPackages_13 , cacert , flutter @@ -19,12 +18,11 @@ let self = (self: llvmPackages_13.stdenv.mkDerivation (args // { deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) { - name = "${self.name}-deps-flutter-v${flutter.unwrapped.version}.tar.gz"; + name = "${self.name}-deps-flutter"; nativeBuildInputs = [ flutter git - nukeReferences ]; # avoid pub phase @@ -36,42 +34,33 @@ let TMP=$(mktemp -d) export HOME="$TMP" + # Configure the package cache + export PUB_CACHE="$out/cache/.pub-cache" + mkdir -p "$PUB_CACHE" + flutter config --no-analytics &>/dev/null # mute first-run flutter config --enable-linux-desktop flutter packages get ${lib.optionalString (args ? flutterExtraFetchCommands) args.flutterExtraFetchCommands} - RES="$TMP" - # so we can use lock, diff yaml - cp "pubspec.yaml" "$RES" - cp "pubspec.lock" "$RES" - - # replace paths with placeholders - find "$RES" -type f -exec sed -i \ - -e s,$TMP,${placeholder_deps},g \ - -e s,${flutter.unwrapped},${placeholder_flutter},g \ - {} + + mkdir -p "$out/pubspec" + cp "pubspec.yaml" "$out/pubspec" + cp "pubspec.lock" "$out/pubspec" # nuke nondeterminism # deterministic git repos - find "$RES" -iname .git -type d | while read -r repoGit; do + find "$PUB_CACHE" -iname .git -type d | while read -r repoGit; do make_deterministic_repo "$(dirname "$repoGit")" done - # Impure Pub files - rm -rf "$RES"/.pub-cache/hosted/*/.cache # Not pinned by pubspec.lock - rm -f "$RES"/.pub-cache/README.md # May change with different Dart versions - - # nuke refs - find "$RES" -type f -exec nuke-refs {} + - - # Build a reproducible tar, per instructions at https://reproducible-builds.org/docs/archives/ - tar --owner=0 --group=0 --numeric-owner --format=gnu \ - --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ - -czf "$out" -C "$RES" \ - pubspec.yaml pubspec.lock .pub-cache + # Impure package cache files + rm -rf "$PUB_CACHE"/hosted/*/.cache # Not pinned by pubspec.lock + rm -f "$PUB_CACHE"/README.md # May change with different Dart versions + rm -rf "$PUB_CACHE"/_temp # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/system_cache.dart#L131 + rm -rf "$PUB_CACHE"/log # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/command.dart#L348 + rm -rf "$PUB_CACHE"/git/cache/*/* # Recreate this on the other end. See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L531 ''; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -84,51 +73,71 @@ let # unnecesarry dontFixup = true; + # Patching shebangs introduces input references to this fixed-output derivation. + # This triggers a bug in Nix, causing the output path to change unexpectedly. + # https://github.com/NixOS/nix/issues/6660 + dontPatchShebangs = true; + outputHashAlgo = if self ? vendorHash then null else "sha256"; - # outputHashMode = "recursive"; + outputHashMode = "recursive"; outputHash = if self ? vendorHash then self.vendorHash else if self ? vendorSha256 then self.vendorSha256 else lib.fakeSha256; - }); - nativeBuildInputs = [ flutter ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; + nativeBuildInputs = [ + flutter + git + ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; buildInputs = lib.optionals (args ? buildInputs) args.buildInputs; configurePhase = '' runHook preConfigure - # for some reason fluffychat build breaks without this - seems file gets overriden by some tool - cp pubspec.yaml pubspec-backup - TMP=$(mktemp -d) export HOME="$TMP" flutter config --no-analytics &>/dev/null # mute first-run flutter config --enable-linux-desktop - # extract deps - tar xzf "$deps" -C "$HOME" + # Configure the package cache + export PUB_CACHE="$TMP/.pub-cache" + mkdir -p "$PUB_CACHE" - # after extracting update paths to point to real paths - find "$HOME" -type f -exec sed -i \ - -e s,${placeholder_deps},"$HOME",g \ - -e s,${placeholder_flutter},${flutter},g \ - {} + + # Link the Git package cache. + mkdir -p "$PUB_CACHE/git" + ln -s "$deps/cache/.pub-cache/git"/* "$PUB_CACHE/git" + + # Recreate the internal Git cache subdirectory. + # See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L339) + # Blank repositories are created instead of attempting to match the cache mirrors to checkouts. + # This is not an issue, as pub does not need the mirrors in the Flutter build process. + rm "$PUB_CACHE/git/cache" && mkdir "$PUB_CACHE/git/cache" + for mirror in $(ls -A "$deps/cache/.pub-cache/git/cache"); do + git --git-dir="$PUB_CACHE/git/cache/$mirror" init --bare --quiet + done + + # Link the remaining package cache directories. + # At this point, any subdirectories that must be writable must have been taken care of. + for file in $(comm -23 <(ls -A "$deps/cache/.pub-cache") <(ls -A "$PUB_CACHE")); do + ln -s "$deps/cache/.pub-cache/$file" "$PUB_CACHE/$file" + done # ensure we're using a lockfile for the right package version if [ -e pubspec.lock ]; then # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things. - # diff -u pubspec.lock "$HOME/pubspec.lock" + # diff -u pubspec.lock "$deps/pubspec/pubspec.lock" true else - cp -v "$HOME/pubspec.lock" . + cp -v "$deps/pubspec/pubspec.lock" . + # Sometimes the pubspec.lock will get opened in write mode, even when offline. + chmod u+w pubspec.lock fi - diff -u pubspec.yaml "$HOME/pubspec.yaml" + diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml" runHook postConfigure ''; @@ -136,8 +145,6 @@ let buildPhase = '' runHook preBuild - # for some reason fluffychat build breaks without this - seems file gets overriden by some tool - mv pubspec-backup pubspec.yaml mkdir -p build/flutter_assets/fonts flutter packages get --offline -v diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 12f5fe13a6a..267440c3298 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -7,7 +7,7 @@ flutter2.mkFlutterApp { pname = "firmware-updater"; version = "unstable"; - vendorHash = "sha256-Pj6CU2W5juk4YE8oq+v7Z8CzuSwpyA3YqscoWGDaI4o="; + vendorHash = "sha256-kKfe+7obb2fihrca+mjCM2+51wNkbPLEPFLpXzK5Wvc="; src = fetchFromGitHub { owner = "canonical"; From f00f918e274bcba8e2265f97cf472bb7fa981d51 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 15 Apr 2023 20:30:46 +1000 Subject: [PATCH 061/337] flutter: Remove cached Git package Git directories Pub does not perform any Git operations on the cached package directly, instead cloning it through a mirror. The .git directories are not needed, and are a source of non-determinism. --- pkgs/build-support/flutter/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index f40c2736f24..2fec501de3e 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -29,8 +29,6 @@ let dontBuild = true; installPhase = '' - . ${../fetchgit/deterministic-git} - TMP=$(mktemp -d) export HOME="$TMP" @@ -50,17 +48,18 @@ let # nuke nondeterminism - # deterministic git repos - find "$PUB_CACHE" -iname .git -type d | while read -r repoGit; do - make_deterministic_repo "$(dirname "$repoGit")" - done + # Remove Git directories in the Git package cache - these are rarely used by Pub, + # which instead maintains a corresponsing mirror and clones cached packages through it. + find "$PUB_CACHE" -name .git -type d -prune -exec rm -rf {} + - # Impure package cache files + # Remove continuously updated package metadata caches rm -rf "$PUB_CACHE"/hosted/*/.cache # Not pinned by pubspec.lock + rm -rf "$PUB_CACHE"/git/cache/*/* # Recreate this on the other end. See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L531 + + # Miscelaneous transient package cache files rm -f "$PUB_CACHE"/README.md # May change with different Dart versions rm -rf "$PUB_CACHE"/_temp # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/system_cache.dart#L131 rm -rf "$PUB_CACHE"/log # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/command.dart#L348 - rm -rf "$PUB_CACHE"/git/cache/*/* # Recreate this on the other end. See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L531 ''; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; From 607a57d48e9f2f61fdb93f4f76310536b0a38273 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 15 Apr 2023 20:57:21 +1000 Subject: [PATCH 062/337] flutter.mkFlutterApp: Rename to flutter.buildFlutterApplication This fits more appropriately with other build derivations like buildPythonApplication. --- pkgs/applications/misc/yubioath-flutter/default.nix | 2 +- pkgs/development/compilers/flutter/flutter.nix | 2 +- pkgs/os-specific/linux/firmware/firmware-updater/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index fc1d366fa60..c0931df4760 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -8,7 +8,7 @@ , removeReferencesTo }: -flutter.mkFlutterApp rec { +flutter.buildFlutterApplication rec { pname = "yubioath-flutter"; version = "6.1.0"; diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 5a4b3ee018d..a566a543e41 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -159,7 +159,7 @@ let # When other derivations wrap this one, any unmodified files # found here should be included as-is, for tooling compatibility. sdk = unwrapped; - mkFlutterApp = callPackage ../../../build-support/flutter { + buildFlutterApplication = callPackage ../../../build-support/flutter { # Package a minimal version of Flutter that only uses Linux desktop release artifacts. flutter = callPackage ./wrapper.nix { flutter = callPackage ./flutter.nix (args // { diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index 267440c3298..a15005cf746 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -flutter2.mkFlutterApp { +flutter2.buildFlutterApplication { pname = "firmware-updater"; version = "unstable"; From 915a6779fc28fe545a3393e2db1fccfc40d40380 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 00:17:41 +1000 Subject: [PATCH 063/337] flutter.buildFlutterApplication: Refactor dependency setup as a standalone derivation with an output hook This allows anything that needs to build a Dart application (such as a future `buildDartApplication` function) to use the same setup. --- .../dart/fetch-dart-deps/default.nix | 133 +++++++++++++++++ .../dart/fetch-dart-deps/setup-hook.sh | 42 ++++++ pkgs/build-support/flutter/default.nix | 139 +++--------------- 3 files changed, 195 insertions(+), 119 deletions(-) create mode 100644 pkgs/build-support/dart/fetch-dart-deps/default.nix create mode 100644 pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix new file mode 100644 index 00000000000..4bb5f257032 --- /dev/null +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -0,0 +1,133 @@ +{ stdenvNoCC +, lib +, makeSetupHook +, dart +, git +, cacert +}: + +{ + # The output hash of the dependencies for this project. + vendorHash ? "" + # Commands to run once before using Dart or pub. +, sdkSetupScript ? "" + # Commands to run to populate the pub cache. +, pubGetScript ? "dart pub get" + # Arguments used in the derivation that builds the Dart package. + # Passing these is recommended to ensure that the same steps are made to prepare the sources in both this + # derivation and the one that builds the Dart package. +, buildDrvArgs ? { } +, ... +}@args: + +# This is a fixed-output derivation and setup hook that can be used to fetch dependencies for Dart projects. +# It is designed to be placed in the nativeBuildInputs of a derivation that builds a Dart package. +# Providing the buildDrvArgs argument is highly recommended. +let + buildDrvInheritArgNames = [ + "name" + "pname" + "version" + "src" + "sourceRoot" + "setSourceRoot" + "preUnpack" + "unpackPhase" + "unpackCmd" + "postUnpack" + "prePatch" + "patchPhase" + "patches" + "patchFlags" + "postPatch" + ]; + + buildDrvInheritArgs = builtins.foldl' + (attrs: arg: + if buildDrvArgs ? ${arg} + then attrs // { ${arg} = buildDrvArgs.${arg}; } + else attrs) + { } + buildDrvInheritArgNames; + + drvArgs = buildDrvInheritArgs // (removeAttrs args [ "buildDrvArgs" ]); + name = (if drvArgs ? name then drvArgs.name else "${drvArgs.pname}-${drvArgs.version}"); + + deps = + # This + stdenvNoCC.mkDerivation ({ + name = "${name}-dart-deps"; + + nativeBuildInputs = [ + dart + git + ]; + + # avoid pub phase + dontBuild = true; + + configurePhase = '' + # Configure the package cache + export PUB_CACHE="$out/cache/.pub-cache" + mkdir -p "$PUB_CACHE" + + ${sdkSetupScript} + ''; + + installPhase = '' + ${pubGetScript} + + # so we can use lock, diff yaml + mkdir -p "$out/pubspec" + cp "pubspec.yaml" "$out/pubspec" + cp "pubspec.lock" "$out/pubspec" + + # nuke nondeterminism + + # Remove Git directories in the Git package cache - these are rarely used by Pub, + # which instead maintains a corresponsing mirror and clones cached packages through it. + find "$PUB_CACHE" -name .git -type d -prune -exec rm -rf {} + + + # Remove continuously updated package metadata caches + rm -rf "$PUB_CACHE"/hosted/*/.cache # Not pinned by pubspec.lock + rm -rf "$PUB_CACHE"/git/cache/*/* # Recreate this on the other end. See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L531 + + # Miscelaneous transient package cache files + rm -f "$PUB_CACHE"/README.md # May change with different Dart versions + rm -rf "$PUB_CACHE"/_temp # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/system_cache.dart#L131 + rm -rf "$PUB_CACHE"/log # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/command.dart#L348 + ''; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "NIX_GIT_SSL_CAINFO" + "SOCKS_SERVER" + ]; + + # Patching shebangs introduces input references to this fixed-output derivation. + # This triggers a bug in Nix, causing the output path to change unexpectedly. + # https://github.com/NixOS/nix/issues/6660 + dontPatchShebangs = true; + + # The following operations are not generally useful for this derivation. + # If a package does contain some native components used at build time, + # please file an issue. + dontStrip = true; + dontMoveSbin = true; + dontPatchELF = true; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = if vendorHash != "" then vendorHash else lib.fakeSha256; + } // drvArgs); +in +(makeSetupHook { + # The setup hook should not be part of the fixed-output derivation. + # Updates to the hook script should not change vendor hashes, and it won't + # work at all anyway due to https://github.com/NixOS/nix/issues/6660. + name = "${name}-dart-deps-setup-hook"; + substitutions = { inherit deps; }; +}) ./setup-hook.sh diff --git a/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh b/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh new file mode 100644 index 00000000000..dcb0cc0622e --- /dev/null +++ b/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh @@ -0,0 +1,42 @@ +preConfigureHooks+=(_setupPubCache) + +_setupPubCache() { + deps="@deps@" + + # Configure the package cache. + export PUB_CACHE="$(mktemp -d)" + mkdir -p "$PUB_CACHE" + + if [ -d "$deps/cache/.pub-cache/git" ]; then + # Link the Git package cache. + mkdir -p "$PUB_CACHE/git" + ln -s "$deps/cache/.pub-cache/git"/* "$PUB_CACHE/git" + + # Recreate the internal Git cache subdirectory. + # See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L339) + # Blank repositories are created instead of attempting to match the cache mirrors to checkouts. + # This is not an issue, as pub does not need the mirrors in the Flutter build process. + rm "$PUB_CACHE/git/cache" && mkdir "$PUB_CACHE/git/cache" + for mirror in $(ls -A "$deps/cache/.pub-cache/git/cache"); do + git --git-dir="$PUB_CACHE/git/cache/$mirror" init --bare --quiet + done + fi + + # Link the remaining package cache directories. + # At this point, any subdirectories that must be writable must have been taken care of. + for file in $(comm -23 <(ls -A "$deps/cache/.pub-cache") <(ls -A "$PUB_CACHE")); do + ln -s "$deps/cache/.pub-cache/$file" "$PUB_CACHE/$file" + done + + # ensure we're using a lockfile for the right package version + if [ -e pubspec.lock ]; then + # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things. + # diff -u pubspec.lock "$deps/pubspec/pubspec.lock" + true + else + cp -v "$deps/pubspec/pubspec.lock" . + # Sometimes the pubspec.lock will get opened in write mode, even when offline. + chmod u+w pubspec.lock + fi + diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml" +} diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 2fec501de3e..f148c3d046e 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -1,4 +1,5 @@ { lib +, callPackage , stdenvNoCC , llvmPackages_13 , cacert @@ -8,135 +9,35 @@ # absolutely no mac support for now -args: +{ pubGetScript ? "flutter pub get" +, vendorHash +, nativeBuildInputs ? [ ] +, ... +}@args: let - pl = n: "##FLUTTER_${n}_PLACEHOLDER_MARKER##"; - placeholder_deps = pl "DEPS"; - placeholder_flutter = pl "FLUTTER"; - fetchAttrs = [ "src" "sourceRoot" "setSourceRoot" "unpackPhase" "patches" ]; - getAttrsOrNull = names: attrs: lib.genAttrs names (name: if attrs ? ${name} then attrs.${name} else null); + flutterSetupScript = '' + export HOME="$NIX_BUILD_TOP" + flutter config --no-analytics &>/dev/null # mute first-run + flutter config --enable-linux-desktop >/dev/null + ''; + + deps = callPackage ../dart/fetch-dart-deps { dart = flutter; } { + sdkSetupScript = flutterSetupScript; + inherit pubGetScript vendorHash; + buildDrvArgs = args; + }; self = (self: llvmPackages_13.stdenv.mkDerivation (args // { - deps = stdenvNoCC.mkDerivation (lib.recursiveUpdate (getAttrsOrNull fetchAttrs args) { - name = "${self.name}-deps-flutter"; - - nativeBuildInputs = [ - flutter - git - ]; - - # avoid pub phase - dontBuild = true; - - installPhase = '' - TMP=$(mktemp -d) - export HOME="$TMP" - - # Configure the package cache - export PUB_CACHE="$out/cache/.pub-cache" - mkdir -p "$PUB_CACHE" - - flutter config --no-analytics &>/dev/null # mute first-run - flutter config --enable-linux-desktop - flutter packages get - ${lib.optionalString (args ? flutterExtraFetchCommands) args.flutterExtraFetchCommands} - - # so we can use lock, diff yaml - mkdir -p "$out/pubspec" - cp "pubspec.yaml" "$out/pubspec" - cp "pubspec.lock" "$out/pubspec" - - # nuke nondeterminism - - # Remove Git directories in the Git package cache - these are rarely used by Pub, - # which instead maintains a corresponsing mirror and clones cached packages through it. - find "$PUB_CACHE" -name .git -type d -prune -exec rm -rf {} + - - # Remove continuously updated package metadata caches - rm -rf "$PUB_CACHE"/hosted/*/.cache # Not pinned by pubspec.lock - rm -rf "$PUB_CACHE"/git/cache/*/* # Recreate this on the other end. See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L531 - - # Miscelaneous transient package cache files - rm -f "$PUB_CACHE"/README.md # May change with different Dart versions - rm -rf "$PUB_CACHE"/_temp # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/system_cache.dart#L131 - rm -rf "$PUB_CACHE"/log # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/command.dart#L348 - ''; - - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER" - ]; - - # unnecesarry - dontFixup = true; - - # Patching shebangs introduces input references to this fixed-output derivation. - # This triggers a bug in Nix, causing the output path to change unexpectedly. - # https://github.com/NixOS/nix/issues/6660 - dontPatchShebangs = true; - - outputHashAlgo = if self ? vendorHash then null else "sha256"; - outputHashMode = "recursive"; - outputHash = if self ? vendorHash then - self.vendorHash - else if self ? vendorSha256 then - self.vendorSha256 - else - lib.fakeSha256; - }); - nativeBuildInputs = [ + deps flutter git - ] ++ lib.optionals (args ? nativeBuildInputs) args.nativeBuildInputs; - - buildInputs = lib.optionals (args ? buildInputs) args.buildInputs; + ] ++ nativeBuildInputs; configurePhase = '' runHook preConfigure - TMP=$(mktemp -d) - export HOME="$TMP" - - flutter config --no-analytics &>/dev/null # mute first-run - flutter config --enable-linux-desktop - - # Configure the package cache - export PUB_CACHE="$TMP/.pub-cache" - mkdir -p "$PUB_CACHE" - - # Link the Git package cache. - mkdir -p "$PUB_CACHE/git" - ln -s "$deps/cache/.pub-cache/git"/* "$PUB_CACHE/git" - - # Recreate the internal Git cache subdirectory. - # See: https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L339) - # Blank repositories are created instead of attempting to match the cache mirrors to checkouts. - # This is not an issue, as pub does not need the mirrors in the Flutter build process. - rm "$PUB_CACHE/git/cache" && mkdir "$PUB_CACHE/git/cache" - for mirror in $(ls -A "$deps/cache/.pub-cache/git/cache"); do - git --git-dir="$PUB_CACHE/git/cache/$mirror" init --bare --quiet - done - - # Link the remaining package cache directories. - # At this point, any subdirectories that must be writable must have been taken care of. - for file in $(comm -23 <(ls -A "$deps/cache/.pub-cache") <(ls -A "$PUB_CACHE")); do - ln -s "$deps/cache/.pub-cache/$file" "$PUB_CACHE/$file" - done - - # ensure we're using a lockfile for the right package version - if [ -e pubspec.lock ]; then - # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things. - # diff -u pubspec.lock "$deps/pubspec/pubspec.lock" - true - else - cp -v "$deps/pubspec/pubspec.lock" . - # Sometimes the pubspec.lock will get opened in write mode, even when offline. - chmod u+w pubspec.lock - fi - diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml" + ${flutterSetupScript} runHook postConfigure ''; From 4e68ee327e38541f0edf4d1d8d757f5ca914a055 Mon Sep 17 00:00:00 2001 From: gilice <104317939+gilice@users.noreply.github.com> Date: Sun, 16 Apr 2023 00:31:12 +1000 Subject: [PATCH 064/337] flutter.buildFlutterApplication: Add an explanation when a pubspec mismatch occurs --- pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh b/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh index dcb0cc0622e..eaca3a31e7d 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh +++ b/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh @@ -38,5 +38,9 @@ _setupPubCache() { # Sometimes the pubspec.lock will get opened in write mode, even when offline. chmod u+w pubspec.lock fi - diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml" + if ! diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml"; then + echo 1>&2 -e 'The pubspec.yaml of the project derivation differs from the one in the dependency derivation.' \ + '\nYou most likely forgot to update the vendorHash while updating the sources.' + exit 1 + fi } From d2ab34122d2f0b103a91d9ab05f327b09d3090b9 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 00:55:55 +1000 Subject: [PATCH 065/337] dart.fetch-dart-deps: Remove stray comment from the dependency derivation --- pkgs/build-support/dart/fetch-dart-deps/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index 4bb5f257032..58f108cd683 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -54,7 +54,6 @@ let name = (if drvArgs ? name then drvArgs.name else "${drvArgs.pname}-${drvArgs.version}"); deps = - # This stdenvNoCC.mkDerivation ({ name = "${name}-dart-deps"; From 88275ca6d6ceeaecfc9c7d1a313c198bb888d287 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 01:49:43 +1000 Subject: [PATCH 066/337] flutter.buildFlutterApplication: Allow using a custom pubspec.lock --- .../dart/fetch-dart-deps/default.nix | 26 +++++++++++++++++-- pkgs/build-support/flutter/default.nix | 3 ++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index 58f108cd683..cf0d66c287c 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -13,6 +13,8 @@ , sdkSetupScript ? "" # Commands to run to populate the pub cache. , pubGetScript ? "dart pub get" + # A path to a pubspec.lock file to use instead of the one in the source directory. +, pubspecLockFile ? null # Arguments used in the derivation that builds the Dart package. # Passing these is recommended to ensure that the same steps are made to prepare the sources in both this # derivation and the one that builds the Dart package. @@ -74,12 +76,32 @@ let ''; installPhase = '' - ${pubGetScript} + _pub_get() { + ${pubGetScript} + } # so we can use lock, diff yaml mkdir -p "$out/pubspec" cp "pubspec.yaml" "$out/pubspec" - cp "pubspec.lock" "$out/pubspec" + ${lib.optionalString (pubspecLockFile != null) "install -m644 ${pubspecLockFile} pubspec.lock"} + if ! cp "pubspec.lock" "$out/pubspec"; then + echo 1>&2 -e '\nThe pubspec.lock file is missing. This is a requirement for reproducible builds.' \ + '\nThe following should be done to fix this issue:' \ + '\n 1. If you are building an application, contact the developer(s).' \ + '\n The pubspec.lock file should be provided with the source code.' \ + '\n https://dart.dev/guides/libraries/private-files#pubspeclock' \ + '\n 2. An attempt to generate and print a pubspec.lock file will be made now.' \ + '\n Save it to a file, and provide the path to that file in the pubspecLockFile argument.' \ + '\n This must be updated whenever the application is updated.' \ + '\n' + _pub_get + echo "" + cat 1>&2 pubspec.lock + echo 1>&2 -e '\nA pubspec.lock file has been printed. Please see the informational message above.' + exit 1 + fi + + _pub_get # nuke nondeterminism diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index f148c3d046e..ac582de3cc0 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -11,6 +11,7 @@ { pubGetScript ? "flutter pub get" , vendorHash +, pubspecLockFile ? null , nativeBuildInputs ? [ ] , ... }@args: @@ -23,7 +24,7 @@ let deps = callPackage ../dart/fetch-dart-deps { dart = flutter; } { sdkSetupScript = flutterSetupScript; - inherit pubGetScript vendorHash; + inherit pubGetScript vendorHash pubspecLockFile; buildDrvArgs = args; }; self = From 0e5db63dc3a1ba3b434b993536c508b69e9a63b8 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 02:39:18 +1000 Subject: [PATCH 067/337] dart.fetch-dart-deps: Don't delete .git/pub-packages --- pkgs/build-support/dart/fetch-dart-deps/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index cf0d66c287c..c8771420277 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -107,7 +107,12 @@ let # Remove Git directories in the Git package cache - these are rarely used by Pub, # which instead maintains a corresponsing mirror and clones cached packages through it. - find "$PUB_CACHE" -name .git -type d -prune -exec rm -rf {} + + # + # An exception is made to keep .git/pub-packages files, which are important. + # https://github.com/dart-lang/pub/blob/c890afa1d65b340fa59308172029680c2f8b0fc6/lib/src/source/git.dart#L621 + if [ -d "$PUB_CACHE"/git ]; then + find "$PUB_CACHE"/git -maxdepth 4 -path "*/.git/*" ! -name "pub-packages" -prune -exec rm -rf {} + + fi # Remove continuously updated package metadata caches rm -rf "$PUB_CACHE"/hosted/*/.cache # Not pinned by pubspec.lock From 65631597c1be82bea68fc7b83aecc604fe5f6b14 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 03:14:29 +1000 Subject: [PATCH 068/337] yubioauth-flutter: Update vendor hash for new pubspec.lock handling --- pkgs/applications/misc/yubioath-flutter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index c0931df4760..e3ff56e77d4 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -21,7 +21,7 @@ flutter.buildFlutterApplication rec { passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; - vendorHash = "sha256-OU433z6Cz+jNJAjIiPO6cxySyejQ4SpSvuUHJsdT8TA="; + vendorHash = "sha256-WfZiB7MO4wHUg81xm67BMu4zQdC9CfhN5BQol+AI2S8="; postPatch = '' substituteInPlace linux/CMakeLists.txt \ From 396938b6de7a40a1a9d8f0d07e0d0d3206e750f9 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 03:14:59 +1000 Subject: [PATCH 069/337] firmware-updater: Add a pubspec.lock --- .../firmware/firmware-updater/default.nix | 1 + .../firmware/firmware-updater/pubspec.lock | 493 ++++++++++++++++++ 2 files changed, 494 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index a15005cf746..d6dfa4dbae3 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -7,6 +7,7 @@ flutter2.buildFlutterApplication { pname = "firmware-updater"; version = "unstable"; + pubspecLockFile = ./pubspec.lock; vendorHash = "sha256-kKfe+7obb2fihrca+mjCM2+51wNkbPLEPFLpXzK5Wvc="; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock b/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock new file mode 100644 index 00000000000..c9e9a204447 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/firmware-updater/pubspec.lock @@ -0,0 +1,493 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.1" + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.2" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" + chewie: + dependency: transitive + description: + name: chewie + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.0" + chewie_audio: + dependency: transitive + description: + name: chewie_audio + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + collection: + dependency: "direct main" + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.15.0" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.2" + cupertino_icons: + dependency: transitive + description: + name: cupertino_icons + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + dbus: + dependency: transitive + description: + name: dbus + url: "https://pub.dartlang.org" + source: hosted + version: "0.7.3" + dio: + dependency: "direct main" + description: + name: dio + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.6" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + ffi: + dependency: transitive + description: + name: ffi + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_html: + dependency: "direct main" + description: + name: flutter_html + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + flutter_layout_grid: + dependency: transitive + description: + name: flutter_layout_grid + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.6" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_math_fork: + dependency: transitive + description: + name: flutter_math_fork + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.0" + flutter_svg: + dependency: transitive + description: + name: flutter_svg + url: "https://pub.dartlang.org" + source: hosted + version: "0.23.0+1" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + fwupd: + dependency: "direct main" + description: + name: fwupd + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.2" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.1" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.2" + intl: + dependency: transitive + description: + name: intl + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.0" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.3" + lints: + dependency: transitive + description: + name: lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.0" + nested: + dependency: transitive + description: + name: nested + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" + numerus: + dependency: transitive + description: + name: numerus + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" + path: + dependency: "direct main" + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0" + path_drawing: + dependency: transitive + description: + name: path_drawing + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.1+1" + path_parsing: + dependency: transitive + description: + name: path_parsing + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "4.4.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" + provider: + dependency: "direct main" + description: + name: provider + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.5" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.1" + stack_trace: + dependency: transitive + description: + name: stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "1.10.0" + stream_channel: + dependency: transitive + description: + name: stream_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" + test_api: + dependency: transitive + description: + name: test_api + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.8" + tuple: + dependency: transitive + description: + name: tuple + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + video_player: + dependency: transitive + description: + name: video_player + url: "https://pub.dartlang.org" + source: hosted + version: "2.5.1" + video_player_android: + dependency: transitive + description: + name: video_player_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.10" + video_player_avfoundation: + dependency: transitive + description: + name: video_player_avfoundation + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.8" + video_player_platform_interface: + dependency: transitive + description: + name: video_player_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.1" + video_player_web: + dependency: transitive + description: + name: video_player_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.13" + wakelock: + dependency: transitive + description: + name: wakelock + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.2" + wakelock_macos: + dependency: transitive + description: + name: wakelock_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.0" + wakelock_platform_interface: + dependency: transitive + description: + name: wakelock_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.0" + wakelock_web: + dependency: transitive + description: + name: wakelock_web + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.0" + wakelock_windows: + dependency: transitive + description: + name: wakelock_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.0" + webview_flutter: + dependency: transitive + description: + name: webview_flutter + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.0" + webview_flutter_android: + dependency: transitive + description: + name: webview_flutter_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.14" + webview_flutter_platform_interface: + dependency: transitive + description: + name: webview_flutter_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.5" + webview_flutter_wkwebview: + dependency: transitive + description: + name: webview_flutter_wkwebview + url: "https://pub.dartlang.org" + source: hosted + version: "2.7.5" + win32: + dependency: transitive + description: + name: win32 + url: "https://pub.dartlang.org" + source: hosted + version: "2.5.2" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "5.3.1" + yaru: + dependency: "direct main" + description: + name: yaru + url: "https://pub.dartlang.org" + source: hosted + version: "0.2.5" + yaru_icons: + dependency: "direct main" + description: + name: yaru_icons + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" + yaru_widgets: + dependency: "direct main" + description: + name: yaru_widgets + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.8" +sdks: + dart: ">=2.15.0 <3.0.0" + flutter: ">=2.10.0" From 5fa3b41041212a468e50b9b36256b3fc74d91ea8 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 03:20:36 +1000 Subject: [PATCH 070/337] dart.fetch-dart-deps: Verify the pubspec.lock as well as pubspec.yaml 88275ca6d6ceeaecfc9c7d1a313c198bb888d287 inadvertently stopped the pubspec.lock from changing, as it copied the file before running pub get. pub get can modify the pubspec.lock to update it to newer formats (for example by adding hashes and updating URLs, see an example diff below). We do not need the modifications at any later stage, so we can preserve the original file. boolean_selector: dependency: transitive description: name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" - url: "https://pub.dartlang.org" source: hosted + version: "2.1.1" - version: "2.1.0" --- .../dart/fetch-dart-deps/setup-hook.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh b/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh index eaca3a31e7d..1a5f86e475c 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh +++ b/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh @@ -29,18 +29,13 @@ _setupPubCache() { done # ensure we're using a lockfile for the right package version - if [ -e pubspec.lock ]; then - # FIXME: currently this is broken. in theory this should not break, but flutter has it's own way of doing things. - # diff -u pubspec.lock "$deps/pubspec/pubspec.lock" - true - else + if [ ! -e pubspec.lock ]; then cp -v "$deps/pubspec/pubspec.lock" . # Sometimes the pubspec.lock will get opened in write mode, even when offline. chmod u+w pubspec.lock - fi - if ! diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml"; then - echo 1>&2 -e 'The pubspec.yaml of the project derivation differs from the one in the dependency derivation.' \ + elif [ ! { diff -u pubspec.lock "$deps/pubspec/pubspec.lock" && diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml" } ]; then + echo 1>&2 -e 'The pubspec.lock or pubspec.yaml of the project derivation differs from the one in the dependency derivation.' \ '\nYou most likely forgot to update the vendorHash while updating the sources.' - exit 1 + exit 1 fi } From 643b62c8f14c8685c9be273991d9e568ba02b6bf Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 03:21:29 +1000 Subject: [PATCH 071/337] dart.fetch-dart-deps: Don't allow overriding the deps derivation name --- pkgs/build-support/dart/fetch-dart-deps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index c8771420277..fc4954ae9e8 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -148,7 +148,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = if vendorHash != "" then vendorHash else lib.fakeSha256; - } // drvArgs); + } // (removeAttrs drvArgs [ "name" "pname" ])); in (makeSetupHook { # The setup hook should not be part of the fixed-output derivation. From 075f50f2d167affaefe3783dc21922a8288f4247 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 03:32:26 +1000 Subject: [PATCH 072/337] dart.fetch-dart-deps: Compress the generated pubspec.lock file This is much more practical for users to copy, as it significantly reduces the length of the output. --- pkgs/build-support/dart/fetch-dart-deps/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index fc4954ae9e8..acde38fc67e 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -86,18 +86,20 @@ let ${lib.optionalString (pubspecLockFile != null) "install -m644 ${pubspecLockFile} pubspec.lock"} if ! cp "pubspec.lock" "$out/pubspec"; then echo 1>&2 -e '\nThe pubspec.lock file is missing. This is a requirement for reproducible builds.' \ - '\nThe following should be done to fix this issue:' \ + '\nThe following steps should be taken to fix this issue:' \ '\n 1. If you are building an application, contact the developer(s).' \ '\n The pubspec.lock file should be provided with the source code.' \ '\n https://dart.dev/guides/libraries/private-files#pubspeclock' \ - '\n 2. An attempt to generate and print a pubspec.lock file will be made now.' \ - '\n Save it to a file, and provide the path to that file in the pubspecLockFile argument.' \ + '\n 2. An attempt to generate and print a compressed pubspec.lock file will be made now.' \ + '\n It is compressed with gzip and base64 encoded.' \ + '\n Paste it to a file and extract it with `base64 -d pubspec.lock.in | gzip -d > pubspec.lock`.' \ + '\n Provide the path to the pubspec.lock file in the pubspecLockFile argument.' \ '\n This must be updated whenever the application is updated.' \ '\n' _pub_get echo "" - cat 1>&2 pubspec.lock - echo 1>&2 -e '\nA pubspec.lock file has been printed. Please see the informational message above.' + gzip --to-stdout --best pubspec.lock | base64 1>&2 + echo 1>&2 -e '\nA gzipped pubspec.lock file has been printed. Please see the informational message above.' exit 1 fi From 1f7eab1c3845f873352a997d947673c2beb05f2d Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 03:56:14 +1000 Subject: [PATCH 073/337] dart.fetch-dart-deps: Fix invalid syntax in pubspec validation statement --- pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh b/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh index 1a5f86e475c..37ef74aa62d 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh +++ b/pkgs/build-support/dart/fetch-dart-deps/setup-hook.sh @@ -33,7 +33,7 @@ _setupPubCache() { cp -v "$deps/pubspec/pubspec.lock" . # Sometimes the pubspec.lock will get opened in write mode, even when offline. chmod u+w pubspec.lock - elif [ ! { diff -u pubspec.lock "$deps/pubspec/pubspec.lock" && diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml" } ]; then + elif ! { diff -u pubspec.lock "$deps/pubspec/pubspec.lock" && diff -u pubspec.yaml "$deps/pubspec/pubspec.yaml"; }; then echo 1>&2 -e 'The pubspec.lock or pubspec.yaml of the project derivation differs from the one in the dependency derivation.' \ '\nYou most likely forgot to update the vendorHash while updating the sources.' exit 1 From 5a5435dea652265c52cf12be864d798d8682e29a Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 15:45:09 +1000 Subject: [PATCH 074/337] flutter.buildFlutterApplication: Add flutterBuildFlags argument --- pkgs/build-support/flutter/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index ac582de3cc0..6b859acba9b 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -10,6 +10,7 @@ # absolutely no mac support for now { pubGetScript ? "flutter pub get" +, flutterBuildFlags ? [] , vendorHash , pubspecLockFile ? null , nativeBuildInputs ? [ ] @@ -49,7 +50,7 @@ let mkdir -p build/flutter_assets/fonts flutter packages get --offline -v - flutter build linux --release -v + flutter build linux -v --release ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)} runHook postBuild ''; From eefb67036f600783ef1284a6b1f635cc9ec6208b Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 15:56:14 +1000 Subject: [PATCH 075/337] flutter.buildFlutterApplication: Move debugging symbols into another output This reduces the size of the executable. It works well with Nix - if the user includes the version in their bug report, the exact debugging symbols required can easily be found. --- pkgs/build-support/flutter/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 6b859acba9b..229d73366d4 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -30,6 +30,8 @@ let }; self = (self: llvmPackages_13.stdenv.mkDerivation (args // { + outputs = [ "out" "debug" ]; + nativeBuildInputs = [ deps flutter @@ -50,7 +52,7 @@ let mkdir -p build/flutter_assets/fonts flutter packages get --offline -v - flutter build linux -v --release ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)} + flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)} runHook postBuild ''; From bbfc7911d3e5bbc1a4abb59fbc73b3059df4a705 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 19:25:42 +1000 Subject: [PATCH 076/337] flutter.buildFlutterApplication: Supply runtime dependencies This wraps Flutter programs with an appropriate LD_LIBRARY_PATH. For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open(). This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately, which is not what application authors expect. The name of the runtimeDependencies argument was chosen to match autoPatchelfHook, which has a similar feature. --- pkgs/build-support/flutter/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 229d73366d4..f85c7a19ce2 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -1,6 +1,7 @@ { lib , callPackage , stdenvNoCC +, makeWrapper , llvmPackages_13 , cacert , flutter @@ -10,10 +11,12 @@ # absolutely no mac support for now { pubGetScript ? "flutter pub get" -, flutterBuildFlags ? [] +, flutterBuildFlags ? [ ] +, runtimeDependencies ? [ ] , vendorHash , pubspecLockFile ? null , nativeBuildInputs ? [ ] +, postFixup ? "" , ... }@args: let @@ -33,6 +36,7 @@ let outputs = [ "out" "debug" ]; nativeBuildInputs = [ + makeWrapper deps flutter git @@ -87,6 +91,20 @@ let runHook postInstall ''; + + postFixup = '' + # Add runtime library dependencies to the LD_LIBRARY_PATH. + # For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open(). + # + # This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately, + # which is not what application authors expect. + for f in "$out"/bin/*; do + wrapProgram "$f" \ + --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath runtimeDependencies}' + done + + ${postFixup} + ''; })) self; in self From 17cb291df1d84b89e4aba1fc085333038c9736c3 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 19:52:42 +1000 Subject: [PATCH 077/337] flutter: Allow adding extra dependencies to the wrapper Flutter application derivations can add dependencies and build flags, but it's not as easy during development. As an alternative to nix-shell, a custom Flutter wrapper can be built with dependencies required by projects. This feature builds on the existing build environment setup techniques required for Linux desktop support, so is fairly cheap to maintain. --- pkgs/development/compilers/flutter/wrapper.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index fe7d95b6180..114465fd0ef 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -3,6 +3,12 @@ , callPackage , flutter , supportsLinuxDesktop ? stdenv.isLinux +, extraPkgConfigPackages ? [ ] +, extraLibraries ? [ ] +, extraIncludes ? [ ] +, extraCxxFlags ? [ ] +, extraCFlags ? [ ] +, extraLinkerFlags ? [ ] , makeWrapper , runCommandLocal , writeShellScript @@ -62,7 +68,7 @@ let # Some header files and libraries are not properly located by the Flutter SDK. # They must be manually included. - appStaticBuildDeps = lib.optionals supportsLinuxDesktop [ libX11 xorgproto zlib ]; + appStaticBuildDeps = (lib.optionals supportsLinuxDesktop [ libX11 xorgproto zlib ]) ++ extraLibraries; # Tools used by the Flutter SDK to compile applications. buildTools = lib.optionals supportsLinuxDesktop [ @@ -73,9 +79,9 @@ let ]; # Nix-specific compiler configuration. - pkgConfigDirectories = builtins.filter builtins.pathExists (builtins.concatMap (pkg: map (dir: "${lib.getOutput "dev" pkg}/${dir}/pkgconfig") [ "lib" "share" ]) appBuildDeps); - cppFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") appStaticBuildDeps; - linkerFlags = map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps; + pkgConfigDirectories = builtins.filter builtins.pathExists (builtins.concatMap (pkg: map (dir: "${lib.getOutput "dev" pkg}/${dir}/pkgconfig") [ "lib" "share" ]) (appBuildDeps ++ extraPkgConfigPackages)); + includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (appStaticBuildDeps ++ extraIncludes); + linkerFlags = (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags; in (callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped" { @@ -94,6 +100,7 @@ in --prefix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ --prefix PKG_CONFIG_PATH : '${builtins.concatStringsSep ":" pkgConfigDirectories}' \ --prefix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ - --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " cppFlags}' \ + --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ + --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \ --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' '') From b68a185b0f6276340fa5aaf2d572c48d0e25a841 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 23:06:22 +1000 Subject: [PATCH 078/337] dart.fetch-dart-deps: Expose the package cache files through passthru --- pkgs/build-support/dart/fetch-dart-deps/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index acde38fc67e..460bba2b1b6 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -158,4 +158,5 @@ in # work at all anyway due to https://github.com/NixOS/nix/issues/6660. name = "${name}-dart-deps-setup-hook"; substitutions = { inherit deps; }; + passthru.files = deps.outPath; }) ./setup-hook.sh From 4f5dd08fe8a8bf81f636074a99dd4264faf017bb Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 23:11:07 +1000 Subject: [PATCH 079/337] dart.fetch-dart-deps: Add hook runtime dependencies --- pkgs/build-support/dart/fetch-dart-deps/default.nix | 1 + pkgs/build-support/flutter/default.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index 460bba2b1b6..a3ab2c2c73a 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -158,5 +158,6 @@ in # work at all anyway due to https://github.com/NixOS/nix/issues/6660. name = "${name}-dart-deps-setup-hook"; substitutions = { inherit deps; }; + propagatedBuildInputs = [ dart git ]; passthru.files = deps.outPath; }) ./setup-hook.sh diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index f85c7a19ce2..152b2dd888c 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -5,7 +5,6 @@ , llvmPackages_13 , cacert , flutter -, git }: # absolutely no mac support for now @@ -39,7 +38,6 @@ let makeWrapper deps flutter - git ] ++ nativeBuildInputs; configurePhase = '' From 87f809e0c6556126489d5340d8b3d71c4f85f0f1 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 16 Apr 2023 23:16:17 +1000 Subject: [PATCH 080/337] dart.list-dart-deps: Add list-dart-deps function This uses `dart pub deps` (https://dart.dev/tools/pub/cmd/pub-deps) to retrieve information about project dependencies. It requires a fetch-dart-deps derivation as input. --- .../dart/list-dart-deps/default.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/build-support/dart/list-dart-deps/default.nix diff --git a/pkgs/build-support/dart/list-dart-deps/default.nix b/pkgs/build-support/dart/list-dart-deps/default.nix new file mode 100644 index 00000000000..5cafd7773d4 --- /dev/null +++ b/pkgs/build-support/dart/list-dart-deps/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, dart +, jq +}: +deps: + +builtins.fromJSON (builtins.readFile (stdenv.mkDerivation { + name = "${deps.name}-list.json"; + nativeBuildInputs = [ deps dart jq ]; + + unpackPhase = '' + runHook preUnpack + ln -s "${deps.files}"/pubspec/* . + runHook postUnpack + ''; + + configurePhase = '' + runHook preConfigure + dart pub get --offline + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + dart pub deps --json | jq .packages > $out + runHook postBuild + ''; +})) From 329c494d0c9e5983da84d5230a00c325b932f79c Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 17 Apr 2023 02:48:10 +1000 Subject: [PATCH 081/337] flutter.buildFlutterApplication: Allow overriding configuration attributes This allows thing like `flutterBuildFlags` and `runtimeDependencies` to be overridden with `overrideAttrs`. Attributes that affect dependency retrieval cannot be overridden. --- pkgs/build-support/flutter/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 152b2dd888c..932306e86d1 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -30,8 +30,11 @@ let inherit pubGetScript vendorHash pubspecLockFile; buildDrvArgs = args; }; - self = -(self: llvmPackages_13.stdenv.mkDerivation (args // { + +in +llvmPackages_13.stdenv.mkDerivation (finalAttrs: args // { + inherit flutterBuildFlags runtimeDependencies; + outputs = [ "out" "debug" ]; nativeBuildInputs = [ @@ -54,7 +57,7 @@ let mkdir -p build/flutter_assets/fonts flutter packages get --offline -v - flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") flutterBuildFlags)} + flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)} runHook postBuild ''; @@ -98,11 +101,9 @@ let # which is not what application authors expect. for f in "$out"/bin/*; do wrapProgram "$f" \ - --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath runtimeDependencies}' + --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' done ${postFixup} ''; -})) self; -in - self +}) From 0495725a1f8e9df1ac3996459a9bb82305e69242 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 17 Apr 2023 03:01:32 +1000 Subject: [PATCH 082/337] flutter.buildFlutterApplication: Introduce a package override repository Some Flutter packages require additional attribute values to be added to buildFlutterApplication, to add things like libraries and environment variables. To prevent duplication in applications that use the packages, a repository of package overrides is kept. buildFlutterApplication will look for package overrides for each dependency, and apply them by calling overrideAttrs on itself. --- pkgs/build-support/flutter/default.nix | 162 ++++++++++-------- .../flutter/package-overrides/default.nix | 4 + 2 files changed, 91 insertions(+), 75 deletions(-) create mode 100644 pkgs/development/compilers/flutter/package-overrides/default.nix diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 932306e86d1..8c732c33779 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -12,6 +12,7 @@ { pubGetScript ? "flutter pub get" , flutterBuildFlags ? [ ] , runtimeDependencies ? [ ] +, customPackageOverrides ? { } , vendorHash , pubspecLockFile ? null , nativeBuildInputs ? [ ] @@ -31,79 +32,90 @@ let buildDrvArgs = args; }; + baseDerivation = llvmPackages_13.stdenv.mkDerivation (finalAttrs: args // { + inherit flutterBuildFlags runtimeDependencies; + + outputs = [ "out" "debug" ]; + + nativeBuildInputs = [ + makeWrapper + deps + flutter + ] ++ nativeBuildInputs; + + configurePhase = '' + runHook preConfigure + + ${flutterSetupScript} + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + mkdir -p build/flutter_assets/fonts + + flutter packages get --offline -v + flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + built=build/linux/*/release/bundle + + mkdir -p $out/bin + mv $built $out/app + + for f in $(find $out/app -iname "*.desktop" -type f); do + install -D $f $out/share/applications/$(basename $f) + done + + for f in $(find $out/app -maxdepth 1 -type f); do + ln -s $f $out/bin/$(basename $f) + done + + # make *.so executable + find $out/app -iname "*.so" -type f -exec chmod +x {} + + + # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral + for f in $(find $out/app -executable -type f); do + if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also + echo "strip RPath of $f" + newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g") + patchelf --set-rpath "$newrp" "$f" + fi + done + + runHook postInstall + ''; + + postFixup = '' + # Add runtime library dependencies to the LD_LIBRARY_PATH. + # For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open(). + # + # This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately, + # which is not what application authors expect. + for f in "$out"/bin/*; do + wrapProgram "$f" \ + --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' + done + + ${postFixup} + ''; + }); + + packageOverrideRepository = (callPackage ../../development/compilers/flutter/package-overrides { }) // customPackageOverrides; + packages = callPackage ../dart/list-dart-deps { dart = flutter; } deps; + productPackages = builtins.filter (package: package.kind != "dev") packages; in -llvmPackages_13.stdenv.mkDerivation (finalAttrs: args // { - inherit flutterBuildFlags runtimeDependencies; - - outputs = [ "out" "debug" ]; - - nativeBuildInputs = [ - makeWrapper - deps - flutter - ] ++ nativeBuildInputs; - - configurePhase = '' - runHook preConfigure - - ${flutterSetupScript} - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - mkdir -p build/flutter_assets/fonts - - flutter packages get --offline -v - flutter build linux -v --release --split-debug-info="$debug" ${builtins.concatStringsSep " " (map (flag: "\"${flag}\"") finalAttrs.flutterBuildFlags)} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - built=build/linux/*/release/bundle - - mkdir -p $out/bin - mv $built $out/app - - for f in $(find $out/app -iname "*.desktop" -type f); do - install -D $f $out/share/applications/$(basename $f) - done - - for f in $(find $out/app -maxdepth 1 -type f); do - ln -s $f $out/bin/$(basename $f) - done - - # make *.so executable - find $out/app -iname "*.so" -type f -exec chmod +x {} + - - # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral - for f in $(find $out/app -executable -type f); do - if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also - echo "strip RPath of $f" - newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g") - patchelf --set-rpath "$newrp" "$f" - fi - done - - runHook postInstall - ''; - - postFixup = '' - # Add runtime library dependencies to the LD_LIBRARY_PATH. - # For some reason, the RUNPATH of the executable is not used to load dynamic libraries in dart:ffi with DynamicLibrary.open(). - # - # This could alternatively be fixed with patchelf --add-needed, but this would cause all the libraries to be opened immediately, - # which is not what application authors expect. - for f in "$out"/bin/*; do - wrapProgram "$f" \ - --suffix LD_LIBRARY_PATH : '${lib.makeLibraryPath finalAttrs.runtimeDependencies}' - done - - ${postFixup} - ''; -}) +builtins.foldl' + (prev: package: + if packageOverrideRepository ? ${package.name} + then prev.overrideAttrs packageOverrideRepository.${package.name} + else prev) + baseDerivation + productPackages diff --git a/pkgs/development/compilers/flutter/package-overrides/default.nix b/pkgs/development/compilers/flutter/package-overrides/default.nix new file mode 100644 index 00000000000..4a3fcd1cded --- /dev/null +++ b/pkgs/development/compilers/flutter/package-overrides/default.nix @@ -0,0 +1,4 @@ +{ callPackage }: + +{ +} From 342ff8c1f1eee9b7add7fd80f2ff1af32778ada1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Apr 2023 02:40:02 +0000 Subject: [PATCH 083/337] armadillo: 12.0.1 -> 12.2.0 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index bd147fffc99..9eeb138f634 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.0.1"; + version = "12.2.0"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-IwpcddqtUtxH4a3Oj1pQ+apOQ1Tg8bsY6oTvoucOIN8="; + sha256 = "sha256-sNzgQil+hlrdM1Ha1394wsdjjWYy9YNXsBXlDty9IYY="; }; nativeBuildInputs = [ cmake ]; From 37e93f7c3b9c98eef13733f2a558194db2d1b0f6 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Mon, 17 Apr 2023 14:40:18 +1000 Subject: [PATCH 084/337] flutter.buildFlutterApplication: Supply package metadata to overrides --- pkgs/build-support/flutter/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 8c732c33779..70428736c32 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -115,7 +115,16 @@ in builtins.foldl' (prev: package: if packageOverrideRepository ? ${package.name} - then prev.overrideAttrs packageOverrideRepository.${package.name} + then + prev.overrideAttrs + (packageOverrideRepository.${package.name} { + inherit (package) + name + version + kind + source + dependencies; + }) else prev) baseDerivation productPackages From 2aa2d2d5c280c6bf2f29aab42acc47311501e1c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 21:21:25 +0000 Subject: [PATCH 085/337] redpanda: 23.1.6 -> 23.1.7 --- pkgs/servers/redpanda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 5292cfd7156..cae7c1948a0 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.1.6"; + version = "23.1.7"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-ZZsZjOuHTwzhfKBd4VPNxfxrcvL6C5Uhv16xA0eUN60="; + sha256 = "sha256-RiGHEJnvNaNFdTSyabnHAB6n1hpL1T0zOZNCV8w8Pe8="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-hG1UPy6Lp0F6y0h9Py28zRPS/s5JvoJ2P3OSOrrjz8U="; + vendorHash = "sha256-8HEJm7m5VgCanV+TY7g00uBUTaWsdv1mxpohmyicjlY="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' From 1150cc09b70d6ac506e40cda0ee2f0318b5b00cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 23:20:06 +0000 Subject: [PATCH 086/337] oven-media-engine: 0.15.8 -> 0.15.9 --- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 00576038303..2601ad23337 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.15.8"; + version = "0.15.9"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-8aR/v0xrHRLkoq0+VYLSMzDeRva5+6XFkrXZgu1tG8o="; + sha256 = "sha256-/sIPDP1Pa8tUpFGkbnTKFNBW1cQxc3i+8ghCpRFRDy8="; }; sourceRoot = "source/src"; From b7a60b612f654735fa4d2d16d242acb2d2a11d10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 23:28:38 +0000 Subject: [PATCH 087/337] shaarli: 0.12.1 -> 0.12.2 --- pkgs/servers/web-apps/shaarli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 2e3386de644..ed0c3961e2c 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "shaarli"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "02zwfr92bmr8pnkrg6my31wx2qapddcgmfsq44msfpmvvnxfj57n"; + sha256 = "sha256-fCB3sd5JMBKnfY6b2SZxXxV29VIO/4aiObyW0t+A/R0="; }; outputs = [ "out" "doc" ]; From 9d0c680b080640f624a8a62d6afe2ab94fb0e787 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Apr 2023 06:41:31 +0000 Subject: [PATCH 088/337] php80Extensions.blackfire: 1.86.6 -> 1.86.8 --- .../tools/misc/blackfire/php-probe.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index e44e61da339..bda782c1ae5 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -13,47 +13,47 @@ let phpMajor = lib.versions.majorMinor php.version; - version = "1.86.6"; + version = "1.86.8"; hashes = { "x86_64-linux" = { system = "amd64"; sha256 = { - "8.0" = "DbaawNIl1ZbSaITFUZE0GC0RgrJrjn0Wlb+o3OMhsAc="; - "8.1" = "VM7RljXwdGgF2ZVvsJ00YIGVfM5JqdRNrALSw+pMJks="; - "8.2" = "hrFNkAX4Am+78xxFfoSWn+bUZIklhb5uKRo1rGWumOA="; + "8.0" = "zoT9f906lvMTyq+w7BAqwA3Wnadk0hEsc9KLYuffE8c="; + "8.1" = "KJB3/BlS8FCDg3CEaYf14RJk3xhda1K2XEPVylSRFTQ="; + "8.2" = "PrhPtYUkz+Zs4ctIJUsHlUqLHZDfXNMc7s6uA5RJNVI="; }; }; "i686-linux" = { system = "i386"; sha256 = { - "8.0" = "FdM+HsVytE5XdjlXDV6mrdylLDQdzCYjxkFrqWwTMbI="; - "8.1" = "Z6RZShh/Gcu9qLcj/yKJu7qy0RnA+nNFwz1IXCEZlKg="; - "8.2" = "mytoRBpSCR4Gibpi7AptgbTq+axBXlpfag9LAnVzUM4="; + "8.0" = "IByOPOvzJZOR9hw6Ngn81XtXBczRPLswDA4Mvh8dQdQ="; + "8.1" = "Mob30xhKWaREiqw3cjlrz0jtAc9onERT6NxTz9bUSSY="; + "8.2" = "a7paFrgLfMLvcQRcHPi+sJ61XTjphcba+tewrJw0OnE="; }; }; "aarch64-linux" = { system = "arm64"; sha256 = { - "8.0" = "6sl3RXgBfXlJpmUDRGCmpLRKSmf1dy0vbRVHFnl7TyI="; - "8.1" = "hDv6G2L+fJylaqmOle0ND9iO28BA2ZPDfDlIhL2gqBQ="; - "8.2" = "ASm65Jwsc2x6R0sfWHyDWTw/FTeQap+SckG4Jdg2Zn8="; + "8.0" = "6ZhFRjjj/y3yyH2PXVnw+Mhkm2trfpysxfXocH5nx48="; + "8.1" = "x2TGaehSJmgJJcapr6xBO9Svo1HE66eVRHt/Ab+RSzQ="; + "8.2" = "YUs8h/DBwaNvmYA9TS7l0skg+X4yBzcHbPH4QXeSdCI="; }; }; "aarch64-darwin" = { system = "arm64"; sha256 = { - "8.0" = "zEAd+8v7j1mFOIMc2dThOY7e1XKHyMOx9dYWnJlJWAE="; - "8.1" = "ZaGwlLcBUSwGoAypw42rIkeXaeVegh05xwVMXfaAtgg="; - "8.2" = "gz8eKNLHlje3gUiXSIyE2csnOq9blS3GWZscTZbA9W4="; + "8.0" = "HZV7I8HOWvGwV9kMuSBW1/vgs+plxYLvbVs/d8aNNfE="; + "8.1" = "PsHDB/P/vbdpqbLl12UqelHfvHHt2WxiWEUCV7s5ZJg="; + "8.2" = "pEkFLhjWOLquBcxE06Gv7HUB/lPU8cPajhsFc0kcKlA="; }; }; "x86_64-darwin" = { system = "amd64"; sha256 = { - "8.0" = "yUcxwya/oTmu0acbuhe2ft2pyKroeWHQMouE2ch94EM="; - "8.1" = "u14WbwGRsDDhd6oZsvGKOgXpTQw3KMVeV1i9wl/vI+I="; - "8.2" = "oYYgo2qSkCuwNjUrJdhFziWyyWfwm1g+ZyqhudDuuoA="; + "8.0" = "VOi901nkVNjHSk02HNk6/z9q3avs+doHWL+Zxxruc6k="; + "8.1" = "TVV9Iysueo1M2WaaX6CF52WzMfJJ96gOIxuy1mIA6ao="; + "8.2" = "XOcjZes3JNfulJimdCTkipiRzrJ/237SSfqNAelVPNU="; }; }; }; From 8c49f09be2e5a62ff005103e5eb7faee7f991200 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 3 Apr 2023 23:20:34 +0200 Subject: [PATCH 089/337] resilio-sync: fix build with libxcrypt and use autoPatchelfHook --- .../networking/resilio-sync/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index c52e96066f8..16d5f0952eb 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxcrypt, ... }: +{ lib, stdenv, fetchurl, autoPatchelfHook, libxcrypt-legacy }: stdenv.mkDerivation rec { pname = "resilio-sync"; @@ -24,11 +24,17 @@ stdenv.mkDerivation rec { dontStrip = true; # Don't strip, otherwise patching the rpaths breaks sourceRoot = "."; + nativeBuildInputs = [ + autoPatchelfHook + ]; + + buildInputs = [ + stdenv.cc.libc + libxcrypt-legacy + ]; + installPhase = '' install -D rslsync "$out/bin/rslsync" - patchelf \ - --interpreter "$(< $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc libxcrypt ]} "$out/bin/rslsync" ''; meta = with lib; { From e3421f59c7f7b2695345ace1aaf433f3e97e5b8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Apr 2023 12:04:53 +0000 Subject: [PATCH 090/337] python310Packages.xml2rfc: 3.17.0 -> 3.17.1 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 54b462203bf..e6dd2495658 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.17.0"; + version = "3.17.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-xG0MCAOA5LmyX5LgJVOKfZS7xM7sJHs9L4kZP2lmlnY="; + hash = "sha256-C5bc32XbAqJtzUbITj1U1ItaY2ZMEXM9z+B7dQadoIs="; }; postPatch = '' From 6ab1860ffdf268bdccbccb8358aa73065fdbcc50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Apr 2023 13:52:50 +0000 Subject: [PATCH 091/337] python310Packages.pyamg: 4.2.3 -> 5.0.0 --- pkgs/development/python-modules/pyamg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index a5c7f58f998..ab1d40fcec2 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pyamg"; - version = "4.2.3"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - hash = "sha256-N608Hcr/JDXCq3yOw2lCrwcmxWPTUFm80Y6wdHP3GC4="; + hash = "sha256-6rlnIo9hQ0LOI8e01rvKJa2LknpFy3Ym0e8XyfBioC4="; }; nativeBuildInputs = [ From 0506c31972a96534a08c5a38ba641480c9dbda12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Apr 2023 18:53:56 +0000 Subject: [PATCH 092/337] besu: 22.10.3 -> 23.1.2 --- pkgs/applications/blockchains/besu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 7993887be65..183dbc9f338 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "22.10.3"; + version = "23.1.2"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-chP5RFqEoZbpSuGHfG/bHlHTe/sZYV2gLvUSHU9A44w="; + sha256 = "sha256-PTpwmjqrmToIAbQSpHGddOMZ+ULdwT+w8ws8SlTRJTg="; }; nativeBuildInputs = [ makeWrapper ]; From d40d00efea5c587e755bcbffa0ee4e96616cd692 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 21 Apr 2023 21:41:47 +0200 Subject: [PATCH 093/337] =?UTF-8?q?libwpe-fdo:=201.14.0=20=E2=86=92=201.14?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/Igalia/WPEBackend-fdo/releases/tag/1.14.1 https://github.com/Igalia/WPEBackend-fdo/releases/tag/1.14.2 --- pkgs/development/libraries/libwpe/fdo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index ce385f24c20..3e2fada38c3 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.14.0"; + version = "1.14.2"; src = fetchurl { url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz"; - sha256 = "51sMsscUVEhBboaWAT2Ig/Z1xmwR7XUOBoZe/sWAkVU="; + sha256 = "k8l2aumGTurq7isKdPIsvKCN9CwaG9tVsIbyUo44DTg="; }; depsBuildBuild = [ From 73ef9868cfac99fcd8e4a840e43c29faaeafb23b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 21 Apr 2023 21:43:30 +0200 Subject: [PATCH 094/337] =?UTF-8?q?webkitgtk:=202.40.0=20=E2=86=92=202.40.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2023/04/20/webkitgtk2.40.1-released.html https://webkitgtk.org/security/WSA-2023-0003.html CVE-2022-0108 CVE-2022-32885 CVE-2023-27932 CVE-2023-27954 CVE-2023-28205 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 51a0a300586..2d6948d2ada 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.40.0"; + version = "2.40.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-pGB+ob+JZp6JscssY/quxRP5PeCbauYMxx1qiqt6s5M="; + hash = "sha256-ZOUmmE+M0hYe8DrpSa+ZwAL/Mz1hXmOGtGAWSjwbfvY="; }; patches = lib.optionals stdenv.isLinux [ From 51f097f853d6423387b18a889dfcf2c7606b0852 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 21 Apr 2023 21:13:13 +0100 Subject: [PATCH 095/337] python3Packages.tensorflow: update darwin x86_64 deps hash no idea if this changed somehow or i somehow got it wrong originally --- pkgs/development/python-modules/tensorflow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 58e94b6a926..62ec1ab8fd4 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -397,7 +397,7 @@ let then "sha256-rcTPOMoBfmKFuuCanMlhmtFtOQzOICfEXTZey/rQEdM=" else "sha256-JGLH64F81xwSUl9RCWJhBLNRBQandImsVafEF5s+ap0="; aarch64-linux = "sha256-g6JUZQQalCTSjvAarkI7+gq13cPhFg/O9LPQDGNvrII="; - x86_64-darwin = "sha256-phmJ71l0DvJUVx1sHGS3nkDqJ18yOO7I3N1ODnfrrYc="; + x86_64-darwin = "sha256-7O0zPs+damAjWXZn5C5SSWBp35C8QX3y4kCM7tYkM7s="; aarch64-darwin = "sha256-qZvqXi6pvIrZpZdR4BcbOh2C/A4ZHJgXgFINhVJmmcs="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; From be90a19796785e4b9c4958e18acc06d68d26e49a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Apr 2023 23:37:13 +0000 Subject: [PATCH 096/337] visualvm: 2.1.5 -> 2.1.6 --- pkgs/development/tools/java/visualvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index c8fa6863c1b..6ea8e876a33 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.5"; + version = "2.1.6"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-OUGuaI3AcdfscfLRULz3uS8gOCVBseC/6aDsPoHRRTY="; + sha256 = "sha256-RqQEeYMYpBlqla+VmrxOUNyrlIGVL4YjZadg2Gq+f8k="; }; desktopItem = makeDesktopItem { From 3a14846ec7b0079b7b63e7799d606a6415692acd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 00:23:56 +0000 Subject: [PATCH 097/337] celestia: 1.6.2.2 -> 1.6.3 --- pkgs/applications/science/astronomy/celestia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 3f21987661c..7f979596148 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "celestia"; - version = "1.6.2.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "CelestiaProject"; repo = "Celestia"; rev = version; - sha256 = "1s9fgxh6i3x1sy75y5wcidi2mjrf5xj71dd4n6rg0hkps441sgsp"; + sha256 = "sha256-iBlrP9Yr/l3tzR1PpRf8C87WfrL6mZDwDtWyd2yJ7Dc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 0c03318f28e05b635becab48dee61a286d99c648 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 01:10:10 +0000 Subject: [PATCH 098/337] spire: 1.6.1 -> 1.6.3 --- pkgs/tools/security/spire/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index deb31ca4f88..ae063e5caee 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.6.1"; + version = "1.6.3"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4OSzb0VMMSQSlD8951nJmRnehJw2IQI6fEYO/Y5hZiU="; + sha256 = "sha256-l+qDRcSZoCMfG20uE7xit2xhwwxVSBByqrRJcAH/WH4="; }; - vendorHash = "sha256-nYi4ZQHsrFSyB+5YI+nlaZ28FaefG3EZ+tT3SX/bI7o="; + vendorHash = "sha256-th6HoMn5PjDFMnXwjNVC0Ngqtyu+XB1SFyrd5j8ZI8k="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; From 26b3ecb50a1182285c85a0a26dc314b4d5c1354b Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 5 Apr 2023 13:34:36 -0400 Subject: [PATCH 099/337] python310Packages.safetensors: init at 0.3.0 --- .../python-modules/safetensors/default.nix | 79 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 81 insertions(+) create mode 100644 pkgs/development/python-modules/safetensors/default.nix diff --git a/pkgs/development/python-modules/safetensors/default.nix b/pkgs/development/python-modules/safetensors/default.nix new file mode 100644 index 00000000000..407dc5bebbe --- /dev/null +++ b/pkgs/development/python-modules/safetensors/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, h5py +, numpy +, pythonOlder +, pytestCheckHook +, rustPlatform +, setuptools-rust +, torch +, libiconv +}: + +buildPythonPackage rec { + pname = "safetensors"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Qpb5lTw1WEME9tWEGfxC8l8dK9mGMH2rz+O+xGCrUxw"; + }; + + patches = [ + # remove after next release + (fetchpatch { + name = "commit-cargo-lockfile"; + relative = "bindings/python"; + url = "https://github.com/huggingface/safetensors/commit/a7061b4235b59312010b2dd6f9597381428ee9a2.patch"; + hash = "sha256-iH4vQOL2LU93kd0dSS8/JJxKGb+kDstqnExjYSSwi78"; + }) + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src patches; + sourceRoot = "source/bindings/python"; + hash = "sha256-tC0XawmKWNGCaByHQfJEfmHM3m/qgTuIpcRaEFJC6dM"; + }; + + sourceRoot = "source/bindings/python"; + + nativeBuildInputs = with rustPlatform; [ + setuptools-rust + rust.cargo + rust.rustc + cargoSetupHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + nativeCheckInputs = [ + h5py numpy pytestCheckHook torch + ]; + pytestFlagsArray = [ "tests" ]; + # don't require PaddlePaddle (not in Nixpkgs), Flax, or Tensorflow (onerous) to run tests: + disabledTestPaths = [ + "tests/test_flax_comparison.py" + "tests/test_paddle_comparison.py" + "tests/test_tf_comparison.py" + ]; + + pythonImportsCheck = [ + "safetensors" + ]; + + meta = with lib; { + homepage = "https://github.com/huggingface/safetensors"; + description = "Fast (zero-copy) and safe (unlike pickle) format for storing tensors"; + changelog = "https://github.com/huggingface/safetensors/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3911f78be3f..42d652c90d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10499,6 +10499,8 @@ self: super: with self; { safeio = callPackage ../development/python-modules/safeio { }; + safetensors = callPackage ../development/python-modules/safetensors { }; + safety = callPackage ../development/python-modules/safety { }; sagemaker = callPackage ../development/python-modules/sagemaker { }; From 29d3baf23c779ad7c0fcc98e5e6b7f190ccd0a00 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 22 Apr 2023 04:20:00 +0000 Subject: [PATCH 100/337] python310Packages.mdit-py-plugins: 0.3.4 -> 0.3.5 https://github.com/executablebooks/mdit-py-plugins/releases/tag/v0.3.5 --- pkgs/development/python-modules/mdit-py-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index 0128b5eec23..e5f40f4c4d3 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdit-py-plugins"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BvxqMSl8YXD84O6qjDI0VZgZpqL0UL0vYDMKxCc9qtI="; + hash = "sha256-U6Qh/1GklW9ZXBXmjPLuxga0JS/Cyga1iorcMEA+WP8="; }; nativeBuildInputs = [ From 93a5256e22aada4d32efcca6806ae66ffe65751f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 22 Apr 2023 04:20:00 +0000 Subject: [PATCH 101/337] python310Packages.mdit-py-plugins: add changelog to meta --- pkgs/development/python-modules/mdit-py-plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mdit-py-plugins/default.nix b/pkgs/development/python-modules/mdit-py-plugins/default.nix index e5f40f4c4d3..772d9547088 100644 --- a/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Collection of core plugins for markdown-it-py"; homepage = "https://github.com/executablebooks/mdit-py-plugins"; + changelog = "https://github.com/executablebooks/mdit-py-plugins/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ AluisioASG ]; }; From f510a301579a0c7beb953c53dd682f92ee73535e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 05:15:10 +0000 Subject: [PATCH 102/337] librewolf-unwrapped: 112.0.1-1 -> 112.0.1-2 --- pkgs/applications/networking/browsers/librewolf/src.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 472bbbe2714..a84b2a038ae 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,8 +1,8 @@ { - "packageVersion": "112.0.1-1", + "packageVersion": "112.0.1-2", "source": { - "rev": "112.0.1-1", - "sha256": "0bk3idpl11n4gwk8rgfi2pilwx9n56s8dpp7y599h17mlrsw8az4" + "rev": "112.0.1-2", + "sha256": "1pm4ilc2zx6qx3qqjl7ypl51mcfwq22abi850kq7l3pznb2z0ljw" }, "firefox": { "version": "112.0.1", From 4e54419a02ea282d3db5aa92b10a70c5e4e5ec34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 06:09:13 +0000 Subject: [PATCH 103/337] python310Packages.timetagger: 23.2.1 -> 23.4.1 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 5b59d288bdd..da570fbd1bc 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.2.1"; + version = "23.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QICn7Ugnac2nu7I4xDWyujvloCiz70XnqA7SJbopR5s="; + hash = "sha256-X0FeRyybomuOitpTldQTRlH3UeEs16ZYdYa/mu7mSGo="; }; propagatedBuildInputs = [ From c21df8adba2ef620124ff64c434256e85862b253 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 06:37:39 +0000 Subject: [PATCH 104/337] kics: 1.6.13 -> 1.6.14 --- pkgs/tools/admin/kics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 83a38d1e439..3d2ce9b36f4 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.13"; + version = "1.6.14"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-qNfqu/BaI4FTwQPNo4IGSsjWwznSXmGBFYMog8hQAdQ="; + sha256 = "sha256-kh8lTiGbbhH2jZYhfyfThKQE170tvRADUa+7dvVy3QU="; }; - vendorHash = "sha256-Hk4QLz31kRnrnV0+0X43Obwy45dwssM1Wc2zoPeKDvI="; + vendorHash = "sha256-Sg8f6fqe7DAsNsEGU1Ml42qgSuE5CrD+YrFqZKpNKtU="; subPackages = [ "cmd/console" ]; From 6a08f73f63a48ed9bee41734611bdda241b28432 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 09:43:15 +0000 Subject: [PATCH 105/337] fluidd: 1.23.4 -> 1.23.5 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 1ec91b7604d..200c4338f59 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.23.4"; + version = "1.23.5"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-ofGjIxxk7tBEa4jbNSCNzZJBHvv+mA1u03f9KtdjIbQ="; + sha256 = "sha256-od/RoxFjnOuyz7+D+avQJyJzpqpovzs+g4ErfyDJQpY="; }; nativeBuildInputs = [ unzip ]; From e5b55e5b549d21bc217fbc87d1175e36906584aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 10:51:46 +0000 Subject: [PATCH 106/337] coin-utils: 2.11.6 -> 2.11.8 --- .../development/libraries/science/math/coin-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix index e725ca7cd85..392d80a317a 100644 --- a/pkgs/development/libraries/science/math/coin-utils/default.nix +++ b/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { - version = "2.11.6"; + version = "2.11.8"; pname = "coinutils"; src = fetchFromGitHub { owner = "coin-or"; repo = "CoinUtils"; rev = "releases/${version}"; - hash = "sha256-avXp7eKSZ/Fe1QmSJiNDMnPQ70LlOHrBeUYb9lhka8c="; + hash = "sha256-ZV2nLP/oOLfnBGk1yow+b/oTKpoxyEkcCPHCSNAk+Tk="; }; doCheck = true; From 83bccf9f83585daa8733a327654b9ba8b778ebfa Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 22 Apr 2023 12:48:05 +0100 Subject: [PATCH 107/337] gocd-server: 22.2.0 -> 23.1.0 --- .../tools/continuous-integration/gocd-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 35707ed62ce..6fc577225f4 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "gocd-server"; - version = "22.2.0"; - rev = "14697"; + version = "23.1.0"; + rev = "16079"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip"; - sha256 = "sha256-OACNCQJQNrihTQ+thGdXKEFD0lC7qRNTX1I42flSUmE="; + sha256 = "sha256-//d6izGm1odE25H/PI5pn51FfUL4/6GbLwKUKAqZ3Kw="; }; meta = with lib; { From 83f57df79dd7d94311f13455558477ee0e5def4e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 22 Apr 2023 12:48:26 +0100 Subject: [PATCH 108/337] gocd-agent: 22.2.0 -> 23.1.0 --- .../tools/continuous-integration/gocd-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 79ec95f4988..6a6c5674bb6 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "gocd-agent"; - version = "22.2.0"; - rev = "14697"; + version = "23.1.0"; + rev = "16079"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; - sha256 = "sha256-0nEJ0cNotVohT+eYRXV/XP4WfGx3UnPDqCBgklAvsnk="; + sha256 = "sha256-L2MOkbVHoQu99lKrbnsNkhuU0SZ8VANSK72GZrGLbiQ="; }; meta = with lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; From 526662e0d08bbb4e3606a305ba200983eb2efa10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Apr 2023 12:15:48 +0000 Subject: [PATCH 109/337] links2: 2.28 -> 2.29 --- pkgs/applications/networking/browsers/links2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index d1631feb879..1bb3fbc97d9 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.28"; + version = "2.29"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "sha256-L9VJmxPe5ZRXwTLBZ7hJXEDe2nU4lInGzMtoMZP0VLQ="; + sha256 = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg="; }; buildInputs = with lib; From 9f05297dc8875baeeeb8160b60f120affc259f2c Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 22 Apr 2023 16:42:22 +1000 Subject: [PATCH 110/337] flutter.buildFlutterApplication: Manually supply the dependency list This removes the need for IFD. --- .../misc/yubioath-flutter/default.nix | 1 + .../misc/yubioath-flutter/deps.json | 1319 +++++++++++++++++ .../dart/fetch-dart-deps/default.nix | 41 +- .../dart/list-dart-deps/default.nix | 28 - pkgs/build-support/flutter/default.nix | 21 +- .../firmware/firmware-updater/default.nix | 1 + .../linux/firmware/firmware-updater/deps.json | 763 ++++++++++ 7 files changed, 2135 insertions(+), 39 deletions(-) create mode 100644 pkgs/applications/misc/yubioath-flutter/deps.json delete mode 100644 pkgs/build-support/dart/list-dart-deps/default.nix create mode 100644 pkgs/os-specific/linux/firmware/firmware-updater/deps.json diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index e3ff56e77d4..4012b40ff60 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -21,6 +21,7 @@ flutter.buildFlutterApplication rec { passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; + depsListFile = ./deps.json; vendorHash = "sha256-WfZiB7MO4wHUg81xm67BMu4zQdC9CfhN5BQol+AI2S8="; postPatch = '' diff --git a/pkgs/applications/misc/yubioath-flutter/deps.json b/pkgs/applications/misc/yubioath-flutter/deps.json new file mode 100644 index 00000000000..1ce525f799b --- /dev/null +++ b/pkgs/applications/misc/yubioath-flutter/deps.json @@ -0,0 +1,1319 @@ +[ + { + "name": "yubico_authenticator", + "version": "6.1.0+60100", + "kind": "root", + "source": "root", + "dependencies": [ + "flutter", + "flutter_localizations", + "intl", + "async", + "logging", + "collection", + "shared_preferences", + "flutter_riverpod", + "json_annotation", + "freezed_annotation", + "window_manager", + "qrscanner_zxing", + "desktop_drop", + "url_launcher", + "integration_test", + "flutter_test", + "flutter_lints", + "build_runner", + "freezed", + "json_serializable" + ] + }, + { + "name": "json_serializable", + "version": "6.5.4", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "build_config", + "collection", + "json_annotation", + "meta", + "path", + "pub_semver", + "pubspec_parse", + "source_gen", + "source_helper" + ] + }, + { + "name": "source_helper", + "version": "1.3.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "collection", + "source_gen" + ] + }, + { + "name": "source_gen", + "version": "1.2.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "dart_style", + "glob", + "meta", + "path", + "source_span", + "yaml" + ] + }, + { + "name": "yaml", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path", + "version": "1.8.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.17.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "meta", + "version": "1.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "glob", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "file", + "version": "6.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "async", + "version": "2.10.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "dart_style", + "version": "2.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "path", + "pub_semver", + "source_span" + ] + }, + { + "name": "pub_semver", + "version": "2.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "args", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer", + "version": "5.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "crypto", + "version": "3.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "50.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "build", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "convert", + "crypto", + "glob", + "logging", + "meta", + "path" + ] + }, + { + "name": "logging", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "pubspec_parse", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "collection", + "json_annotation", + "pub_semver", + "yaml" + ] + }, + { + "name": "json_annotation", + "version": "4.7.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "checked_yaml", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation", + "source_span", + "yaml" + ] + }, + { + "name": "build_config", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "json_annotation", + "path", + "pubspec_parse", + "yaml" + ] + }, + { + "name": "freezed", + "version": "2.3.2", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "build", + "build_config", + "collection", + "meta", + "source_gen", + "freezed_annotation", + "json_annotation" + ] + }, + { + "name": "freezed_annotation", + "version": "2.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "json_annotation", + "meta" + ] + }, + { + "name": "build_runner", + "version": "2.3.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "args", + "async", + "analyzer", + "build", + "build_config", + "build_daemon", + "build_resolvers", + "build_runner_core", + "code_builder", + "collection", + "crypto", + "dart_style", + "frontend_server_client", + "glob", + "graphs", + "http_multi_server", + "io", + "js", + "logging", + "meta", + "mime", + "package_config", + "path", + "pool", + "pub_semver", + "pubspec_parse", + "shelf", + "shelf_web_socket", + "stack_trace", + "stream_transform", + "timing", + "watcher", + "web_socket_channel", + "yaml" + ] + }, + { + "name": "web_socket_channel", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "stream_channel", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "timing", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation" + ] + }, + { + "name": "stream_transform", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "stack_trace", + "version": "1.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "shelf_web_socket", + "version": "1.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "mime", + "version": "1.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "js", + "version": "0.6.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "io", + "version": "1.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "graphs", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "code_builder", + "version": "4.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "collection", + "matcher", + "meta" + ] + }, + { + "name": "matcher", + "version": "0.12.13", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "stack_trace" + ] + }, + { + "name": "built_value", + "version": "8.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "built_collection", + "version": "5.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "build_runner_core", + "version": "7.2.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "build", + "build_config", + "build_resolvers", + "collection", + "convert", + "crypto", + "glob", + "graphs", + "json_annotation", + "logging", + "meta", + "path", + "package_config", + "pool", + "timing", + "watcher", + "yaml" + ] + }, + { + "name": "build_resolvers", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "crypto", + "graphs", + "logging", + "path", + "package_config", + "pool", + "pub_semver", + "stream_transform", + "yaml" + ] + }, + { + "name": "build_daemon", + "version": "3.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "http_multi_server", + "logging", + "path", + "pool", + "shelf", + "shelf_web_socket", + "stream_transform", + "watcher", + "web_socket_channel" + ] + }, + { + "name": "flutter_lints", + "version": "2.0.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "test_api", + "path", + "fake_async", + "clock", + "stack_trace", + "vector_math", + "async", + "boolean_selector", + "characters", + "collection", + "js", + "matcher", + "material_color_utilities", + "meta", + "source_span", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "material_color_utilities", + "version": "0.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "characters", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "vector_math", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "clock", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "fake_async", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "test_api", + "version": "0.4.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph", + "matcher" + ] + }, + { + "name": "flutter", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "characters", + "collection", + "js", + "material_color_utilities", + "meta", + "vector_math", + "sky_engine" + ] + }, + { + "name": "sky_engine", + "version": "0.0.99", + "kind": "transitive", + "source": "sdk", + "dependencies": [] + }, + { + "name": "integration_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "flutter_driver", + "flutter_test", + "path", + "vm_service", + "archive", + "async", + "boolean_selector", + "characters", + "clock", + "collection", + "crypto", + "fake_async", + "file", + "js", + "matcher", + "material_color_utilities", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "sync_http", + "term_glyph", + "test_api", + "typed_data", + "vector_math", + "webdriver" + ] + }, + { + "name": "webdriver", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "matcher", + "path", + "stack_trace", + "sync_http" + ] + }, + { + "name": "sync_http", + "version": "0.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "archive", + "version": "3.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto", + "path" + ] + }, + { + "name": "vm_service", + "version": "9.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_driver", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "file", + "flutter", + "flutter_test", + "fuchsia_remote_debug_protocol", + "path", + "meta", + "vm_service", + "webdriver", + "archive", + "async", + "boolean_selector", + "characters", + "clock", + "collection", + "crypto", + "js", + "matcher", + "material_color_utilities", + "platform", + "process", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "sync_http", + "term_glyph", + "test_api", + "typed_data", + "vector_math" + ] + }, + { + "name": "process", + "version": "4.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "path", + "platform" + ] + }, + { + "name": "platform", + "version": "3.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "fuchsia_remote_debug_protocol", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "process", + "vm_service", + "file", + "meta", + "path", + "platform" + ] + }, + { + "name": "url_launcher", + "version": "6.1.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_android", + "url_launcher_ios", + "url_launcher_linux", + "url_launcher_macos", + "url_launcher_platform_interface", + "url_launcher_web", + "url_launcher_windows" + ] + }, + { + "name": "url_launcher_windows", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_platform_interface", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "plugin_platform_interface", + "version": "2.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "url_launcher_web", + "version": "2.0.13", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "url_launcher_platform_interface" + ] + }, + { + "name": "flutter_web_plugins", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "js", + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math" + ] + }, + { + "name": "url_launcher_macos", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_linux", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_ios", + "version": "6.0.17", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_android", + "version": "6.0.22", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "desktop_drop", + "version": "0.4.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "cross_file" + ] + }, + { + "name": "cross_file", + "version": "0.3.3+2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "js", + "meta" + ] + }, + { + "name": "qrscanner_zxing", + "version": "1.0.0", + "kind": "direct", + "source": "path", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "window_manager", + "version": "0.3.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path", + "screen_retriever" + ] + }, + { + "name": "screen_retriever", + "version": "0.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_riverpod", + "version": "2.1.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "meta", + "riverpod", + "state_notifier" + ] + }, + { + "name": "state_notifier", + "version": "0.7.2+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "riverpod", + "version": "2.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "stack_trace", + "state_notifier" + ] + }, + { + "name": "shared_preferences", + "version": "2.0.16", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_android", + "shared_preferences_foundation", + "shared_preferences_linux", + "shared_preferences_platform_interface", + "shared_preferences_web", + "shared_preferences_windows" + ] + }, + { + "name": "shared_preferences_windows", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_platform_interface", + "path_provider_windows", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_platform_interface", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "path_provider_windows", + "version": "2.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "win32" + ] + }, + { + "name": "win32", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "ffi", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path_provider_platform_interface", + "version": "2.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "shared_preferences_web", + "version": "2.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_linux", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_linux", + "path_provider_platform_interface", + "shared_preferences_platform_interface" + ] + }, + { + "name": "path_provider_linux", + "version": "2.1.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "xdg_directories", + "version": "0.2.0+2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "process" + ] + }, + { + "name": "shared_preferences_foundation", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_android", + "version": "2.0.14", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "intl", + "version": "0.17.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "path" + ] + }, + { + "name": "flutter_localizations", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "flutter", + "intl", + "characters", + "clock", + "collection", + "js", + "material_color_utilities", + "meta", + "path", + "vector_math" + ] + } +] diff --git a/pkgs/build-support/dart/fetch-dart-deps/default.nix b/pkgs/build-support/dart/fetch-dart-deps/default.nix index a3ab2c2c73a..9deb99648c0 100644 --- a/pkgs/build-support/dart/fetch-dart-deps/default.nix +++ b/pkgs/build-support/dart/fetch-dart-deps/default.nix @@ -4,6 +4,7 @@ , dart , git , cacert +, jq }: { @@ -151,13 +152,35 @@ let outputHashMode = "recursive"; outputHash = if vendorHash != "" then vendorHash else lib.fakeSha256; } // (removeAttrs drvArgs [ "name" "pname" ])); + + depsListDrv = stdenvNoCC.mkDerivation ({ + name = "${name}-dart-deps-list.json"; + nativeBuildInputs = [ hook dart jq ]; + + configurePhase = '' + runHook preConfigure + dart pub get --offline + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + dart pub deps --json | jq .packages > $out + runHook postBuild + ''; + } // buildDrvInheritArgs); + + hook = (makeSetupHook { + # The setup hook should not be part of the fixed-output derivation. + # Updates to the hook script should not change vendor hashes, and it won't + # work at all anyway due to https://github.com/NixOS/nix/issues/6660. + name = "${name}-dart-deps-setup-hook"; + substitutions = { inherit deps; }; + propagatedBuildInputs = [ dart git ]; + passthru = { + files = deps.outPath; + depsListFile = depsListDrv.outPath; + }; + }) ./setup-hook.sh; in -(makeSetupHook { - # The setup hook should not be part of the fixed-output derivation. - # Updates to the hook script should not change vendor hashes, and it won't - # work at all anyway due to https://github.com/NixOS/nix/issues/6660. - name = "${name}-dart-deps-setup-hook"; - substitutions = { inherit deps; }; - propagatedBuildInputs = [ dart git ]; - passthru.files = deps.outPath; -}) ./setup-hook.sh +hook diff --git a/pkgs/build-support/dart/list-dart-deps/default.nix b/pkgs/build-support/dart/list-dart-deps/default.nix deleted file mode 100644 index 5cafd7773d4..00000000000 --- a/pkgs/build-support/dart/list-dart-deps/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv -, dart -, jq -}: -deps: - -builtins.fromJSON (builtins.readFile (stdenv.mkDerivation { - name = "${deps.name}-list.json"; - nativeBuildInputs = [ deps dart jq ]; - - unpackPhase = '' - runHook preUnpack - ln -s "${deps.files}"/pubspec/* . - runHook postUnpack - ''; - - configurePhase = '' - runHook preConfigure - dart pub get --offline - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - dart pub deps --json | jq .packages > $out - runHook postBuild - ''; -})) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 70428736c32..622a19c32bd 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -5,6 +5,7 @@ , llvmPackages_13 , cacert , flutter +, jq }: # absolutely no mac support for now @@ -13,9 +14,11 @@ , flutterBuildFlags ? [ ] , runtimeDependencies ? [ ] , customPackageOverrides ? { } +, depsListFile ? null , vendorHash , pubspecLockFile ? null , nativeBuildInputs ? [ ] +, preUnpack ? "" , postFixup ? "" , ... }@args: @@ -41,8 +44,19 @@ let makeWrapper deps flutter + jq ] ++ nativeBuildInputs; + preUnpack = '' + if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then + echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \ + '\nPlease copy the contents of ${finalAttrs.passthru.depsListFile} to a new file to pass to the depsListFile argument.' + exit 1 + fi + + ${preUnpack} + ''; + configurePhase = '' runHook preConfigure @@ -106,11 +120,14 @@ let ${postFixup} ''; + + passthru = { + inherit (deps) depsListFile; + }; }); packageOverrideRepository = (callPackage ../../development/compilers/flutter/package-overrides { }) // customPackageOverrides; - packages = callPackage ../dart/list-dart-deps { dart = flutter; } deps; - productPackages = builtins.filter (package: package.kind != "dev") packages; + productPackages = builtins.filter (package: package.kind != "dev") (if depsListFile == null then [ ] else (builtins.fromJSON (builtins.readFile depsListFile))); in builtins.foldl' (prev: package: diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix index d6dfa4dbae3..13421c5cc8b 100644 --- a/pkgs/os-specific/linux/firmware/firmware-updater/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-updater/default.nix @@ -8,6 +8,7 @@ flutter2.buildFlutterApplication { version = "unstable"; pubspecLockFile = ./pubspec.lock; + depsListFile = ./deps.json; vendorHash = "sha256-kKfe+7obb2fihrca+mjCM2+51wNkbPLEPFLpXzK5Wvc="; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/firmware/firmware-updater/deps.json b/pkgs/os-specific/linux/firmware/firmware-updater/deps.json new file mode 100644 index 00000000000..9264a9fb70e --- /dev/null +++ b/pkgs/os-specific/linux/firmware/firmware-updater/deps.json @@ -0,0 +1,763 @@ +[ + { + "name": "firmware_updater", + "version": "0.0.0", + "kind": "root", + "source": "root", + "dependencies": [ + "collection", + "dio", + "flutter", + "flutter_html", + "flutter_localizations", + "fwupd", + "path", + "provider", + "yaru", + "yaru_icons", + "yaru_widgets", + "flutter_lints", + "flutter_test" + ] + }, + { + "name": "flutter_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "test_api", + "path", + "fake_async", + "clock", + "stack_trace", + "vector_math", + "async", + "boolean_selector", + "characters", + "charcode", + "collection", + "matcher", + "material_color_utilities", + "meta", + "source_span", + "stream_channel", + "string_scanner", + "term_glyph", + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "collection", + "version": "1.15.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "term_glyph", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "string_scanner", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "charcode", + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.8.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "path", + "version": "1.8.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "charcode", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "stream_channel", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "async", + "version": "2.8.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "meta", + "version": "1.7.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "material_color_utilities", + "version": "0.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "matcher", + "version": "0.12.11", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "stack_trace" + ] + }, + { + "name": "stack_trace", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "characters", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "boolean_selector", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "vector_math", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "clock", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "fake_async", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "test_api", + "version": "0.4.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph", + "matcher" + ] + }, + { + "name": "flutter", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "characters", + "collection", + "material_color_utilities", + "meta", + "typed_data", + "vector_math", + "sky_engine" + ] + }, + { + "name": "sky_engine", + "version": "0.0.99", + "kind": "transitive", + "source": "sdk", + "dependencies": [] + }, + { + "name": "flutter_lints", + "version": "1.0.4", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "yaru_widgets", + "version": "1.0.8", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "yaru_icons", + "version": "0.1.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "yaru", + "version": "0.2.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "provider", + "version": "6.0.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "nested" + ] + }, + { + "name": "nested", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "fwupd", + "version": "0.2.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "dbus", + "meta" + ] + }, + { + "name": "dbus", + "version": "0.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "ffi", + "meta", + "xml" + ] + }, + { + "name": "xml", + "version": "5.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "4.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "ffi", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "args", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_localizations", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "flutter", + "intl", + "characters", + "clock", + "collection", + "material_color_utilities", + "meta", + "path", + "typed_data", + "vector_math" + ] + }, + { + "name": "intl", + "version": "0.17.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "path" + ] + }, + { + "name": "flutter_html", + "version": "2.2.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "html", + "csslib", + "flutter_layout_grid", + "video_player", + "chewie", + "webview_flutter", + "chewie_audio", + "flutter_svg", + "flutter_math_fork", + "collection", + "numerus", + "flutter" + ] + }, + { + "name": "numerus", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_math_fork", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_svg", + "provider", + "meta", + "collection", + "tuple" + ] + }, + { + "name": "tuple", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_svg", + "version": "0.23.0+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "path_drawing", + "vector_math", + "xml" + ] + }, + { + "name": "path_drawing", + "version": "0.5.1+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math", + "meta", + "path_parsing", + "flutter" + ] + }, + { + "name": "path_parsing", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math", + "meta" + ] + }, + { + "name": "chewie_audio", + "version": "1.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cupertino_icons", + "flutter", + "video_player" + ] + }, + { + "name": "video_player", + "version": "2.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "html", + "video_player_android", + "video_player_avfoundation", + "video_player_platform_interface", + "video_player_web" + ] + }, + { + "name": "video_player_web", + "version": "2.0.13", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_platform_interface", + "version": "6.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "plugin_platform_interface", + "version": "2.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "flutter_web_plugins", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "js", + "characters", + "collection", + "material_color_utilities", + "meta", + "typed_data", + "vector_math" + ] + }, + { + "name": "js", + "version": "0.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "video_player_avfoundation", + "version": "2.3.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_android", + "version": "2.3.10", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "html", + "version": "0.15.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "csslib", + "source_span" + ] + }, + { + "name": "csslib", + "version": "0.17.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "cupertino_icons", + "version": "1.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "webview_flutter", + "version": "2.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "webview_flutter_android", + "webview_flutter_platform_interface", + "webview_flutter_wkwebview" + ] + }, + { + "name": "webview_flutter_wkwebview", + "version": "2.7.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path", + "webview_flutter_platform_interface" + ] + }, + { + "name": "webview_flutter_platform_interface", + "version": "1.9.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "webview_flutter_android", + "version": "2.8.14", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "webview_flutter_platform_interface" + ] + }, + { + "name": "chewie", + "version": "1.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cupertino_icons", + "flutter", + "provider", + "video_player", + "wakelock" + ] + }, + { + "name": "wakelock", + "version": "0.6.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "wakelock_macos", + "wakelock_platform_interface", + "wakelock_web", + "wakelock_windows" + ] + }, + { + "name": "wakelock_windows", + "version": "0.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "wakelock_platform_interface", + "win32" + ] + }, + { + "name": "win32", + "version": "2.5.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "wakelock_platform_interface", + "version": "0.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta" + ] + }, + { + "name": "wakelock_web", + "version": "0.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "js", + "wakelock_platform_interface" + ] + }, + { + "name": "wakelock_macos", + "version": "0.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "wakelock_platform_interface" + ] + }, + { + "name": "flutter_layout_grid", + "version": "1.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "collection", + "meta", + "quiver" + ] + }, + { + "name": "quiver", + "version": "3.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher" + ] + }, + { + "name": "dio", + "version": "4.0.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http_parser", + "path" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + } +] From 89bb0ed91bd5ed327ce0c9bd745921fdf4bad097 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 23 Apr 2023 00:32:24 +1000 Subject: [PATCH 111/337] flutter.buildFlutterApplication: Add an option to generate the dependency list with IFD This is useful for projects outside of Nixpkgs. --- pkgs/build-support/flutter/default.nix | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/build-support/flutter/default.nix index 622a19c32bd..abb1c8ac359 100644 --- a/pkgs/build-support/flutter/default.nix +++ b/pkgs/build-support/flutter/default.nix @@ -14,6 +14,7 @@ , flutterBuildFlags ? [ ] , runtimeDependencies ? [ ] , customPackageOverrides ? { } +, autoDepsList ? false , depsListFile ? null , vendorHash , pubspecLockFile ? null @@ -48,11 +49,16 @@ let ] ++ nativeBuildInputs; preUnpack = '' - if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then - echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \ - '\nPlease copy the contents of ${finalAttrs.passthru.depsListFile} to a new file to pass to the depsListFile argument.' - exit 1 - fi + ${lib.optionalString (!autoDepsList) '' + if ! { [ '${lib.boolToString (depsListFile != null)}' = 'true' ] ${lib.optionalString (depsListFile != null) "&& cmp -s <(jq -Sc . '${depsListFile}') <(jq -Sc . '${finalAttrs.passthru.depsListFile}')"}; }; then + echo 1>&2 -e '\nThe dependency list file was either not given or differs from the expected result.' \ + '\nPlease choose one of the following solutions:' \ + '\n - Duplicate the following file and pass it to the depsListFile argument.' \ + '\n ${finalAttrs.passthru.depsListFile}' \ + '\n - Set autoDepsList to true (not supported by Hydra or permitted in Nixpkgs)'. + exit 1 + fi + ''} ${preUnpack} ''; @@ -127,7 +133,13 @@ let }); packageOverrideRepository = (callPackage ../../development/compilers/flutter/package-overrides { }) // customPackageOverrides; - productPackages = builtins.filter (package: package.kind != "dev") (if depsListFile == null then [ ] else (builtins.fromJSON (builtins.readFile depsListFile))); + productPackages = builtins.filter (package: package.kind != "dev") + (if autoDepsList + then builtins.fromJSON (builtins.readFile deps.depsListFile) + else + if depsListFile == null + then [ ] + else builtins.fromJSON (builtins.readFile depsListFile)); in builtins.foldl' (prev: package: From 549c1a62fee6c05b6c5ebaad6decfb933b52ffd4 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Mon, 20 Mar 2023 12:09:57 +0400 Subject: [PATCH 112/337] maintainers: add anpin --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d15322cf497..43eedd7585d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1061,6 +1061,16 @@ githubId = 1342360; name = "Andrew Morgan"; }; + anpin = { + email = "pavel@anpin.fyi"; + github = "anpin"; + githubId = 6060545; + matrix = "@anpin:matrix.org"; + name = "Pavel Anpin"; + keys = [{ + fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; + }]; + }; anpryl = { email = "anpryl@gmail.com"; github = "anpryl"; From 3efea7f0eacb27b940d5d3e930246bd37eb1cca0 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Mon, 20 Mar 2023 12:11:26 +0400 Subject: [PATCH 113/337] postgresqlPackages.promscale_extension: init at 0.8.0 --- .../postgresql/ext/promscale_extension.nix | 60 +++++++++++++++++++ pkgs/servers/sql/postgresql/packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/ext/promscale_extension.nix diff --git a/pkgs/servers/sql/postgresql/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix new file mode 100644 index 00000000000..0e574a8ac85 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, fetchpatch +, buildPgxExtension +, postgresql +, stdenv +, nixosTests +}: + +buildPgxExtension rec { + inherit postgresql; + + pname = "promscale_extension"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "timescale"; + repo = "promscale_extension"; + rev = version; + sha256 = "sha256-vyEfQMGguHrHYdBEEmbev29L2uCa/4xL9DpGIniUwfI="; + }; + + cargoSha256 = "sha256-vq/R9Kd0a9ckgEYm9Kt2J+RdyiHHYVutNEM4dcRViUo="; + + cargoPatches = [ + # there is a duplicate definition in the lock file which fails to build with buildRustPackage + (fetchpatch { + name = "cargo-vendor.patch"; + url = "https://github.com/timescale/promscale_extension/commit/3cef3f26f72ebf52d8800910ea655cac09312c57.patch"; + hash = "sha256-bXwvOv6T09EsCu+QCOCZny+V/Cy1UvCP6zlE8TdBlEg="; + }) + ]; + + preBuild = '' + patchShebangs create-upgrade-symlinks.sh extract-extension-version.sh + ## Hack to boostrap the build because some pgx commands require this file. It gets re-generated later. + cp templates/promscale.control ./promscale.control + ''; + postInstall = '' + ln -s $out/lib/promscale-${version}.so $out/lib/promscale.so + ''; + passthru.tests = { + promscale = nixosTests.promscale; + }; + + # tests take really long + doCheck = false; + + meta = with lib; { + description = "Promscale is an open source observability backend for metrics and traces powered by SQL"; + homepage = "https://github.com/timescale/promscale_extension"; + maintainers = with maintainers; [ anpin ]; + platforms = postgresql.meta.platforms; + license = licenses.unfree; + + # as it needs to be used with timescaledb, simply use the condition from there + broken = versionOlder postgresql.version "12" + || versionAtLeast postgresql.version "15"; + }; +} diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 211a54bb552..c94b91f02e2 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -71,6 +71,8 @@ self: super: { pg_safeupdate = super.callPackage ./ext/pg_safeupdate.nix { }; + promscale_extension = super.callPackage ./ext/promscale_extension.nix { }; + repmgr = super.callPackage ./ext/repmgr.nix { }; rum = super.callPackage ./ext/rum.nix { }; From 4e6ddd0c15d65bcd5bdc36bac7a6e51b64b39061 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Mon, 20 Mar 2023 12:12:37 +0400 Subject: [PATCH 114/337] promscale: 0.10.0 -> 0.17.0 --- .../0001-remove-jaeger-test-dep.patch | 17 ----------------- .../prometheus/promscale/default.nix | 18 +++++++++--------- 2 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch diff --git a/pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch b/pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch deleted file mode 100644 index 9266a9aca53..00000000000 --- a/pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch +++ /dev/null @@ -1,17 +0,0 @@ - -A Promscale test has a dependency on a package which was not intended to be -vendored, so `go mod vendor` breaks. The dependency is not required to build -Promscale, so it can be removed. - -diff --git a/pkg/tests/end_to_end_tests/trace_query_integration_test.go b/pkg/tests/end_to_end_tests/trace_query_integration_test.go -index 84a0d08..efbe5e1 100644 ---- a/pkg/tests/end_to_end_tests/trace_query_integration_test.go -+++ b/pkg/tests/end_to_end_tests/trace_query_integration_test.go -@@ -24,7 +24,6 @@ import ( - ingstr "github.com/timescale/promscale/pkg/pgmodel/ingestor" - "github.com/timescale/promscale/pkg/pgxconn" - -- jaegerQueryApp "github.com/jaegertracing/jaeger/cmd/query/app" - jaegerQueryService "github.com/jaegertracing/jaeger/cmd/query/app/querysvc" - jaegerJSONModel "github.com/jaegertracing/jaeger/model/json" - ) diff --git a/pkgs/servers/monitoring/prometheus/promscale/default.nix b/pkgs/servers/monitoring/prometheus/promscale/default.nix index fbd1661c5f8..7dcc5f01e47 100644 --- a/pkgs/servers/monitoring/prometheus/promscale/default.nix +++ b/pkgs/servers/monitoring/prometheus/promscale/default.nix @@ -7,20 +7,16 @@ buildGoModule rec { pname = "promscale"; - version = "0.10.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-KF+aD9vJYqNJkJftx27ZsxmOIXZ/2ciKwjwcTw0GBvY="; + sha256 = "sha256-JizUI9XRzOEHF1kAblYQRYB11z9KWX7od3lPiRN+JNI="; }; - patches = [ - ./0001-remove-jaeger-test-dep.patch - ]; - - vendorSha256 = "sha256-/cjRM8CrOKnx0BcRu2+MLV28MYLOrG5x1DN24mRUJzQ="; + vendorSha256 = "sha256-lnyKsipr/f9W9LWLb2lizKGLvIbS3XnSlOH1u1B87OY="; ldflags = [ "-s" @@ -28,7 +24,11 @@ buildGoModule rec { "-X github.com/timescale/promscale/pkg/version.Version=${version}" "-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; - + preBuild = '' + # Without this build fails with + # main module (github.com/timescale/promscale) does not contain package github.com/timescale/promscale/migration-tool/cmd/prom-migrator + rm -r migration-tool + ''; checkPhase = '' runHook preCheck @@ -51,6 +51,6 @@ buildGoModule rec { changelog = "https://github.com/timescale/promscale/blob/${version}/CHANGELOG.md"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ _0x4A6F ]; + maintainers = with maintainers; [ _0x4A6F anpin ]; }; } From 08ddf6f0e3ce657dcd1d579796297af2b32b578d Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Mon, 20 Mar 2023 12:13:09 +0400 Subject: [PATCH 115/337] nixosTests.promscale: add tests for promscale_extension --- nixos/tests/all-tests.nix | 1 + nixos/tests/promscale.nix | 60 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 nixos/tests/promscale.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 715fe7e51e0..4926286a4ec 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -712,6 +712,7 @@ in { tiddlywiki = handleTest ./tiddlywiki.nix {}; tigervnc = handleTest ./tigervnc.nix {}; timescaledb = handleTest ./timescaledb.nix {}; + promscale = handleTest ./promscale.nix {}; timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; tinydns = handleTest ./tinydns.nix {}; diff --git a/nixos/tests/promscale.nix b/nixos/tests/promscale.nix new file mode 100644 index 00000000000..d4825b6d7f5 --- /dev/null +++ b/nixos/tests/promscale.nix @@ -0,0 +1,60 @@ +# mostly copied from ./timescaledb.nix which was copied from ./postgresql.nix +# as it seemed unapproriate to test additional extensions for postgresql there. + +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs; + test-sql = pkgs.writeText "postgresql-test" '' + CREATE USER promscale SUPERUSER PASSWORD 'promscale'; + CREATE DATABASE promscale OWNER promscale; + ''; + + make-postgresql-test = postgresql-name: postgresql-package: makeTest { + name = postgresql-name; + meta = with pkgs.lib.maintainers; { + maintainers = [ anpin ]; + }; + + nodes.machine = { config, pkgs, ... }: + { + services.postgresql = { + enable = true; + package = postgresql-package; + extraPlugins = with postgresql-package.pkgs; [ + timescaledb + promscale_extension + ]; + settings = { shared_preload_libraries = "timescaledb, promscale"; }; + }; + environment.systemPackages = with pkgs; [ promscale ]; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("postgresql") + with subtest("Postgresql with extensions timescaledb and promscale is available just after unit start"): + print(machine.succeed("sudo -u postgres psql -f ${test-sql}")) + machine.succeed("sudo -u postgres psql promscale -c 'SHOW shared_preload_libraries;' | grep promscale") + machine.succeed( + "promscale --db.name promscale --db.password promscale --db.user promscale --db.ssl-mode allow --startup.install-extensions --startup.only" + ) + machine.succeed("sudo -u postgres psql promscale -c 'SELECT ps_trace.get_trace_retention_period();' | grep '(1 row)'") + machine.shutdown() + ''; + }; + #version 15 is not supported yet + applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "12" && !(versionAtLeast value.version "15")) postgresql-versions; +in +mapAttrs' + (name: package: { + inherit name; + value = make-postgresql-test name package; + }) + applicablePostgresqlVersions From ec669ababf278d7eac378b7665e777f8f0e2ba22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 22 Apr 2023 21:30:31 +0200 Subject: [PATCH 116/337] dnscontrol: 3.31.1 -> 3.31.2 Diff: https://github.com/StackExchange/dnscontrol/compare/v3.31.1...v3.31.2 Changelog: https://github.com/StackExchange/dnscontrol/releases/tag/v3.31.2 --- pkgs/applications/networking/dnscontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 47c47276095..653f27fcc11 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.31.1"; + version = "3.31.2"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T8fErChbQbarvE3/Zds1482m1hfD9Qa3esYvqjzNN3c="; + sha256 = "sha256-vKfbL2a/5rTVsG0rDs/D0t5eXDNWlbwURI2FYzGu9lY="; }; vendorHash = "sha256-BE/UnJw5elHYmyB+quN89ZkrlMcTjaVN0T2+h8cpPS8="; From c3e9a94359522691d47b60b0df972c09babe237d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 22 Apr 2023 16:04:14 -0700 Subject: [PATCH 117/337] libadwaita: 1.3.1 -> 1.3.2 Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.3.1...1.3.2 Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.3.2/NEWS --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index daf02487d08..520ea920bfc 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.3.1"; + version = "1.3.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-RIJtlSBZX4+rMOGQaFn31CCEKkWtPjtzO4fcX+iApvs="; + hash = "sha256-9Qha8xN3lC/t5dQNYPbgMX6HAKgEk80pyycrd5MGYLo="; }; depsBuildBuild = [ From 8af51c362856f71ebafa89229bf59bff848cd933 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 00:06:26 +0000 Subject: [PATCH 118/337] workcraft: 3.3.9 -> 3.4.0 --- pkgs/applications/science/logic/workcraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index 173d1d5a213..da8d8ac9ea5 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.3.9"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-Z3QtOGyOjmiM+qfB0FO4UDg8O99Ru/Qy2WNoBpXd1So="; + sha256 = "sha256-iqHdyyZX3AcBAjPTpZAiJi0IHhEDWBtKp0e2LAdWGsQ="; }; nativeBuildInputs = [ makeWrapper ]; From 03e187d7f10d3665e9676418e06ae4b6cca65b8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 00:31:41 +0000 Subject: [PATCH 119/337] mandelbulber: 2.28 -> 2.29 --- pkgs/applications/graphics/mandelbulber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index fd552df11b4..75aa146d3ed 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-NrXfEUoTJSz8C6rNU+tSO4PUUo5YWP0bknzXQieOqDc="; + sha256 = "sha256-PVyJnPPNehQ5qzhuoUsDRQ+V3azauEkIk26XfLZOmXg="; }; nativeBuildInputs = [ From efe1e848e7a657c2a77163b34b59d6c73b007735 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 02:16:36 +0000 Subject: [PATCH 120/337] libcef: 111.2.6 -> 112.3.0 --- pkgs/development/libraries/libcef/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index e64156c548c..3d3fe36b45b 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "1mrrsj213jc3s926wc1ccz63n7052mbmb70411lsi0192xfmrpjb"; - platforms."x86_64-linux".sha256 = "1jf4yv83xjbj75j1mqzib9f3kb9pwsnqryhv1dwqm5qi6if6g5y3"; + platforms."aarch64-linux".sha256 = "0qn412iv3sl843vwx38c5wc9nwf0sx34a4x78qkdn17wjbrfjj79"; + platforms."x86_64-linux".sha256 = "02vipzdcmq5cvpmra44r82z8y9d53yqpnymsc2mfk98fvkvgz2j9"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "111.2.6"; - gitRevision = "491d238"; - chromiumVersion = "111.0.5563.65"; + version = "112.3.0"; + gitRevision = "b09c4ca"; + chromiumVersion = "112.0.5615.165"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; From 1ef54d4a89e3adbf22e73dcf55f677a0483662a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 02:50:10 +0000 Subject: [PATCH 121/337] lcm: 1.4.0 -> 1.5.0 --- pkgs/development/libraries/lcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lcm/default.nix b/pkgs/development/libraries/lcm/default.nix index 64d22f4c7dc..dcd50a6f4fe 100644 --- a/pkgs/development/libraries/lcm/default.nix +++ b/pkgs/development/libraries/lcm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lcm"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "lcm-proj"; repo = "lcm"; rev = "v${version}"; - hash = "sha256-ujz52m7JuE5DYGM9QHLwVWVVBcny4w05J6Eu6DI2HBI="; + hash = "sha256-IFHoJl5OtnUb+w3gLG5f578yAektjgrY9Uj2eUVoIrc="; }; outputs = [ "out" "dev" "man" ]; From a4875b8af02e5fb0333020e438661a7bbf31c94b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 03:54:49 +0000 Subject: [PATCH 122/337] umockdev: 0.17.16 -> 0.17.17 --- pkgs/development/libraries/umockdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index a6d2a9ea00c..b40f465546d 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.16"; + version = "0.17.17"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-T0BbjOkhn4EX2GBezYFbiUHNgp2uEbSiaxpJ/36jriY="; + sha256 = "sha256-IOYhseRYsyADz+qZc5tngkuGZShUqLzjPiYSTjR/32w="; }; patches = [ From 7e53598823416e2feb0c4fdc645e7692b8453b5d Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 23 Apr 2023 14:30:37 +1000 Subject: [PATCH 123/337] flutter: 3.7.11 -> 3.7.12 --- pkgs/development/compilers/flutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 56361bbb6ab..e3b060777e7 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -31,9 +31,9 @@ in { inherit mkFlutter wrapFlutter flutterDrv flutter3Patches flutter2Patches; stable = flutterDrv { - version = "3.7.11"; + version = "3.7.12"; dartVersion = "2.19.6"; - hash = "sha256-H2S8nRpTte6ux34jTkCneGbSMQldrnjH1dI+/pzrcNg="; + hash = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE="; dartHash = { x86_64-linux = "sha256-4ezRuwhQHVCxZg5WbzU/tBUDvZVpfCo6coDE4K0UzXo="; aarch64-linux = "sha256-pYmClIqOo0sRPOkrcF4xQbo0mHlrr1TkhT1fnNyYNck="; From ae0aff848fce2a672919bedffbe04f85bfed13b6 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 23 Apr 2023 14:43:48 +1000 Subject: [PATCH 124/337] flutter: Throw a useful message when there are missing artifact hashes --- .../development/compilers/flutter/engine-artifacts/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/engine-artifacts/default.nix b/pkgs/development/compilers/flutter/engine-artifacts/default.nix index 30ef16bbeca..214a195e0c4 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/default.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/default.nix @@ -9,7 +9,8 @@ }: let - hashes = (import ./hashes.nix).${engineVersion}; + hashes = (import ./hashes.nix).${engineVersion} or + (throw "There are no known artifact hashes for Flutter engine version ${engineVersion}."); artifacts = { From 552e3fe49817599c2127a8ab32b72b8e6bf9f724 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sun, 23 Apr 2023 14:44:46 +1000 Subject: [PATCH 125/337] flutter: Don't use IFD to read the engine version --- pkgs/development/compilers/flutter/default.nix | 8 +++++--- pkgs/development/compilers/flutter/flutter.nix | 12 +++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index e3b060777e7..2cc1844801f 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchzip, dart }: let - mkFlutter = { version, patches, dart, src }: callPackage ./flutter.nix { inherit version patches dart src; }; + mkFlutter = { version, engineVersion, patches, dart, src }: callPackage ./flutter.nix { inherit version engineVersion patches dart src; }; wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; getPatches = dir: let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; - flutterDrv = { version, dartVersion, hash, dartHash, patches }: mkFlutter { - inherit version patches; + flutterDrv = { version, engineVersion, dartVersion, hash, dartHash, patches }: mkFlutter { + inherit version engineVersion patches; dart = dart.override { version = dartVersion; sources = { @@ -32,6 +32,7 @@ in inherit mkFlutter wrapFlutter flutterDrv flutter3Patches flutter2Patches; stable = flutterDrv { version = "3.7.12"; + engineVersion = "1a65d409c7a1438a34d21b60bf30a6fd5db59314"; dartVersion = "2.19.6"; hash = "sha256-5ExDBQXIpoZ5NwS66seY3m9/V8xDiyq/RdzldAyHdEE="; dartHash = { @@ -43,6 +44,7 @@ in v2 = flutterDrv { version = "2.10.5"; + engineVersion = "57d3bac3dd5cb5b0e464ab70e7bc8a0d8cf083ab"; dartVersion = "2.16.2"; hash = "sha256-MxaWvlcCfXN8gsC116UMzqb4LgixHL3YjrGWy7WYgW4="; dartHash = { diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index a566a543e41..92d635be967 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -1,4 +1,5 @@ { version +, engineVersion , patches , dart , src @@ -29,9 +30,7 @@ let engineArtifactDirectory = let - engineArtifacts = callPackage ./engine-artifacts { - engineVersion = lib.removeSuffix "\n" (builtins.readFile (src + /bin/internal/engine.version)); - }; + engineArtifacts = callPackage ./engine-artifacts { inherit engineVersion; }; in runCommandLocal "flutter-engine-artifacts-${version}" { } ( @@ -81,6 +80,13 @@ let buildInputs = [ git ]; + preConfigure = '' + if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then + echo 1>&2 "The given engine version (${engineVersion}) does not match the version required by the Flutter SDK ($(< bin/internal/engine.version))." + exit 1 + fi + ''; + postPatch = '' patchShebangs --build ./bin/ ''; From 8ee586120177ea66d2b6d69e69373af08a9d9c5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 08:03:11 +0000 Subject: [PATCH 126/337] tiled: 1.10.0 -> 1.10.1 --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 47270dcce65..4d83ffe082c 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y79trmkRrkOOP6p9VMjo/11IE22J3YJtnerBsVP9134="; + sha256 = "sha256-zrDka6yXJ++UuGFepn8glQ1r7ufBcjsnNZuH+jnkJw0="; }; nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; From 0e191c7ec12e5af4041c2c5cba1a3ab52f3a17ae Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Sun, 23 Apr 2023 13:17:14 +0400 Subject: [PATCH 127/337] promscale_extension: fixed cargoPatch somehow the patch made earlier stoped working, so the build was failing due to git dependency in cargo.lock. Fixed that in the upstream PR and repointed fetchpatch to the new commit --- pkgs/servers/sql/postgresql/ext/promscale_extension.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix index 0e574a8ac85..e031bb4c021 100644 --- a/pkgs/servers/sql/postgresql/ext/promscale_extension.nix +++ b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix @@ -20,14 +20,14 @@ buildPgxExtension rec { sha256 = "sha256-vyEfQMGguHrHYdBEEmbev29L2uCa/4xL9DpGIniUwfI="; }; - cargoSha256 = "sha256-vq/R9Kd0a9ckgEYm9Kt2J+RdyiHHYVutNEM4dcRViUo="; + cargoSha256 = "sha256-VK9DObkg4trcGUXxxISCd0zqU3vc1Qt6NxqpgKIARCQ="; cargoPatches = [ # there is a duplicate definition in the lock file which fails to build with buildRustPackage (fetchpatch { name = "cargo-vendor.patch"; - url = "https://github.com/timescale/promscale_extension/commit/3cef3f26f72ebf52d8800910ea655cac09312c57.patch"; - hash = "sha256-bXwvOv6T09EsCu+QCOCZny+V/Cy1UvCP6zlE8TdBlEg="; + url = "https://github.com/timescale/promscale_extension/commit/3048bd959430e9abc2c1d5c772ab6b4fc1dc6a95.patch"; + hash = "sha256-xTk4Ml8GN06QlJdrvAdVK21r30ZR/S83y5A5jJPdOw4="; }) ]; From 16865b959fbcea2769c02ea864c51414fa4f50b8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 17:56:49 +0800 Subject: [PATCH 128/337] =?UTF-8?q?gtk4:=204.10.1=20=E2=86=92=204.10.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/-/compare/4.10.1...4.10.3 --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index d90abc0068d..65bb57e0667 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.10.1"; + version = "4.10.3"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "6PysBLx3FbnaZnyRGl7o8mLiANHWpQrfI2RcqM/NAxE="; + sha256 = "RUVEGteeN3624KcFAm3HpGiG5GobA020CRKQnagBzqk="; }; patches = [ From 4a651cac38ffb8d3064ecb6b6315c0db5e037dc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 13:01:56 +0000 Subject: [PATCH 129/337] nats-streaming-server: 0.24.6 -> 0.25.4 --- pkgs/servers/nats-streaming-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 946d1be5f26..314e9b4cce6 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,16 +4,16 @@ with lib; buildGoModule rec { pname = "nats-streaming-server"; - version = "0.24.6"; + version = "0.25.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-CEDUlMigOK8ZAntqwD6jnqcMhDfgxrrrP53QU6XgI6k="; + sha256 = "sha256-/uPkcJOUDPVcdNBo6PxbJEvrrbElQ8lzMERZv6lOZwQ="; }; - vendorSha256 = "sha256-qaKkYcHOpnQQUWg3jWq99hM9y/7p0Vsy6hQm7HqXEKg="; + vendorHash = "sha256-Ah7F4+l1Bmr5j15x7fsEOzFIvxDR4OuJFTY95ZYyOYc="; # tests fail and ask to `go install` doCheck = false; From 213752fd01a2c0fb32c02285c3ebbcd692e04fca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 13:13:39 +0000 Subject: [PATCH 130/337] ergo: 5.0.8 -> 5.0.9 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 6a78061ced9..31e4a95503b 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.8"; + version = "5.0.9"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-ZXLtlxxhM6yOwRRVkzaLk5sLfJbDrodI7kIX6ItOk5I="; + sha256 = "sha256-EChnLRoInWFRuRMfnyRlZbZBWB6/QG9yRdwW9+IiMYc="; }; nativeBuildInputs = [ makeWrapper ]; From 13c90a1bfed55320d2f8e7e89da82f7edfa53d3b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 23 Apr 2023 09:37:33 -0400 Subject: [PATCH 131/337] zine: 0.13.0 -> 0.14.0 Changelog: https://github.com/zineland/zine/releases/tag/v0.14.0 --- pkgs/applications/misc/zine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 939611a5628..0659fecfc07 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.13.0"; + version = "0.14.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-N+0FEZ8TUbMs9cwPmURr39wRA+m7B4UbUOkpNmF1p9A="; + sha256 = "sha256-ydcrU2nIlu7Jx7S00DZmD2lAwLIFNzfv4zzM4SwJLVc="; }; - cargoHash = "sha256-2Mc1hrVJ3a1tE/Jo6MYjCfd03889raVTyLBzhCQi8ck="; + cargoHash = "sha256-j87mpWuYOx7oQyUIlvqKeQ/LZ2lRxz4hyPC0TsrgX2g="; nativeBuildInputs = [ pkg-config From c1c98d9cc805ab2992b13a1c0b4b15fad400a976 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 23 Apr 2023 16:03:58 +0100 Subject: [PATCH 132/337] python3Packages.wagtail: 4.2 -> 4.2.2 --- pkgs/development/python-modules/wagtail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 5d14f80369e..afdd14ec9d7 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "wagtail"; - version = "4.2"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VUdVG2YHfH1Q3QGx8Gvg2DuJolxlq6REZmn8fG8xgxw="; + sha256 = "sha256-s89gs3H//Dc3k6BLZUC4APyDgiWY9LetWAkI+kXQTf8="; }; propagatedBuildInputs = [ From f1eb2df82ef910afe2c882475a32c3cf5e1789be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Apr 2023 15:25:29 +0000 Subject: [PATCH 133/337] python310Packages.codecov: 2.1.12 -> 2.1.13 --- pkgs/development/python-modules/codecov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index d63de1631a2..4aaf0a403be 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "codecov"; - version = "2.1.12"; + version = "2.1.13"; src = fetchFromGitHub { owner = "codecov"; repo = "codecov-python"; - rev = "v${version}"; - sha256 = "0bdk1cp3hxydpx9knqfv88ywwzw7yqhywi0inxjd6x53qh75prqy"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cZEpAw8uv/XGiGzdBZ9MnabNaTP0did2GT+BkKMJM/E="; }; propagatedBuildInputs = [ From 4a0f7c97d986f7de6450d1813fc4668f6cd27e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 23 Apr 2023 12:57:32 -0700 Subject: [PATCH 134/337] python310Packages.forecast-solar: 2.3.0 -> 3.0.0 Diff: https://github.com/home-assistant-libs/forecast_solar/compare/refs/tags/2.3.0...3.0.0 Changelog: https://github.com/home-assistant-libs/forecast_solar/releases/tag/3.0.0 --- .../python-modules/forecast-solar/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/forecast-solar/default.nix b/pkgs/development/python-modules/forecast-solar/default.nix index a56eab06bba..9f4b199c567 100644 --- a/pkgs/development/python-modules/forecast-solar/default.nix +++ b/pkgs/development/python-modules/forecast-solar/default.nix @@ -5,17 +5,20 @@ , aiodns , aiohttp , backports-zoneinfo +, pytestCheckHook }: buildPythonPackage rec { pname = "forecast-solar"; - version = "2.3.0"; + version = "3.0.0"; + + format = "setuptools"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "forecast_solar"; rev = "refs/tags/${version}"; - hash = "sha256-1xRbTOeBHzLmf0FJwsrg/4+Z2Fs7uwbQwS2Tm41mNRk="; + hash = "sha256-Go0DF2qyVyGVYEeoEEuxsSR9Ge8Pg4S77zM1HL83ELc="; }; PACKAGE_VERSION = version; @@ -27,11 +30,12 @@ buildPythonPackage rec { backports-zoneinfo ]; - # no unit tests implemented - doCheck = false; - pythonImportsCheck = [ "forecast_solar" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Asynchronous Python client for getting forecast solar information"; homepage = "https://github.com/home-assistant-libs/forecast_solar"; From 9605ca4834edd44efe423ec81ec1c0f89829cd2f Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Sun, 23 Apr 2023 23:55:41 +0200 Subject: [PATCH 135/337] ledger-live-desktop: 2.55.0->2.57.0 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 3c9086b97fd..3455641b0ea 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.55.0"; + version = "2.57.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-N0BhbqZvZs3IP+jMxr85KlHs6I/fxWgoK884EKT9C9Y="; + hash = "sha256-fXvCj9eBEp/kGPSiNUdir19eU0x461KzXgl5YgeapHI="; }; appimageContents = appimageTools.extractType2 { From 1ad9fb62a99384c3cf120f0d258061515de4fe1d Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 23 Apr 2023 17:25:45 -0700 Subject: [PATCH 136/337] wasmtime: 7.0.0 -> 8.0.0 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 7a3297ba7f0..a3b736a6d9e 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-vbsjUJH6wHmSTwUV5tXrTUljPJNLTms8K6EyWi0mipA="; + hash = "sha256-NSD0xWqxRVFiearYRZFIllizsRHPylWYNzcNoC6+Cpg="; fetchSubmodules = true; }; - cargoHash = "sha256-eTm0FfWiNpEwj2egLrQGPA1lZ0K5GfVOeULsbNyf18Q="; + cargoHash = "sha256-v0DLbYM9EoIcj0JEH+LWrMx14gLRfCLW8wYDFKdFNCs="; cargoBuildFlags = [ "--package wasmtime-cli" From e46a7cd12a5fc44ad468be8cc8beb1380e2f5569 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 24 Apr 2023 04:20:00 +0000 Subject: [PATCH 137/337] _1password: 2.16.1 -> 2.17.0 --- pkgs/applications/misc/1password/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index f7a7281496b..f71d1ff0fcb 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.16.1"; + version = "2.17.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-8zKxd2yY8syGhgyPv06b+ag2bEfFfG19ZmQPrfi+Qh4=" "zip"; - i686-linux = fetch "linux_386" "sha256-3OO0JMJMRqbmq/rD/VRKIMBdjYu66ebEFGNLKX9K6A8=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-ZCXfreBiFDc5YFd9YsMddEvzl22KwnnfSQsV6BmHqeA=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-vlsqvz+AgEhL7M8cJhxmjjZ6ocIVUdq7MC1EVZOExU8=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-pnLAFCKhQKOIqp0qDv3DfAqF4fDXjFdw7Jl9WgDf7C0=" "zip"; + i686-linux = fetch "linux_386" "sha256-o+pSWUOSzDKA5m+Riu3QOi9gQMyEmbIGcE/yUjKu9p8=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-aukQSeC+5p6ioTE6QlzEAM+9VOI34GfzzjaGt/N0klY=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-HSXbbeDWYrFTh9SsKwvNovprWRwaDr3rA6X6E1QJJos=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; From 5c8bea32bb1f0a9c3be3852c112d5234b7c8147c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 05:20:04 +0000 Subject: [PATCH 138/337] firefox-beta-bin-unwrapped: 113.0b4 -> 113.0b7 --- .../browsers/firefox-bin/beta_sources.nix | 810 +++++++++--------- 1 file changed, 405 insertions(+), 405 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 4267ec80c2c..e3512ef4d6a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1015 +1,1015 @@ { - version = "113.0b4"; + version = "113.0b7"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ach/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ach/firefox-113.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "bd2ef5cb7f385ed11a813eb70f7599e9a95045b2095c982ddd33ed1d4c9b9938"; + sha256 = "8304b7f04da1d235306652483d6f4266965fe98a5d3473b12884d07f86e2e5b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/af/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/af/firefox-113.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "0f736e3a332bf351703fe6ef3ae5c498497d240891bd722beff3d0cae95b6f42"; + sha256 = "1d5b8f25d8940b8b9a5e74b84c11013fc485a35a68b644dc22fcf071d9b36018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/an/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/an/firefox-113.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "46575d630aada9e974dc47099ce03388806ce088fe30ed60112695b3e7df16bc"; + sha256 = "8d4ee4f37dad33cd3025456c27dd07fe577cfdbf1e7ee949fffc88c38d1e5f68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ar/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ar/firefox-113.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "06827c3ef613643c4aca61fe608488df1373016f3a601b8352d7f40971f837ca"; + sha256 = "adbb0b380aec9b6c41dc453846c33b4552cebfdeda26f5c01353e0ee6ed00107"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ast/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ast/firefox-113.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "52b7ed3cf3b4d95a5786dc6ff0ea408268430fb33a702d4e5f15bf101057daec"; + sha256 = "333a918b7e158d3f101a04b5fabe67f79189fcf8441d4d37f9bfbe8dc3b0cfab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/az/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/az/firefox-113.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e4e5c82337aaa5013d96baa0039e441e642e8343cc14f311b1829190cef85c11"; + sha256 = "615f482fcb779f92823c0619b574e4a6212b21844ef9fcf1a2c2813159fcaa7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/be/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/be/firefox-113.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "feaab0297cd50411ee66c277056915b09324753dfb9a9ec5ffa4e95826a0321f"; + sha256 = "31f9884073300254682faa23d8b93c4c9c9d4eb2b9812c259bf23125e21bc9ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/bg/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/bg/firefox-113.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "6c3bac53c27d2866bde4a3c7c7df722b8f8b199d22a949f8f4b23ba778fd072c"; + sha256 = "81eaf5b7075d9b1ab7e1d206de2762335089e4f2196a9c95686a8c050c405382"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/bn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/bn/firefox-113.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f3a35430f570eca76a18695a6770527d03c3f35f7eb252f3f1ad0ac8a417baf7"; + sha256 = "dd7ad54421d7f34d1fe85aa4c9135c863701fdfc6b52220e9984685870882afa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/br/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/br/firefox-113.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ff645d57d0dd11952cd38bf3c336638f1ef38c58b7e968871f615a3732124c0e"; + sha256 = "2459874c0399403a7a28dbcb45ce20f556084775abf48386e6e1f559525fe940"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/bs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/bs/firefox-113.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c3b5046b06219af95e0e9f53b24325ef620f614800a2cdd51388b0ddfc9f58b2"; + sha256 = "a57b9696b406f48578268ea5fe1cab099a0d0fdb7bb356bcefd5a5ad04144c5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ca-valencia/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ca-valencia/firefox-113.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "4381724cdf143d94fe6528ec893f0e66e3eabac31cdf8c42d95cbf1de23c302d"; + sha256 = "572a51d01345c9348f0ea5ff179f315c1b4914447792be579d1e0a882435e563"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ca/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ca/firefox-113.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8a4188c7dd0de8f43273f697915b7339b37f5af9eb87c3298ec3407e10fc1da6"; + sha256 = "725b39f999046bad86cc204d9d8726109093058aeb46de8038831c3c2dec1795"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/cak/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/cak/firefox-113.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "83a21e5fc16de4ab21d5917f50941140b167f3301e59b9ee13b58042b5d5e4fe"; + sha256 = "ad4b2e722fb08f3f57582fb8779816de80489871d2efcc5664d868d45fa1beea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/cs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/cs/firefox-113.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d0bb3f0194490e6a1225606d2f71a8b0f39c6a3bb782286f5f223693f5c94e01"; + sha256 = "dd3d34cb3f83edf189b190287cf20f9622986e084cf04fc45c4831928c98f3f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/cy/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/cy/firefox-113.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "41dd598b8dc8b672e35cfc3c020138c462cfae50dac94213f026684b7b0c24a8"; + sha256 = "f1f0ed029de0cc1ead437e48ebb04298e35009944328583ca91f9aa0b14e495d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/da/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/da/firefox-113.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "4568ab93f3589d1b1afea6a28be4bbdcb743b3a6e161f30046c5f4324ee7b188"; + sha256 = "8921352f1a74dad5d6f2485f0af5b39fc0a0597ec7a01cf5c0b119cd8738dce2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/de/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/de/firefox-113.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4fc35860d8c4c371382a51f28eeced158dd0fceb5d097907350dac6ae25af798"; + sha256 = "2139d35ceb3c0d570072746a0ecdb3519cdf64642b234ea950e7e167a20cb4ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/dsb/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/dsb/firefox-113.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "26d8cd12f60cf3ed44a24f1c16dd4b8f4bfb34095c457df6ac92ba4a56b35dbe"; + sha256 = "466788df7ed52bce5f98a255be95297d717a46b2122f4c9856443a1c70eaa98b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/el/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/el/firefox-113.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "990a93cb5f325f9b4bdec516a780acbad7585ae26f4b90b6483975c1f1236df8"; + sha256 = "aa513139110255df0690d6cbc46e914efcc46bd5a560df4aff217ce09b5501d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/en-CA/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/en-CA/firefox-113.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "240578f0a61edf14680d4b9a998259301ba0b04fe467ab77c9bb3755f21bf5d5"; + sha256 = "38a7e9f00bacaa8f284f90f76b2737e6276860c2b9107de175c8563f4aae7a5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/en-GB/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/en-GB/firefox-113.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8afbf0f83369ca4d1a96f7551ae25ab247382fa1d768f2b9ee853a63ab7ec7b3"; + sha256 = "6bb41254422eaa8738f241e3a50387993a27b2ebce6c1ce4eef85567d49e5790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/en-US/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/en-US/firefox-113.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "b7fe5cb9d9cf914175d8f6b12f9e162468a9208e40772fac63a15e8e7c3c9a1a"; + sha256 = "021d131db5359ff92be0c301152e352808914522a1cedc203ef3c9643e128933"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/eo/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/eo/firefox-113.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3306326323347a481aa0072b79a5a4a407990f622eae68e220bedc777d3872f1"; + sha256 = "b624c2eddf6c6c40798cbc9069e6ae2d00b931c447bfd67179ddee10bf995416"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/es-AR/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/es-AR/firefox-113.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c2b89d9f17b725317c61753e1b3227c3326b5be226514212e8b5d61e6cb7777a"; + sha256 = "74244e0f5adfaa5478dcbba18c39397597fb6fbc3d017ce3752d044d5efd7216"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/es-CL/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/es-CL/firefox-113.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "715f21235295544fc8e4f90d090f8ecdbb8804c168dc7e3d054db88abd0855c9"; + sha256 = "90b4f77121defeeb4baa448cd606d615a9d66a859940624cc77fefd51f473266"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/es-ES/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/es-ES/firefox-113.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "db786e3ab0ad59ad1ff8dfed973e738c6fb99283ee715a1539cb00336a7a8416"; + sha256 = "1cad611fbc46c94d22c058615ccc8ba49a87ede8d3caf25e7e33ed295cf3d0a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/es-MX/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/es-MX/firefox-113.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e205fe060805082ada478f5ade6ac2bfc9d3fc6c5261ef84539bddbce0236a56"; + sha256 = "f5152a736b70a76130cbb50038bb536695f17435dfd5b2a3b12041d52d25a295"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/et/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/et/firefox-113.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "88743293ceab6bb4699f52c6e769b24d5efb039d6186161914f3c40ca02f2441"; + sha256 = "21432666bf1fa50c00c69eb64348dc41bcc4e4a84638aa75403f1a7fcc914eb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/eu/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/eu/firefox-113.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0eac6d0b26ed55bd5599c9da230af362ed75acaa2d5737d9fa328d5416133feb"; + sha256 = "de4507c9c2aa45bc7758ea9c7c5c1501647cf674cf669c24fb6dccffe25dbbe7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/fa/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/fa/firefox-113.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9cd3e924e7b2ef70c3b5520c32aa006b0f080cf2b6bcc553474f83d00c5f908d"; + sha256 = "b09f8c91be01f0bc2974c8f4f6df1cc7f296a15f4e5037e7cfd8168a073146fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ff/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ff/firefox-113.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e512906a47c886c1c2fe50cd666ca354e14b5ce24807c017be323818c66f051f"; + sha256 = "09bb8e1f51a6eb3d0f2cde469500a80164229a1deca7d4bf5c45eb29de5fd871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/fi/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/fi/firefox-113.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0add16ff8823269962cdbd9e7ef84fcbd0c7674d42de2686f673f9cc8a183a45"; + sha256 = "da580ebe3b06333270eb25770f921f142d3fa8abb3a70b07ad23db0f87e4ae6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/fr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/fr/firefox-113.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ed523134172614b65791b5993b3337cbc0f0949edbb2ede11c955757d482b4e8"; + sha256 = "949b3c5e4de0ab0d378513b397955318597bc9ee2808f1e17492ce46441d71e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/fur/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/fur/firefox-113.0b7.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "9f8ae3d0d5965958a3bea863e5bb460a9d6d7959c10cca39485ae058fef54684"; + sha256 = "e8f964b4e4d89d2dfd9c953ca5b43e0a244545ab33de7a54680467e6770c2a4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/fy-NL/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/fy-NL/firefox-113.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0588b7c79609fcab6771e3663d65af91ebd63cdb33594fbe7beb654f10cc9912"; + sha256 = "c249dc215fce9a62dc9f23422aa4b296ff7531cb1d7a58bb6cdc2fcef08f5c15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ga-IE/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ga-IE/firefox-113.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "84f7447193a5888006838c7dbc7b3df4f5cc81491140f64235079548c0d47fba"; + sha256 = "dcbc44f3589c7efa24c5169c70bfa13976c66c64a21a5f259140979c8cd6e1f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/gd/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/gd/firefox-113.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "75a8a8df62ab893c652b7f4b3a714488298fee905855b9123a93fe1ffb0a730f"; + sha256 = "e65d1108b428875ffe16d9fe14ca42d338e5a5c4da349b3ace87f34e1f0df030"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/gl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/gl/firefox-113.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bbfb47bab16dbb83eff9897b6ee223dc4e9147670c9879fc8a16269f0c895556"; + sha256 = "7c8e3db727c714914d6f44e55b6c78fd63e9c2090db58676b90c77f2750d1e73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/gn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/gn/firefox-113.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "4a80d30ed2ca80904f975fac1fcad49b3708f9ccc5370b4a124c0408ec44b0a8"; + sha256 = "a27f7c00e8bcec9ef086a5bc2b437ef4d260ec4e7baa3f3c7b7e1b74f46cb063"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/gu-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/gu-IN/firefox-113.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "7a12884054a47b62671e640a94b9766cf607cd7072212afed05172d8005a62fc"; + sha256 = "6fb63530b49662cf0385c1fcc6de0b4ef1f7a6bd68beabf2d9bac1ed0fa23461"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/he/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/he/firefox-113.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "fe5b8e14ddb06970d999102e319007c8d18b38db675eee6058b25987be9fb354"; + sha256 = "d32dbaaa5c1ad9b2524eb2d8b142196628f0e10fbb9424fdfc28a5a5e3977ce2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/hi-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/hi-IN/firefox-113.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "48d8dae0392067414ede355d3034220cbba1da2db134744e1940a35210d6a0ed"; + sha256 = "2cfec2966b8b66937b475995d8b3b70fed4c5852bef4ed6b58d69ca004cba53b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/hr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/hr/firefox-113.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "4783758b0a598d3e937cb0717394500e894112c3aa33fa77c514a97d90bad560"; + sha256 = "4076686496cf84813188e5218f863e83cd53e3e52429fcb0a3d6cf0e9ea32571"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/hsb/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/hsb/firefox-113.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2d3a1b746fda95228f41490b3b249a4aecf96684cc99ac57284352e1325d6f49"; + sha256 = "673ab892faa960c7f04623254765944eff420fc3d0a40aa11b9b650a5bfc36d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/hu/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/hu/firefox-113.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "3eddc1704cfe04ae6efcaed6f67cb4fd0f952ed890b3d3c10724812b95e4f18a"; + sha256 = "97644ba4f1e24c5c3b96aab8e3e91187cd6f9c423196f94fce0c8981055ee6c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/hy-AM/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/hy-AM/firefox-113.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "56883c3bc6c5383216031d4933a9a2c59c707769ab8d3d10fde6e8ecc501e4ca"; + sha256 = "9481ef5a31f42851faa30011d79aa1e139935b79fa4ded6e3dd0029fd42cfb02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ia/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ia/firefox-113.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "658c714e15477f7408f49f8c1aa2b2ecbf82c29f2e7e994a94834a66402b838d"; + sha256 = "87270bd197237d94c6169ce0303dad294057c77ab2d0d48a62e86b291f58ed58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/id/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/id/firefox-113.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "39d9345f260a0667d407fb0f18ea10e6d9d4853594a7c34e5932009af4d28665"; + sha256 = "72f9eade6a0927ecfa7a59b473e0532ed9d266c10457985939ada5289ec7ebdc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/is/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/is/firefox-113.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "023cba20d9f4c34845486162353c514bd7a95917f04fcefa3b5d1cc905516eea"; + sha256 = "f805e2ebe1e6b55b96ae36542f7a6d885b07121e6dcac4ccf399b9069feefd31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/it/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/it/firefox-113.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ca7f7b524f0e606287b59ab558ca3c8a2da4432d973e58be19d8ede199cd6dff"; + sha256 = "0d671da7ff89751f9691709b22b71ec5dbaae6383c5193425b3cb70eff4935a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ja/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ja/firefox-113.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1291da6d5f742f6acdfa7e1ad24a8c6d56f012909794185a320cb3065feadb8b"; + sha256 = "deac72a4fd248281eebef8d66f36f08b54c36045d089a0dc5d71ebf59b208167"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ka/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ka/firefox-113.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a46ddc99bea340ce7e1faa7ff211971aebc803ea280fdee3a92ed5ef7fbf1f7a"; + sha256 = "19957e6b1dd413a084e2305371a12b40820852b9be33df76b7fcc0151597c563"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/kab/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/kab/firefox-113.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4116a67ab0a88c89f262511cfdd8acff95554c38ec5418679bae1478d2d7bfe0"; + sha256 = "cf29fc38cf2dbd4325e64bf0671434d12dfafc07b23d0362c41e4521f9a6792c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/kk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/kk/firefox-113.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f61e7df2ad9e578b25ad97d0b36b133214f1ca9db5373a724ad863e671a8eba5"; + sha256 = "9445e3840b74b1502dc504550e32009819d75d58d37ff1cf965e655440bf984b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/km/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/km/firefox-113.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "c03f48eceab957ec36766cfd87acb64eb2e6f522ed9932591da0fcb1311b4de8"; + sha256 = "acf5620a3a68618bde06ebbeb91a1214aa22b6422d837d556e0cf4095ee3ef27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/kn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/kn/firefox-113.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "39f5df7a0d6e5c981485abded79276c2edd9575a31fd68798434cabc701a4093"; + sha256 = "fdc91776d4b5247844ba4d48d58fbfaf35a70d46d3a1abdb16a1e53a8853ebca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ko/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ko/firefox-113.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "29c40b5b9c327ddd61fa6913a94111b3857d23fba5980874b6d244b92f2afb15"; + sha256 = "6ab818a234d904bf1617e2311fe1a3f2f3190a55c787429244ab731f032551c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/lij/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/lij/firefox-113.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "615923a0deaf6a13c4c8ec4b8dfae5ae46d9e1636747395fbf1fba21c07e96e2"; + sha256 = "689f9e3ce242134f7cf54aff83a5e2026abe2de7172b0e5859a7ca1a4b64f737"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/lt/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/lt/firefox-113.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f6c96722d00c25e11642dacf80a7381d97c87a049a0cbdcc7628ddf9d4e2d8b7"; + sha256 = "217a5cc836681a05d0c34f439800d8dcbe95460e34d5bb1d34bfef13f7cb3d78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/lv/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/lv/firefox-113.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "bf34546f55d8d0d53e0373c35813a4b5b90d2923dd6334bc77142b809971889e"; + sha256 = "e77aee7407ef1d7b9a1a5740ad7c93f686fa410dcc1d2fe2c6a306cd8d464328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/mk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/mk/firefox-113.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e302cec5c63303b66a7a1278200ac169f6c0ae8345fe5fe638350591a54f8ef7"; + sha256 = "beb0bb567d7796c529eb7b5f700b0d45a358b3f8687b8966b8cf11a13367025c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/mr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/mr/firefox-113.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b9e4c52b4e92d75fa25b596c65cd97d512f93c6d13706e6839b8872588cb9c98"; + sha256 = "751bd8746588ad5c60a6795748ef7af9d64762515f887864cb287c14c0c5a168"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ms/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ms/firefox-113.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "65dcb105a25fed6e9e4f792c5967f5e3465ab1ebb10df3b99e42a218f3790fe2"; + sha256 = "ec249e40271930471d11480d12e8c389f9762f8affa32893be1735a4ed88cadd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/my/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/my/firefox-113.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "44505363953c5f5640bd94fe7dbe552ee44c3d4ef931a273847c0ee7c1e264d2"; + sha256 = "7668708bb7b0eec5d2d7a4b9dd8ffdec17719503dd206f7eb632c44760014551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/nb-NO/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/nb-NO/firefox-113.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "76f81c9d55c602d53a60ac9f71883840dc083664d480042387fdb2a9837b105f"; + sha256 = "bd138dbbb96dd267d4c7f7c89abd46b6ffc8e90af7c4a2678a78f93c4ee74f2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ne-NP/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ne-NP/firefox-113.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "aeec5fc9f658befca5c3c969ac46148291d5cac68a6d884ac36d0711f014c22f"; + sha256 = "525ccbf79631a8c46f7410099285e783b89ddfd67598997d2bd35f9cc4ca2c6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/nl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/nl/firefox-113.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b0b8f373fecd653e0780b7540f8d6707a974953321a0583d2a253a0bc1e250bb"; + sha256 = "bd58268627543c6bf26a4a0ef1fb8d10dde865dfee2e92cfc938a6535269dfd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/nn-NO/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/nn-NO/firefox-113.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "63460ca2e898710807ce2ef5fe2b6487239e994735097a774a07318ae72efe1a"; + sha256 = "133c51ca040a5adcbb1e88b65c422f142ef4d3c3e81abed5c688f210598babd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/oc/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/oc/firefox-113.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2d7394bca2c47900465136a13badd18d558738c3123e3ebc836e186e72182f49"; + sha256 = "2e4d841c90d252da58891833d073c5fd09ba6a21fc5be5c08c576994e03a969e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/pa-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/pa-IN/firefox-113.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "92ab6a3700deb6385b464dfeece0f69d0ef2cd38bccce7dffdf5c93c4c6b0e7f"; + sha256 = "24b768863219b8632c077a4e909101809c286f229341fc14deb302268a6e9709"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/pl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/pl/firefox-113.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b83928f19a06095f35c3c4f1e79f14c6a5afc7fd5de3435984f6110b7938b4c0"; + sha256 = "ef26ff6da916cc699c480b4b0197b532b16419657cdd11e908fce6e6a31bd295"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/pt-BR/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/pt-BR/firefox-113.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1044aebccdc33a59492a6315cfd54959ef3e7918297253a7de2a22356fc0947a"; + sha256 = "293932a319e8adbf92476829e23be6f59f2af9bfe8dd89ade9ed5672461f1a87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/pt-PT/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/pt-PT/firefox-113.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d7999b295a7adc9aba65106e803f7e11ba7317dce074dcb4a0392ff3927291f2"; + sha256 = "d830408cfde6c425f5015e38e5bfcb5a31f56e09b2afa5a29267716f38946def"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/rm/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/rm/firefox-113.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "931ea3976f962b48af6dd8ea1fc3dbd21eab71d82e247307b9c00e3f50459a48"; + sha256 = "1ba8f0ac19c8a7bb65fd71063d94921d7c48eb711b371039b7fa025fb4f39296"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ro/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ro/firefox-113.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "5f23a8a62b6246268c98fabed9ba8ca76cfc94f8bb8cdc6608df674438114eda"; + sha256 = "87e25a7be99f566426700a37b64fbffe7607942dbea16ed10583eaf43be9a3c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ru/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ru/firefox-113.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "76976d869ade535b35ed2e4559333a24e61f206937b02a4da453007077c49274"; + sha256 = "8225dd670d9d359ac3b74696a4804aa73de5cedc9ddc5a38ac09b47e236c899a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/sc/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/sc/firefox-113.0b7.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "58c1c69e69d22c2886b5686ddb1ee8ac27c22c91c796ecb116f11cdce75ec472"; + sha256 = "272f6dfb019375ab193c8cb734cc42450013eb246288df32e90f6f60ef57d280"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/sco/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/sco/firefox-113.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "5a281ca8c242fe6021225ea13f956d47045fbf7890e95c90ffb0f571af6c9c77"; + sha256 = "65c40a489dbf51ee028b08547cfa7fcc0dbbb0590cff22b228ed79d59a81957c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/si/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/si/firefox-113.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3a881bcdc916cfab452f2bc631bdea3fdc7edd028a70e1c848e7497842d43c20"; + sha256 = "0435b2293fe16ba10793f20ed6d3936c1b97da7da21be4cafb17bef373f59298"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/sk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/sk/firefox-113.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "2e49e2e6258388edea5e0901fcc0522017925045361852f204d5d3286805d251"; + sha256 = "f84c2a5c6cd943146bd31173a2995a14b931a50d134c085d1d12ffe37da9bdd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/sl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/sl/firefox-113.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1fe7987b5a544f876147d6c15293d934921a0da1599a0668ede49f938f1da4aa"; + sha256 = "ce70f4b543d753c61af035d2f38efd568c78060a04a0ca0466c0629284a65c1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/son/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/son/firefox-113.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "8cf548e594f7397fe2b15a89ea1113ae48bf6999a37d32ea231106d10c06177c"; + sha256 = "0a5a3853c732bdfdf4cb81d2b75a0e4fa71df17eb58a9ded0056c0ce22c66dc8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/sq/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/sq/firefox-113.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0120f4957c375eb78d07188ede2e5e9f7feee53899e93d72e4eb839fbe862200"; + sha256 = "ebf23deb72ef6b3000dcb71bf3d5089b6ee18e25496a445982e0443e72db3337"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/sr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/sr/firefox-113.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ff862d5f965b7afb89f22f0575734509da5ffb59e786442df773f0a1fb174a11"; + sha256 = "a507b67e2c26bad4cf4899611ba75fe251d1f0f7e17678bd63f1dc1f8c9573eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/sv-SE/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/sv-SE/firefox-113.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "bdb27a923632e3fe5aebc7247bf77c36fd4e84798bfce483d64b9bfda2712e83"; + sha256 = "87ff5a3d88da51362461068f94ae24aeba8c209bb7438dca19af2dbc7e4bee7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/szl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/szl/firefox-113.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "04b7df5690ca4b9151975ceee725b66eadb62b6568d8eb184c78ab9a77507c55"; + sha256 = "3fffe51ddf094c49c5954594f41a0c773b4af475465040abf8196b59c1a90b22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ta/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ta/firefox-113.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "af7842a9cfe51340119101e769c998e78d5f304b2746fda0bb2b87cbdac032ec"; + sha256 = "064be4dbd09dc63a62ccaa06be819aaafd036117479288c5a676538e1f7b90f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/te/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/te/firefox-113.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "e42529c812d3ed862979887ef8d08ac35b21fda3df5defe072ee2533634b69d0"; + sha256 = "08cd9752579bfed3c6b6ecc1f939b8438e774e6cfb51dfee8c27a70e393a336e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/tg/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/tg/firefox-113.0b7.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "ad81d51e62417f9b58aa139cea1f9a0520c472657b4d61b583b724a8eb1593ec"; + sha256 = "d5fbb1c3a6bce7d1e2dc4b1bc7d21717e7a9540d96ad62f7aa1ff955614c6d3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/th/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/th/firefox-113.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "0496f3df038d3d4029234c23633bb65b6f6bf665860cdb1a69c6ed596affaf11"; + sha256 = "bcaeb34cc9f86a0a64b296b9bf83b048f7c51e9c6b473f98d6554d520432083a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/tl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/tl/firefox-113.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c4cba7d19baf14c0d9299ec78937d83d6a6218a2809d77d254e9ebae9ca1c08e"; + sha256 = "d8104808fcfb464b8d6176d54337c242996c43b799d46791f3d18baaef725de4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/tr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/tr/firefox-113.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "121196bd67ee3ab5f1faf9c0b90d755d3cf50d24176daa5ecaf3fc8745b3f9c6"; + sha256 = "13f0f0f7622169f2e544e85a95c39aeebdcab058ea0d69db435cb87256b9407d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/trs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/trs/firefox-113.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "38bdc1e42da4c69046e5ce7004cc07023300011f5a9ecd5036df7eb40d4380fc"; + sha256 = "54a7b070e4f9d0e46931cc31d0c1945796c7aa5694108efb93d0fefc2c3f417d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/uk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/uk/firefox-113.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0f431bf61fc940024e25ecc1661b538ba180782fec84e5261c4828eaf1d6a017"; + sha256 = "2a77aebcf67e481bdf56a78f8b02eb017e7dd4890b8051ae37d51f9aae297b7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/ur/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/ur/firefox-113.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "9bd5157175c8ef7145f64659cef0141eae74a97a55fedac097fd8facd3280536"; + sha256 = "00e711ccfcdf52525d9e3720f5d4e800a070644f128bd1bf389e44a7c7467a4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/uz/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/uz/firefox-113.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7dcdaa9c2113bcbee34627595cf343301633bd1299baa805d9ee34096c992ec7"; + sha256 = "14c7b26084579dd2e4fc765464bfc6a39fabd3025f80556a03a6c90845a747f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/vi/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/vi/firefox-113.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8037c30c27316f0be0bd354ef0105728486a0e850d646dff311773fe68707d7a"; + sha256 = "87eb3e51b1e26924e4349ea65d9d04bdc5880871842f581ec010bc80938dbfbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/xh/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/xh/firefox-113.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "65b8d38986361fd1a4c47480e7325db93e3de04f534a3d5905e2717121d16fb9"; + sha256 = "4880b16b4be5dc839f5c26a2769b7fea236f9ad11e7b6806708f9b5e12a53a65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/zh-CN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/zh-CN/firefox-113.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ed13763d037cc3256cd66e606231ca9580431b99d6798c1c8bd4e3563fd1be3f"; + sha256 = "77f5df57deea9ac7a015ef6984d4c4ee1652b451c147c9c6f1501210b1b851ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-x86_64/zh-TW/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-x86_64/zh-TW/firefox-113.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "255d3cd276ebef5772cb4c64dd6cb6d48a569df145f52599487c0cf974ea8598"; + sha256 = "59c8ab57a87017ccd4fde49af3a55b289a8f459cfad2f9d182f41fdf01e37522"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ach/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ach/firefox-113.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "3d8f8203a23f1937bb0bca5ca198ca91a6d1e4e505acd0cf64dba8a1599e7980"; + sha256 = "10132b97f0e225c1b871550002891a740620111055f8efd6fb9ab1a8272818bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/af/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/af/firefox-113.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "2d3a9d197bf96389369f36271ba6b6ac484787e19554d9c50fcc746ffcff3ee8"; + sha256 = "d092b39e0fa3db963f5c8a3621ec6927d4069085a586ab5fd704770b477d9551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/an/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/an/firefox-113.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "74944b6bdaec3d713f36c6801868b9c6e0c08b0eeaaab9285c2748c40cbfc6e7"; + sha256 = "2cb0fa7a5acb40bec37c0be5721a3eb5cb905eb18a2d0548582eb38a8df8aeab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ar/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ar/firefox-113.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a2a7a45192845c8d1514a55e24086cc6f873014e10d9a43e430aaa58e0898afc"; + sha256 = "7ae779d9d046460ba3be02992a3e69091826e9017d6698548610b30ba7f59c95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ast/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ast/firefox-113.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "4f438dd3afda39c754bb0010e3a81ac3fae4a482576552120683fc22852e3b6f"; + sha256 = "310a3dfbee7fc55acd53be9b76aacc465313767149a279e79ef501b7a86d50ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/az/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/az/firefox-113.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ff3f9abb2b55f84184a722204d966aaabe94731ecce2410755d6d9eb49a132b3"; + sha256 = "4439c559d83a2881f46d74e0fc1106af66761d805f467462c01ae4d5467ffaff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/be/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/be/firefox-113.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5788d683bbf2d6f87984a74b283b250baae11572454f91ab187ca7e6da128e0c"; + sha256 = "fedefb312f522a6cd5abfc402e90e6e57f698696bd23103b4e0eed8942091721"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/bg/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/bg/firefox-113.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1008ea1147e0dd1caae8bc614abed7fda3b5597efa36f0908cf4bcbe0bc89a22"; + sha256 = "7977823ab30766ea30d6c5c808045ad7798005242f76672ae0d27eb7fd9621b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/bn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/bn/firefox-113.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "1c21174ddd85c80a52bd5d1b16c909e247f56a05b97ed587a19b9a0bd417abd8"; + sha256 = "06e50ed07293f58bc636e89e647d45cf881471c60425a50ee54732c8d5fda523"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/br/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/br/firefox-113.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "d25ffcfb920ed4566413a83c84d9b2a4b2338e7d9871a0a45f3fcb5110a83023"; + sha256 = "cb0fd2b668e879f97e9627ec60b7c1f7170266f9d71c7129a12c5ca95a32cf6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/bs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/bs/firefox-113.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "21bea1cbb19f76a82ae561d3ca9408e796373ccf297bd7925292e2b7ce57b74c"; + sha256 = "fb539b6f8f7e40e8689bcae9260f014249da88963340a828bad432e07777ccf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ca-valencia/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ca-valencia/firefox-113.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "49b426208d239603a27c2f60e7309065ba63b84c9a7d54f0cab63e7108cf47b7"; + sha256 = "b16ae1f944c79d7980da5fc4125511fd0b2a12b85ce10ea7e68f37079e0e937b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ca/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ca/firefox-113.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8bfb905dc540af1dc0b5dc18d5ce0199559a11d3be64f6d737588ca4df438b6d"; + sha256 = "c8b6746bd62f13b2a15f7f1d4c2c8f519f6d9a34b9d6b79545422fb701acf5a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/cak/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/cak/firefox-113.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "cc99d3f74eaaac8b7e6c73b6613f1bea75ef62faeef836e49a1355857dfb18d5"; + sha256 = "ab9f2e6a978cae1e7f74e096052a263e10247e7fcc4356f6eef052fd5566346c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/cs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/cs/firefox-113.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "ea41a1b5dd5452408a8f30a425c40dab8cc93969dd0270dd135e0d69af7f714f"; + sha256 = "a6111d3e2ae8379b914bcd75b23721287150cdd3dd2265c4a2cd575c18337b48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/cy/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/cy/firefox-113.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4f292f687cd087107218ca7a4559e302686bf0e721515d360c3a9d230a71586a"; + sha256 = "153fec694e5f1e2ca7ebefb279f8df08565c709f2024da7888aa51b67051e31f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/da/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/da/firefox-113.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ba24357939ad19eac0cd60aab308e9601526029f6c4d1703e6b6ce77126127e1"; + sha256 = "07e7c384d32d9d7c864451eb663ae551dd5d120536006c1e21c4b08118564c8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/de/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/de/firefox-113.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f21b0581ec94aaf6c402d700ed3ffe82a35ca6f9b7be140a573eb8f912d15cd8"; + sha256 = "f5220465df951d51519bd19eab468c14cb12c8be6298130f105059f443ee14e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/dsb/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/dsb/firefox-113.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6f7624a3efc1a7ca08406dbf73bc0ea7eb8444a146d60579bb079eb0c748508d"; + sha256 = "4d5d31a53ee8969e66744c19fe8de3b2fd843c776998426428df84fd26bb2511"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/el/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/el/firefox-113.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8daa34a6de7a3be7a3d7280a14c5b0bbd78582017b15a4680aad0a1eab2ff791"; + sha256 = "4e71c76a3d3e318c54bb190ef66ee49cd24fcb56d0fa7ac78be2a24f3bfb89ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/en-CA/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/en-CA/firefox-113.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "6f9091352b42d23262a9858676fa6a22844881f52385595704a8b2cad2f8b285"; + sha256 = "c5a4b9d2340102c665a53ed554c139abe04fb993d1a82acb7e5249163cc6cf2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/en-GB/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/en-GB/firefox-113.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8e9bfaab64dc066d1e1087b3efb6aa3b40e4321a1925034653730bd917137fca"; + sha256 = "4ad4798bf34416ec43fe6ccbabf45799b2685ded65dc7abde992c3e04a6863cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/en-US/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/en-US/firefox-113.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d73ecdeec81e643f57e1c231a99bffd96bbedefa085f5629f8ea9e0ba29cdf55"; + sha256 = "d61c0684534588fc274a82b442020e71e39624c68a3b6639416f952148487ac8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/eo/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/eo/firefox-113.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "99230cbde8f0d0203f3afe9ab51026d3311c8372c15a1a73c4d17499bd659bd6"; + sha256 = "1595ef12f46b59ed756d5a61527f80b0da5c1dfca8ed095dfd481afc6e7f4cfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/es-AR/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/es-AR/firefox-113.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a4eb35fd6425983b9f39b397ace40199f7db80b8604181e66a5f006a0046386c"; + sha256 = "47fff77011a62b9d72142f24aa25c9308731cb581e1f4fce3a7a7a6d206f6569"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/es-CL/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/es-CL/firefox-113.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "138eae3a0bf3f5153cb8869e97fd2c73d0f0a929420eced07e6972a5a59a7af2"; + sha256 = "162b9ec786a7c5a3f8928ffa1603f4d2b3279dc8a258b2099b70e9b2a5eed0a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/es-ES/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/es-ES/firefox-113.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4bb9af1ccfe569cd1661b9a4781991ef60220142f73b77a10f943cce57dc4c63"; + sha256 = "35b76350db78dbae51ce5b047b9cc8fa6a725e525b00d55c1a0735a4c31dc3fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/es-MX/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/es-MX/firefox-113.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e9999b0af6ccb84ad6ab143a00a676ce65377c3b81a796d796c691ee222e92da"; + sha256 = "18f59ce051cb814b63ab424652be9cddc1689109aa19f0ea2e3d4d6f846a30a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/et/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/et/firefox-113.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e91688eaf4ad293d097b5bbaab95a3c04ba3e7292176aad116aee201d0fa25f5"; + sha256 = "81fd9dbdf33386900dc4a1ef908df578175a1de2514e111d1143597f77534501"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/eu/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/eu/firefox-113.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "563fbfde720e65905e4df5063389f9f0cf3ac7b435f0e48fea4943781287abe8"; + sha256 = "3e0fccbd98958073f3cbc5dbff1b66bfbceb345e490e249a98642b174a9abbec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/fa/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/fa/firefox-113.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0d8d95804aaadf0abe3f6efd6ca463d99248dc20ac7f45252705de6044694583"; + sha256 = "64c631440b594239637b73022480f3f3e0c97538e1ecd0eff7ae301e02edb79c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ff/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ff/firefox-113.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "63c231f6956ad1305b80c2f60dd48792a50aa1c69ba72e5aca082c675c11941a"; + sha256 = "d561c0f44378c36b8c56605ba159e639c5908402d81109bfdd387087f46aea6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/fi/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/fi/firefox-113.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "82e9e91201582324d55c38ba19b036422076d084ae32625aaec08e404ff53ee6"; + sha256 = "d593aaba28bd3dae1ee19c11b10248c1ae6809bcd1c63344fba376e6b589dec2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/fr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/fr/firefox-113.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "543f408db05692407be94c1d216768e0095b1e19c8ff5d4497a179a2a6892037"; + sha256 = "c762a748094baddcc2292ce21c18b14c455ae51b3cbb4907043fac9c23266b2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/fur/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/fur/firefox-113.0b7.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "8538f3309b76d455a33fef08e66189c798539ee57d485016093c5b3efc26d991"; + sha256 = "a24e088c70967672f3b94f131f8f9a55a0841a003ba3a32fc553ae8dec8f3588"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/fy-NL/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/fy-NL/firefox-113.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1db4fc67530c2d8a6d5810254181f35cf7c267940f8f70c6c8dae14044b6055b"; + sha256 = "ff4fd0da532c54b64f24ad6223b501b94798c439e48b010e4538ecd740a1fe1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ga-IE/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ga-IE/firefox-113.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a64302e2d33594c898186a15f462745d18cf37ab26d3bad72738bd2ee5274a55"; + sha256 = "b54d9c1743f6311b10d8671e20e3958c9a08a70a548181b18516becb270616f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/gd/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/gd/firefox-113.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "85a8af67e1311df497f2090ebe311b2759170ef227d8091238f74b923d608342"; + sha256 = "d1b6dc3d6ff990ce4932199ac2e8066206b29f4fe51549e36a0ebb2c7de43dd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/gl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/gl/firefox-113.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "76db7d4d8b99a19b37270b8daa2049d4e85c5db8db2b172cd2fffb8f5b8d22da"; + sha256 = "a03e3acff58b2584f447a75e3389f36a8a346cbca6ca5ff2602f5fc1d6f27f3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/gn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/gn/firefox-113.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "39c52d434405b28ab44162d1c8f72acb60843278a9b67eeae61875de4ef046d4"; + sha256 = "f4418cf45db3aae3debe5a68cc73e501c2f8bd0285affa3d9f0275a1df4708ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/gu-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/gu-IN/firefox-113.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f5e5a2db396ad33837f3815594ac8a60e85deea7f3bda96c2aed0b8aabaa4af1"; + sha256 = "9f650fcc1de7d94a9e7667519650761b5bb65daa9099a3d7f9a176eda908466a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/he/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/he/firefox-113.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "943ce126ed6eef3aea32227e22ad0093e3128ac14be020eaccbd9d6ea8a412cd"; + sha256 = "6772d77dff4ef46a09f7b73b442f96a856a608eeec8d38c5de0eb35c5743fc3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/hi-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/hi-IN/firefox-113.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "f412eeac8e736de6517ac7a05e3f3ab044d02f102e7ec3c4a8bb1f44244214c0"; + sha256 = "bdf9c70135f24b5e09bfbac1d22c6997b3c7665c089b13f8bc810af9ed73f2b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/hr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/hr/firefox-113.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "224333f514de3d39f3cc5b320ee21c2e10ae38a3477d447957261684177cf024"; + sha256 = "13b2add3648bcc0b1c77d67bf93bd641b635fd6d4c346cf11bd0c779633d0900"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/hsb/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/hsb/firefox-113.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "1928199d49b1511157bd3c59dafc11e5515d793d3525e19be98fef64328d11ff"; + sha256 = "f8ea4eefbd8a9fc8aeb52430c433ceb15ef7368c846b104d4171d0dc1aaaec61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/hu/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/hu/firefox-113.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "1d48af7e9b91fa4b6985fca5b418d3c954e8a538ef48602e778378894b1ffbb5"; + sha256 = "768ad86260ef19949d2bd3fd6c3317a7c1b08255ad57cd87b25c4b311a5856f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/hy-AM/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/hy-AM/firefox-113.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "67b6ccb3f52ba0cbba784f07255a9c6c242d21efb63a37b2beab2959bbeac308"; + sha256 = "267c5e1e94112201a316ed9223a4e02563c8c0bfabff7231cf5b4bcbedbd18f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ia/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ia/firefox-113.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "375f35e4faea3cc87dc9879e0dd601ffcc50f253f03149677b59ef781f4150c8"; + sha256 = "00f0c01188042fd312c0befbb631266e5f3249c5515f984172d500aab74e38e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/id/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/id/firefox-113.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8fbeaab86851d3c30348b0c592046020bcaca9b986b684520db90a1dc3a56975"; + sha256 = "d837a5dd454293ded9217c000bb706325e0c605c1dc44d6e6c14bcf00b72188f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/is/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/is/firefox-113.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b88ffd3bbdf06b20f35d313858f9c9b10e85a2fd22c30f95fd5be5ce0568c01f"; + sha256 = "4dd888066abbbc97df8ac86f4cc5d49671f88c5d949d8717123f21d7a5ec02d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/it/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/it/firefox-113.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "793ba7db4e7f51896f4ece5f2a3fd2f609f8cc760258f9c23f7694f0746923f4"; + sha256 = "5f7fac46beafb772f6960ab5e4ee5eeb3ab7b46537cdaefddbb3cc11f7d9727b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ja/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ja/firefox-113.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "3dc65531a0b02f2a6c55a8aaeb0e620308e52a5bf63ab471dbb4b30983e24c2c"; + sha256 = "603cd01a319d4147287e3ea2bf151e3f9c211294a8fdd3c27d0002287983318e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ka/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ka/firefox-113.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "74665643f67b46bb9e9ac03b8d82e307afacc6807876ae8711698edaac1abb76"; + sha256 = "eb2022a4e1dcca3d30f1c4141e23c55dfac8b6409a54f5b3613ba3b66c0bab30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/kab/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/kab/firefox-113.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "35a692235355f535020292957a0fe44fbd77ecbbb43124e75b9a1a6a01152cc3"; + sha256 = "fc040bc467c3a4afb7505a8e3de41e05431777388ced2719b4894e0bb63328b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/kk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/kk/firefox-113.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6bcddf4e6ffbb8c9f14dff7da8191cea82f45752f1b1b93cedd89998448c94f5"; + sha256 = "c90ba2fe2c3ccd1d85c0dce2cb28ead479d917baa6f7dd2f73f7e854214155c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/km/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/km/firefox-113.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "a205d8c307dda1f226b8a3053120ebe6611668690f31175b12bfedebbde195ab"; + sha256 = "52baba902f3a069bd86745bfc6ce318306b2e3f9fb1a6b1062a87715165befdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/kn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/kn/firefox-113.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "0c09b9596b356712c83a94555d2b997de97a7ad675a189645267c0942d2c034c"; + sha256 = "cc6c0ed5a3a86089557462bb2d726cce8f246efe3900f396ef1d312f6e929ba4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ko/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ko/firefox-113.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "05e25a992dc4f56ff4fc5a55a2dbc70b36fc29483c6ccf628afbf8b8ad44f13f"; + sha256 = "2fd44061c92b33d04205f88fb1314acdd13dbeaede19cc49ade0d69fd47f2f23"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/lij/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/lij/firefox-113.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "11305dd713791ecb98508deeffaf1ce51b47b7e629c60d80316436cd9ea2fad1"; + sha256 = "cf0516c5b80a92aaf4d4ce39ed6851c81f2a5fd670556dd9957867e1364193f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/lt/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/lt/firefox-113.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "9dbabb8719251d033f604434fb28cf02ec63187dbb74fdb33e0513bf49729976"; + sha256 = "fcb21e117659b00587348e932186ed054e87174715379f8fac5a404efa8dc037"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/lv/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/lv/firefox-113.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1c447d4fa5d995645cd7ffcab3f2051fddd0a3bd9e5d12ead7290268bccbf9e5"; + sha256 = "0e319625487af8c5eaab2087035530e4c95ade0711d19e2faa6dbe9fdb1d8af0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/mk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/mk/firefox-113.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "5f066039eccab51a5683f133dc66511c39026a9ce1b70dd1dbbd87bc0cb96093"; + sha256 = "709a849b09975506de5e4f8a0abbb79fb0b6913e88a8958a9cfdeb898d4085e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/mr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/mr/firefox-113.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "4aa8eb39d12ff6ba0569dc251ed13110f2edc7c92368d7d35b9854b14d8cf619"; + sha256 = "7dcc8478f7003ba402492a38d5cb921b82f660f94b25068fd364189bb4653fe6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ms/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ms/firefox-113.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "1538f31ca131746558746236d9ce1132cdfba2dc479916969276470cc48714d3"; + sha256 = "1ee57f0c17a74017766550cf89a36f1810c96d2e209d2a94ff509bea6340c5f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/my/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/my/firefox-113.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "6be6fbb63f2100479069d70032cd4b99f6c65ca88be4f4e1f157d390b49f570a"; + sha256 = "95472bd7b76d3a6e6963e49f33fc8400d9bb999fd82abe7d86e7b204ad8bd03f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/nb-NO/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/nb-NO/firefox-113.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "7e3e90b7f2dd3e7285d751eb2aace580b0346235942394f2cc17da79eb0c4b72"; + sha256 = "5da083b4068ba51501f1e8896939effb17a5c0e85607528c73c4e4f0ae71296a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ne-NP/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ne-NP/firefox-113.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "2c606e573aa44ad8f434e6c70704786db879259408495a00f2a99f0c1d2c5d84"; + sha256 = "0ddda188267178c76b726c4a22f7ee89d4996de55adbbdb3150fa164b2c9999b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/nl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/nl/firefox-113.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a2444c1d68dbcea7192207771889f12c4963c70616b7cc8b56772a5c9956ae5b"; + sha256 = "1492be3571f337a5c75ced6b3d53e51f3114ec2e739e0f571265fab1991e172e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/nn-NO/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/nn-NO/firefox-113.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "93c1d0d4a5472fee193fef5414b7ce66261c99274fa5229f71e9f2146c915d4f"; + sha256 = "d4daac025eca19f73ddd1543da029d9a71d847855a31543cc073cc8e6f9a6fc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/oc/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/oc/firefox-113.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "701105e4dced9844f08e1f746691604c59319f4dcde89e74d29f66079f16fe1e"; + sha256 = "b0efbdd458345bcdb6c15dfe46d5f9519092ceb33413b1fae1003016ce940290"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/pa-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/pa-IN/firefox-113.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "49d05fe43a1ec88b45d1dd04dd9e980a61db203da49f872017f361179a4bebeb"; + sha256 = "b186a93c7fccac1fe4deb24ca23b22a6293bfac6ee317cc590082a2024887694"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/pl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/pl/firefox-113.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "b90306abb2e6127d2d123451b70fa4a776e72a47eda8b427c134297a629bf426"; + sha256 = "99a25412bf874a6fd2f7fbe3fe46505aa3e0c345fedd175a65af10aae28c516a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/pt-BR/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/pt-BR/firefox-113.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "761fa6623ec00fb7b518e43f73ac76a02c8194603ea262fd823b059b1d9f2593"; + sha256 = "991d620b7a40de1d6310aceafd9fe22aa10daad9318075307eafc70311b71b1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/pt-PT/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/pt-PT/firefox-113.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "18b3e492d284bf78317c58f239f7f39f14a4f37df2663ffc81b878c62efb7493"; + sha256 = "44495cb1a9eb55e452b2fa0b0bd5a1006de226df1509f5f1c5cdde39e666792b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/rm/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/rm/firefox-113.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "092f0bae7448482f0ff1fb8d7cde47205508ec42d99d3531c3f3efade0cf59ef"; + sha256 = "24af496e1c7218dca89b4d8a5f2367a70426fe6cd5dc6bd9e551923c5d51e069"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ro/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ro/firefox-113.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "457bc780c54c626e50b8252aa87b2d140433aaab5d96f49893fe16d0f4c22e6f"; + sha256 = "8aaa752798ebdcc259a3bcc7ef370da18c778ed8b2df2a675f1fedd040b15f21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ru/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ru/firefox-113.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "63ae2db68cb0a21c06ede98873e65c680e3edd4e751d660d7b8adf9363d9ef88"; + sha256 = "d24396f812a3cde68a0a83a5acd3f0d4eb502ff62e24418c3e266f1d09e09f8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/sc/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/sc/firefox-113.0b7.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "d22bb9f57c3ef7c57d8f35ad5ccf875390509c7a3526d71ae82abb465e3ca102"; + sha256 = "97f73e27c73bf8ba870d72eff48de1d971bb10e3fc3de03780fe289ce5262d33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/sco/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/sco/firefox-113.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "17b5df121066163f0d07b8a19e4bd9c33a00748863a28806862a40f8cb34cd5f"; + sha256 = "60cd1e7883cb29806068d0ef5bbb934de4e48e623811ead5629ecf0d4ea5b115"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/si/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/si/firefox-113.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "59ca4a57fc0012526fe8bb1b256a377939bca310ecade0ad2b067d32357d1227"; + sha256 = "bdb59fb3b57680543d0fe894cc314cd0ec5c9a3f1c6d6dbbb44e8d7baaad56e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/sk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/sk/firefox-113.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ff7ce0af4e5f9fd3c0add9772dc08989463d46949fe1b7b33ee73e18b4b508f5"; + sha256 = "ad0ecca0413e08d0b49a085bc950e19aa9970f667e01c401a2089c9d05315aaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/sl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/sl/firefox-113.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "21e7ffc5c0618fa50a5b1e5ccc073c2fffcc638d80f3abf40893a5e52aa43dcc"; + sha256 = "46b25cb52965094069ad9aac3a6b45844692744a0209dd50926e5f6b49d0f31b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/son/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/son/firefox-113.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a6d27a518aa43eafa46b137824d7151bd0293feace506ee7d1f7a083d85c940f"; + sha256 = "2a47d6b10bb507f36271be9d118ae35a721fbe9b3cf8d2d76017c24cd5975a61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/sq/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/sq/firefox-113.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b745dd2a0c887e23fda2fbad199a16a7416e33068328c6e194a9726c03ffbe54"; + sha256 = "41b5d5e93ecc2b0570b3b8c185e128665fdccf1780b8a6ff9ad2c8c035831805"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/sr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/sr/firefox-113.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c2f35ae6041a1e958ec8f68937ea0d0f844a709c403af03a5727396e12c6758f"; + sha256 = "f019cdcd4e5f467dd3eaf15980365267d0402575f5ce9b6bd0a003cdcb035f6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/sv-SE/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/sv-SE/firefox-113.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a3192a4838032800f991da43c5c2b318b2d15b9407e7dc23a706cf19c755cf2f"; + sha256 = "19c4331d9007ba6c6872c628538217ca3749e155c32bcbd9664e30ec7219ca37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/szl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/szl/firefox-113.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "7e2a1c32a8ff9950ad66223b28a79eb0d3c6cff4166851f96ed7ab6ba95e8546"; + sha256 = "771ef4d8ce89be13a5a739b200607729f8f4ac908dda9cc3ac0eee2faaf35879"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ta/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ta/firefox-113.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "cc67465e38045b741ae259eab51a27414f7f3bf757785411d5ced4b98984eded"; + sha256 = "fe452dc7e401d7467ddb12b32e611ef8881b6c8e6cfab11df6afb4e0d0328958"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/te/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/te/firefox-113.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "be2a5747ca247cd68607497824da890dd7da8e983470f0873311c6ec26524003"; + sha256 = "aecef1993754956f876a4302f3454caf412576485f7d38f502cdc72a8d65df3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/tg/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/tg/firefox-113.0b7.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "7fda21f7489d052d438c5d5033e2ea045cfcadee6c9408b6c50a59c201e886cd"; + sha256 = "5ae4732fdf871db600885123ad91305df4969a378c4c409103de0770aec5166d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/th/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/th/firefox-113.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8f9144d196b6a2c3f5856763b956dadb7602425e3e4ffe3ea30f7c48946b5f63"; + sha256 = "741e664e3d00f238509274c1a7c1f20902c712e381c95cedf568f603fb85b088"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/tl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/tl/firefox-113.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "127d9264a48a3b6ffa2fe0add6d46a29a190920e0646d080305e7b7bd9b5922e"; + sha256 = "4e10eec0fa48f60c7123fba8a479612ea0bb47c2bcaad168528cad050073de7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/tr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/tr/firefox-113.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6b46075ca55880d2ef1aa73a5cb92fbbf4b838eabca6c86d041cdf51b9d64dd8"; + sha256 = "61ba2b005fe27b459ae2c5de78ac14134e8446033bffc5bf175ea6e2d5548a89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/trs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/trs/firefox-113.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "3efabc75692552a301377bf8d819fb6ee46136c75c3cc3b58a5d63f9ef7d8ae9"; + sha256 = "05c725cd98de4253d722cedcbf033133f7e2346118d6316488bd3299f3a4f75f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/uk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/uk/firefox-113.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "757dd41529c2c9a3f4564a0c6af3e369ba53a03e17572efb9a9c793b370bbc84"; + sha256 = "0e4e230d74f4d08097a293da6c6ccc94cf2b800b0af3d6aed20b5ecf769fe7ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/ur/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/ur/firefox-113.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "47675d1d8851f84398cbdbcf3efd631c873c5b422280e51e7c996668fbdb57e5"; + sha256 = "662d4c1387fa9063cc0535c163ff80933b9378837b373e5e8df4cbfa4329bd4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/uz/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/uz/firefox-113.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "0fbb8d13adff4ffbfd3e9b1b3f1c9eb673bacad69d4a2e89bc47014977948d23"; + sha256 = "9af37cd5f9661f0cb01c89b8bd61c889b70f2cdd8a583df1ef3c8aadecc3370d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/vi/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/vi/firefox-113.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a607c5e943f84c466ac1671cd9a4ceebc3601bf51709f815fe7f392d3b5c6308"; + sha256 = "66f40d7d536fd411fd192365b41dca2b3ececd0ac59a23fc8ff964e54cea2866"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/xh/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/xh/firefox-113.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "fd38317380cf41829a49fc3af8b18c65094bd8eba8732691f1cb809bf96b72aa"; + sha256 = "8da4a41803499bafd88463791de9b4fe9bec2c658514b79b58df86810c0a2288"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/zh-CN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/zh-CN/firefox-113.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7b5600dc2743e3c8f506cb5dece02da7d7b0c40704c569fc963353391c58cb17"; + sha256 = "c09c8106a85c63e3a483cee1a27b2b67d7622633b98c897cddbd0ca669aa68ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b4/linux-i686/zh-TW/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/113.0b7/linux-i686/zh-TW/firefox-113.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b3395791485ff4c6adb0886f3c77ea9b9fea4b6ffb298349ac109a948a7dc377"; + sha256 = "0ea6d72495775d286552c33881d3dcde0e77bc9b740c18e0cc492b875731be9c"; } ]; } From c21cc2ada2725d897d9480cecdfad8d68639385f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 07:40:07 +0000 Subject: [PATCH 139/337] python310Packages.python-periphery: 2.3.0 -> 2.4.1 --- pkgs/development/python-modules/python-periphery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index b52ad018d57..feeb22373d8 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "2.3.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "8a8ec019d9b330a6a6f69a7de61d14b4c98b102d76359047c5ce0263e12246a6"; + sha256 = "sha256-YdRh1zaYKm92boeHIKsQpoFR4ujBCGYA2TiaxH5A6Io="; }; # Some tests require physical probing and additional physical setup From c7c41577f890d7745d91dc07a555c2e23ad99e15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 08:55:02 +0000 Subject: [PATCH 140/337] python310Packages.azure-mgmt-applicationinsights: 3.1.0 -> 4.0.0 --- .../python-modules/azure-mgmt-applicationinsights/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 9578143553f..2f2c1c72b57 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "3.1.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-mFUKupq4IXywGs6aQQYFYSNNH9PCNxicS1mRneSdhHU="; + hash = "sha256-UMPbBVc+DMLVYxSgVW+zRu8F7EiawAD01yDZLGtkfgY="; }; propagatedBuildInputs = [ From d45ee7f0c9b9d41e39bdcaf3bd9aa94eb636fb27 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 24 Apr 2023 09:17:34 +0000 Subject: [PATCH 141/337] okteto: 2.14.3 -> 2.15.0 --- pkgs/development/tools/okteto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 5282ecac886..c0b2035c7da 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.14.3"; + version = "2.15.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-E96IAAbWmFIQILUU3WLjX6NAXzwIkrbEgKUs4wrh8z4="; + hash = "sha256-+fIVkkx4UVmHnAQT2nXmBARvUsemiD42LZI3kmt/nX4="; }; - vendorHash = "sha256-b2qxvP9spXEJVYOq7o0VG2WOxzUchwtLaY97/2IYoV4="; + vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE="; postPatch = '' # Disable some tests that need file system & network access. From c0649e3c5ac98340060467953c82b25b4b7b523c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Apr 2023 19:20:55 +0800 Subject: [PATCH 142/337] transmission-remote-cli: add missing throw in alias --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4f00b0e30c9..a2bead6ca68 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1628,7 +1628,7 @@ mapAliases ({ torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 trang = throw "'trang' has been renamed to/replaced by 'jing-trang'"; # Converted to throw 2022-02-22 transfig = fig2dev; # Added 2022-02-15 - transmission-remote-cli = "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 + transmission-remote-cli = throw "transmission-remote-cli has been removed, as the upstream project has been abandoned. Please use tremc instead"; # Added 2020-10-14 transmission_gtk = throw "'transmission_gtk' has been renamed to/replaced by 'transmission-gtk'"; # Converted to throw 2022-02-22 transmission_remote_gtk = throw "'transmission_remote_gtk' has been renamed to/replaced by 'transmission-remote-gtk'"; # Converted to throw 2022-02-22 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned"; From a6b9a1e5c75b6e47695ab85ffab371ca275adec9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Apr 2023 19:22:10 +0800 Subject: [PATCH 143/337] kexpand: add missing throw in alias --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2bead6ca68..f5c7bfad339 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -782,7 +782,7 @@ mapAliases ({ keepnote = throw "keepnote has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-01 kerberos = libkrb5; # moved from top-level 2021-03-14 kexectools = kexec-tools; # Added 2021-09-03 - kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 + kexpand = throw "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01 keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22 keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14 kgx = gnome-console; # Added 2022-02-19 From 6196f9de5e504f3f55adb4d82241f7e78eb2bde8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Apr 2023 19:22:55 +0800 Subject: [PATCH 144/337] alibayatana-indicator-gtk2: add missing throw in alias --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f5c7bfad339..85030c94348 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -814,7 +814,7 @@ mapAliases ({ letsencrypt = throw "'letsencrypt' has been renamed to/replaced by 'certbot'"; # Converted to throw 2022-02-22 libGL_driver = throw "'libGL_driver' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-02-22 libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 - libayatana-indicator-gtk2 = "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 + libayatana-indicator-gtk2 = throw "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18 libayatana-appindicator-gtk2 = "'libayatana-appindicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 From e339d7b79aa5e4ba58d71218c9da7c3ae9aa75fe Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Apr 2023 19:23:41 +0800 Subject: [PATCH 145/337] libayatana-appindicator-gtk2: add missing throw in alias --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 85030c94348..482d679d573 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -816,7 +816,7 @@ mapAliases ({ libaudit = throw "'libaudit' has been renamed to/replaced by 'audit'"; # Converted to throw 2022-02-22 libayatana-indicator-gtk2 = throw "'libayatana-indicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18 - libayatana-appindicator-gtk2 = "'libayatana-appindicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 + libayatana-appindicator-gtk2 = throw "'libayatana-appindicator-gtk2' has been removed from nixpkgs, as gtk2 is deprecated"; # Added 2022-10-18 libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 libbencodetools = bencodetools; # Added 2022-07-30 libbluedevil = throw "'libbluedevil' (Qt4) is unmaintained and unused since 'kde4.bluedevil's removal in 2017"; # Added 2022-06-14 From a8377dd16d83f57eec55dd52529640202ed71c21 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Apr 2023 19:30:55 +0800 Subject: [PATCH 146/337] oracle{jdk,jre}8psu{,_distro}: cleanup alias --- pkgs/top-level/aliases.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 482d679d573..1dd58339234 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1860,9 +1860,6 @@ mapAliases ({ Its new location is obs-studio-plugins.wlrobs. ''; # Added 2021-06-01 - oraclejdk8psu = throw "The *psu versions of oraclejdk are no longer provided by upstream"; # Cleanup before 20.09 - oraclejre8psu = oraclejdk8psu; # Cleanup before 20.09 - oraclejdk8psu_distro = oraclejdk8psu; # Cleanup before 20.09 posix_man_pages = man-pages-posix; # Added 2021-04-15 riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05 riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05 From 41a52f6d2355b2c087f0bdae982a8f0bb85526e0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Apr 2023 19:31:30 +0800 Subject: [PATCH 147/337] riot-{desktop,web}: cleanup alias --- pkgs/top-level/aliases.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1dd58339234..dae85e157af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1861,8 +1861,6 @@ mapAliases ({ ''; # Added 2021-06-01 posix_man_pages = man-pages-posix; # Added 2021-04-15 - riot-desktop = throw "riot-desktop is now element-desktop!"; # Cleanup before 21.05 - riot-web = throw "riot-web is now element-web"; # Cleanup before 21.05 sqldeveloper_18 = throw "sqldeveloper_18 is not maintained anymore!"; # Added 2020-02-04 todolist = throw "todolist is now ultralist"; # Added 2020-12-27 tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 From 7fce3da6da337372f2d2ec5e23810b4d8c0246fb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 24 Apr 2023 19:31:51 +0800 Subject: [PATCH 148/337] avian: cleanup alias --- pkgs/top-level/aliases.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dae85e157af..28e9c8e40df 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1823,10 +1823,6 @@ mapAliases ({ zeromq3 = throw "zeromq3 has been deprecated by zeromq4"; jzmq = throw "jzmq has been removed from nixpkgs, as it was unmaintained"; - avian = throw '' - The package doesn't compile anymore on NixOS and both development & - maintenance is abandoned by upstream. - ''; # Cleanup before 21.11, Added 2021-05-07 ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula"; dina-font-pcf = dina-font; # Added 2020-02-09 dnscrypt-proxy = throw "dnscrypt-proxy has been removed. Please use dnscrypt-proxy2"; # Added 2020-02-02 From 8d40a0ecaafc620540835651865780cd2f045270 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 24 Apr 2023 18:49:37 +0900 Subject: [PATCH 149/337] bedops: fix build on darwin --- .../science/biology/bedops/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/bedops/default.nix b/pkgs/applications/science/biology/bedops/default.nix index bde774c622b..d455e98264c 100644 --- a/pkgs/applications/science/biology/bedops/default.nix +++ b/pkgs/applications/science/biology/bedops/default.nix @@ -18,7 +18,20 @@ stdenv.mkDerivation rec { # We use nixpkgs versions of these libraries rm -r third-party sed -i '/^LIBS/d' system.mk/* - sed -i 's|^LIBRARIES.*$|LIBRARIES = -lbz2 -lz -ljansson|' */*/*/*/Makefile + sed -i 's|^LIBRARIES.*$|LIBRARIES = -lbz2 -lz -ljansson|' */*/*/*/Makefile* + + # `make support` installs above libraries + substituteInPlace system.mk/* \ + --replace ": support" ":" + + # Variable name is different in this makefile + substituteInPlace applications/bed/sort-bed/src/Makefile.darwin \ + --replace "DIST_DIR" "BINDIR" + + # `mkdir -p $BINDIR` is missing + substituteInPlace applications/bed/sort-bed/src/Makefile.darwin \ + --replace 'mkdir -p ''${OBJ_DIR}' 'mkdir -p ''${OBJ_DIR} ''${BINDIR}' + substituteInPlace applications/bed/starch/src/Makefile --replace '$(LIBRARIES)' "" # Function name is different in nixpkgs provided libraries @@ -27,7 +40,7 @@ stdenv.mkDerivation rec { done # Don't force static - for f in */*/*/*/Makefile ; do + for f in */*/*/*/Makefile* ; do substituteInPlace $f --replace '-static' "" done ''; @@ -46,6 +59,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ jbedo ]; platforms = platforms.x86_64; - broken = stdenv.isDarwin; }; } From 12942b52df1bca7339aa4fae9e6cd99bfdeb8c2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 13:20:44 +0000 Subject: [PATCH 150/337] firefox-devedition-bin-unwrapped: 113.0b4 -> 113.0b7 --- .../firefox-bin/devedition_sources.nix | 810 +++++++++--------- 1 file changed, 405 insertions(+), 405 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index ec160a8e375..f0f5d4ea001 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1015 +1,1015 @@ { - version = "113.0b4"; + version = "113.0b7"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ach/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ach/firefox-113.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "0fb6cc894e45447bb6ba1f5638e716619f3554c71fffe85e240a817811d1753f"; + sha256 = "904480f72f24a699d32e5dce26390f4153fd57f54a53dce954490a6b5f971506"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/af/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/af/firefox-113.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2524ea4c6a0c7dfe51f496cbff0790599550bbb62a191ede3a696ae09cb4ce2f"; + sha256 = "7b1268005cfd5927c6f920e459f50779f45818213f91e8a53b57057714f517b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/an/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/an/firefox-113.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "efab5b1fea7d0f04ff72dec207f31794ea728e4c95a645b6ed69d6491ec07d72"; + sha256 = "ba2d1362f5fca90e0f0948dcedb903a1c93e9719226f6881eb2e3a1008c054ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ar/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ar/firefox-113.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "a46096e83028a1026c1123d13a05823138bf19971cf12b84f8bd3806e668d13e"; + sha256 = "16f827303e864104f4371487018a30f8e247a36c16082006f2d63bb5b3573325"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ast/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ast/firefox-113.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "41320331326b8cac13cda8963027a867c77a4cbbb2ea495e413080cd0c41eea8"; + sha256 = "ecb3cf47840ac0129f493e5c982d1b81c913f769c227d33a1ee15fe35a61e468"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/az/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/az/firefox-113.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "543670c4f3ec4823fcf594f45ef2c1a297f76f53aee3501012e7a4372ae211e7"; + sha256 = "cf2146d519b5e7f1982136cad7263f84ff0aa1da2dae8b2215ffada06d118759"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/be/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/be/firefox-113.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a3b801f43fa0c19a1a17d9ffb979782f0450ed318e061dfa85c1f7b00be51ff9"; + sha256 = "18131d1b168db3653cd083db821ce5e956ade7ddb0701c5abc9dc0e847ed4f6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/bg/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/bg/firefox-113.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e71ae08e0ff78139cfbd35f98203df9398ba64e98d5fb4618ce899a5b3ca3f08"; + sha256 = "3f380d503ac50e8865fb48d5b84bb10eb23fbdbe7ea208df5616fe8bad4ff428"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/bn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/bn/firefox-113.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a9475fb211a305dc7d3614f7ba2f9eb259cc94852c2b2a4d2009400a3433aab3"; + sha256 = "b1751aec5860dd22aa6a9cc0f2964b8ac6f96b552d8efceef3ff1803406d448d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/br/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/br/firefox-113.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "8f5ff443b2ec5eaa68e732b3487983443a1cb2e6dbc9fc97b521662862fe78fe"; + sha256 = "a3733a27b0262363581c59b8532cb49bd56ab44847a0313eb2b3e184b1539500"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/bs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/bs/firefox-113.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "cd311989d74d7192b7b5011901317a8fcaecbf1b35eb8d9eafcbfcfd65b31d50"; + sha256 = "75c5f1ba4b12975722d9807e8b90bbb29f0abaded7bd695d43089136df21c58b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ca-valencia/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ca-valencia/firefox-113.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "020ddd0e07609a6a8d74c3b7a8f84986320fbd711df7a846eede70f57c92fa61"; + sha256 = "d2db9138d76537082ae38a985c1e9b2f214ff7d1cf559be5c4c608f23ec580db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ca/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ca/firefox-113.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "5242da58d848163ed6f6c0950f6b15bb2695039f1e36766c843d4e6d24029a21"; + sha256 = "5f522615141a6f32bd18632a436028cf11d906558444b46f20ff183b0a606110"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/cak/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/cak/firefox-113.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8f8be24b896cb9dc91832f85afacd07fda9cea47b44d4885b758b6f42f4ba8f2"; + sha256 = "e92a2832d3beb4578f072279f7a77db465150178eff44be7edc73681dad29e17"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/cs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/cs/firefox-113.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "13d4316d04e1dc777318c7fa45ac162904bc073947ea535c1085c394e9ade361"; + sha256 = "5d1a37c769567bd7cd2115a714a1c3566900b771916c396e961a7b6013f5a57a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/cy/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/cy/firefox-113.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "bca6e4745d235399627caa12e64d06b6ee98c21656d686d15ee27d7bc53d81ab"; + sha256 = "644bb3d45dfe1ba0b321928f4a16a57c3f814bcd1b94ed8ef053fa5789f9309a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/da/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/da/firefox-113.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "6d9e212af96a91dd994c5fbda78e17038e8366ba366ee9cb6ef2cb0bbd6db6ab"; + sha256 = "9d811d2988d69aaf992c689cda3eb46d0211d1c4cbccd859b8a81534362f4f37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/de/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/de/firefox-113.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "33cc3250cba675b4b100240965db4cda1969c1fcda7eabc83d28cf3496162296"; + sha256 = "aba4b1bb14fe58ba19b3529651d37cce6e89e5eb16f9013cfce442015583519d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/dsb/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/dsb/firefox-113.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b7d1f3759e36600b0294f3067075117c74f951867704a6a87a1807608b760b79"; + sha256 = "1993f03e84abca0f8b6b015f97f39ad47026646b672364dca361b4d0388e3a95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/el/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/el/firefox-113.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "a5e8f807f9f0afc83da34b5f684d1251b9057b1a48f0ea55dcb3a6d2b0b5827f"; + sha256 = "cbe7117db745784ad6072cb463315decf5a55a467f7ad0562ce7f1d0ce565d6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/en-CA/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/en-CA/firefox-113.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "655a6ac0aabc242fbfe3e17bd6a4e0aaf4bc35aafbaa32f776e85f4c8a4fd947"; + sha256 = "d3b9f5c3e10fa478db7a5455182e4bb5e8a8e3716c085ce4774852f1b2570bff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/en-GB/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/en-GB/firefox-113.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "9d59ddeb52188ed384791ad39d6fab27456164ed9fefb05c3a715a86ddb73199"; + sha256 = "bf8e2f10531f0ca57d3baf3a8e0abfded47c37ed4552fa1e529d4a092a6cc974"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/en-US/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/en-US/firefox-113.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "335d6eebce1d079832dc165b938a2e94438bbdd7e4067b96a5f8c524cb3fdc10"; + sha256 = "e899d94e41abd41bc42fee30fd183608b75115fbbe6ffa636ea0fe0fe88659c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/eo/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/eo/firefox-113.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "b5dcd0aba20d3041d05c3fb70e1f73d95129fca80ddd53a1eb6eaa862bb5f309"; + sha256 = "99dbb7b56bdf64cfaac651e2eaa10467200b87eea8f1e277a0b9f64bce16cc71"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/es-AR/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/es-AR/firefox-113.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "59df349819e4c7881696f1224b7beb933420fbf7b7c6c6bf2abcdae15d6c8ef3"; + sha256 = "901fbd7d2999d12bf5a5e617dfae8b6b445193d247c81126c1edbc9b1ddec431"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/es-CL/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/es-CL/firefox-113.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "243e5fb75f8fb0ec083bab5e83774d6d05e1298db707c746a24a0803cc725e9f"; + sha256 = "410146753ff37a0580d2bb9b02f4596a3ede391f641c091f5cef79ef077374c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/es-ES/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/es-ES/firefox-113.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "60fc4ef8ee54e662df20b7cf425b5777ddc36354e3ebe58cb41555a30a1498e2"; + sha256 = "b60435e0de94a0e2bcd080c1d8f3133372c7ec239f559d835dedb54386c75f5f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/es-MX/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/es-MX/firefox-113.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "563d0f9ef8bf7c69d5197358522235a24782b49907989c186040d7170ae79c87"; + sha256 = "8ece59e7a6addd468fea7b2c87f9df88e19203cb9ea1c98a29062eba6b41a1f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/et/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/et/firefox-113.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "68185bd9cd373634cffd669740f6023e866eb4f37ae3241fac2d9c864342c1ef"; + sha256 = "1d6ced45ebe3eb42fc592694e8f1d1954fec5467c038646990609e6f630594f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/eu/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/eu/firefox-113.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "13b5e024b8c288f934669f54a00478fed905a2885e4b0c1379d4fe00438af3a4"; + sha256 = "f63e74a698feb8d9a55ffa079b7414ecbf619523caa4bf542e86a9efd5203f48"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/fa/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/fa/firefox-113.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "4d349fe8db19a5766d7c5e8add14a7ab94ad2403df932ff1e656786fdcd93b6b"; + sha256 = "a643cd7cc4a502e5053772c366f1421f249491ff04f1b68d88e410c947cbc7c8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ff/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ff/firefox-113.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c86494bd989c0f777d4d90ad950b72fc69a768b2ff728092f6c53a24cb9844f2"; + sha256 = "6d6a565774456f951fb785112c4fa1d63e68439b0d3177817d014f6befa9e8b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/fi/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/fi/firefox-113.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e05070b60800ba97773d00bd6a1fc397c268b489e535848d17f144396c2e690b"; + sha256 = "07fe4793a6696379c7242a7da0343ac8505ed8b84377569ce883274e46aed381"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/fr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/fr/firefox-113.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "aa94ee3eff97c7e9ca31f25c45cfd40f0292a27ebc7e399a4318dfcb3e893cef"; + sha256 = "afeb18e912c4118ab3054b2f4bc796476a9083b42410cd18d9bed5d3ec7210d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/fur/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/fur/firefox-113.0b7.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "71592b4a094dbf4fa153a25f368fedeb4338bd4bbcd990ed8779afe72c90c8c5"; + sha256 = "609f39ee5320c9211309f327e6ad63211acd12c97cff1e8674428ec42434d0e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/fy-NL/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/fy-NL/firefox-113.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "93c4035a51d20fd83d3513670618b53213c8cab25bd496a0665b2a0849d24a70"; + sha256 = "5293be26474402ac9c4a5c367a8a4017c14197391afaa1144590fa00f7d05935"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ga-IE/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ga-IE/firefox-113.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "24db4cef5050cfa47827acb0da6d539d480ea2c847dd73700ee5879c8759a3aa"; + sha256 = "78aab6fa6606da16284cc58dde870e33e1addb15b1c00aee160ac487e1981a2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/gd/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/gd/firefox-113.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "97d8d4fceb01fd352220e9b98e107338c7642c00bb960f20fb68aefc7b189b00"; + sha256 = "518cca0d0371fc0c8dbb61a154c8abae8c9f803a4dd3acd3e5d7a8ba7653fb42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/gl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/gl/firefox-113.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2b91f7aed363e5fa3b10a14b3a5b479546cd67e17490715d4d714634f0245b1d"; + sha256 = "3bc833f9743faac0e6f71a51b2c7c726f092be6f814a6788d00427913c594e08"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/gn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/gn/firefox-113.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "292d36b9a37dd7ad6421082f317b8ce9b2e01230e24e524418cad8166a8d7423"; + sha256 = "66cac912362e1c5d5e76fa08928de89d8c57c8fb33a6370a9359efcc9a5598c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/gu-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/gu-IN/firefox-113.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "68a5ddc18975de60ff79732f07c6471f79e7db6977b4a7f59709d4661efdf3b7"; + sha256 = "3f15332d45dba91b166f8270d55d58103ee230134748ff9b6c4f4c4efaa54661"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/he/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/he/firefox-113.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "dcd8876a30d4807a831d771ff4450711098373c23bfa43c0d7810dafb8b67c57"; + sha256 = "219acf2c6f980972fe5ebc9f9c6c04fb401a8a0a22ca8ac1f8c545a489878f60"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/hi-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/hi-IN/firefox-113.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "375ab1e64b8ecb2b2b42b9348f64254a01a11213a8b1ba6dd7febe6c5b5bf242"; + sha256 = "e6dacb43db1c9656ddd26ba0f429503efb0f6977b0b381f5aba7999749dfc026"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/hr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/hr/firefox-113.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "bcd791204b366c601bfffabf8815e3f50fd5baf16ed7dc4005e4d567be37adbd"; + sha256 = "b9b190c090bd48d0bf1c73f70a4502752c188ca64ae7d8bad53203e2028831f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/hsb/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/hsb/firefox-113.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "8ed56ed8e9b4323d6a2e6138e7756d384331fe975f5ac792ddbe744dacbde748"; + sha256 = "c1627ebc76bdcbf2692ef4d0467c426074f65d30be16a5cc69efdfe897f0f2f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/hu/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/hu/firefox-113.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "038ee88979fa635c4b436e9f52a64fda9e9bf552d9687246c1d70a7332272b9b"; + sha256 = "a9e451516a5e50292d68bd0b49cf1a32ea83411cd0f6e1d11c367eedeca268c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/hy-AM/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/hy-AM/firefox-113.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f8276de6b8ccae8c7c08c0f58f2987755b0d56ce450a90dba807541bf415c595"; + sha256 = "cd30ae08c0453f98bf1d79d5dff99d8b811e20bb1f061fee1408be4ce4241fb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ia/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ia/firefox-113.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "46282849748878cc2238c86f9bf7ae0c72fa9e364d13e63050be4776e39fa7af"; + sha256 = "16b8c94a54b90542432913c8a060a94112793ef843c5167b0c7a2863d97a5cf8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/id/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/id/firefox-113.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1423f4e631414d9485598624c4537b04173eb3cece13461a86d0d511d5ac66e5"; + sha256 = "9634725ca373762e064cd41ede11da39ad499d339c205801288d2c3f11cfee0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/is/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/is/firefox-113.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f286d939beb07e9f30bdcfe66b48b499cd6f74b4fe99ee4f07f87834ab5e7e35"; + sha256 = "b9e340c36cc47e1b6f9a89af4c7d6c30f404ae468bb3a58f429c615e89a80329"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/it/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/it/firefox-113.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "38e9effdb34a6c65899e5fa121256d63dc9f6fa213a7b70e0305ed41d01ec279"; + sha256 = "41678d492f758abf27c97538d3043f6c05a8fea7e3aeabbfffc5ab98681af1b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ja/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ja/firefox-113.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "bf8aea1bee94db6069d01115c388dee548676e1fb63c09a61d2241c3317a4e01"; + sha256 = "d17a8d120f183214d78fc62347283a1383ed515380ca873f9d2b2b5f8fcbad00"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ka/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ka/firefox-113.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "80af1ec4f933906c50f5511e389da05df1f969cdffeedc4ab36ad869ddd34e60"; + sha256 = "2e71482b95320045aab341cd7d97d612c510fe5fad6a19f2c6a0b80d8312997f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/kab/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/kab/firefox-113.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "47d4c4047f2021e9acb5746f5ff7f4850c4f94d62fa7ab4d364ad29af227561a"; + sha256 = "3fa02f44afccab0253897fefb2f07ce1ed7759647de43d1fbe6ceee33014ca4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/kk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/kk/firefox-113.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "b6faf1396886c0acb36061ce0b2b0a67fdd71be82067bd62b2adcff21500e081"; + sha256 = "11f53ac7580009ab76d3ff13119e045070e895d6395c472fa4ed7dbd331ac6d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/km/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/km/firefox-113.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "82622ac8d0127113ac2a6e540c47150c37b8905d751f077a1f32641b89287816"; + sha256 = "7e01d0bd4eabb8ac992c1aaae156a2c067eafa460732e211eebc5ec76e4259aa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/kn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/kn/firefox-113.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "228717419016c7592c90702176d432e49c768bed9003335dbbb7421370bef866"; + sha256 = "39f708827d6f4ad7d1603d4eed5afd9f3c90babb5901688abb4a55c57262c58f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ko/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ko/firefox-113.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4969f9f7ce79a4bba078be41fe7b920f31f9f0b9c850e3781e2ee5002aac2483"; + sha256 = "82afd31b4c9196785a6377889c298827d7847c86b30d789ecfc99196bca2ae16"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/lij/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/lij/firefox-113.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "9011c0d250d33ea3774311bf7c3906e17ae692c3bfefa40d494f87825a87a3c4"; + sha256 = "afacc323c92d0bf33f0ae63559f11a3e4cd04fa0c06e4f90354b1506539dcfb4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/lt/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/lt/firefox-113.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f5fb60877d144485be0be40df901f6cb54d32933029d4970983a504ddf3ac0c3"; + sha256 = "09c8ca7d8d53ca704add2df352471f5c4563530f50ab764eb2e078c0ec90a8cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/lv/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/lv/firefox-113.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "03b08f0cc65ecf085db89ffffab11380f29d7e7c4869a8aa6c63a4664f6d56c9"; + sha256 = "440fd1285552020c085a9dd310041fb6aab4ac829dde2cc7f8c9f0ceb122917c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/mk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/mk/firefox-113.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "8c1125c0a57e32d228d92f87250aeaf4957d28f8b29fab696492fe25fef40100"; + sha256 = "46a7a969d9237cae290b7a802dea2a3d12cdb73bff35c7ae0a717a35e74eacda"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/mr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/mr/firefox-113.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "560af9575fb685cdf45e65a539db6b750044b1282d8529d7b6e96111161449e0"; + sha256 = "f6f117c21c5e1a048f675f3f56e1078b7baa72c7fa912eb226f2f24afc54590e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ms/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ms/firefox-113.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c9184543f1f8aeb7cf1b4215666a51f454a8503a36eebd8b4d6398ba9cc3dfdf"; + sha256 = "b26b0b55e7c8bb66a249fe8632aed2eb2818b859841eac87d62d4a599ea71e37"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/my/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/my/firefox-113.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c1ba7a95eeee9f83f94d603ff97ff4e3cfaa2c45da285f10a923d0f635f33444"; + sha256 = "6e4f472523a5c7d3a5a792d6d3acbc198b9cab875bec626f81f3d906a4cb6e40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/nb-NO/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/nb-NO/firefox-113.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "0214c5f94fb2ab276109c8b058548ba2761a88e9b306d00cb0bbc0cc9ed82598"; + sha256 = "f103226634c1172db5ec9584a5ff6feefa66cb556e0d6ccd0c90e7681b7d8ac3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ne-NP/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ne-NP/firefox-113.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2370de43beb5baf22bcfadc5c4c36e80bdfc4165948b2bb7ad3051b559074945"; + sha256 = "30a16efbae9e82649fdb9a15bb99f0969de95634494a31d22c2943f6ce1167c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/nl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/nl/firefox-113.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ea7b19a009498e0e30e10bc8dcc180d2b564e8e01b2c85c3ca1c9d44c6571c6e"; + sha256 = "729f9c30b71ed8a5ad1037d5af4b3184008d519ff4e8244419f0b26593a72d91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/nn-NO/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/nn-NO/firefox-113.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e8f79357a90ca197a547e27215ea3f85cc6ea88190e0238fabec0cb07baa9d99"; + sha256 = "0d9070376e08708593310dfb520a1f5ea8702ff4decc361548e1600734d0d75f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/oc/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/oc/firefox-113.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "185146385971b16174ffc56c5a9e7e3dadea43a1288c32759929db0fe8412ced"; + sha256 = "9f0ff41c53c1e7e6aab38994407f22ef123ef9c158159042a4d2ebbae8d749de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/pa-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/pa-IN/firefox-113.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "4e2cd0af0bd3109b98db82ffc5bee0932e9a5dd3e43136e1a0b82bdc58bd6af2"; + sha256 = "8a3f9dd30d6bbbafed57185aec40a035b125d0a882789db2b481a38e1d8c5a5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/pl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/pl/firefox-113.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "89e76380d3acc65eb9fcb82f982ae436f7a863d8f3f48e9e2df57d00253c5496"; + sha256 = "7e25dd5984c2705e27538cad6942b5558546a712c6d1f6a5ef4d08b294cb5c07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/pt-BR/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/pt-BR/firefox-113.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "39543bee91267117a0470adf00b69d9f21348a6fc3de1e27077dd2b5807b2613"; + sha256 = "3a005c4ec459f8174a8e7394b67fdceb70fbf56dc5cf72f946948d7fa74cdea1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/pt-PT/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/pt-PT/firefox-113.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "78353c4e7e4a14466a276cf45421c5783a408e2ad9a3fdf967cc23e6b000800a"; + sha256 = "e47121f9027130c5d02e2429521a3efec465213c95c060789b7b0e714eae3143"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/rm/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/rm/firefox-113.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "1ed52804ef3d9186d7f911f3301f2660b751bc6685cff531844bdde4b5e5b040"; + sha256 = "222a29dfccd2c21a9843c72fed9f11fad0da72f480136323d13673986ea0bb07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ro/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ro/firefox-113.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d5da1b3c4186f52f87dd312b55ca148e3c7bf846fcb76d88c066d2dee253fe61"; + sha256 = "2597a1513b38528dace34e525b33386d3e5dbf0792b48aa4b62fc25f3d67a303"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ru/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ru/firefox-113.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a3be2839119265612c68a68fe9933cc80e8d2d770aa4805cd8f4a39a8bde5ea7"; + sha256 = "fbb3993a136f96f7718668b09d1ca9feb94c04cd6a02655d9678398a442bfc0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/sc/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/sc/firefox-113.0b7.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "b2e9d9cce625130180c36a97496a26efce2b647fed7cd2722c6c140bcfe62cd9"; + sha256 = "5c9dddb127cd8a70428f9ccdaecb9474704512cb02bb7d140f38697eeb623d86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/sco/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/sco/firefox-113.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "95ac4a4211d2b30dbb378dbd7b76be67933809b7cb5a38fa1ee9cb67bbfbe741"; + sha256 = "41ae4f7b72f1882e00ef8d9b33cf0ffdf625748ddc52ee304b8d78e1ec077ca8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/si/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/si/firefox-113.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "cf509aeeabd75e0017aead58d26f964c86d8dabe6bed4a21e2b9ca96b69da40c"; + sha256 = "67c03f9c84a2650347fc0aa76dc77f26a71b74e18a5c77f95e1b2c4139e163f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/sk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/sk/firefox-113.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "3dfd87d0bec5ada439d55b0cf30f6ee368b7fcedef7a1f55347f89ae29bb70fd"; + sha256 = "b56fc2fddfd3d876787ebdbbc1208e8a29a34813576e73d55a84172c2c1c953f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/sl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/sl/firefox-113.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c16f872446ccacdbf561b4492f05238f1eaffa7eec2da53dac5e1244faef1223"; + sha256 = "8c750fbba77e7b49d42bb484719c74018d450a6c5516e8b2a024c0fd15719bea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/son/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/son/firefox-113.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "fca55d28673767468d1eecf79c2ecac9466d0299aa47e15cc98318e7f62c9482"; + sha256 = "5d9bb8baeb303456076f1c98dc7aa80659a443a73ab570726269f14be87b49cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/sq/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/sq/firefox-113.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8d0022b899cbccfb0393083767b8a1d3751521e60a4b000ffc92ebebd0f9147c"; + sha256 = "7518c2f4f1f09808d0b716e33d7243cbe0b55e2c834d2ee40b935c944c635224"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/sr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/sr/firefox-113.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0ca3277be4e770c2fa36dd63048595bd462ec02d6b59d15738b6bbbe82bac525"; + sha256 = "4b4b89c31796374835992b795c08ed21f0421745bfcdb3f9b68e79ff4bff1696"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/sv-SE/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/sv-SE/firefox-113.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d1267346ef9c96ad80c615ba4824677c7f0d2abbadea41633c9a60594a22eacc"; + sha256 = "91db9de7d91f371a4298db03d8629bd1cb2e4e868e4c95562dedbbd49bea6b7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/szl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/szl/firefox-113.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "596eff230be38686e66b87fad5f00eb8795fa6d9d42f996c6cbf4c3979ebc6fa"; + sha256 = "003b8be1b484df93b4de7a9077a9b8b97e89ed82dd2b306b567eb842e4a54355"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ta/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ta/firefox-113.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "33048dba43825b4a5beec7183125bcc7e8d9b9c7ea005a57a58506888c432e62"; + sha256 = "49049adaccb8525aeb36faeb07801914531a137096e5c1eea0ceb7a51230bfa7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/te/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/te/firefox-113.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "873676b3f7b9f331fb9d98d1740739504dd4a56df179bbd244a9b3a3591a9fda"; + sha256 = "06e34ef0c76197eca191d62df4c6a849cb4cd4627351fcb6090fb9639aade635"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/tg/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/tg/firefox-113.0b7.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "274336b778a16ef103890bf1b6cd57e402ebb845e7a801d3dd922bb35808e1e6"; + sha256 = "a3e1c885eea43638ce62bcd62deac8b9b76b1540b6013d8b0ef05c428f2d0f8f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/th/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/th/firefox-113.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b20f4884edb96ee00310fec3c3692bc42f011ad648590d033e78c1afed666dd5"; + sha256 = "57b1c04ec60f273ae9feef932b5d0096ad463db6b62a6db3f03764a2f822dc25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/tl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/tl/firefox-113.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "264be78a43678db6eb62a70dc35a41720a5729eb476cb424ca6b72cff2dc1f05"; + sha256 = "4002f1898af05f4d96ef9d4a0c9c705761cecf09f065079a0c11daff98d1fe28"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/tr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/tr/firefox-113.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "aa17646494f43a8eeb760147c344e5b420c686612901067761ed3d0aca083026"; + sha256 = "c8a7d428026a566ab73a6ba83122212853bba0f91f31fc5c6181c6a0c5b5e99b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/trs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/trs/firefox-113.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c1a02c9c46c7f711ba337569b088b3e1884def1f0d200558e95bbffbabd088d5"; + sha256 = "4d16062e680f11e3a8cdf6f4f0766aa08942cbb0961dde90eca73b39e8dbd64c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/uk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/uk/firefox-113.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c69c6b60d83c75c0a043113c46ff7d246b68c3ccee3297bbc9f777d2cefb27fa"; + sha256 = "8ddf6b1a458dd29b2e48d1932f769f4f8e14747cc729d961b90600b252644c85"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/ur/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/ur/firefox-113.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "42d44f5032f7fe9ff52594f9a255cfc2bfd36724c44e3e3aa499743b25444731"; + sha256 = "6e78b0ebe0928c2d07e83bd8b225b696b5af16ebb2ba9d21dbe9852cf55a3c86"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/uz/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/uz/firefox-113.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9ce18b6b5aea21119fa363717ab33d4ec371d662dc622dcd994adaafd6af73df"; + sha256 = "891042453632d75882c03e9c81be0432f00ee63246f6a6e2e74075150c2c2646"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/vi/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/vi/firefox-113.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c72b4501ed8cec57839e1bc0b5185b29d8f02fa4860af9157a1389345aafa34d"; + sha256 = "088f09c4e0416ff6f9fbbadc51a5e723c62817952763e3081e3fa236f92f7386"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/xh/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/xh/firefox-113.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5c1e3a51f7acd068bafc97e0c44c0760ae95e79878e7a8875c044595919563f0"; + sha256 = "00ab887a9c4cc23886dfab5ef505619051300d106a5330cd49e3db931f645bd2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/zh-CN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/zh-CN/firefox-113.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4d9e592f2d50195d58e912f41ee4ad0a3eb081edf3e9f9975e9f81317b0e9cce"; + sha256 = "c1cb6bec43a25cb9c90ee5727ebb884c156b6200b9d267d0e546cc7b96ccf145"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-x86_64/zh-TW/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-x86_64/zh-TW/firefox-113.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6070b4f82733768a8d5a8a2b96a4458b908f754c752d42522fdd735eb89378b4"; + sha256 = "01564c14d3234f5bc83f91a43e5dd0f9267ae32d3cabdb5c980750f262ea31f2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ach/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ach/firefox-113.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "936e06c50e1f8c3c2072fa73fab8c421614dcecc65678543fe6c67510c5eeb0f"; + sha256 = "aef5a85c70f4eda63e2064e3d3ca9e092f5fde64eb5c923e2aaa875b26168f82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/af/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/af/firefox-113.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3079c5e96e5302a8847ca4a4071f3024f1d6f39e46a462b9dbb1042deb18c827"; + sha256 = "b857eccdda3dc411cfb65866bb5ddeac6205be53063b8760cd19dee14f86d9c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/an/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/an/firefox-113.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "76f086e64b6be05a48c37670186de699e359b54fa16ba5f68697ac752d7bafe2"; + sha256 = "0a3980ba3487e06ff1f21ed2e0a37f5d70d659c37c6466c577922d7d88720760"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ar/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ar/firefox-113.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b0c1ff9cf42030a36a556359f3ef83e614086032553f0203a9c38dc70f10736f"; + sha256 = "f8685a55a52d51a35cf7bf16bdeb2b0bfede51ccac0c14e38f4f8925b80e06be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ast/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ast/firefox-113.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "3a0bd2384b91e8adce81cd256936e1a2862d29be5e069eb85cf9ca7975e3344c"; + sha256 = "922c222ef1d0d80e3e7e4be0622bc650b766f4b3b9f402f5147f3c0b3fadff31"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/az/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/az/firefox-113.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0b2e6a98270c89a70ff66aebaa69695e172a1067c7d54b2023f184c3c9774221"; + sha256 = "a60b50dd59b78e871163ac0b5ca55fa61fd4ebd2a846dcbacf66fa4cb7029aeb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/be/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/be/firefox-113.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "a64d1846226a617d573871cf542dd5d2349a674d49f0a9b52532bc5a4c80e8c7"; + sha256 = "d4f837308217408b405581cc0d783c1b9ed5351c90fdbfb8305c359bdf433632"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/bg/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/bg/firefox-113.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4d1d2a660e8dd2e4cc2ba6ee9535382a7912e9849d74474337676e1fd9cd52e9"; + sha256 = "fe5168b1685423bdc19356ac0f1a097423a7222b9e1d90b09eb3afa451e3941b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/bn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/bn/firefox-113.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "64c394d10b8983b8bf15a0767c1a6b51d6d53040b76e16b0847ef5406ad891a4"; + sha256 = "22cec9e3cc96d426639071f18745b40591119024f3312878c05801dc32c21433"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/br/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/br/firefox-113.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "aa4b5ab4f50d6c4cc3453b2d5bb58b41dab9005530c4b9269f8c47dca16e6ecc"; + sha256 = "34b31fbdebc1e139adccf5710e4e055717df3159cadc4a6f8f236422d5363ce3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/bs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/bs/firefox-113.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "2c0a110869de26ea45bb443fc2edcb9418d278dc9ceafee6f22d34dc22d2b88f"; + sha256 = "6cdcac3fe41ede77156ee3966a766b47024c8ffdc89c1f782313d98df107fdfc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ca-valencia/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ca-valencia/firefox-113.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d67683b661851496ee79494fa546420f9f5fb22d33a245eea82097801a5eeaf9"; + sha256 = "ec4ff26d283aa11173bbaf488e11b7d094d37452a8f7d4bdc1f8c87d5d917c90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ca/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ca/firefox-113.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c3f16e4d7021ce63e47a452e6edb0c6075fef3c09e8f128879d679dfbe403b0e"; + sha256 = "b10585156835740b67f2e07fd150825b7755740f209eea34cd581312c8842a9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/cak/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/cak/firefox-113.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "9d81f66eaaf19bc9135e9d52aea1a021ceed08a2d9d94ef07f8bf686ae663942"; + sha256 = "366bd0bb3293972be9ffbe55b7b8c9f4905b76542d99ff889595d2977055e682"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/cs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/cs/firefox-113.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7ac035c2c731e604c83b130e36036c9843769b98f3a86b47fd075fdfa1af783a"; + sha256 = "1533541c191b55337bec03c3359de73df7a15add7e5ed98379e73acbfb8a2364"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/cy/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/cy/firefox-113.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "1cedddda8ac30189cebc851754b625c5ef76efa454e33316cab1416e0351cd07"; + sha256 = "b65d81efda7523d0610c260c0a5748144e95e26f14aa2e727b0b4791f4750b21"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/da/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/da/firefox-113.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "148906e2dc9fce96b7bceeab47374741995944472276d3cd8c5bed5546196118"; + sha256 = "eaa73335cbea22918c004f86609a06cf6d7c30340e1450fbbcebd7450237421f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/de/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/de/firefox-113.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "7d4fb199aa20dac726af832c42579642775a31a7ddbca5af95a0a12aa52e85d8"; + sha256 = "5fe6d48ceb126cd46c25ce3ebb7f15e50df0a3fc4d26ca93117616982200b9f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/dsb/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/dsb/firefox-113.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "85e1203438dee275e0adfd2797cd48f3af482fc96d04c7ef0e7ec501de371db1"; + sha256 = "9bc0caaae7b4f461de36e7f20fd21b51131dc7e8abf0e5827d55935b39222c38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/el/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/el/firefox-113.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f186e11acf6eacff7e053c84796f2f0f53f87c2294a86e1ad77cec621d51a9f8"; + sha256 = "218eb131f2bfc195c028aaa50044f3747f37a26470b4984934c48c233663f6cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/en-CA/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/en-CA/firefox-113.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a21f967a04c242b63be3cad6177bf14bdf67d5f1ea60d77158dbcd46c75be175"; + sha256 = "f0c1fea409ca35c48e5a7f0d5719bc15cd1cfaf763aef1ef47631927e1d76d69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/en-GB/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/en-GB/firefox-113.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "61021f235a7365ebae4702edd4481f8e085324e1f741bb6e939623e79e0602d1"; + sha256 = "435b3901ad5fcf72ae7d0b4109743e14ba7bbc4518d4a112901625eba7526108"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/en-US/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/en-US/firefox-113.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "91eb6d71d80f467bf090ea6667376dc4d93295ca4ae1343c1f30eff473edf367"; + sha256 = "517b8d26467c37e4910b3540c5c0ce9faf3d37ba80305407c0cb04b4f6f594bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/eo/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/eo/firefox-113.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "96e23c25b698f5fbc6cf71ba96c98e4bc3cd8f10bbae985801703afac46c04dc"; + sha256 = "b9db37aa326c7a84f6d996d0a98033e31d521971edd303b2919d06d51ff78aab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/es-AR/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/es-AR/firefox-113.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "c2014a1a80116f35e5626280c32ecaae3e2ebe431364c83b54ebba76bfd87420"; + sha256 = "f716a26d7032c412121225517610d4fd1c09c63476134d50601ffd15b7ba09d6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/es-CL/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/es-CL/firefox-113.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "05d321538080fed98010477334d86e62d8713c2ae877a7c9c9ec927ec69d781d"; + sha256 = "9170f9765104931645919def85a239a961f263a1b25c13b525c36f5d028e53ca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/es-ES/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/es-ES/firefox-113.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "0fb5ffabf790deb1cb8f7950645a8ee84aa6305c2935f4164a5db3bfa0b80b71"; + sha256 = "6c56fb1b0a2da884e265e75a7aea0f16dc9a640f24c514bad159099ffa0220e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/es-MX/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/es-MX/firefox-113.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6cc687f8c2a5719734c3c80cf53e4e850cea87762d444525fe1668727794159f"; + sha256 = "72f32b212eb7a8465acea4e85625e0b0c7e4c4212848ac1ae13456edf6945bed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/et/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/et/firefox-113.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4b65caba627743b26ee2b88a1468e0e59ed646c7afaef99a02d0ceee0ed3e20b"; + sha256 = "dcba25081390c7049b25ae54903b366d4911b4fd13cc79eb1273f9f510763e57"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/eu/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/eu/firefox-113.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "7e32b1640385f70aeea5a7cf893ee64b171f3f6582f17f7652928d0427e33894"; + sha256 = "d12c7bde3fb27f25cc5bad236f525e2dd02f0872843362ca92fd03cfc25608f8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/fa/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/fa/firefox-113.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "bacce7d98476eeae20c3763526d5058aed1af5397f451b23bd9357a5900ecbf2"; + sha256 = "a901cdfec6407c7e653b93895d148228ceab14291e996358b17f0c0a749fafc6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ff/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ff/firefox-113.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9684cd278984810d1fa0ece1e76938ddc755bf376e046801c75a5c1eb4831cc8"; + sha256 = "8395a7415eaba62b891e4e66ae003013cf08f586a107db9789d2717961950dc9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/fi/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/fi/firefox-113.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "3b089f8e6adc58219f59910aa56f8c5d1f337342a6eb42f5528e471c1e283386"; + sha256 = "afdb1af9895c2195a9c9c4b5db54b6e48df55ab2dfddbddaff93ca252e972691"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/fr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/fr/firefox-113.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f0d6eb3a151c190248bc1fb7f02be9cfbab275d3386bf521a2eaba01e43e0630"; + sha256 = "0dc7bd70e211e6a555b7434a2b65c8a1c032a127ca712196572ce16fdcf3d6df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/fur/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/fur/firefox-113.0b7.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "4cd849954469bc09633ce1aac32d81bb98e50e50172e57ff56a5190640968af8"; + sha256 = "144c002616a9d14dae8d5c31b1c07c4d9c9282dfcfd07c98920bc872e10367fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/fy-NL/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/fy-NL/firefox-113.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "de53ad4263cc6c171a1e38d47432c8bea4fe5ea60232bc57bc7e8ee13b363791"; + sha256 = "691459116c6ba43e5f58b660c80087079fa718b4c2fbfa68d1ef33b752edf511"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ga-IE/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ga-IE/firefox-113.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "97eaebaf3909a03f7155cd3a3bc6b2790f0b3baa3067c3d05da9c9290ded9c21"; + sha256 = "af274cb3086d5fb0ea838ab00833a016e3cd5cbca11086392f8dabe94ce993e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/gd/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/gd/firefox-113.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "23ca706b7451cfb8eaa635b53c1456d9afef76bff42b1df2d192cea357e2cbcd"; + sha256 = "9d01215949e0833f03f6f78b1194bfd5a98ada187f5541e8a33914dd62b7bb72"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/gl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/gl/firefox-113.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "fc0767d413d57ec70f2b21d314cec297621593f6b58bca2915135e07b51ec13d"; + sha256 = "0a688881bdd60eb6054fec4234809579ef3a5c7eaeb61916149c3b4f437c03ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/gn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/gn/firefox-113.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "50ab4d236ed416e2bb65b33739ad01ab873f4fe10c4b4d6ed7ec4677dc391ec9"; + sha256 = "dea4af765ef0b060830bee26ad6d18192ed3c488f585a582fd5ff09a6953f2b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/gu-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/gu-IN/firefox-113.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "20172e82d455f5f1732c927647256528128c17c459b2c347b699657a77354458"; + sha256 = "103b07056bd865362ba1bbb9b778c524c61de7103936ac17e10195a39876fff6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/he/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/he/firefox-113.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0e1dffc25c0223be04aa762ce9edd1980406f02c0e208a0a51fe71afde10d84c"; + sha256 = "db50742e5622d984b3db65da506487dd51a1a95d33dc9db5d48c6753e2b61b5d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/hi-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/hi-IN/firefox-113.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "419642c9a24e6603878ca14c6a8399a05eb7cf7f6acd5314356e767f6a332d53"; + sha256 = "dd48e48cb6730a307d537a847c32a81b23b9e788208eaf50457eb23fb8feafca"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/hr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/hr/firefox-113.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "5a5eadeda99a91187b6a0aef1d22e9f5ad033adf45bfcb3bd3c71febd23b4362"; + sha256 = "0e4a1b482e8447076c0c852451781eced978ab46921c85b81ea5c56b39c91d90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/hsb/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/hsb/firefox-113.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "43c1fa154ac67e1115646a4d92e3a4bb6437a28e7ec57bf87af947d6d8a1c437"; + sha256 = "29b81646d09bf1f1cb5e3031577c28bf26fff258eb020bc7e99bb39479a374b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/hu/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/hu/firefox-113.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "218738d4563f707a858a911b1dd4de19ee27a99b2e6c8fcd3ee8843e301a9395"; + sha256 = "506af8b51c8e761007d732dfa19bb43758e25a469c040a99ea27d661466621a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/hy-AM/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/hy-AM/firefox-113.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "a8c8e514a94c975b26addd2879effc7760d3cee48e26f549aa8a7f5e8f48d5a3"; + sha256 = "b70df160e8d4a3683dad402f8c3629dc49b6c0151b5231c2344948b8a7f86ca8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ia/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ia/firefox-113.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a2bd5401daa1a68e67d3c787489cec2711fd1b67be69048441a0dd5589336982"; + sha256 = "e08f9c7ad6a93533199bb0268febf71518c0cfaf94dcb9017110bac99679d320"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/id/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/id/firefox-113.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f68a1a3c3b2bb50c5250f15d9317c0928c17833395f1724892e7378df30639d5"; + sha256 = "f3cbe61f65840033bc0874ef4a05e05d94efb2042fa60dd546950dea96eaaf94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/is/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/is/firefox-113.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f9288d857a73c66530c28aab9f263792c8ff90e324016f1bb3221bab2afcbee2"; + sha256 = "f17654c6f29459b90b72d38e55817b3aadd15599b23e7d830dfd6c4a7650175a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/it/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/it/firefox-113.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "85bf83f5e43d295826d50a8f9bbb0b21fd17de3719b986d4ff3680855e4595ce"; + sha256 = "5cb8eef18e3533d0d48a2002b1dcc690993b98d6a446d6c7bdecd01b73d10e62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ja/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ja/firefox-113.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "85fd36480c8420bff78890fc6be958335b9af840888dfad6beb5915dd03f8c8f"; + sha256 = "e64306a28ca002a5e46e3ed79521bcda6ff03a08c89521ca59c7c72a129d3d60"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ka/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ka/firefox-113.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c8390a86f9bd11b850be5d92b46ee51aa2f26c1fd7596ea0d663e9015c403cb6"; + sha256 = "4560f4099a40c4098a38b1d075d1ffb3bbd4de5f4f22ce28fdf89e93a6d7f23f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/kab/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/kab/firefox-113.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "067ff3f08728615b35c84f58f8dd52702a9d7fd4e1d5aace74a8ec20f7deed7c"; + sha256 = "b9d87af265e42a2ed45bb40e737dc077dcfb9f0372d119c624b2cfd5764d7012"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/kk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/kk/firefox-113.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "2c0621f9698a8309009624d71b34ae306e686db08d5796afc3e029313aaade2b"; + sha256 = "618d3c994268afa147e09032ff37ac0759a6d2300dc9fe340144f5cd94126603"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/km/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/km/firefox-113.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2a9250fa99dd237f124c99cd561dc596d42d4475d7368a7f806216be270a2adb"; + sha256 = "9d384d5f5e9a2fdcd805d258846634eac14dc43451002b9b3174e6b4e3d21347"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/kn/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/kn/firefox-113.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "db57ddfb1b32995464263c209aef78da6ae316d6b95ceb1d9aeb91cca82164a2"; + sha256 = "3d6843124395686f1ee71fedf94ed650bb8f6b81aa8bbadad1f856432993d8a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ko/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ko/firefox-113.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a5b977fab95ae026dbfb1a41f7ea1e212da81cabb296d54364161f979b243a94"; + sha256 = "dd8f1952de23ad2616f9572ba26f558fae5bb2f8f71b8582abeacdd8554febd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/lij/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/lij/firefox-113.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "810f62f0cdd576f898f26fb41579f3b4d4064d229415686bc1617d47a357f328"; + sha256 = "9617acffeff3d2fa017922b005af9c14aa07ee479a35f03c5919fb847890224d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/lt/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/lt/firefox-113.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2c7d5403413d0010a058b324b74358b86943060ba5449e5c762e745e7582df7d"; + sha256 = "80c84b3664e0b4dee701487c0974eda7120db128e083ae171bca19d0b024cfac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/lv/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/lv/firefox-113.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "95439ee735358e46fbea69779e76dcd697a4e2599c4ee55794dd7f9e39d9eb55"; + sha256 = "5c79ecde02885b486a48c3bba68e3c5db0bcf2af85d2edbb32a0325ec81763e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/mk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/mk/firefox-113.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9ffa65f36282c6a697275cf4626aa5f3c1fcc96f559b7678370f89354c1bf51d"; + sha256 = "f53555da93ff9c7e38efa03deb955166bb252aa872d4a8e7e2b1dbf483a076e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/mr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/mr/firefox-113.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "a65149e47a1b5c61964ced5b91c10967e619af1f5a653e409d1a5b69a4c20db5"; + sha256 = "7a0f14986973ef70d1644c19ccf486238b7f37c282a3ef672f37d21f2dedfb92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ms/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ms/firefox-113.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "cc3a14463edbd0cf8beab80166264a31039d4e0a57b12d11278fbe410b7dbf93"; + sha256 = "85722f8537ecebe583996ec9f7cb2d6f55b8e5a0bd317d062977b813b84b8232"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/my/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/my/firefox-113.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "958570b1d5673cbeb557737ccdab62d08cad015cea256754c0703b7018e9462d"; + sha256 = "5c6433cafa1088bc6ed5748cb63a6d682fcbee0cb4f4c30078995b8d62ae4a67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/nb-NO/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/nb-NO/firefox-113.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f1da12060e3cbceffe88311e7d23f0d30a2f637776ce4513972554bf5f1b3ad5"; + sha256 = "664c2ec2701fb1d993d757958bd83421c500b9b85ec2a4470b362c04a485e324"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ne-NP/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ne-NP/firefox-113.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ea76e71f5402fb38df5d422cf25ee2a6040d752dc8ca980610e1fd46b7d3d86a"; + sha256 = "b260442890f61ac1193391e9eb86e94c00ba41192b4a876fa67c000c698b0a07"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/nl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/nl/firefox-113.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "310908604a5f3d82340bbfcee1bd16288d9837dc42b71afd9a58c7e4bf8f1f70"; + sha256 = "7959d0a6ac5ef2e8102373c042ef52316563bb5f47b51b4767cf0ec8857c08d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/nn-NO/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/nn-NO/firefox-113.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "1716a0909521e28b3422822eaef677cd65f680fefc3734cbec3bdae98ab50115"; + sha256 = "485e0ac9994d5df8e049c3ec33c2e3a50088b28c0e1a6bb4351234b0457b8910"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/oc/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/oc/firefox-113.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "15daca31128922441b384d6e00a59e4bdb7dd8b1e765f908b53dca432b1f2ddc"; + sha256 = "174a65d138a31a197bf97625a89b2f7efe53321f67a9984438c48122c1155f15"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/pa-IN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/pa-IN/firefox-113.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "553594b9d63977e855b072249b5ccfd3b2d9765f8e0dadbcc9cd7a2d8a66083d"; + sha256 = "018a0a03b274716081dc9970de18274b19462ce5225a0ee427f2403225b116bb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/pl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/pl/firefox-113.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "afe71cca35b72d204cd9745ce2d1cda8499fd2ad5be565aab164c2ea46d23ae7"; + sha256 = "0fa2fba8e72e3cc2403ea48c783520fad8260765b26069a2e8e4a061d890f9dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/pt-BR/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/pt-BR/firefox-113.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "9bc09269a0287e785c18b66863199772f3fd29efce96e26c7382f3b092ed9adc"; + sha256 = "5e4702f9a668b62c505f735d46c0452b3c6f8b0d049f24e21d5cbf457992254c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/pt-PT/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/pt-PT/firefox-113.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b23d3a6e71580d6e1037f79a20dca96c670daf94525ce5ce40ec0f4ae11a26f2"; + sha256 = "92e3487cff0a73727f01b56a2b3a802ff7775799f0b6f49fb1139fdec273f50b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/rm/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/rm/firefox-113.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "33c3bda8431458a8dc838dc4a11cd565487fb74844ae3e55bbe4c475a0513aa7"; + sha256 = "fce12780196adbddd51c6844332b65835283b3082a5bb08e6a0e52696c9f71ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ro/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ro/firefox-113.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8f29fbe62d6c208894f87dcc8c3d4d6103e3de863a67516b5015d951457b90a6"; + sha256 = "4a28d5f29182fcc9a083b53b4524e1fcefafc44bac75de28eb1c0d306eecf967"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ru/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ru/firefox-113.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e70ab287dfeb0fb888c85ac71b279b9d7524d1a0ef93c787d1f207349cac56e8"; + sha256 = "254fe7fe3c7b3a598a3fb76dbf79a81d28d6ce2c93e2b451bc7719972954c1ce"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/sc/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/sc/firefox-113.0b7.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "534292fbbab374db489b168f6d4d81ce976fef4c40b3d95408a8bae0b9279b24"; + sha256 = "05d50d18693210b3d040584e672f0e0cadb8369fb5b7138f8a6c535a83c08d6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/sco/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/sco/firefox-113.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "d7a0f577037fb1ac64cf9831448ef8ac5f49b17b81c171742e99aa1d0e25de01"; + sha256 = "a0ee30cff3ed8ea2f1867aa25f49a848ba0483900cd35f4ef679ca1afd414fd5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/si/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/si/firefox-113.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "dce56847aa598fd4300b80f9fa264219a1aa5db2bed10db6320ba10f60495ce5"; + sha256 = "a14b0fba579a440d678dc7205d71be9c1d44bb2e79a8c5b2a8207b8c05187d73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/sk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/sk/firefox-113.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "6bf4ec218b7219ef7210c3ed73712286f505d3a9beb0afb5d962370758e1ef49"; + sha256 = "3812974b7fb53940d4c43aa82ad30345b34952e3ed3cd0e89b8da08c11fb7f82"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/sl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/sl/firefox-113.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "3a8e18d2fbf73be9f7df357a78774d87b28b051e5e3d3c491333f893d063b717"; + sha256 = "12a2a5844a8f8bd729ac4a5a568ca5ad034b44eb34a831fe1c6dfd1182e823de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/son/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/son/firefox-113.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "852667eb0d6307b711a25da361bb8c05cf48c54da245d4ab940739380fc81d1f"; + sha256 = "853dedad81103a949ed0f91b10e145f8ab41683da80b690e35e5a4a5ceefb121"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/sq/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/sq/firefox-113.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "f190df34c60bbdda8982a89f1a205c3dc24ec474025a7ed76c1c9f5bba875d0b"; + sha256 = "d8f632499fd1111fe9d4c2f7af47864387323b4eabffb8d2761833f53f84c2a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/sr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/sr/firefox-113.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "87dda2312559b3a0c726267658cc7aad81c7e27df02c8ebf63e171c48653a07c"; + sha256 = "720da13c525bc55091b6dba896b7fba8bff4a013cb5aac995a4ed69c75b9efc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/sv-SE/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/sv-SE/firefox-113.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3ec0a222252f42b593feec33b11ed82478435185e20d67eb2ecf74efeef67a42"; + sha256 = "1fa3c361175692fe3fa03e613be4e1769b2de61cfaee47b1a23f40152387b25a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/szl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/szl/firefox-113.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a2a65d6d63ee3a4fa74741481ba9f54d58b5a381c8568e90130f4a9dfd239f9a"; + sha256 = "341eb28e76ac7f541dfb72b4e40c9e3c5d7e03b25023955018bdfca36f41952a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ta/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ta/firefox-113.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "8a9aa1a5972e635d606454a5ff5a955b3158df858f4b47fe9b55fa393e5079d3"; + sha256 = "ce3e65089f00728bad484e2eb7e38dcf3a9f94061fe44f6749477bf7d2da6e68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/te/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/te/firefox-113.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c738e9501ce7f6baa2b1424aeb2706c5f8313394db0fdbddc82704a234b8947c"; + sha256 = "9be9503ae09d67353025142723bfc97ca24f83c722c2ce08263423577430fce1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/tg/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/tg/firefox-113.0b7.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "26971632a8a33e85cd6b457b4a281ac3429661f78d1d4c2cd5a2aedd90aadf5a"; + sha256 = "38f1ad8befac1a4a20bc913a70a55c43a415cc9d2401dd5912636767f6013e4b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/th/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/th/firefox-113.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9a01fa61b73e3c59d425ee693934120dc40b116708886c444223ae2d3e9eb73b"; + sha256 = "5ab3c3e0d4d626b373e0d5f30c3fa1d83f00b6863f0741ff1c95472e2497c964"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/tl/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/tl/firefox-113.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "4ab70ad927a290357855955f9f295451fb9ea0a01d5e071897e40fa4e8919561"; + sha256 = "f3e1b381eb25df14d496a2017db6256bf10c63af0f0596904722f3a55a323326"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/tr/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/tr/firefox-113.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "170b7116604420e2cf96edac326111812461fd26ce98af92ec1e52bb6bf0bfb7"; + sha256 = "4496a53a4ad09059bac44c5f163b281562f4d15e78986f2c138154876cbbdbd2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/trs/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/trs/firefox-113.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "43a9405e4752ced41686f4daf7667e9cdcf51afe33379308a1936e5ef19906fb"; + sha256 = "fbea2b899d622738fc5b42919170645a404996cc0dd9c95d172bb58c7ac52141"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/uk/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/uk/firefox-113.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "35444329df7c31f12f46ea4a6a04d93b4c2cbfe4d54ce13f7ec4ba5e354d395e"; + sha256 = "0bb6ff512a7559fc0552b692fdd8b0d059e8565590903cf4ac0b80abc9d2f540"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/ur/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/ur/firefox-113.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "b7238872782a714e18cc86fa9dc4aa7160b3046d2820d2878a00bf65100f214a"; + sha256 = "da7cd6bf60161b094b0556bf0254f0cfaf8ee6b1e9687dd94b555b6c32a951e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/uz/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/uz/firefox-113.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c25aa114828d68598b360f198c6ebb0e5349bf307c4d5ffdc19dd6a722008a88"; + sha256 = "9a85ce6a39dbbea55e97c6e2250de2df53ed354681ba24f674def6afb58515c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/vi/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/vi/firefox-113.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3414b1be971af656b0084a8d9c20feccf3d78c8e06327150147056235232dcee"; + sha256 = "8ff48f5305c12a0476a2a84ee8aba77c736b9d482f67b42a36e7c688fcf3e1c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/xh/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/xh/firefox-113.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "1beb794e9d9c83662479452fe5aa4b0b09afe3bde104d61526241570df24b4ec"; + sha256 = "842e3148156bba2891ea7803e94a878c1aa263141d9ac388206f596f5b691759"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/zh-CN/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/zh-CN/firefox-113.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "854977638ccb4618f230545a69913071df90578eb5ad477245fe21a6c64e59dc"; + sha256 = "cea38947c0a0cde12a1aedb5b5e582182e0fa3b544c7a500e19467ad54fd37cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b4/linux-i686/zh-TW/firefox-113.0b4.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/113.0b7/linux-i686/zh-TW/firefox-113.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f5cc0d5d03f5a1ab207535c52f2459a72ee0d11a20673636925e3e28cec729ff"; + sha256 = "728df3437030a3dcb132cf977c5b0765abff90e0f7fabffc7864ee0b496b250e"; } ]; } From 26d40c8b8502039aa8b6af5a6cf56c58f7fcf35a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 13:24:17 +0000 Subject: [PATCH 151/337] python310Packages.spacy-transformers: 1.2.2 -> 1.2.3 --- .../development/python-modules/spacy-transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy-transformers/default.nix b/pkgs/development/python-modules/spacy-transformers/default.nix index e0cf684f4cf..7d3057e54ef 100644 --- a/pkgs/development/python-modules/spacy-transformers/default.nix +++ b/pkgs/development/python-modules/spacy-transformers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "spacy-transformers"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Up9ZlLlAM0CDXEYDI95KsLzA0TBz/uZFqEgZLmNIABA="; + hash = "sha256-oNdH0oZNo8XWx+bbzwZs7iXD0Af6zx1k6wBYksgtp4w="; }; nativeBuildInputs = [ From 9deea846bd627f4ebabbc01e8062028b0d6ecf49 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 24 Apr 2023 09:21:52 -0400 Subject: [PATCH 152/337] boxxy: 0.6.4 -> 0.7.0 Diff: https://github.com/queer/boxxy/compare/v0.6.4...v0.7.0 --- pkgs/tools/misc/boxxy/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/boxxy/default.nix b/pkgs/tools/misc/boxxy/default.nix index 1de9bd0469d..d9a694f27c5 100644 --- a/pkgs/tools/misc/boxxy/default.nix +++ b/pkgs/tools/misc/boxxy/default.nix @@ -1,23 +1,23 @@ { lib , rustPlatform , fetchFromGitHub -, stdenv , pkg-config , oniguruma +, stdenv }: rustPlatform.buildRustPackage rec { pname = "boxxy"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "queer"; repo = "boxxy"; rev = "v${version}"; - hash = "sha256-OUnvjn58jVMg4wYwoSMsqQvy5yveF+KeRjkjvB1W/Q4="; + hash = "sha256-QbXR79jmTlrqFlg5ZpXJXO/YljcCrwGrucRwASA5aK0="; }; - cargoHash = "sha256-UhtxvEK3hknBdLS1eOlEPng+THoPuhYGIFhYz4LpF5E="; + cargoHash = "sha256-Mc6UjO3/XGIz25tHQFjRT/xf3KMfr/miiZDIR9lHnGY="; nativeBuildInputs = [ pkg-config @@ -27,7 +27,9 @@ rustPlatform.buildRustPackage rec { oniguruma ]; - RUSTONIG_SYSTEM_LIBONIG = true; + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; meta = with lib; { description = "Puts bad Linux applications in a box with only their files"; From 48c4390ebfaa3ce53eae58650d0419dd4a2086f3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 24 Apr 2023 09:27:06 -0400 Subject: [PATCH 153/337] cargo-careful: 0.3.2 -> 0.3.3 Diff: https://github.com/RalfJung/cargo-careful/compare/v0.3.2...v0.3.3 --- pkgs/development/tools/rust/cargo-careful/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix index 5e8d5c504f7..d197e0c7f4d 100644 --- a/pkgs/development/tools/rust/cargo-careful/default.nix +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-+rj9f4uCNDWwX+0Dsr7dwoeQunvsniG61+W9ehs0KDY="; + hash = "sha256-oYwbRww+NFPV9q26vfuTdxTBp0kzWdgWl6MAXhir2lc="; }; - cargoHash = "sha256-dxb+euJ5PCdDjfne+iUTgsdOSt2HLiItHrVwHx4588c="; + cargoHash = "sha256-8b718qYPFFstjl2LQ23IoQDikF9YV1Ao+pDg2tiXxsc="; meta = with lib; { description = "A tool to execute Rust code carefully, with extra checking along the way"; From fefbedb149024dc55f640fb0faf5b79af5012134 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 13:33:05 +0000 Subject: [PATCH 154/337] kodiPackages.arteplussept: 1.1.8 -> 1.1.9 --- pkgs/applications/video/kodi/addons/arteplussept/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 7d58625d2d7..35bfc7e8c5f 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.1.8"; + version = "1.1.9"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-1f+oEHEhSsDMXH7WssSVjjuDjK3UNyMiNhaw7mh/xjI="; + hash = "sha256-B4IIYwWrQ5U+aPl9nzAN3HWaQjHX1G+hxpicBgBAwiA="; }; propagatedBuildInputs = [ From 2c5843f731e19846497cfee4d6e21ac6bab6d2f4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 24 Apr 2023 09:39:21 -0400 Subject: [PATCH 155/337] sccache: 0.4.1 -> 0.4.2 Diff: https://github.com/mozilla/sccache/compare/v0.4.1...v0.4.2 Changelog: https://github.com/mozilla/sccache/releases/tag/v0.4.2 --- pkgs/development/tools/misc/sccache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 7c307c503fe..0a5bcb699ea 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.4.1"; + version = "0.4.2"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-omov7/o1ToWJBTsDXTp3FNLk7PuWGL3J6pNz6n47taU="; + sha256 = "sha256-OXCR052syGpqeIHviKAqS5LEAt8epdlFFarkVdmfa0I="; }; - cargoSha256 = "sha256-UkccHrs3q4MlIaK/lo+bPC9Jy/JCBjGzo8jgjZsvEIc="; + cargoSha256 = "sha256-hYNnzVhw0yCqgRcRJCZusuY+g+MZn1DD5pfDTJlTv+w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; From aac51377f0eecb49e86288f0616123590511a941 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 24 Apr 2023 22:39:03 +0900 Subject: [PATCH 156/337] sketchybar: 2.14.4 -> 2.15.1 https://github.com/FelixKratz/SketchyBar/releases/tag/v2.15.1 --- pkgs/os-specific/darwin/sketchybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index 5468e7a2a33..6d478d8ab33 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -10,13 +10,13 @@ in stdenv.mkDerivation rec { pname = "sketchybar"; - version = "2.14.4"; + version = "2.15.1"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${version}"; - hash = "sha256-snB1DII04OeoPbLzblfgdaM1hdXL62u/g/0CNLmqrxo="; + hash = "sha256-0jCVDaFc7ZvA8apeHRoQvPhAlaGlBHzqUkS9or88PcM="; }; buildInputs = [ Carbon Cocoa CoreWLAN DisplayServices SkyLight ]; From 085203d84c0b1713947d0710eab1ca6e2f47cea0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 24 Apr 2023 09:44:55 -0400 Subject: [PATCH 157/337] simple-http-server: 0.6.6 -> 0.6.7 Diff: https://github.com/TheWaWaR/simple-http-server/compare/v0.6.6...v0.6.7 Changelog: https://github.com/TheWaWaR/simple-http-server/releases/tag/v0.6.7 --- pkgs/servers/simple-http-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index e59b9d73d5a..f2d8309d090 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b+z3rio+kg1Z0B4pqhTlCTtzXgAeCAhinSa9dkIwcaY="; + sha256 = "sha256-Xi5tJIfK4zjckKERhxHuDqeyOB9Dxul/eFLKOtpgR/w="; }; - cargoSha256 = "sha256-teBqgQloI/13F7K/+EBKFcHWqcK1wJrNUu5LO8nwQbo="; + cargoSha256 = "sha256-wv1hlBTQe1Mm67J2FqrrXSSlZkFPB0TzKc5VUMMfUIQ="; nativeBuildInputs = [ pkg-config ]; From bf5333b014bd691b5ccf5b996eb89140b17f3027 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 24 Apr 2023 09:47:07 -0400 Subject: [PATCH 158/337] jql: 6.0.5 -> 6.0.6 Diff: https://github.com/yamafaktory/jql/compare/jql-v6.0.5...jql-v6.0.6 Changelog: https://github.com/yamafaktory/jql/releases/tag/jql-v6.0.6 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index fdc2d011d6f..758e5c9120e 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "6.0.5"; + version = "6.0.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-MdIYU6/j+hpFBcaZ1IiW6ImeWD3mmYezGEpZBbWmRzs="; + hash = "sha256-0Tg8vqlTngLfmp0HDxR5ymmLXw16J9pQJfOCOZrRreE="; }; - cargoHash = "sha256-vb7HyumsLYN9rZTD8KxzV+1SN5F2rLhuullYDwRt7wM="; + cargoHash = "sha256-w51soAdIdNuJzQpvQZQZuxbxlClEWYdT/v0ZOnVvsTA="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From 775e5cf5f4f6cb8a95c05ded80bdae047aa81a23 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 24 Apr 2023 11:00:57 -0400 Subject: [PATCH 159/337] localsend: 1.8.0 -> 1.9.0 --- pkgs/applications/networking/localsend/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/localsend/default.nix b/pkgs/applications/networking/localsend/default.nix index 58bc5b3fdc6..ac0de9cfd5d 100644 --- a/pkgs/applications/networking/localsend/default.nix +++ b/pkgs/applications/networking/localsend/default.nix @@ -2,16 +2,16 @@ let pname = "localsend"; - version = "1.8.0"; + version = "1.9.0"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.AppImage"; - hash = "sha256-Setxw0urfJCiHI+Ms+Igroi1CLCgB0H5BsV6RkxyBME="; + hash = "sha256-i5/haQHsw3BAOFGsHO41oiop1JgMISTr1Dw0tAeYupU="; }; x86_64-darwin = fetchurl { url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; - hash = "sha256-uVZ/ULhr8CiV/wL9Yaw6q2IYAHNqld606ADKab/EVlU="; + hash = "sha256-Ibojcg5To288c+v6IKMOjuLz970osiKJU7/K0VnIs8k="; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -21,7 +21,7 @@ let linux = appimageTools.wrapType2 rec { inherit pname version src meta; - extraPkgs = p: [ p.libepoxy ]; + extraPkgs = p: [ p.ayatana-ido p.libayatana-appindicator p.libayatana-indicator p.libdbusmenu p.libepoxy ]; extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} From 1523364317d5bccd5a29e734e774f94b90acf7de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 16:13:38 +0000 Subject: [PATCH 160/337] goda: 0.5.6 -> 0.5.7 --- pkgs/development/tools/goda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix index 65086bb44d5..edf37fa5167 100644 --- a/pkgs/development/tools/goda/default.nix +++ b/pkgs/development/tools/goda/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goda"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${version}"; - sha256 = "sha256-l9ehpDAqZqNV+07ENXJ2GJEY6bb6W37Ls6UqjE9DEWQ="; + sha256 = "sha256-kilFb/2wXdzn/gXy9mBg0PZH8rd+MFIom4AGAZLgnBo="; }; - vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms="; + vendorSha256 = "sha256-FYjlOYB0L4l6gF8hYtJroV1qMQD0ZmKWXBarjyConRs="; passthru.updateScript = nix-update-script { }; From 38b8adcca55561ba9a8a10aef81679ada97a9c80 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 24 Apr 2023 18:24:21 +0200 Subject: [PATCH 161/337] pgmodeler: 1.0.2 -> 1.0.3 --- pkgs/applications/misc/pgmodeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index ca9387e34e6..367c0aee408 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-yvVgBfJLjEynsqxQisDfOM99C8/QM0F44RIHAmxh4uU="; + sha256 = "sha256-ZlIz+7YyER0/wQEkEe8XHYHcLK4vu09v1zkDrIgR/Dc="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; From 8aba7c43d1f6c4ec00fc5a0e1911c0d562b0b303 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Mon, 10 Apr 2023 23:56:11 +0200 Subject: [PATCH 162/337] openimageio: 2.4.6.1 -> 2.4.10.0 Update to the most recent release and unpin from fmt_8. --- .../libraries/openimageio/default.nix | 18 +++++++----------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 88d99a0fae7..cd219dc976f 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , boost , cmake , giflib @@ -17,23 +16,15 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.4.6.1"; + version = "2.4.10.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "v${version}"; - sha256 = "sha256-oBICukkborxXFHXyM2rIn5qSbCWECjwDQI9MUg13IRU="; + hash = "sha256-EQ9/G41AZJJ+KMIwDRZDf5V0VOx5fewmebeHlPWSPCQ="; }; - patches = [ - (fetchpatch { - name = "arm-fix-signed-unsigned-simd-mismatch.patch"; - url = "https://github.com/OpenImageIO/oiio/commit/726c51181a2888b0bd1edbef5ac8451e9cc3f893.patch"; - hash = "sha256-G4vexf0OHZ/sbcRob5X92tajkmAv72ok8rcVQtIE9XE="; - }) - ]; - outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ @@ -51,6 +42,9 @@ stdenv.mkDerivation rec { opencolorio openexr robin-map + ]; + + propagatedBuildInputs = [ fmt ]; @@ -59,6 +53,8 @@ stdenv.mkDerivation rec { "-DUSE_QT=OFF" # GNUInstallDirs "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config + # Do not install a copy of fmt header files + "-DINTERNALIZE_FMT=OFF" ]; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20f1e7b4aaa..e841f350713 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32817,9 +32817,7 @@ with pkgs; boost = boost175; }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { - fmt = fmt_8; - }; + openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { }; openjump = callPackage ../applications/misc/openjump { }; From 4d1d7ff9549b5d57be062f07c5fe457c0930fd7e Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 24 Apr 2023 12:42:36 -0400 Subject: [PATCH 163/337] maintainers-list: Add ElvishJerricco's matrix ID. --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f804cf83bf6..495b31f2b26 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4521,6 +4521,7 @@ }; elvishjerricco = { email = "elvishjerricco@gmail.com"; + matrix = "@elvishjerricco:matrix.org"; github = "ElvishJerricco"; githubId = 1365692; name = "Will Fancher"; From 12f58ef507c3be66139984adc4b0c3ea63606344 Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 24 Apr 2023 09:58:39 -0700 Subject: [PATCH 164/337] standardnotes: 3.150.45 -> 3.151.3 --- pkgs/applications/editors/standardnotes/src.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/standardnotes/src.json b/pkgs/applications/editors/standardnotes/src.json index ddb759837b0..10c7ee38e9c 100644 --- a/pkgs/applications/editors/standardnotes/src.json +++ b/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.150.45", + "version": "3.151.3", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.45/standard-notes-3.150.45-linux-x86_64.AppImage", - "hash": "sha512-a1g+nOJJ1MSiCvguFAlAPhwyogAS6cwDD8Ou+P0lufLLG2HyLPdOEwVl8Nhqq4iaFFQoyY3FtKm+Sdpd3WJ72Q==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.151.3/standard-notes-3.151.3-linux-x86_64.AppImage", + "hash": "sha512-Wk31nB9OjR8E3cPFfh4KpUqQxXsnerzDt5TgaExXW4OeWLftv3ejyf2ROWXAoqG/8K87OclbunCqS3b2g8hAjA==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.150.45/standard-notes-3.150.45-linux-arm64.AppImage", - "hash": "sha512-ivnyuMhdBweRs+9Qkt4srm2JlMMxLFDbT0DBaeNCHVuyWM/13LRczIyto2tbPp9xC6DCJmGktjY3ZYsB3odftA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.151.3/standard-notes-3.151.3-linux-arm64.AppImage", + "hash": "sha512-nPTpEJs978wxZjG1pN15ETgUBdGBzl574QHCQNo2ShYvhi9Uf38jCaGQIsY0d779eT8kSHuMBXoAiE/flxfWMQ==" } } } From 96d7f37161691155cd98d71e9d38a6006b8aa71f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 17:37:50 +0000 Subject: [PATCH 165/337] iosevka-bin: 22.0.2 -> 22.1.0 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index d18a9d24dfa..33458c428d2 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "22.0.2"; + version = "22.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index c75708299a5..b8a40ce5e86 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0dj0fk40impvlnbgmpnhndhad841sbk7056nyaxagiz12qq6rrii"; - iosevka-aile = "01r6gdl2s93mhsr7ipq8ir6sy7srpyn8w09yd06hqh26ps40ki2b"; - iosevka-curly = "0d0wsb5fpknxix6qng6mzkfdj2abm8hq067bqvbqhrdwhvbl83x9"; - iosevka-curly-slab = "1hh9ck2pbsjaj81hivq9b7wqxb03mr6hsargw6gic4qn6pkk4l3n"; - iosevka-etoile = "0p85jw25pkhndcdi56l9yg1hm4rsdjvy713q89dygrn5678nw74w"; - iosevka-slab = "11vf6w59pcs71liw0k0nrhaw61nbn4n68vrj1b4rymc7mdaxfp1i"; - iosevka-ss01 = "0hiffyfhfwwy55i1rvr78mvlmgx3c4czfx0lf4vmq2c6c4bldbf7"; - iosevka-ss02 = "1z796x3a7hv05wir06rcj8i1l99169a7wab9j3ibb819pdycs5v7"; - iosevka-ss03 = "1jjmg538avphd3djdjy521q0lbn7ip97qpf479kgvcr1hhv606kl"; - iosevka-ss04 = "09xfsnl5dqzind60wip38pr0j9db47prbcgndfh283jcaysh5c0b"; - iosevka-ss05 = "1mj4q45ifxvgwrrrmlv46p9cliznc4z2vipdf6k8b05ad71n7gab"; - iosevka-ss06 = "02hn8dajvn5x303fv5gfl95hhsvql4h8525hd9k3a93g9qj13ib8"; - iosevka-ss07 = "1hki40chpp3bnz6ksbly8lpjiqywdhgkqpc2h25lksdg8hwd8mcb"; - iosevka-ss08 = "16bpzbcq2i0flw48ch2dfxljgscrm2fxfrcb2112wjv8zvi593hd"; - iosevka-ss09 = "0ajm1gn45zklijyijxvib0iy47q7jvgmp2kdgmsa5zwwvnh8fipb"; - iosevka-ss10 = "1g1if97w5mzzvm8y141rsqby90pmvc4whxxrjvdpmv94yb2biryp"; - iosevka-ss11 = "0icx5cflzk05h51i4i7p5wbdkrpnyfn9r89rsvrd22vxc038xhmg"; - iosevka-ss12 = "1var71j3pfa2fakrmm0c5sgiznbnqnxsnnkmpcb2xpjy4q68xfq1"; - iosevka-ss13 = "0mpidl1hickx60zmza94002721jfs169b5a1l6vxwi5x6vk5329v"; - iosevka-ss14 = "15z0ipnx2spgsp68465x7c8fkvb4hjnyl8pmfj2izn6jmgsrlc4x"; - iosevka-ss15 = "0fyw53nvv45z55x2cnm9kcdcbiw1nykycychkih2fwlydm67vj0d"; - iosevka-ss16 = "18lja4xw63i013ndqhm7kr7ggpbwc5zsxam7xib258nfhyx548ff"; - iosevka-ss17 = "1h2q2v93504539imbn0gbkxi9jw71hisl6px87hs3sh6lmm5kjfm"; - iosevka-ss18 = "085j759av6pspqn3sajrc12w74m7h5y64vdi1spmgd97dnj1gz6q"; - sgr-iosevka = "1ykc80hgc9pipqvqw4m3mqj37rhf6hskgds42kxqzxdn194072m1"; - sgr-iosevka-aile = "0c1jhff87hg4hxwrrp1vxx8gq1bkl9q85py1fz7gb3xdbim54s3z"; - sgr-iosevka-curly = "0zb3y46wbsjb847s31s56gjf9sj8ikp8qvsg1fm2m01idv6f21ig"; - sgr-iosevka-curly-slab = "113wmkzaaqp1yw95ld2j4l1f7yw9miq4bv4zjf9jib4ss6yjq97v"; - sgr-iosevka-etoile = "1pgsh5myw2ihnlk6qkxr7p46sg1402mqvqn7bi2ch8gd472gijck"; - sgr-iosevka-fixed = "1jf1icg1mqv1059p9msvk64j09apcqc9alvzrrxdqblw9b2ckrkj"; - sgr-iosevka-fixed-curly = "1p3m6i1cbphxqrwyj2n0d7zwx9f75nvdsdfyyh8wvap88xwm0ggf"; - sgr-iosevka-fixed-curly-slab = "0lgvai6293ddxckr9yvymi704pymcyp3ks4yx3jn207f70mpdg41"; - sgr-iosevka-fixed-slab = "17935bvl9yly24g95wi2g4faahnj98z3dkb1a6dkb4frjq1nif2m"; - sgr-iosevka-fixed-ss01 = "0wqpm57zcis9h8pzwvyjw8gggrwfgzlc3zd9c3shh7mpzx6zcj88"; - sgr-iosevka-fixed-ss02 = "00jlapqakmpjcdycvdlhlm46iyvr05b8qskl6m7fxqg46dvnzz9z"; - sgr-iosevka-fixed-ss03 = "1qd9wybq9miazkqkpis61s07yak7pn2lfawws421ynfgbb5r7987"; - sgr-iosevka-fixed-ss04 = "0dbrimliy072mqg1gys9cmbl0ac56iavjnl73d14mxc77ciavkkl"; - sgr-iosevka-fixed-ss05 = "1xfhvbzi91gddql6q1byyi40s9n6ym517c2pf6zpirnk6a7415k6"; - sgr-iosevka-fixed-ss06 = "0ibji574aifh7pqpdgnmgmp3k784swjdvly9292sd758mlh8j5sa"; - sgr-iosevka-fixed-ss07 = "1ixx123q5w7pbp9sgm84bhmzi7zy0h1ki3plm891mfv64pkbg42w"; - sgr-iosevka-fixed-ss08 = "00jwiwbgrj6yxqjdp4g8cbsq2jk5pz6h401mh7y6wp2j3y2xrrkb"; - sgr-iosevka-fixed-ss09 = "0jikxfir5md9qp5j1lhk1l9vjx2m15ncy9nkvb50mm32b6y5x3ph"; - sgr-iosevka-fixed-ss10 = "0ampkjvr8qyadfc0yvmyvac7gnm1xi441vz1pf8n2qniypy29bgj"; - sgr-iosevka-fixed-ss11 = "1nchlqkilglymydj33jzgp9wfivja2x3p8app3g9rgcsncsgjyc8"; - sgr-iosevka-fixed-ss12 = "1wpza8g4as1p4cd8g0lv20m2k57f22kazp2w7810k2wzv06613jq"; - sgr-iosevka-fixed-ss13 = "0phh86fk0l37998vxakz0vsxwsj1lbbzls23q56x7hgynnh8nr3x"; - sgr-iosevka-fixed-ss14 = "1x1hmfj692ify57lffg08pa2420fgx0amha1kdzyyxf87s3maqx8"; - sgr-iosevka-fixed-ss15 = "0qbf0b92668pxhjx778nnm5mj2w65c02k3cwk4f4x8vwkagwq2jp"; - sgr-iosevka-fixed-ss16 = "0wmlcckbyrr1sspqfp5r6rymy5myy53q02fl7agv1c7bwfx9iycr"; - sgr-iosevka-fixed-ss17 = "1rrkyv919m86biydl8jivfyn7wf8cna5c3b8rwv80ihz131zgj6z"; - sgr-iosevka-fixed-ss18 = "1s5gj3iyyfgkkxy23yzbibwrzw4s2x9xprc5hhzyh2r10zvib5cf"; - sgr-iosevka-slab = "1313y3nma1pqxm73yksw1b4vkvbwnv434hvkpqk1gp232j3i6dw2"; - sgr-iosevka-ss01 = "137lmgn490vyl2y7aa5pqa66rsdwrsd4z8nz22fsks3p1pzm3fc7"; - sgr-iosevka-ss02 = "1rhc76hfm204l5bmp1jdi74f0ay34g9q2rzi7lz5jirjjinnvadj"; - sgr-iosevka-ss03 = "1gpb5vcx624gi0jjrj8p7jpm6r2465gpbn3khq46f9557ril4m5y"; - sgr-iosevka-ss04 = "0kf1pmq2ffiam4zllj6x1dzd738zi9a843fz6jkpjbf9fascad9z"; - sgr-iosevka-ss05 = "1xibjsa438lwk4y4bf0r7gjqy5czp7j7fml08f492jb1dwz7vqhq"; - sgr-iosevka-ss06 = "1mk6haqj77b7r8cazkhf0bzd5w9ln2s6chsr12pd6bzmvphvzrzi"; - sgr-iosevka-ss07 = "087030ckif8w4mv7j9y4pirfia5g8dh385awpqc6fffls9l0l0zh"; - sgr-iosevka-ss08 = "0gzgsl7li9i1hl0ffw81j4w2ps3wy4kq986fwcwhgk7n9cy9rg97"; - sgr-iosevka-ss09 = "1hsdgsg5y40bxwjkhm2q7jmjcjffsyjwa741n7fkfaqrqwl6273g"; - sgr-iosevka-ss10 = "0ayspdypq0n7j8nbx17lxzki84icy5bzk88xq6akp7g6n035vw37"; - sgr-iosevka-ss11 = "0kf2a1765qrmd5ba3s3hw8hxgzbcqi9dwb754yid18kiipl3lp4l"; - sgr-iosevka-ss12 = "02d8i8qizfd1akhp0857y5i60hq3y4dj2dg2aq9pf4ldydcvc16g"; - sgr-iosevka-ss13 = "0aw77vcfmr868vyff01cqln09xb1f30lwcsg4mqg2ym2ibp0xv71"; - sgr-iosevka-ss14 = "1s1y5hww1vlqavgp4rr36bdvdicx7azw0yyrgv401i5w1p5z0088"; - sgr-iosevka-ss15 = "1wb8s43hjw36x99sh610ms5x04nb6pi9z7i0dcpch7x9g2kk9ydh"; - sgr-iosevka-ss16 = "1fwgskyl6ys383sa6fkkmdpw61m0d5nxc2vrhw56wysfvrz2cfa8"; - sgr-iosevka-ss17 = "1zvzwy90gkaiq9ij9030wssnrjrkx9xkddwghaa1s2p9bdyfnf8x"; - sgr-iosevka-ss18 = "12ijnkr69hahk8ghgibz438ar3yfky4kzwb9r08y43zjvycf2qhg"; - sgr-iosevka-term = "13dvkydib9gv7308i093zpxpr40cr3admq0c4gg6ki3ix7cml3ac"; - sgr-iosevka-term-curly = "0991m6p3b4kiyw0rgvxswwn263i7if7nznbivyzdsj1dgp3b2pkr"; - sgr-iosevka-term-curly-slab = "1qbhhd4w2nxga2j7llsn8w3qa66rfw4nqylsw6dknqfhf34ba2mq"; - sgr-iosevka-term-slab = "0g0dy4nrgy1a3xdbc5nxyh7y8j7plkbk09bid8rq51rdsljzp1hg"; - sgr-iosevka-term-ss01 = "1smlqzqvp8by7rz5g5nbywyg740v9fhyiy3khn9rx5szyj92pmrb"; - sgr-iosevka-term-ss02 = "1caxixkzbjapdr3k1ki1wfvcgs74mng0h15y00msfga1pjbj41vw"; - sgr-iosevka-term-ss03 = "1fsbzb57jx2qcdmixxpgpqm8x1rlvc5vzkgx2w9z83nrll3iba5n"; - sgr-iosevka-term-ss04 = "0zmpgsb0x8d8pggliqyl79hnxv5ivir0d8z2bg5zy1cw5ryzz94w"; - sgr-iosevka-term-ss05 = "17d8ak2xnmp0g37b5ly3qik38mmmblrdqgmixp4i91wldf66h58c"; - sgr-iosevka-term-ss06 = "0vv5gga66c5rs2vl4ncid403yqx7nwjfkr4mr5krlpc6lhs7wzhk"; - sgr-iosevka-term-ss07 = "0mjpm4x0gy4749fnha26xssm7aw72sh7rgf3jf46pmqz40ya829b"; - sgr-iosevka-term-ss08 = "1hw3cjfr3wwmjvi84vdn32kpk6x9zyqi43ib9nva7db4if39vf7s"; - sgr-iosevka-term-ss09 = "1049yb11dlxc7d97hw51mzssrc0ips2dll8wglinp0l23y1nhf2s"; - sgr-iosevka-term-ss10 = "0nzgcr2rlcgzfidnpix1dxyqiz273xmhfipfkflz5plpqvscd0c1"; - sgr-iosevka-term-ss11 = "135crs740qprnzk0mycp83vw9x1m8za6w51syvvx8h0vncsc8g6b"; - sgr-iosevka-term-ss12 = "1a2qrp44i4gqqpn2ycmslnm2g92v79v4hsim2ssiia474s5qn41z"; - sgr-iosevka-term-ss13 = "18dbgl28iykw1hqcmanvpkc8zk12547rgw8zisr4vwqck8an50vb"; - sgr-iosevka-term-ss14 = "0474ricwyvcmk9baxmd3gq1p6zrgnj59p0bbrsfc142ixqgkc0pp"; - sgr-iosevka-term-ss15 = "1g8pjbyxnhvx62g96zlfpbq2kdc329j0pcr8iib7isyhijh4ygcx"; - sgr-iosevka-term-ss16 = "199jhbfh2zbmp07jzi2wm8a63zhmasf4a04bp9i13pqwxz9hic7i"; - sgr-iosevka-term-ss17 = "1lyv2hpmyalrwbhcxjqw9lzil9dfhrf971vazg366wngwn027sp2"; - sgr-iosevka-term-ss18 = "1wszzj13gv3kc488yg9bshrf98db86xi0958g9l2y9l137h4frbz"; + iosevka = "1f0l3d6j936799szy243k58rk28qbrgvgi35g0w6bfsra25lycq2"; + iosevka-aile = "0prhfpz0ib7cbpi1kznb6yrp0wqjnsh39hymzha6lm0pa7py1r36"; + iosevka-curly = "0yzdm4ypfk60zvl54fhsmi9xs1bg08pac0srs9nggicp5zswixb3"; + iosevka-curly-slab = "175d96yzrqdjg7ic88dacvs7hz8daskn1a9vrqks132rr6a26xvw"; + iosevka-etoile = "1n5xcnq6vbks53vfaxkm1ykpfcsbw1q3zmkrlrwsdd0zdxjsy1fx"; + iosevka-slab = "07z3r27px5hsnz9rac290f2xraavflxqnd2ppmjiwz1yg9ch80d9"; + iosevka-ss01 = "1fd5pjyxrqna98nghsp6rxbaqhmxch89s3jdvqdmpwj87jb6dkcc"; + iosevka-ss02 = "13i8cqdh8g3wv8686g09aazjly157wvzgf5a6n1az4kcax9cawi3"; + iosevka-ss03 = "1l1dkk6321czqrd7if4wwmps9r6in88952i1hqgjqr3r797x4k8p"; + iosevka-ss04 = "1798nzr27pv9dpmjgp9bbivg9dcnk3cz603k3n3igmp8rb4rhz5f"; + iosevka-ss05 = "0csxpmh6ymkgfhzl5x370y4qdl92cjhas25782n8carg16bc854f"; + iosevka-ss06 = "12kmb4g0f31jr0d2gr66xjcjjqsmbr5hs0ynqbcsdpk4x58lv4y7"; + iosevka-ss07 = "1fwdiyzs5prggzld9zip2bqzhngljwsy33cdbfq9526qakbxi67g"; + iosevka-ss08 = "0yha45vyl0kdl593f04m26sl92vhklr1afd7yhmlkmhhhqp6bs9n"; + iosevka-ss09 = "0av1npxxky47239x64rbrv7q7gb2lrgyzkaw1mqhafg6yzjn9iq5"; + iosevka-ss10 = "0w3j04sjkrsd91vl7gyxbjjm76xx64p7b5c97p04xsa09gaig7i9"; + iosevka-ss11 = "1vv20s4kp3mhngdpxzxwa1hldahxm1cxybnf1hzgd79a1162blhx"; + iosevka-ss12 = "1yh200azn914s8lyzv8ga68ixxrqhcxx1rywxm3cpmm8iisvjf4y"; + iosevka-ss13 = "0yvnzz53x0np7w53r5989chs9fcv81mckbf41z519r8l30m31bbj"; + iosevka-ss14 = "17cv02gbzn0v8c8apdh7dd5s3y2qb9cydr8g5rbczzpvywixxrwr"; + iosevka-ss15 = "04iqvjx0nkzikar4ivi7zswqvpcd954khmjjx8vicq3x56wggj8z"; + iosevka-ss16 = "1q3krbi3vh8ry35s24cja77a8430x4n8i4anf8v7rh45sns37fmj"; + iosevka-ss17 = "0vyzhix547j7yq717ffns6pd5mgis5sbxl85c1qf3nhij8czqg6l"; + iosevka-ss18 = "0qikq8p8kvxw9lmrgzlm1g26bz3lppbc8jcgl8417jz400npfqg9"; + sgr-iosevka = "095nwxsgwj671m962ix8qva5himdva0iqv9b5lapgb7acidrj8m7"; + sgr-iosevka-aile = "1fkl0v7rclia5lwfm7f3vc3gkgnd88gf00icm6qka1xylzk8z83l"; + sgr-iosevka-curly = "0q7dakcldx7j2cvn8hz079j81y5ab6ziqz6jr51w1whzb46al7rq"; + sgr-iosevka-curly-slab = "0pw3fbygsgdw0isnv18axh49yxyfjdav6xizrvg6x4y8hispx0xp"; + sgr-iosevka-etoile = "1fs22ap272hkf1wfymhbvgdpsrnxwadp8z6lv2hv5wy8ibc0ccia"; + sgr-iosevka-fixed = "0bgag04jidcdj0gmsppc2lhvawpvylxs645sgxjj8bljy6480s96"; + sgr-iosevka-fixed-curly = "0hgablbcb0wrpdkxw78pyvyni7dh457nwb10acwjxy6lbsshd88z"; + sgr-iosevka-fixed-curly-slab = "1nb3izaq3slaxypylz3l6r8xjg7yy0yan08nsw8zny5lp0kaiqw9"; + sgr-iosevka-fixed-slab = "16cc32ysmvifx736alp8bmcb9sjs1426sv72qydy99dafw34xhmm"; + sgr-iosevka-fixed-ss01 = "0vvjj3dsfj8a60pg1qf7hcm6livsjc40xr0sfc9z1hx3dwjqpvlh"; + sgr-iosevka-fixed-ss02 = "1yy9hqfdb897wi3nl5ny5j5i56jggbppx4ddckfa62a4jxvfks58"; + sgr-iosevka-fixed-ss03 = "0qhk1w3gsd3qriyk9k33sfq46h9hn5zy9zk9cpd429z0xdps49kc"; + sgr-iosevka-fixed-ss04 = "02psmn72r1mkza8n7p4sgrag7iz5zylnw03hnq6fnc4bqnn29gph"; + sgr-iosevka-fixed-ss05 = "1w3jjjr8vvzjihpai9mivkcm2wngag6iva120zsqgb2n2k1z31bp"; + sgr-iosevka-fixed-ss06 = "1icabqjnnsj59m4lg3qk820kdsq7hhl3gngfm5x4br43h031cdc7"; + sgr-iosevka-fixed-ss07 = "0j9l18w7xxdgnw728zyphb52a76rbhb8cv388yc94wldzcmsk1jb"; + sgr-iosevka-fixed-ss08 = "0js9pf92pgd944dywya1yjdx99sz56ra0nwxs9n9g0zn1rj5czwv"; + sgr-iosevka-fixed-ss09 = "06bnyhx5rhkqjiwkjy1rxx6mby16wkyb1r4l3lkln5v6v0sfixfp"; + sgr-iosevka-fixed-ss10 = "13y3vvcrm2v78bmadk051zr3izl0hpcxmfag34cikapzmf9vzxn3"; + sgr-iosevka-fixed-ss11 = "1rwjzdz2ab90rv5p8hh870x9knhilqh0iiwfkyx8kjp7s9shhncp"; + sgr-iosevka-fixed-ss12 = "0fj2szv0g2dclf7yhi8xc9hkgz1mw7kpc62hcvs3044ciga9cxrv"; + sgr-iosevka-fixed-ss13 = "1z6rpf9l6yadzqgrdcyi75vd8mh75b6dx7d9bh06n8sjr5amhav5"; + sgr-iosevka-fixed-ss14 = "0cp58j9c7fkm0q0ym99rhg7ljvzympwks4wk7l8vhh0wp2hfw78h"; + sgr-iosevka-fixed-ss15 = "1fzs0c12abrf81yy1254nfiaq5q2rgvnv1yhqh985jmwcr010n83"; + sgr-iosevka-fixed-ss16 = "16wffgq3b9d290kkbb6xa6z9aphn2d1wzqsqfr4mrkbhpwchbh0i"; + sgr-iosevka-fixed-ss17 = "030l59270vyjhik8cn2jphdvd6vphr9ac8kqzx3bdbf1wgsr4sir"; + sgr-iosevka-fixed-ss18 = "06qym0ffxy6j9hagpd3vrf6j5bd83ch150wkqg9rkg1i26q71v36"; + sgr-iosevka-slab = "0mbdgpxkb3s4a8x0dvnjwqg3za0hl73n3a5vrmy8p694bnx1mi7r"; + sgr-iosevka-ss01 = "0ilr1jiqmjmjfv4py1q3pdn3j20nh8j99629gq9g1zb82x1c9g9l"; + sgr-iosevka-ss02 = "0l4cbx4v8zffbbq1lklk8knn0w6j9gjdp1f780k6x0z0jz3dxvdw"; + sgr-iosevka-ss03 = "0dpl84ybj2h6nv03yy4vrwwksx4zms1c8fgr238w1nbhd7lnlyrv"; + sgr-iosevka-ss04 = "0xlyjxsz6zc3gljvw0rsfgyv9xg1kvgsy2ibd2950vlxk2c597jb"; + sgr-iosevka-ss05 = "02vfkdjq01jxjcvcnxs8g2snmq2gg56448yk0l0gna9mi1hagsk3"; + sgr-iosevka-ss06 = "0b75h0al34f6w0s94i5c88pzs4zjl2iinkwjx855a036mdcqkz1l"; + sgr-iosevka-ss07 = "1grqjqn9gckpgrrch9xa05ljpwr1rdr4lczsn89irhjz102s0bik"; + sgr-iosevka-ss08 = "1mzbaslpy7pscmyiiz0k7czw3kjjc9an7mdb4yh99bpxwaskiv3k"; + sgr-iosevka-ss09 = "1d7r2cv1w9q5h1frvzylizwimp8r6bdpg3fckcrdrfxsl0xfdffc"; + sgr-iosevka-ss10 = "1jr01z6s476aggnnki0q4x24z35jx03fl4fh1l44pf3rckz7c0m9"; + sgr-iosevka-ss11 = "05kybk7wskrg2i58h9n31sj1g6m93dcbbxr38y9nfcxb02cdbxp3"; + sgr-iosevka-ss12 = "0pzrn3b5qj2q7k7slwvvz31j566l8xbmgk6kv324r3r19xcmsx31"; + sgr-iosevka-ss13 = "1cgn33g39pnjkh452r396cyw00iskrr73k2jghw2ywb8ard024gc"; + sgr-iosevka-ss14 = "0q74z4p3ybhaha4z6myasxyidy464vmccqk0bji6ks6fdklh2l3m"; + sgr-iosevka-ss15 = "13gcgv08pwsbnr51b67w5hb9x5vcz7ridxjzwcnjhavssq3qn02x"; + sgr-iosevka-ss16 = "1lkxrvd328ww8xi2189333p40awk7bb4d5k0mpcibp1r2hqbhx3x"; + sgr-iosevka-ss17 = "0q4j381k2nz88y2nszd90ynmqyzna5il7j5illhdjk9dyp936f1p"; + sgr-iosevka-ss18 = "16hdbvx9pa5z03i3dv8x40x6d8nvgxn4vga8sgdgpd2d5k8ibcq5"; + sgr-iosevka-term = "0a16brmr2xsm48bcd5rrsv1c7b4yhvnkrlqp14p0fawyfs05bk5v"; + sgr-iosevka-term-curly = "0a53j231zd1nkirp3fg6m72455gmkn0ipvdqswkkipxp5llbxkhx"; + sgr-iosevka-term-curly-slab = "1ypbffwg7pihq5ywy59y3f2d8dw8p5lzk2284336z3a7i8kzmhpq"; + sgr-iosevka-term-slab = "0rcf9i8fibrvmhzmm192crl7jlv7bwda7b12865w4g719a8ksdsv"; + sgr-iosevka-term-ss01 = "0h12vz7qkl6xflffiqjqqkd1ziqkg2pi1s8pk28ak706fv4k203n"; + sgr-iosevka-term-ss02 = "19d3hqlwv7pi9xyh9amshirbj6ypg6ka5g6hz9dmmh0pmwhcvpjs"; + sgr-iosevka-term-ss03 = "09b3ghyvrjx8dnh8i9ly3cmkbpl10gn1283q9bjamcc8niva6g36"; + sgr-iosevka-term-ss04 = "0l27i49myv81x09bj8ii732zc6473psa58ls2zgvd7yz2bihi3ar"; + sgr-iosevka-term-ss05 = "0421p4y94zxwvc7qyl4zgxld3jrx12wsjirmvfxvfndn0f4dwqyk"; + sgr-iosevka-term-ss06 = "0dl62wnqfqrryp0hrj073yvvy225swv9kcldhygapi16mw97v30b"; + sgr-iosevka-term-ss07 = "03sipvjji22g0gajj0vxkmsc81fd173bb816vjv56fh489g04hn3"; + sgr-iosevka-term-ss08 = "0j0y2dzn6a8r0yg40kajzrhyvl5yf2b8hm7n9970h0gl3rrk5pxa"; + sgr-iosevka-term-ss09 = "1y37cr436hwb1iqqsybg0w595kbn0373hm0zmwcsmsxb25166lcf"; + sgr-iosevka-term-ss10 = "1ngyppn90nn8f59xkh63ifl077w0zldjxzxjw8skx2jhj2kis537"; + sgr-iosevka-term-ss11 = "193snjki9wd6cjpd754g7pvhlyg3yizlcjhcw9x0zx60830xcbd3"; + sgr-iosevka-term-ss12 = "000maksimlm3gapp8d3cwymkmkg4n0dcwxvlxwgi2a6f5rwgfm8n"; + sgr-iosevka-term-ss13 = "09yfj7kxd0p2w1dd1n8hwr3j2plqiq7l17rhh0lys1clyw1jrph8"; + sgr-iosevka-term-ss14 = "16fipp8pka2187mclsf24sxx7idcqh4nn4z63glrg6695g8r0vd0"; + sgr-iosevka-term-ss15 = "0yaj5all8jljzyhd5qmgvmiwv7whx4f9zvxgv3l53xxww5i5yhiz"; + sgr-iosevka-term-ss16 = "163g9mj2n8z21nr5yslnq8m4m7j4aq7q918zs8nd5hggjzhqpy9y"; + sgr-iosevka-term-ss17 = "07zicd0f8bclwxfkvxy6x6bhccz3334wmgfxqpzx36sshyhvfihg"; + sgr-iosevka-term-ss18 = "1qwxyyqv483p05mvkar9vb2m349is0qgdijri8ipran73w363fhc"; } From 78dad85b64a1ca5290f751edddc237dab87ebee7 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 5 Apr 2023 16:57:15 -0400 Subject: [PATCH 166/337] Revert "python3Packages.catboost: 1.0.5 -> 1.1.1" This reverts commit 3626e3084a65c2a36ab70420d9624d3449b1556b. --- pkgs/development/python-modules/catboost/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 9c4b4d8049e..1939b7c13a6 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -5,7 +5,8 @@ buildPythonPackage rec { pname = "catboost"; - version = "1.1.1"; + # nixpkgs-update: no auto update + version = "1.0.5"; disabled = pythonOlder "3.4"; @@ -13,7 +14,7 @@ buildPythonPackage rec { owner = "catboost"; repo = "catboost"; rev = "refs/tags/v${version}"; - hash = "sha256-bqnUHTTRan/spA5y4LRt/sIUYpP3pxzdN/4wHjzgZVY="; + hash = "sha256-ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk"; }; nativeBuildInputs = [ clang_12 ]; @@ -41,6 +42,11 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; pythonImportsCheck = [ "catboost" ]; + passthru = { + # Do not update to catboost 1.1.x because the patch doesn't apply cleanly + skipBulkUpdate = true; + }; + meta = with lib; { description = "High-performance library for gradient boosting on decision trees."; longDescription = '' From 206cde956fc1d6e68a2a096911db3a523ce7c825 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 12 Apr 2023 13:22:42 -0400 Subject: [PATCH 167/337] datalad: 0.16.5 -> 0.18.3; unbreak Added missing `looseversion` and undeclared `setuptools` dependencies. Added git-annex. Correctly wrapped `datalad` program so that `datalad create` works. --- .../version-management/datalad/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/applications/version-management/datalad/default.nix index dfbb4e7db9e..f5920d198af 100644 --- a/pkgs/applications/version-management/datalad/default.nix +++ b/pkgs/applications/version-management/datalad/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git, git-annex }: python3.pkgs.buildPythonApplication rec { pname = "datalad"; - version = "0.16.5"; + version = "0.18.3"; src = fetchFromGitHub { owner = "datalad"; repo = pname; rev = version; - hash = "sha256-F5UFW0/XqntrHclpj3TqoAwuHJbiiv5a7/4MnFoJ1dE="; + hash = "sha256-vqO37o5NxQk+gHfvhM1I2ea9/q9ZaLWkDEyPYJKEPcs"; }; nativeBuildInputs = [ installShellFiles git ]; @@ -24,6 +24,9 @@ python3.pkgs.buildPythonApplication rec { patool tqdm annexremote + looseversion + setuptools + git-annex # downloaders-extra # requests-ftp # not in nixpkgs yet @@ -66,11 +69,14 @@ python3.pkgs.buildPythonApplication rec { installShellCompletion --cmd datalad \ --bash <($out/bin/datalad shell-completion) \ --zsh <($out/bin/datalad shell-completion) + wrapProgram $out/bin/datalad --prefix PYTHONPATH : "$PYTHONPATH" ''; # no tests doCheck = false; + pythonImportsCheck = [ "datalad" ]; + meta = with lib; { description = "Keep code, data, containers under control with git and git-annex"; homepage = "https://www.datalad.org"; From b23764c2e14b41f897bf96702fdfb3ed28de2934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 18:12:29 +0000 Subject: [PATCH 168/337] opcr-policy: 0.1.51 -> 0.2.1 --- pkgs/development/tools/opcr-policy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index 46365e23fd7..7d867623558 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.1.51"; + version = "0.2.1"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-RpjuKtxiZA6l0ZW0TsEUn2AMLjU/V2RRfQLmfa0imW4="; + sha256 = "sha256-t/OiLSr0RFin2yGVFaddDvGBWNUYddvjsERzm2DuXKE="; }; - vendorHash = "sha256-QoD6J+is+InumLiFdbL/y1tuWwBCdBebx6RrIZ4Irik="; + vendorHash = "sha256-ihuZuBsTP/i8M7Fwu5arizryMFZxZ0J26k+JeqnSiJQ="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; From d481521e6e22728ca2a1fcac26e9de8c539d3f0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 18:20:42 +0000 Subject: [PATCH 169/337] loccount: 2.14 -> 2.15 --- pkgs/development/tools/misc/loccount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix index 899ee219c4d..d51cec639c1 100644 --- a/pkgs/development/tools/misc/loccount/default.nix +++ b/pkgs/development/tools/misc/loccount/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitLab, python3 }: buildGoModule rec { pname = "loccount"; - version = "2.14"; + version = "2.15"; src = fetchFromGitLab { owner = "esr"; repo = "loccount"; rev = version; - hash = "sha256-9tzDNwWM4uzxC+xqM603l8EIqYrGUUvZgSe6r1EyHi8="; + hash = "sha256-IRDwxz/InF4okyfAzbK0PzZz+HMUwv5LgRthUUy3rus="; }; vendorHash = null; From 205db0055c53efc3a5a64fb7f1e87a3f84682fa6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 18:21:28 +0000 Subject: [PATCH 170/337] haproxy: 2.7.3 -> 2.7.6 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 7e9cec19de0..bb446eb8b96 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.7.3"; + version = "2.7.6"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-sX5RuWUxhDtKmdLDtiGCgbyYi/Ykyf+Q4Z8MvLol0Gc="; + sha256 = "sha256-Ez81fds/z8WtgUnvPXTLtdtrtKWrZyic4LCraGzet08="; }; buildInputs = [ openssl zlib libxcrypt ] From 1551a82b814c3ac764b4b47855d039162f884455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Apr 2023 11:32:55 -0700 Subject: [PATCH 171/337] python310Packages.docformatter: 1.6.2 -> 1.6.3 Diff: https://github.com/PyCQA/docformatter/compare/refs/tags/v1.6.2...v1.6.3 Changelog: https://github.com/PyCQA/docformatter/blob/refs/tags/v1.6.3/CHANGELOG.md --- pkgs/development/python-modules/docformatter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docformatter/default.nix b/pkgs/development/python-modules/docformatter/default.nix index 11958148d87..61180107894 100644 --- a/pkgs/development/python-modules/docformatter/default.nix +++ b/pkgs/development/python-modules/docformatter/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "docformatter"; - version = "1.6.2"; + version = "1.6.3"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fQm+eMA1p7uCVgQ3Hbm3UY1mhROsThtgkjRRPg3XcsI="; + hash = "sha256-MyrLzEVuNsAZCnRXWDGK7jFAu8woZUSrN6ml1yiadF0="; }; patches = [ From 248a283b4894405260c90a89d9a9212cf84618ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 18:36:15 +0000 Subject: [PATCH 172/337] kubeshark: 39.5 -> 40.0 --- pkgs/applications/networking/cluster/kubeshark/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 8f1b9533214..22a4bde4c34 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeshark"; - version = "39.5"; + version = "40.0"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-1SmIL4kA65VlsHw7YUTxklUtXTwMkb12SCpm3Ja24KA="; + sha256 = "sha256-Tmk9xbAqEsJ8nffRX6qw3RKKoBbSO2gmVT5Ff4Cn9DA="; }; - vendorHash = "sha256-cMX9OYErnnnkvmXgau5xLBSv+wo0VTqgo/rYCBmXYZ4="; + vendorHash = "sha256-ckIjmrXkn1AVBQRwM6+wdRwwYHytxKm3rKEe+csORdU="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" From 9da5430a791fad5bb7da395c6320b8166f6ca69b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Apr 2023 19:35:35 +0000 Subject: [PATCH 173/337] bear: 3.1.1 -> 3.1.2 --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 3132678eade..468cec56791 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-EiAGM2tfzHp2rTAsf+mrfQ7VfX0NTFakcLVpT/plqh8="; + sha256 = "sha256-x46BS+By5Zj5xeYRD45eXRDCAOqwpkkivVyJPnhkAMc="; }; nativeBuildInputs = [ cmake pkg-config ]; From 53655d967acd13807a32988637d3f394ad910189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Apayd=C4=B1n?= Date: Mon, 24 Apr 2023 23:05:14 +0300 Subject: [PATCH 174/337] cosign: 2.0.1 -> 2.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Batuhan Apaydın --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 5997d5eb33c..5193e3af4c8 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-x03I86WJT+dLToeGzIaPrLJK0G7siVZuJHjE1WjZao0="; + hash = "sha256-jJHLCN9hEQy4ijFm6g2E9WvTT43kvPhdRW1aczvEcFs="; }; buildInputs = @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-eTyFIuq9G9/0t5ePZNsBpKJ/lcUU0ryqzg6i+nqbHc4="; + vendorHash = "sha256-X5CY8U3IgxWD3zpb1f9R9Xk/25x1zxfYXkvXbelFBQc="; subPackages = [ "cmd/cosign" From e51b538b35553dace80c6db9574aeae6a993cba7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:24:08 +0300 Subject: [PATCH 175/337] plasma5Packages.bluez-qt: restrict platforms --- pkgs/development/libraries/kde-frameworks/bluez-qt.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index c07553f8493..4dad732641a 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation +{ mkDerivation, lib , extra-cmake-modules , qtbase, qtdeclarative }: @@ -12,4 +12,5 @@ mkDerivation { substituteInPlace CMakeLists.txt \ --replace /lib/udev/rules.d "$bin/lib/udev/rules.d" ''; + meta.platforms = lib.platforms.linux; } From c033b967182439e7f348eb70e315c1127cbec2cb Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 24 Apr 2023 13:27:06 -0700 Subject: [PATCH 176/337] signalbackup-tools: 20230421-1 -> 20230424-1 Diff: https://github.com/bepaald/signalbackup-tools/compare/20230421-1...20230424-1 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 34d06f9fd1e..d71f653892c 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230421-1"; + version = "20230424-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-ZQFoajkD7vvz74TXVT7I4D0Qjknt5YxfHYpGi3i01Ns="; + hash = "sha256-G3cAXpHixRVp+FOwyWS+3uuKGp5+7AGLE/1TlghAlFA="; }; postPatch = '' From f99a52e735c9b8b22fe149e34ec59cdaa8cb2892 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 24 Apr 2023 23:27:17 +0300 Subject: [PATCH 177/337] plasma5Packages.kwayland: restrict platforms --- pkgs/development/libraries/kde-frameworks/kwayland.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 6a070d22780..fbe7d70ec2f 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,5 +1,5 @@ { - mkDerivation, propagateBin, + mkDerivation, propagateBin, lib, extra-cmake-modules, plasma-wayland-protocols, qtbase, wayland, wayland-protocols }: @@ -10,4 +10,5 @@ mkDerivation { buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; setupHook = propagateBin; # XDG_CONFIG_DIRS + meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } From 8c0dde1254622a05a682cc06f0335e6b11167536 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 18:07:04 +0300 Subject: [PATCH 178/337] plasma5Packages.modemmanager-qt: restrict platforms --- pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index 507e24e8f61..f82f97fc7d9 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, modemmanager, qtbase }: @@ -9,4 +9,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ modemmanager qtbase ]; outputs = [ "out" "dev" ]; + meta.platforms = lib.platforms.linux; } From 1133eae76c1784a8a2f9292a41c627b96d1b00b7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 18:07:44 +0300 Subject: [PATCH 179/337] plasma5Packages.networkmanager-qt: restrict platforms --- .../development/libraries/kde-frameworks/networkmanager-qt.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index b79c79b084d..e9f812d68da 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, networkmanager, qtbase, }: @@ -9,4 +9,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; + meta.platforms = lib.platforms.linux; } From 4a2fb58f1a0001f2076a4252350b944d7a73c776 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 18:57:16 +0300 Subject: [PATCH 180/337] plasma5Packages.solid: refactor --- .../development/libraries/kde-frameworks/solid/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/solid/default.nix b/pkgs/development/libraries/kde-frameworks/solid/default.nix index 8c39025e945..27160c3bda0 100644 --- a/pkgs/development/libraries/kde-frameworks/solid/default.nix +++ b/pkgs/development/libraries/kde-frameworks/solid/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, stdenv, bison, extra-cmake-modules, flex, media-player-info, qtbase, qtdeclarative, qttools }: @@ -7,8 +7,9 @@ mkDerivation { pname = "solid"; patches = [ ./fix-search-path.patch ]; - nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; + nativeBuildInputs = [ bison extra-cmake-modules flex ] + ++ lib.optionals stdenv.isLinux [ media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; - propagatedUserEnvPkgs = [ media-player-info ]; + propagatedUserEnvPkgs = lib.optionals stdenv.isLinux [ media-player-info ]; } From c155ee2b7f68c044822968e901082c266ba2de5e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 24 Apr 2023 23:22:08 +0300 Subject: [PATCH 181/337] plasma5Packages.kactivities: refactor --- pkgs/development/libraries/kde-frameworks/kio/default.nix | 4 +++- .../development/libraries/kde-frameworks/knotifications.nix | 6 ++++-- pkgs/development/libraries/phonon/default.nix | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 7b2815945c8..3b07654fb80 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -21,7 +21,9 @@ mkDerivation { ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice - kxmlgui qtbase qttools solid kded + kxmlgui qtbase qttools solid + ] ++ lib.optionals stdenv.isLinux [ + kded ]; outputs = [ "out" "dev" ]; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 363ca46d10a..5284d673d89 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -1,9 +1,9 @@ -{ mkDerivation +{ mkDerivation, lib, stdenv , extra-cmake-modules , kcodecs, kconfig, kcoreaddons, kwindowsystem , libdbusmenu , phonon -, qttools, qtx11extras +, qttools, qtx11extras, qtmacextras }: mkDerivation { @@ -11,5 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras + ] ++ lib.optionals stdenv.isDarwin [ + qtmacextras ]; } diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 48f4729ba16..edfc6c7eded 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -25,8 +25,9 @@ stdenv.mkDerivation rec { homepage = "https://community.kde.org/Phonon"; description = "Multimedia API for Qt"; license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ttuegel ]; + broken = stdenv.isDarwin; }; src = fetchurl { From c49f5e48bd2f14f25fef897f997d2980ee50bb22 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 24 Apr 2023 23:59:02 +0300 Subject: [PATCH 182/337] plasma5Packages.kactivities-stats: restrict platforms --- .../development/libraries/kde-frameworks/kactivities-stats.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 63a5b035724..cb838e06774 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, boost, kactivities, kconfig, qtbase, }: @@ -10,4 +10,5 @@ mkDerivation { buildInputs = [ boost kactivities kconfig ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; + meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } From 5b36fa169886225e06aa3c1412f3fbf07ab74096 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 19:19:19 +0300 Subject: [PATCH 183/337] plasma5Packages.kfilemetadata: refactor --- .../libraries/kde-frameworks/kfilemetadata/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 782b0332214..1bd1f115c6c 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,5 +1,6 @@ { mkDerivation , lib +, stdenv , extra-cmake-modules , attr , ebook_tools @@ -17,8 +18,9 @@ mkDerivation { pname = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ + buildInputs = lib.optionals stdenv.isLinux [ attr + ] ++ [ ebook_tools exiv2 ffmpeg From b10532554663735e463b506a573bbe35941dd32e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 24 Apr 2023 23:52:45 +0300 Subject: [PATCH 184/337] plasma5Packages.baloo: restrict platforms --- pkgs/development/libraries/kde-frameworks/baloo.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 73df056516e..4b0ac039193 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime, kio, lmdb, qtbase, qtdeclarative, solid, @@ -22,4 +22,5 @@ mkDerivation { substituteInPlace "$sourceRoot"/src/file/kde-baloo.service.in \ --replace @KDE_INSTALL_FULL_BINDIR@ /run/current-system/sw/bin ''; + meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } From 2ddd52c93f73282070317e569b09518f252ffeb6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 24 Apr 2023 23:25:51 +0300 Subject: [PATCH 185/337] plasma5Packages.kded: restrict platforms --- pkgs/development/libraries/kde-frameworks/kded.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 180d508acc5..02364ba72f3 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,5 +1,5 @@ { - mkDerivation, propagate, wrapGAppsHook, + mkDerivation, lib, propagate, wrapGAppsHook, extra-cmake-modules, kdoctools, gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, qtbase, @@ -18,4 +18,5 @@ mkDerivation { preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } From bb8a261ecb89802db85383f2833404de1ca2b30e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 24 Apr 2023 23:26:34 +0300 Subject: [PATCH 186/337] plasma5Packages.kdesu: restrict platforms --- pkgs/development/libraries/kde-frameworks/kdesu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix index fe506401da4..29a02d75076 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty, kservice, qtbase, }: @@ -11,4 +11,5 @@ mkDerivation { propagatedBuildInputs = [ kpty ]; outputs = [ "out" "dev" ]; patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; + meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd; } From ae0a6be287d7550a4940cd32716f1ea937acd141 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 19:32:15 +0300 Subject: [PATCH 187/337] plasma5Packages.kinit: refactor --- pkgs/development/libraries/kde-frameworks/kinit/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 9acd56f324c..1f2620c5664 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, writeScript, + mkDerivation, lib, stdenv, writeScript, extra-cmake-modules, kdoctools, kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework }: @@ -21,6 +21,7 @@ mkDerivation { CXXFLAGS = [ ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' + ] ++ lib.optionals stdenv.isLinux [ ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"'' ]; setupHook = writeScript "setup-hook.sh" '' From 50058841dbdca5eed17cb378857214b0b7f32f64 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 20:52:03 +0300 Subject: [PATCH 188/337] libsForQt5.maui-core: restrict platforms --- pkgs/development/libraries/maui-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/maui-core/default.nix b/pkgs/development/libraries/maui-core/default.nix index 4b9491ed9c3..8d6a81b93ff 100644 --- a/pkgs/development/libraries/maui-core/default.nix +++ b/pkgs/development/libraries/maui-core/default.nix @@ -39,6 +39,7 @@ mkDerivation rec { # Missing license information https://github.com/Nitrux/maui-core/issues/1 license = licenses.unfree; maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; }; } From 9f74a9f9ccd9ed327eba0dd4568187662c9df718 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 20:39:46 +0300 Subject: [PATCH 189/337] drawpile: mark as broken on darwin --- pkgs/applications/graphics/drawpile/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 76409860ffa..ea07e231421 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -103,6 +103,7 @@ in mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } From 98a1542d62b308449e134275be41733e2934c9dd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 24 Apr 2023 23:02:03 +0200 Subject: [PATCH 190/337] rustic-rs: 0.5.1 -> 0.5.2 --- pkgs/tools/backup/rustic-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/rustic-rs/default.nix b/pkgs/tools/backup/rustic-rs/default.nix index def401ca187..1e7d7939fbc 100644 --- a/pkgs/tools/backup/rustic-rs/default.nix +++ b/pkgs/tools/backup/rustic-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic-rs"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "refs/tags/v${version}"; - hash = "sha256-r1h21J+pR8HiFfSxBwTVhuPFtc7HP+XnI3Xtx4oRKzY="; + hash = "sha256-DL6IpWUGZT5kqnJVFehjMZAmBp2shUZSA5KvJDa9FFY="; }; - cargoHash = "sha256-HiGBp79bxxZaupPo5s6cjXa4Q83O9i8VLzB9psjKSfo="; + cargoHash = "sha256-K4bj0jE+PuOL2mEeVEI84On17Jyw7PKtNPQzDKMvY+c="; nativeBuildInputs = [ installShellFiles ]; From 198205160db3e3984a2257c7af5ff1ed12b5a46c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 25 Apr 2023 00:14:24 +0300 Subject: [PATCH 191/337] qmake2cmake: 1.0.3 -> 1.0.5 --- pkgs/tools/misc/qmake2cmake/default.nix | 10 ++++++++-- pkgs/tools/misc/qmake2cmake/fix-locations.patch | 14 -------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/qmake2cmake/default.nix b/pkgs/tools/misc/qmake2cmake/default.nix index 7ed349af31c..ea70325cee8 100644 --- a/pkgs/tools/misc/qmake2cmake/default.nix +++ b/pkgs/tools/misc/qmake2cmake/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchgit , packaging +, platformdirs , portalocker , pyparsing , sympy @@ -10,12 +11,12 @@ buildPythonPackage rec { pname = "qmake2cmake"; - version = "1.0.3"; + version = "1.0.5"; src = fetchgit { url = "https://codereview.qt-project.org/qt/qmake2cmake"; rev = "v${version}"; - hash = "sha256-HzbygFmnKq3E2eEdWCFa4z9Qszfck7dJm2Z5s+il4I0="; + hash = "sha256-6a1CIzHj9kmNgWN6QPNNUbiugkyfSrrIb7Fbz0ocr6o="; }; patches = [ @@ -24,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging + platformdirs portalocker pyparsing sympy @@ -33,6 +35,10 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = with lib; { description = "Tool to convert qmake .pro files to CMakeLists.txt"; homepage = "https://wiki.qt.io/Qmake2cmake"; diff --git a/pkgs/tools/misc/qmake2cmake/fix-locations.patch b/pkgs/tools/misc/qmake2cmake/fix-locations.patch index 44741c0e708..33b22382e21 100644 --- a/pkgs/tools/misc/qmake2cmake/fix-locations.patch +++ b/pkgs/tools/misc/qmake2cmake/fix-locations.patch @@ -1,17 +1,3 @@ -diff --git a/src/qmake2cmake/condition_simplifier_cache.py b/src/qmake2cmake/condition_simplifier_cache.py -index 86c8e83..9d1ac00 100755 ---- a/src/qmake2cmake/condition_simplifier_cache.py -+++ b/src/qmake2cmake/condition_simplifier_cache.py -@@ -29,8 +29,7 @@ def get_current_file_path() -> str: - - - def get_cache_location() -> str: -- this_file = get_current_file_path() -- dir_path = os.path.dirname(this_file) -+ dir_path = os.getcwd() - cache_path = os.path.join(dir_path, ".pro2cmake_cache", "cache.json") - return cache_path - diff --git a/src/qmake2cmake/run_pro2cmake.py b/src/qmake2cmake/run_pro2cmake.py index fd3e11a..bdbadb0 100755 --- a/src/qmake2cmake/run_pro2cmake.py From 7eb272bbe8258738cfbae7ae8223901306987c7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Apr 2023 23:29:22 +0200 Subject: [PATCH 192/337] checkov: 2.3.192 -> 2.3.199 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.192...2.3.199 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.199 --- pkgs/development/tools/analysis/checkov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 615eb49ae6c..8917ff369d0 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.192"; + version = "2.3.199"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vTn6Fum47wpgpICyiL+s6azhAgqzLj2w7wntypsatiU="; + hash = "sha256-JwEI+i6xvO8wsCCAliljXxddL3T6MWzHvzMmewNlbsk="; }; patches = [ @@ -116,7 +116,7 @@ buildPythonApplication rec { # Tests are comparing console output "cli" "console" - # Starting to fail after 2.3.192 + # Starting to fail after 2.3.199 "test_non_multiline_pair" ]; From 793b1a707f8165bc185f82eb7f781dbd730790f8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 25 Apr 2023 00:36:15 +0300 Subject: [PATCH 193/337] epoll-shim: unstable-2023-02-05 -> 0.0.20230411 --- pkgs/development/libraries/epoll-shim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/epoll-shim/default.nix b/pkgs/development/libraries/epoll-shim/default.nix index 311496fe07b..ae2c22afd63 100644 --- a/pkgs/development/libraries/epoll-shim/default.nix +++ b/pkgs/development/libraries/epoll-shim/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "epoll-shim"; - version = "unstable-2023-02-05"; + version = "0.0.20230411"; src = fetchFromGitHub { owner = "jiixyj"; repo = finalAttrs.pname; - rev = "702e845d7850e30a7b9e29f759c9c8f7bb40784b"; - hash = "sha256-QfBnF0/P2KjQggEdJCdqVJDeV/+iaN0OZIwIGyIyr68="; + rev = "v${finalAttrs.version}"; + hash = "sha256-TOfybtUEp+EtY2l/UGwVFIESDe9kELJCZHlcz22Cmi8="; }; nativeBuildInputs = [ From 70a89b0500553cb864f6021be3033bf007baccae Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 25 Apr 2023 07:39:32 +1000 Subject: [PATCH 194/337] awsebcli: 3.20.5 -> 3.20.6 --- pkgs/tools/virtualization/awsebcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 4a7f1baa0c2..c7fa5479121 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -36,11 +36,11 @@ let in with localPython.pkgs; buildPythonApplication rec { pname = "awsebcli"; - version = "3.20.5"; + version = "3.20.6"; src = fetchPypi { inherit pname version; - hash = "sha256-EoSEanwGvP3RcemXrVy7iAGrY/vMC6LbwcrXj2OsF8Q="; + hash = "sha256-9n6nObYoZlOKgQvSdNqHLRr+RlDoKfR3fgD7Xa9wPzM="; }; From b9ba5d3e7e0933ac709b249e45d0e6791372dd27 Mon Sep 17 00:00:00 2001 From: waelwindows Date: Tue, 25 Apr 2023 00:27:38 +0300 Subject: [PATCH 195/337] tauon: Add Darwin support --- pkgs/applications/audio/tauon/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 427c1e9e5dc..a75110c15da 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -57,6 +57,8 @@ stdenv.mkDerivation rec { patchShebangs compile-phazor.sh + substituteInPlace compile-phazor.sh --replace 'gcc' '${stdenv.cc.targetPrefix}cc' + substituteInPlace extra/tauonmb.desktop --replace 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' ''; @@ -95,7 +97,6 @@ stdenv.mkDerivation rec { natsort pillow plexapi - pulsectl pycairo pychromecast pylast @@ -105,7 +106,8 @@ stdenv.mkDerivation rec { requests send2trash setproctitle - ] ++ lib.optional withDiscordRPC pypresence; + ] ++ lib.optional withDiscordRPC pypresence + ++ lib.optional stdenv.isLinux pulsectl; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ffmpeg]}" @@ -134,6 +136,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Taiko2k/TauonMusicBox/releases/tag/v${version}"; license = licenses.gpl3; maintainers = with maintainers; [ jansol ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 46559d5fca477f1d5ce692253be958b64abd6834 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 23 Apr 2023 15:13:23 +0100 Subject: [PATCH 196/337] openimageio_1: add CVE-2023-22845, CVE-2023-24472 & CVE-2023-24473 to knownVulnerabilities --- pkgs/development/libraries/openimageio/1.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/openimageio/1.x.nix b/pkgs/development/libraries/openimageio/1.x.nix index 62dd3f4cc2c..90d8df5f5a5 100644 --- a/pkgs/development/libraries/openimageio/1.x.nix +++ b/pkgs/development/libraries/openimageio/1.x.nix @@ -72,6 +72,9 @@ stdenv.mkDerivation rec { "CVE-2022-43601" "CVE-2022-43602" "CVE-2022-43603" + "CVE-2023-22845" + "CVE-2023-24472" + "CVE-2023-24473" ]; }; } From 244a2f399fa62bea8580b6c8518e9a0d0603a383 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Apr 2023 23:59:45 +0200 Subject: [PATCH 197/337] metasploit: 6.3.12 -> 6.3.13 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 21 ++++++------ pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 36 +++++++++++++-------- 4 files changed, 38 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index fe28b723b1a..7595e891610 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.3.12" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.13" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index dfdc81bf957..8a748567b1f 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: a78862340cacb90e2d27b6f7ae670387081a0276 - ref: refs/tags/6.3.12 + revision: f58dd240e0c900976bc0609096b3b2e9965f70cb + ref: refs/tags/6.3.13 specs: - metasploit-framework (6.3.12) + metasploit-framework (6.3.13) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -12,6 +12,7 @@ GIT aws-sdk-s3 bcrypt bcrypt_pbkdf + bootsnap bson chunky_png dnsruby @@ -32,7 +33,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.123) + metasploit-payloads (= 2.0.126) metasploit_data_models metasploit_payloads-mettle (= 1.0.20) mqtt @@ -129,7 +130,7 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.748.0) + aws-partitions (1.752.0) aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -144,7 +145,7 @@ GEM aws-sdk-kms (1.63.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.120.1) + aws-sdk-s3 (1.121.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -153,6 +154,8 @@ GEM bcrypt (3.1.18) bcrypt_pbkdf (1.1.0) bindata (2.4.15) + bootsnap (1.16.0) + msgpack (~> 1.2) bson (4.15.0) builder (3.2.4) chunky_png (1.4.0) @@ -238,7 +241,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.123) + metasploit-payloads (2.0.126) metasploit_data_models (6.0.2) activerecord (~> 7.0) activesupport (~> 7.0) @@ -288,9 +291,9 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.4.6) + pg (1.5.1) public_suffix (5.0.1) - puma (6.2.1) + puma (6.2.2) nio4r (~> 2.0) racc (1.6.2) rack (2.2.6.4) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index f2ae0baa3a8..a47cad064f1 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.3.12"; + version = "6.3.13"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-+ZWH/rOFm6jSEUT6SGnIJ8rBY2GvNc2tDxHH9+TAwiQ="; + sha256 = "sha256-bmp5H7awE8ZaLrPt9UEXeK6haaLzejsIq8jk1bbnv/c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 63e95598142..b3ac89b5ad6 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12pi6xcvwaplzgy24vqiw2q9aaxs5r8gl92kv2gy6riqldgs10gi"; + sha256 = "18ndv604p1p3gkyy0d958jx2wp74d100q6vbc6ak70a7bv93wqsg"; type = "gem"; }; - version = "1.748.0"; + version = "1.752.0"; }; aws-sdk-core = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mapdzm97rv22pca1hvvshwsafa12gd2yv2fcy63dfjn5vjjq893"; + sha256 = "1s5v3799pi7ik53gv7dl02am5pngv6x4azzwx9my09nll4q3lfk8"; type = "gem"; }; - version = "1.120.1"; + version = "1.121.0"; }; aws-sigv4 = { groups = ["default"]; @@ -199,6 +199,16 @@ }; version = "2.4.15"; }; + bootsnap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; + type = "gem"; + }; + version = "1.16.0"; + }; bson = { groups = ["default"]; platforms = []; @@ -614,12 +624,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "a78862340cacb90e2d27b6f7ae670387081a0276"; - sha256 = "0962q3jggiqi1ynwsddgc5iw3ji7r1lliyj4279ai6w5ngz8g5gr"; + rev = "f58dd240e0c900976bc0609096b3b2e9965f70cb"; + sha256 = "1xxzwyvdbr68mc43nypkl9ls3bkq2x0zbvdk5rdcc4xhnqgpjskf"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.12"; + version = "6.3.13"; }; metasploit-model = { groups = ["default"]; @@ -636,10 +646,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ay75vrp7cpxzl1cny3fikgyg4wsg1fz3qqfafrysz0wfmqlkpyp"; + sha256 = "1dncaysx2llgcy5a4vgv93hbp3cmiqa36ch229vmshfr296vfqr8"; type = "gem"; }; - version = "2.0.123"; + version = "2.0.126"; }; metasploit_data_models = { groups = ["default"]; @@ -917,10 +927,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; + sha256 = "0ihx7icaib5hfr51s44aw63y7g8za3gkqk3diwp75hzkbgjj9hrc"; type = "gem"; }; - version = "1.4.6"; + version = "1.5.1"; }; public_suffix = { groups = ["default"]; @@ -937,10 +947,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qqd5lb3mamh53ssx0xavmspg4blhq6hd1kipksw20bq71xcklf5"; + sha256 = "0yf4jmkyy8das7pj1xzwllfvzkhq2p6p534j61d9h4wz3nfyf0s5"; type = "gem"; }; - version = "6.2.1"; + version = "6.2.2"; }; racc = { groups = ["default"]; From 1fcf617fdc391f20c764b625b30e53b2a1ebf9a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 00:05:33 +0200 Subject: [PATCH 198/337] exploitdb: 2023-04-22 -> 2023-04-24 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-04-22...2023-04-24 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index b58190c23b3..8bd0c529f39 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-04-22"; + version = "2023-04-24"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HE8L7+/41GMxQeMeei4CEBSbr+CzNkew843dK34D48k="; + hash = "sha256-RJYyFHTt7Cm6N+ZTD7D6GW/gKhwPhOMriV2+/lFWN10="; }; nativeBuildInputs = [ From de6e3b24ed23f738fbc7bd4003b2e106f1ee6e57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 00:06:24 +0200 Subject: [PATCH 199/337] python311Packages.hahomematic: 2023.4.0 -> 2023.4.2 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.4.0...2023.4.2 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.4.2 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 445bba54943..5458986e7f1 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.4.0"; + version = "2023.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-IR8Sx9rb6vPA/wIZVCwOl2bKxwWbogW4Xry14yxb2Ic="; + hash = "sha256-cMrp0IewFezXpuXDnXDoDmEge/2NWRlhqkBmIwBjlrE="; }; nativeBuildInputs = [ From 116edd5e23413bee532a921c518deef352c7a019 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 00:07:20 +0200 Subject: [PATCH 200/337] python311Packages.elmax-api: 0.0.3 -> 0.0.4 Diff: https://github.com/albertogeniola/elmax-api/compare/refs/tags/v0.0.3...v0.0.4 Changelog: https://github.com/albertogeniola/elmax-api/releases/tag/v0.0.4 --- pkgs/development/python-modules/elmax-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix index a57225d41db..415211cb362 100644 --- a/pkgs/development/python-modules/elmax-api/default.nix +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "elmax-api"; - version = "0.0.3"; + version = "0.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZqPDnIiFzxS6nU19bfEgnqEsuz7oI+Z4ac6br6Gr4Vk="; + hash = "sha256-+dR1ccRa4G91yFeSwjgdZ1lEXV/PIgnKN8e9tfy5fTU="; }; propagatedBuildInputs = [ From 663d19f9196d91cc185789dc1ed87a9da666c907 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 00:10:22 +0200 Subject: [PATCH 201/337] python311Packages.gehomesdk: 0.5.8 -> 0.5.9 Changelog: https://github.com/simbaja/gehome/blob/master/CHANGELOG.md --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 7c83f062307..060b921a38b 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.8"; + version = "0.5.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-x83CmOAZFaIDv4bzO01YZxVPVM/cwUpJtKdCWOxH/O4="; + hash = "sha256-V8vwsLIO44q2ms/segTZ70DUVb7BNuxYZ8vX9KPNP4c="; }; propagatedBuildInputs = [ From df0aedb1e9b211ceb8f19f4265bb22542754a338 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 00:10:54 +0200 Subject: [PATCH 202/337] python311Packages.yalexs: 1.3.0 -> 1.3.2 Diff: https://github.com/bdraco/yalexs/compare/refs/tags/v1.3.0...v1.3.2 Changelog: https://github.com/bdraco/yalexs/releases/tag/v1.3.2 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index e319e2d93fb..52d5be83808 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.3.0"; + version = "1.3.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5UmuQsA5pPzgP+uCkykWQBCPY437cxblGCiZxEYQzGg="; + hash = "sha256-CqonGKcbAg0Edqw3WosK2vEJ0DxOMZNSNO5RkecECa0="; }; propagatedBuildInputs = [ From 11d5f170ad714021b82c62e64666d3eb47d679af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 00:11:32 +0200 Subject: [PATCH 203/337] python311Packages.ttp-templates: 0.3.4 -> 0.3.5 Diff: https://github.com/dmulyalin/ttp_templates/compare/refs/tags/0.3.4...0.3.5 Changelog: https://github.com/dmulyalin/ttp_templates/releases/tag/0.3.5 --- pkgs/development/python-modules/ttp-templates/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ttp-templates/default.nix b/pkgs/development/python-modules/ttp-templates/default.nix index 364041704d5..77acc320fe8 100644 --- a/pkgs/development/python-modules/ttp-templates/default.nix +++ b/pkgs/development/python-modules/ttp-templates/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ttp-templates"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; From 1e4e8a1775f813b6145e872e33997e6f9280573c Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 24 Apr 2023 18:15:57 -0400 Subject: [PATCH 204/337] gmic-qt: add meta.mainProgram --- pkgs/tools/graphics/gmic-qt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index d81fe16a910..fa974aa97c8 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -108,5 +108,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.lilyinstarlight ]; platforms = platforms.unix; + mainProgram = "gmic_qt"; }; } From 9d1fa577a1747846574388f4e7b006d1d1237b34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 00:18:11 +0200 Subject: [PATCH 205/337] python311Packages.syncedlyrics: 0.4.0 -> 0.5.0 Diff: https://github.com/rtcq/syncedlyrics/compare/refs/tags/v0.4.0...v0.5.0 Changelog: https://github.com/rtcq/syncedlyrics/releases/tag/v0.5.0 --- .../python-modules/syncedlyrics/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index f69ce5fe83e..48330988df8 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchFromGitHub , poetry-core -, pytestCheckHook , pythonOlder , pythonRelaxDepsHook , rapidfuzz @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "rtcq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dH9irIah9CdZ9Kv7bIymP1o5ifWEYCiSqegUpu8Y+Tg="; + hash = "sha256-79dy1f5Pd/JGIpH/71E6IBg+AtR4zgHL4b/GRH1AFp0="; }; nativeBuildInputs = [ @@ -39,18 +38,13 @@ buildPythonPackage rec { beautifulsoup4 ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + # Tests require network access + doCheck = false; pythonImportsCheck = [ "syncedlyrics" ]; - pytestFlagsArray = [ - "test.py::test_all_providers" - ]; - meta = with lib; { description = "Module to get LRC format (synchronized) lyrics"; homepage = "https://github.com/rtcq/syncedlyrics"; From 56268b0c6b8c920b20fec694a977ad8357d509a8 Mon Sep 17 00:00:00 2001 From: Cynthia Fox Date: Mon, 24 Apr 2023 19:23:49 -0400 Subject: [PATCH 206/337] maintainers: Update `cyntheticfox` email --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f190c7086bb..66c7f3c9559 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3304,7 +3304,7 @@ }]; }; cyntheticfox = { - email = "houstdav000@gmail.com"; + email = "cyntheticfox@gh0st.sh"; github = "cyntheticfox"; githubId = 17628961; matrix = "@houstdav000:gh0st.ems.host"; From a541b37190bdb1a5b4c9bc1bd091cd9448109462 Mon Sep 17 00:00:00 2001 From: Cynthia Fox Date: Mon, 24 Apr 2023 19:24:41 -0400 Subject: [PATCH 207/337] maintainers: Add `cyntheticfox` key fingerprint --- maintainers/maintainer-list.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 66c7f3c9559..11b283925fa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3307,6 +3307,9 @@ email = "cyntheticfox@gh0st.sh"; github = "cyntheticfox"; githubId = 17628961; + keys = [{ + fingerprint = "73C1 C5DF 51E7 BB92 85E9 A262 5960 278C E235 F821"; + }]; matrix = "@houstdav000:gh0st.ems.host"; name = "Cynthia Fox"; }; From c251c021fe168479f811d1496d5c4571592d8dfa Mon Sep 17 00:00:00 2001 From: gaykitty <126119280+gaykitty@users.noreply.github.com> Date: Sun, 16 Apr 2023 19:24:06 -0400 Subject: [PATCH 208/337] nixos/stargazer: init --- .../manual/release-notes/rl-2305.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/web-servers/stargazer.nix | 198 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/web-servers/stargazer.nix | 30 +++ 5 files changed, 232 insertions(+) create mode 100644 nixos/modules/services/web-servers/stargazer.nix create mode 100644 nixos/tests/web-servers/stargazer.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index a89c46152ca..c411ecb6dcb 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -95,6 +95,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [jellyseerr](https://github.com/Fallenbagel/jellyseerr), a web-based requests manager for Jellyfin, forked from Overseerr. Available as [services.jellyseerr](#opt-services.jellyseerr.enable). +- [stargazer](https://sr.ht/~zethra/stargazer/), a fast and easy to use Gemini server. Available as [services.stargazer](#opt-services.stargazer.enable). + - [photoprism](https://photoprism.app/), a AI-Powered Photos App for the Decentralized Web. Available as [services.photoprism](options.html#opt-services.photoprism.enable). - [peroxide](https://github.com/ljanyst/peroxide), a fork of the official [ProtonMail bridge](https://github.com/ProtonMail/proton-bridge) that aims to be similar to [Hydroxide](https://github.com/emersion/hydroxide). Available as [services.peroxide](#opt-services.peroxide.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f1c459f7557..bbbe8682fd0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1243,6 +1243,7 @@ ./services/web-servers/nginx/gitweb.nix ./services/web-servers/phpfpm/default.nix ./services/web-servers/pomerium.nix + ./services/web-servers/stargazer.nix ./services/web-servers/tomcat.nix ./services/web-servers/traefik.nix ./services/web-servers/trafficserver/default.nix diff --git a/nixos/modules/services/web-servers/stargazer.nix b/nixos/modules/services/web-servers/stargazer.nix new file mode 100644 index 00000000000..85783a500d6 --- /dev/null +++ b/nixos/modules/services/web-servers/stargazer.nix @@ -0,0 +1,198 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.stargazer; + routesFormat = pkgs.formats.ini { }; + globalFile = pkgs.writeText "global.ini" '' + listen = ${concatStringsSep " " cfg.listen} + connection-logging = ${boolToString cfg.connectionLogging} + log-ip = ${boolToString cfg.ipLog} + log-ip-partial = ${boolToString cfg.ipLogPartial} + request-timeout = ${toString cfg.requestTimeout} + response-timeout = ${toString cfg.responseTimeout} + + [:tls] + store = ${toString cfg.store} + organization = ${cfg.certOrg} + gen-certs = ${boolToString cfg.genCerts} + regen-certs = ${boolToString cfg.regenCerts} + ${optionalString (cfg.certLifetime != "") "cert-lifetime = ${cfg.certLifetime}"} + + ''; + routesFile = routesFormat.generate "router.ini" cfg.routes; + configFile = pkgs.runCommand "config.ini" { } '' + cat ${globalFile} ${routesFile} > $out + ''; +in +{ + options.services.stargazer = { + enable = mkEnableOption (lib.mdDoc "Stargazer Gemini server"); + + listen = lib.mkOption { + type = types.listOf types.str; + default = [ "0.0.0.0" ] ++ optional config.networking.enableIPv6 "[::0]"; + defaultText = literalExpression ''[ "0.0.0.0" ] ++ lib.optional config.networking.enableIPv6 "[::0]"''; + example = literalExpression ''[ "10.0.0.12" "[2002:a00:1::]" ]''; + description = lib.mdDoc '' + Address and port to listen on. + ''; + }; + + connectionLogging = lib.mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Whether or not to log connections to stdout."; + }; + + ipLog = lib.mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Log client IP addresses in the connection log."; + }; + + ipLogPartial = lib.mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Log partial client IP addresses in the connection log."; + }; + + requestTimeout = lib.mkOption { + type = types.int; + default = 5; + description = lib.mdDoc '' + Number of seconds to wait for the client to send a complete + request. Set to 0 to disable. + ''; + }; + + responseTimeout = lib.mkOption { + type = types.int; + default = 0; + description = lib.mdDoc '' + Number of seconds to wait for the client to send a complete + request and for stargazer to finish sending the response. + Set to 0 to disable. + ''; + }; + + store = lib.mkOption { + type = types.path; + default = /var/lib/gemini/certs; + description = lib.mdDoc '' + Path to the certificate store on disk. This should be a + persistent directory writable by Stargazer. + ''; + }; + + certOrg = lib.mkOption { + type = types.str; + default = "stargazer"; + description = lib.mdDoc '' + The name of the organization responsible for the X.509 + certificate's /O name. + ''; + }; + + genCerts = lib.mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Set to false to disable automatic certificate generation. + Use if you want to provide your own certs. + ''; + }; + + regenCerts = lib.mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Set to false to turn off automatic regeneration of expired certificates. + Use if you want to provide your own certs. + ''; + }; + + certLifetime = lib.mkOption { + type = types.str; + default = ""; + description = lib.mdDoc '' + How long certs generated by Stargazer should live for. + Certs live forever by default. + ''; + example = literalExpression "\"1y\""; + }; + + routes = lib.mkOption { + type = routesFormat.type; + default = { }; + description = lib.mdDoc '' + Routes that Stargazer should server. + + [Refer to upstream docs](https://git.sr.ht/~zethra/stargazer/tree/main/item/doc/stargazer.ini.5.txt) + ''; + example = literalExpression '' + { + "example.com" = { + root = "/srv/gemini/example.com"; + }; + "example.com:/man" = { + root = "/cgi-bin"; + cgi = true; + }; + "other.org~(.*)" = { + redirect = "gemini://example.com"; + rewrite = "\1"; + }; + } + ''; + }; + + user = mkOption { + type = types.str; + default = "stargazer"; + description = lib.mdDoc "User account under which stargazer runs."; + }; + + group = mkOption { + type = types.str; + default = "stargazer"; + description = lib.mdDoc "Group account under which stargazer runs."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.stargazer = { + description = "Stargazer gemini server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.stargazer}/bin/stargazer ${configFile}"; + Restart = "always"; + # User and group + User = cfg.user; + Group = cfg.group; + }; + }; + + # Create default cert store + system.activationScripts.makeStargazerCertDir = + optionalAttrs (cfg.store == /var/lib/gemini/certs) '' + mkdir -p /var/lib/gemini/certs + chown -R ${cfg.user}:${cfg.group} /var/lib/gemini/certs + ''; + + users.users = optionalAttrs (cfg.user == "stargazer") { + stargazer = { + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = optionalAttrs (cfg.group == "stargazer") { + stargazer = { }; + }; + }; + + meta.maintainers = with lib.maintainers; [ gaykitty ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 715fe7e51e0..dace17d7670 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -645,6 +645,7 @@ in { sslh = handleTest ./sslh.nix {}; sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; + stargazer = runTest ./web-servers/stargazer.nix; starship = handleTest ./starship.nix {}; step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {}; stratis = handleTest ./stratis {}; diff --git a/nixos/tests/web-servers/stargazer.nix b/nixos/tests/web-servers/stargazer.nix new file mode 100644 index 00000000000..6e720b120d1 --- /dev/null +++ b/nixos/tests/web-servers/stargazer.nix @@ -0,0 +1,30 @@ +{ pkgs, lib, ... }: +{ + name = "stargazer"; + meta = with lib.maintainers; { maintainers = [ gaykitty ]; }; + + nodes = { + geminiserver = { pkgs, ... }: { + services.stargazer = { + enable = true; + routes = { + "localhost" = { + root = toString (pkgs.writeTextDir "index.gmi" '' + # Hello NixOS! + ''); + }; + }; + }; + }; + }; + + testScript = { nodes, ... }: '' + geminiserver.wait_for_unit("stargazer") + geminiserver.wait_for_open_port(1965) + + with subtest("check is serving over gemini"): + response = geminiserver.succeed("${pkgs.gmni}/bin/gmni -j once -i -N gemini://localhost:1965") + print(response) + assert "Hello NixOS!" in response + ''; +} From a9c149e0e2f795312ccd20ba10a00a76e1917a3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 01:15:29 +0000 Subject: [PATCH 209/337] go-task: 3.23.0 -> 3.24.0 --- pkgs/development/tools/go-task/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 6d7194811eb..2e5ba53f719 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-/PGg5Gt85KN1I/7iV9zXTrbt0DU1a3VhJmPBj7pv+lg="; + hash = "sha256-8YkhdMJJ4EgFqkBOSudpznEKRe9bsd/yR2NuvJcrfgY="; }; - vendorHash = "sha256-wk06dlUcSpQTTzabUmAFjl/FnHFQQCkMv+XMna6ikGo="; + vendorHash = "sha256-iHze5mcXDmOyTxqQX5/HtElDY0Af3bTbB6xLrZjVHPY="; doCheck = false; From 6b9626a8c06eb16b4e209b700a593ed5de30db61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 01:25:30 +0000 Subject: [PATCH 210/337] ttdl: 3.7.1 -> 3.8.0 --- pkgs/applications/misc/ttdl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix index 519efbcf587..03ecf260d24 100644 --- a/pkgs/applications/misc/ttdl/default.nix +++ b/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "3.7.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-Bhi1d01VqeLmxsiyIG8HXD6AgabgsKgZoKYgnGNpk/8="; + sha256 = "sha256-6QfUy1Y7qFOdBFmDFQyRr+GJZSdH+pbU3dEcAjsV1JM="; }; - cargoHash = "sha256-A/5DS7b7Dgj+GlCPu6fx0t14BfMm4XjkpcDjSpeDSnE="; + cargoHash = "sha256-N+mVfgbL22fmynmz4/xFNxQh7l455cH2jyuczc4XsM4="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; From a805249595d696eeb18110dce18fd5d382e20648 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 01:28:27 +0000 Subject: [PATCH 211/337] spicedb: 1.19.0 -> 1.20.0 --- pkgs/servers/spicedb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 8da312f5c70..75e72f4c386 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-2s5FR3qICB3nw0RAgwiuHLFh/aTzu7jXuIGi0xLIXNY="; + hash = "sha256-gTQ6AiFcx9ckygZt8l5BWHfk8wv0Z7xCirPzCPkloKA="; }; - vendorHash = "sha256-w6Ch0oyiF32ChJopdgXFh+QTadLIMFiNBBDyfVgtCik="; + vendorHash = "sha256-sL2i9kpMuJIdkDXOXJVMzYBiIsU7duu/tRfDaLPjbwo="; subPackages = [ "cmd/spicedb" ]; From 75258c90ea9cf9dc06f30b48d598bc2a8c3c357e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 01:37:15 +0000 Subject: [PATCH 212/337] gh-dash: 3.7.6 -> 3.7.7 --- pkgs/tools/misc/gh-dash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index 131db58c0b8..8d2d7258071 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.7.6"; + version = "3.7.7"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-EYDSfxFOnMuPDZaG1CYQtYLNe6afm/2YYlQPheAKXDg="; + hash = "sha256-Ih9Vdt/ds8f37n7onWhvfrgMrE2iXQPwSTgxrui5TYY="; }; - vendorHash = "sha256-66GxD48fCWUWMyZ3GiivWNtz0mgI4JHMcvNwHGFTRfU="; + vendorHash = "sha256-ZpX+0AyHFWOb75jlIS5/BqKpRkqNpE4SkOJ01CqO/0w="; ldflags = [ "-s" From e37823b7f2f875dd1b70a0f2136e17099df194cc Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Tue, 25 Apr 2023 03:41:55 +0200 Subject: [PATCH 213/337] markdown-it-py: disable checks on i686 `pandas` is in the `nativeCheckInputs` closure, but is marked as broken on i686, due to maintainers no longer testing on that platform. This causes some derivations (eg. fontconfig/noto-fonts-emoji) to fail on i686. --- pkgs/development/python-modules/markdown-it-py/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index e0c9946a3ba..38d92159f3b 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -16,6 +16,7 @@ , sphinx-book-theme , sphinx-copybutton , sphinx-design +, stdenv , pytest-regressions , pytestCheckHook , pythonOlder @@ -52,6 +53,7 @@ buildPythonPackage rec { preCheck = '' rm -r benchmarking ''; + doCheck = !stdenv.isi686; pythonImportsCheck = [ "markdown_it" From 1065acd63332ccf377db717729f3bd59ee838319 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 15:39:14 +0000 Subject: [PATCH 214/337] =?UTF-8?q?epiphany:=2044.1=20=E2=86=92=2044.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/44.1...44.2 --- pkgs/desktops/gnome/core/epiphany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 2c18f50dbd2..4c99e038122 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "44.1"; + version = "44.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "u60o/HJzqGa5teXdVoa9BIQww/C+7UwIJgtNCN2P+Fs="; + sha256 = "sfbfFftqYX/t1hmLLcqr1EENJYNECdpRVwndd8/FazM="; }; nativeBuildInputs = [ From 4c36ee7712a5cf3bc2e29602fa124f4f86b110d7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 15:47:08 +0000 Subject: [PATCH 215/337] =?UTF-8?q?gnome-user-docs:=2044.0=20=E2=86=92=204?= =?UTF-8?q?4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-user-docs/-/compare/44.0...44.1 --- pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index cd506b61c59..82aef1735a7 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z2zX65xBSd2Tlm9x+huQevyPZR7MOvVOEIW89K0hsb0="; + sha256 = "k/MpTUP9IvmWLM9r0X/2Tq54psoGP+bB6bxY0A8046g="; }; nativeBuildInputs = [ From 84b3d63860982d4b30488d1f93091fb529dc1f55 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 23 Apr 2023 15:52:49 +0000 Subject: [PATCH 216/337] =?UTF-8?q?networkmanagerapplet:=201.30.0=20?= =?UTF-8?q?=E2=86=92=201.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/network-manager-applet/-/compare/1.30.0...1.32.0 --- pkgs/tools/networking/networkmanager/applet/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index c2dcf73ab17..9eefd2afead 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -6,7 +6,6 @@ , pkg-config , networkmanager , gnome -, libnotify , libsecret , polkit , modemmanager @@ -25,11 +24,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.30.0"; + version = "1.32.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-lRa4Tp2fEA24mgxny/5XztsFYjENRcqvtjMuJ7vrXNM="; + sha256 = "sha256-orWv+hUFrUOQKVn9vgnlvOxXsR7TM/pgRY/7nGLvujg="; }; mesonFlags = [ From 177bac3fb17c3c23f2490f7c46d2f3bd64c99aa4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 25 Apr 2023 01:34:46 +0000 Subject: [PATCH 217/337] =?UTF-8?q?gnome-connections:=2044.0=20=E2=86=92?= =?UTF-8?q?=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/connections/-/compare/44.0...44.1 --- pkgs/desktops/gnome/apps/gnome-connections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 13dc7cd9690..d28b7bb206a 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-connections"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-NMemu/7Jqaz6nC0tukslFDHNcYdPjwVcX/JvJvQkQZk="; + hash = "sha256-E2otkksHfVzEEAyEWCbUcURCMKFsjawnMhE2gBcaYms="; }; nativeBuildInputs = [ From 33400e3fea591d51e320cc302e12890ec6f73058 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 25 Apr 2023 01:40:02 +0000 Subject: [PATCH 218/337] =?UTF-8?q?gtk-frdp:=20unstable-2023-03-03=20?= =?UTF-8?q?=E2=86=92=20unstable-2023-04-14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk-frdp/-/compare/3f991a22...9af99d95 --- pkgs/development/libraries/gtk-frdp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gtk-frdp/default.nix b/pkgs/development/libraries/gtk-frdp/default.nix index 24f768a678a..9272d042685 100644 --- a/pkgs/development/libraries/gtk-frdp/default.nix +++ b/pkgs/development/libraries/gtk-frdp/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { pname = "gtk-frdp"; - version = "unstable-2023-03-03"; + version = "unstable-2023-04-14"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "3f991a22c025cad3016a7aa55988e51884964050"; - sha256 = "jzum4/iU1oSr5t/IrSOLFyZcj38VIL7ooIbfoJZhk+g="; + rev = "9af99d95ed532128c1856e7a1bfd0b59dd61a35f"; + sha256 = "cz4JJ/NKBYBv5bw18BBfwtWtxPWGBmrwSHgTZ1hS3Qk="; }; nativeBuildInputs = [ From 3a39edac802280e5e536419708d89b356434e238 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 4 Feb 2023 20:34:15 -0500 Subject: [PATCH 219/337] elmerfem: 9.0 -> unstable-2023-02-03 vtk_8_withQt5 -> vtkWithQt5 --- .../science/physics/elmerfem/default.nix | 21 ++--- .../0001-fix-import-of-QPainterPath.patch | 24 ------ ...ename-loopvars-to-avoid-redefinition.patch | 82 ------------------- .../patches/0003-ignore-qwt_compat.patch | 36 -------- 4 files changed, 8 insertions(+), 155 deletions(-) delete mode 100644 pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch delete mode 100644 pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch delete mode 100644 pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 9221f4bcdbd..41a0e00ae78 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, vtk_8_withQt5}: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, tbb, vtkWithQt5 }: stdenv.mkDerivation rec { pname = "elmerfem"; - version = "9.0"; + version = "unstable-2023-02-03"; src = fetchFromGitHub { owner = "elmercsc"; - repo = "elmerfem"; - rev = "release-${version}"; - sha256 = "VK7jvu4s5d7k0c39XqY9dEzg/vXtX5Yr/09VcuZVQ9A="; + repo = pname; + rev = "39c8784b6e4543a6bf560b5d597e0eec1eb06343"; + hash = "sha256-yyxgFvlS+I4PouDL6eD4ZrXuONTDejCSYKq2AwQ0Iug="; }; hardeningDisable = [ "format" ]; @@ -29,19 +29,14 @@ stdenv.mkDerivation rec { libGL libGLU opencascade - vtk_8_withQt5 + tbb + vtkWithQt5 ]; preConfigure = '' patchShebangs ./ ''; - patches = [ - ./patches/0001-fix-import-of-QPainterPath.patch - ./patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch - ./patches/0003-ignore-qwt_compat.patch - ]; - storepath = placeholder "out"; cmakeFlags = [ @@ -58,7 +53,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://elmerfem.org/"; + homepage = "https://elmerfem.org"; description = "A finite element software for multiphysical problems"; platforms = platforms.unix; maintainers = with maintainers; [ wulfsta broke ]; diff --git a/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch b/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch deleted file mode 100644 index a9e1ba442b4..00000000000 --- a/pkgs/applications/science/physics/elmerfem/patches/0001-fix-import-of-QPainterPath.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 87885de957aa3f891fe963503c94685675c24f49 Mon Sep 17 00:00:00 2001 -From: grindhold -Date: Wed, 27 Apr 2022 19:16:42 +0200 -Subject: [PATCH] fix import of QPainterPath - ---- - ElmerGUI/Application/twod/renderarea.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ElmerGUI/Application/twod/renderarea.cpp b/ElmerGUI/Application/twod/renderarea.cpp -index 4c2515c5..65128ea9 100644 ---- a/ElmerGUI/Application/twod/renderarea.cpp -+++ b/ElmerGUI/Application/twod/renderarea.cpp -@@ -38,6 +38,7 @@ - * * - *****************************************************************************/ - #include -+#include - #include - #include - #include --- -2.33.3 - diff --git a/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch b/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch deleted file mode 100644 index 6c2782b9e0b..00000000000 --- a/pkgs/applications/science/physics/elmerfem/patches/0002-fem-rename-loopvars-to-avoid-redefinition.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 06634e5fd46a27dca11b87d4a38e9ead561de3d5 Mon Sep 17 00:00:00 2001 -From: grindhold -Date: Thu, 28 Apr 2022 15:47:07 +0200 -Subject: [PATCH] fem: rename loopvars to avoid redefinition - ---- - fem/src/modules/DCRComplexSolve.F90 | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/fem/src/modules/DCRComplexSolve.F90 b/fem/src/modules/DCRComplexSolve.F90 -index 469214ee..268591fd 100644 ---- a/fem/src/modules/DCRComplexSolve.F90 -+++ b/fem/src/modules/DCRComplexSolve.F90 -@@ -502,14 +502,14 @@ CONTAINS - - IF ( SIZE(Hwrk,1) == 1 ) THEN - -- DO i=1,MIN(3,SIZE(Hwrk,2)) -- Tensor( i,1:n ) = Hwrk( 1,1,1:n ) -+ DO k=1,MIN(3,SIZE(Hwrk,2)) -+ Tensor( k,1:n ) = Hwrk( 1,1,1:n ) - END DO - - ELSE - -- DO i=1,MIN(3,SIZE(Hwrk,1)) -- Tensor( i,1:n ) = Hwrk( i,1,1:n ) -+ DO k=1,MIN(3,SIZE(Hwrk,1)) -+ Tensor( k,1:n ) = Hwrk( k,1,1:n ) - END DO - - END IF -@@ -1391,21 +1391,21 @@ contains - - IF ( SIZE(Hwrk,1) == 1 ) THEN - -- DO i=1,MIN(3,SIZE(Hwrk,2)) -- Tensor( i,i,1:n ) = Hwrk( 1,1,1:n ) -+ DO k=1,MIN(3,SIZE(Hwrk,2)) -+ Tensor( k,k,1:n ) = Hwrk( 1,1,1:n ) - END DO - - ELSE IF ( SIZE(Hwrk,2) == 1 ) THEN - -- DO i=1,MIN(3,SIZE(Hwrk,1)) -- Tensor(i,i,1:n) = Hwrk(i,1,1:n) -+ DO k=1,MIN(3,SIZE(Hwrk,1)) -+ Tensor(k,k,1:n) = Hwrk(k,1,1:n) - END DO - - ELSE - -- DO i=1,MIN(3,SIZE(Hwrk,1)) -+ DO k=1,MIN(3,SIZE(Hwrk,1)) - DO j=1,MIN(3,SIZE(Hwrk,2)) -- Tensor( i,j,1:n ) = Hwrk(i,j,1:n) -+ Tensor( k,j,1:n ) = Hwrk(k,j,1:n) - END DO - END DO - -@@ -1443,14 +1443,14 @@ contains - - IF ( SIZE(Hwrk,1) == 1 ) THEN - -- DO i=1,MIN(3,SIZE(Hwrk,2)) -- Tensor( i,1:n ) = Hwrk( 1,1,1:n ) -+ DO k=1,MIN(3,SIZE(Hwrk,2)) -+ Tensor( k,1:n ) = Hwrk( 1,1,1:n ) - END DO - - ELSE - -- DO i=1,MIN(3,SIZE(Hwrk,1)) -- Tensor( i,1:n ) = Hwrk( i,1,1:n ) -+ DO k=1,MIN(3,SIZE(Hwrk,1)) -+ Tensor( k,1:n ) = Hwrk( k,1,1:n ) - END DO - - END IF --- -2.33.3 - diff --git a/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch b/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch deleted file mode 100644 index 26954008d5d..00000000000 --- a/pkgs/applications/science/physics/elmerfem/patches/0003-ignore-qwt_compat.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 26601fec36a4978e805aad40e6d0cbf268c653d2 Mon Sep 17 00:00:00 2001 -From: grindhold -Date: Thu, 28 Apr 2022 17:13:06 +0200 -Subject: [PATCH] ignore qwt_compat - ---- - ElmerGUI/Application/src/convergenceview.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ElmerGUI/Application/src/convergenceview.h b/ElmerGUI/Application/src/convergenceview.h -index 377b644b..64250149 100755 ---- a/ElmerGUI/Application/src/convergenceview.h -+++ b/ElmerGUI/Application/src/convergenceview.h -@@ -52,7 +52,7 @@ - #include - #include - /*#include <-- deprecated in Qwt6, using qwt_compat.h instead*/ --#include -+/*#include */ - #include - #include - -@@ -76,8 +76,8 @@ public: - - private: - int d_count; -- QwtArray d_x; -- QwtArray d_y; -+ QVector d_x; -+ QVector d_y; - }; - - class Curve --- -2.33.3 - From 93b42a14f7e6695e3177534a7fa94df12d4f9874 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 01:48:36 +0000 Subject: [PATCH 220/337] tofi: 0.8.1 -> 0.9.1 --- pkgs/applications/misc/tofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix index 9438201d45a..ba2c2827b7d 100644 --- a/pkgs/applications/misc/tofi/default.nix +++ b/pkgs/applications/misc/tofi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "tofi"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "philj56"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HhkXypRGerWWHrR4maR3AtayWSy5qhl/LYwBHWGKboU="; + sha256 = "sha256-lokp6Zmdt7WuAyuRnHBkKD4ydbNiQY7pEVY97Z62U90="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ]; From ea57420ae2e61a5eeed52a0e65735d17f655169b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 02:21:32 +0000 Subject: [PATCH 221/337] klipper: unstable-2023-04-15 -> unstable-2023-04-24 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 366762f76e0..e8d572393e2 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2023-04-15"; + version = "unstable-2023-04-24"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "cba119db3a386c70caa4dc1f0a52be626792e208"; - sha256 = "sha256-dDyD6+7kxmwUQjPoSRscUZDnngcyEXQowW9NjWXHPgI="; + rev = "b17ae55f5bd3a079ab3626b1e6fd5c60416e6ba0"; + sha256 = "sha256-e1luOJdTeSB/UNl/W91tBuuQ5f2fKfo1CSMQiE+A1T4="; }; sourceRoot = "source/klippy"; From daa0521a3140ccc8310913844f0087e05b96654b Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 24 Apr 2023 21:44:13 -0400 Subject: [PATCH 222/337] python310Packages.pybids: 0.15.5 -> 0.15.6; unbreak --- .../python-modules/pybids/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 862cff1b8da..33660d9165e 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage , lib , fetchPypi +, fetchpatch +, formulaic , click , num2words , numpy @@ -11,19 +13,36 @@ , bids-validator , sqlalchemy , pytestCheckHook +, versioneer +, pythonRelaxDepsHook }: buildPythonPackage rec { - version = "0.15.5"; + version = "0.15.6"; pname = "pybids"; src = fetchPypi { inherit pname version; - hash = "sha256-ryIiWpFoh0KSmyLI4LDn+EkXEYwDIr8/A7opoZJ+bo4="; + hash = "sha256-OjWW08tyVDHkF0X3Pa+10HYD/7Gysp5DkEt9LaVxsdM="; }; + patches = [ + # remove after next release + (fetchpatch { + name = "fix-pybids-sqlalchemy-dep"; + url = "https://github.com/bids-standard/pybids/commit/5f008dfc282394ef94a68d47dba37ceead9eac9a.patch"; + hash = "sha256-gx6w35XqDBZ8cTGHeY/mz2xNQqza9E5z8bRJR7mbPcg="; + excludes = [ "pyproject.toml" ]; # not in PyPI dist + }) + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + pythonRelaxDeps = [ "sqlalchemy" ]; + propagatedBuildInputs = [ click + formulaic num2words numpy scipy @@ -32,18 +51,18 @@ buildPythonPackage rec { patsy bids-validator sqlalchemy + versioneer ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bids" ]; + # looks for missing data: + disabledTests = [ "test_config_filename" ]; meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; homepage = "https://github.com/bids-standard/pybids"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; - # Doesn't support sqlalchemy >=1.4 - # See https://github.com/bids-standard/pybids/issues/680 - broken = true; }; } From 8a3121c4e24591bf7d242e1ee58dc0aec1ad2fd0 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 8 Apr 2023 02:30:42 +0800 Subject: [PATCH 223/337] qtcreator-qt6: 9.0.2 -> 10.0.0 --- pkgs/development/tools/qtcreator/qt6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qtcreator/qt6.nix b/pkgs/development/tools/qtcreator/qt6.nix index 0afc6984abe..55a8859352e 100644 --- a/pkgs/development/tools/qtcreator/qt6.nix +++ b/pkgs/development/tools/qtcreator/qt6.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "9.0.2"; + version = "10.0.0"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "sha256-7KWMxcoNOXiWlAVCYZzyA/WWLuPIggCBIics23Ifoyg="; + sha256 = "sha256-lImCneBYk6Rii3tlga8JbEivvTHJMs2KTbMKkMUhl78="; }; nativeBuildInputs = [ From 5377072106f3a1edd63fb1b00f74f40ecdac740a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 02:50:49 +0000 Subject: [PATCH 224/337] python310Packages.itemdb: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/itemdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/itemdb/default.nix b/pkgs/development/python-modules/itemdb/default.nix index f9afc4c5cb3..68fb6d5dc55 100644 --- a/pkgs/development/python-modules/itemdb/default.nix +++ b/pkgs/development/python-modules/itemdb/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "itemdb"; - version = "1.1.1"; + version = "1.1.2"; # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "almarklein"; repo = pname; - rev = "v${version}"; - sha256 = "0ksad5j91nlbsn0a11clf994qz7r9ijand5hxnjhgd66i9hl3y78"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-s7a+MJLTAcGv2rYRMO2SAlsDYen6Si10qUQOVDFuf6c="; }; meta = with lib; { From a17fff23967cc0c9947192934c8227bc9c1ce6f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 02:57:32 +0000 Subject: [PATCH 225/337] minizip-ng: 3.0.9 -> 3.0.10 --- pkgs/development/libraries/minizip-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index 8c53d6f566e..9f76e213c56 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "3.0.9"; + version = "3.0.10"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-yuHJUy/Ed7dutmosmcbedz5nZoCc5imLDOXikIde8bs="; + sha256 = "sha256-ynYAWF570S6MpD1WXbUC3cu+chL3+AhsMHr15l+LYVg="; }; nativeBuildInputs = [ cmake pkg-config ]; From ead4dd05d38c08f5c1412bc69e2b5a442419209f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 03:01:01 +0000 Subject: [PATCH 226/337] sarasa-gothic: 0.40.5 -> 0.40.6 --- pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 3498e840eae..417008490bc 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.40.5"; + version = "0.40.6"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-bs3o8+LyCTCZvUYigUWfSmjFrzPg7nLzElZYxDEsQ9k="; + hash = "sha256-AHslDiYBQXcxo8XVh1GMZDR8LJXvzJHl4hrisfhltEM="; }; sourceRoot = "."; From fe0e07a2d49b26a14a382883e15861be1ce8c1f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 03:34:02 +0000 Subject: [PATCH 227/337] gocryptfs: 2.3 -> 2.3.1 --- pkgs/tools/filesystems/gocryptfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 249444ae0d6..ab333255227 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IJUmH9w6ItDAZNbiO1Kkq3NO2c4Qpcd0ELiPlIPpbNI="; + sha256 = "sha256-mfbdxKZdYDbnNWQTrDV+4E6WYA8ybE5oiAH1WWOZHdQ="; }; - vendorSha256 = "sha256-7PpMnkoTMW4rb2Gy6s3CN7K3wG+QHmyvN3+7TYru2hE="; + vendorHash = "sha256-eibUACIOfIsCgPYJ57Hq29S80XT6w4VbpjvaX7XasdE="; nativeBuildInputs = [ makeWrapper From 11dcf3cea2a7f26449ea08599101fb2eb595d1d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 03:52:59 +0000 Subject: [PATCH 228/337] snabb: 2022.12 -> 2023.04 --- pkgs/tools/networking/snabb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 2ac9931f2ca..771ef059fa8 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2022.12"; + version = "2023.04"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "sha256-DPJ1GrqZQyiW2s5JBZszcB/Is0Is2f/O/6Riz/M3wAs="; + sha256 = "sha256-6STKoDARQ6Ue/ckd3kdIH+ZKnQ4iozx4a070g2N+XMo="; }; installPhase = '' From 7c71129d9d8691f5068bd84d520502b507f8df77 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 03:06:27 +0000 Subject: [PATCH 229/337] terraform-providers.exoscale: 0.46.0 -> 0.47.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dfbeb9d95d2..9514c7e7f0e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": "sha256-rJev48aS0nd8DRWmUN4i0LgDYvfjdfoO67N6AiWeg+k=" }, "exoscale": { - "hash": "sha256-XbuVvVOv8k7T/7smr73+lvhFMxKtJkaLN3WgvTWIkrA=", + "hash": "sha256-u/2ePkENpx8Q7WcmtNxXR4GIsr2TnIHyOA8CnzTFTnk=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.46.0", + "rev": "v0.47.0", "spdx": "MPL-2.0", "vendorHash": null }, From 0c8e19ac9a71f8c26784dccef8aa72f338fbd2e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 03:06:32 +0000 Subject: [PATCH 230/337] terraform-providers.dns: 3.3.1 -> 3.3.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9514c7e7f0e..d6001b1a8c9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -318,13 +318,13 @@ "vendorHash": null }, "dns": { - "hash": "sha256-Bzj1rLTzWJuqKEq5mz0UAbYMWMp4JoRhedfC2lORocE=", + "hash": "sha256-feMN0Fpq8ct3l0u1Y8Zjgee4iC+e90CwAZmk5VQj2So=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.3.1", + "rev": "v3.3.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-wx8BXlobu86Nk9D8o5loKhbO14ANI+shFQ2i7jswKgE=" + "vendorHash": "sha256-SvyeMKuAJ4vu++7Fx0hutx3vQvgf1sh1PFSLPRqJPjw=" }, "dnsimple": { "hash": "sha256-I5TUhq8OZqcLQs/jr8LB22Uc9s5M/WH9LRzV8EsgRnc=", From 7edcaa486f5bd34053e706ab64e104e7dcccacea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 03:11:30 +0000 Subject: [PATCH 231/337] terraform-providers.google: 4.62.1 -> 4.63.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d6001b1a8c9..8fc774955eb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -437,12 +437,12 @@ "vendorHash": "sha256-SLFpH7isx4OM2X9bzWYYD4VlejlgckBovOxthg47OOQ=" }, "google": { - "hash": "sha256-rF68NnqyEY4BWl+oLOxfTaQw5zEGs6Ue/L9DwzsJ46M=", + "hash": "sha256-92abTfGWNFQMf8YjOxgKEncdqEdbfAt+3BU0fQaSnGk=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.62.1", + "rev": "v4.63.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A=" }, From 0c51ac724ad30d26feb46cd45b1f4f23dddd5555 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 03:11:51 +0000 Subject: [PATCH 232/337] terraform-providers.google-beta: 4.62.1 -> 4.63.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8fc774955eb..f54a7df736c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -447,12 +447,12 @@ "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A=" }, "google-beta": { - "hash": "sha256-/wcNrCMaXjameyE3o09N+bPjL8r627BJy1vYy1u2iAI=", + "hash": "sha256-OyaMoySQ7qd8fsxMcetZCUVvxi6nWwVJusNV61DASck=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.62.1", + "rev": "v4.63.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Xm1P6P2tMLqjV9QFX6D7koBPzg4umTH6jCQesyt0A/A=" }, From 50dc8c78599e2b15ab6f34be40ac4548bdd8cecd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 03:15:08 +0000 Subject: [PATCH 233/337] terraform-providers.talos: 0.1.2 -> 0.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f54a7df736c..d0d25383099 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1089,13 +1089,13 @@ "vendorHash": "sha256-6UxBnQiogcizff5Rv4eadOeiG5JaXQphUWlfnqELvAI=" }, "talos": { - "hash": "sha256-/Ml+Vsh50U5CoVdnls69iTPoSPpgAtOpO2hWlcmbyKw=", + "hash": "sha256-bYDFtng6kASmBtQN+iewVOh6HPD57GDUuusiQSVfuBs=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.1.2", + "rev": "v0.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY=" + "vendorHash": "sha256-GNSKSlaFBj2P+z40U+0uwPSOuQBy+9vOVFfPe8p0A24=" }, "tencentcloud": { "hash": "sha256-kIsH+kp+fnYsZatEJOH51lUdQs9cq/8FtpXHZIRzSM0=", From 91dee5da609e826b78351b803755e6979f1408cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 04:12:33 +0000 Subject: [PATCH 234/337] mycorrhiza: 1.13.0 -> 1.14.0 --- pkgs/servers/mycorrhiza/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index 342d7a3ec55..bb930ab2756 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-zRDMfHjR1obagRItdlmO1fJnutMM8MqcKNc3ZjtuvnY="; + sha256 = "sha256-sSaqcVrJq/ag6urFH2nzpVEFhcQGvXUR7E8NofvTk1A="; }; - vendorSha256 = "sha256-Z6pQwUMMgHLMrRN4Fpu1QyG7WCHGWuvBc2UBTY6jncU="; + vendorHash = "sha256-xZ3J0/SxABPnmCw716xXG/XJvlvcfsIBuNl1h/z9i5g="; subPackages = [ "." ]; From 1d3899ff2dbe23d881e56d3b3cc76df241c9fefd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 04:17:08 +0000 Subject: [PATCH 235/337] vassal: 3.6.15 -> 3.6.17 --- pkgs/games/vassal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index ff3cdffb03b..1b4787330be 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.15"; + version = "3.6.17"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-Zm3xrg1Srzd3wUOl4humNXQYhOxakxvNq6NqHHks0TI="; + sha256 = "sha256-hm1tgkF/SYRnoq1+ZxlgriLMQm3IX+UBR2bPYpBVp5k="; }; buildInputs = [ From 39d2fafebc12010318f74b2f5ecdfff124560628 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 04:26:03 +0000 Subject: [PATCH 236/337] yq-go: 4.33.2 -> 4.33.3 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index f2a02845b34..ee59039d370 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.33.2"; + version = "4.33.3"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-z4TSc6thjWoaucx2RBDDqK+f6689cympifGzzF4N07E="; + hash = "sha256-hsADk1h9bxqgvIddU0JTIv/uSJnukoJb39i0tngnImE="; }; - vendorHash = "sha256-aaQxW8fvDaOb49rsTw92WVWgtbJJHH7e92ChuhKI4ME="; + vendorHash = "sha256-EW2coQdrFfs6xYeJb+6gab8+CVT3O8x4cSRuj1o+3ok="; nativeBuildInputs = [ installShellFiles ]; From 367de92de8fe78d41a789a50a185263515a5a273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 04:27:58 +0000 Subject: [PATCH 237/337] qtstyleplugin-kvantum-qt4: 1.0.9 -> 1.0.10 --- .../libraries/qtstyleplugin-kvantum-qt4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 1c39c004447..6198a059345 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - hash = "sha256-5/cScJpi5Z5Z/SjizKfMTGytuEo2uUT6QtpMnn7JhKc="; + hash = "sha256-48Blio8qHLmXSKG0c1tphXSfiwQXs0Xqwxe187nM3Ro="; }; nativeBuildInputs = [ qmake4Hook ]; From f7af9373ed3a615471669802134cf02f7a46f985 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Tue, 25 Apr 2023 14:40:29 +1000 Subject: [PATCH 238/337] flutter: Generate target PKG_CONFIG_PATH at build time --- pkgs/development/compilers/flutter/wrapper.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index 114465fd0ef..4ea17924ecb 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -79,7 +79,7 @@ let ]; # Nix-specific compiler configuration. - pkgConfigDirectories = builtins.filter builtins.pathExists (builtins.concatMap (pkg: map (dir: "${lib.getOutput "dev" pkg}/${dir}/pkgconfig") [ "lib" "share" ]) (appBuildDeps ++ extraPkgConfigPackages)); + pkgConfigPackages = map (lib.getOutput "dev") (appBuildDeps ++ extraPkgConfigPackages); includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (appStaticBuildDeps ++ extraIncludes); linkerFlags = (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags; in @@ -94,11 +94,15 @@ in inherit (flutter) meta; } '' + for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do + addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path" + done + mkdir -p $out/bin makeWrapper '${immutableFlutter}' $out/bin/flutter \ --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --prefix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ - --prefix PKG_CONFIG_PATH : '${builtins.concatStringsSep ":" pkgConfigDirectories}' \ + --prefix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ --prefix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \ From aa7e3f35c5ea931f382fd8f452264c68e7036ba3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 04:59:29 +0000 Subject: [PATCH 239/337] orbiton: 2.60.6 -> 2.61.0 --- pkgs/applications/editors/orbiton/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 321bd1358e2..59723a04325 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.60.6"; + version = "2.61.0"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-uDxdv7HlswGsuM4UewZOO45/P9jIOo4bb0T1RrQqtpg="; + hash = "sha256-GknQXHwpdIRzSjIc1ITsoiaks4Vi5KmVqL7sHzmfnmQ="; }; vendorHash = null; From 0cc1844bb4d0ce28fd187531afa818b152c3d1b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Apr 2023 21:50:45 -0700 Subject: [PATCH 240/337] deltachat-desktop: fix build of libdeltachat --- .../networking/instant-messengers/deltachat-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 0de4809ff23..ed3849ffac3 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -25,7 +25,7 @@ let src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; - rev = version; + rev = "v${version}"; hash = "sha256-bvXZtgFZx94Sw9Tst620HAhi9kmG8PjtWnghdw2ZF84="; }; cargoDeps = rustPlatform.importCargoLock { From e452880efe71c8989afb386020784b4fc7983003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 05:44:22 +0000 Subject: [PATCH 241/337] cfssl: 1.6.3 -> 1.6.4 --- pkgs/tools/security/cfssl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 8d1c0df11a8..903b52f8bd0 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cfssl"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "sha256-aZjb4mWoevRnPyL+b7H+VjIVklNe+u054OsmJbxPx4g="; + sha256 = "sha256-QVKgfwyHzN6n8CnvGT9gg2ncfaDo+Pe4IAQhm4gNiz4="; }; subPackages = [ @@ -22,7 +22,7 @@ buildGoModule rec { "cmd/mkbundle" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; From d5b1550fc8328ea68e94d9604e8d5d3c1ba08abd Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 25 Apr 2023 07:48:04 +0200 Subject: [PATCH 242/337] pythonPackages.devito: fix source hash --- pkgs/development/python-modules/devito/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 51f3895f66f..3b4063518cf 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = "devito"; rev = "refs/tags/v${version}"; - hash = "sha256-JLfTWfQ9HYb7jsPAuAfNXuIWv7lOomJGE9hBss+AI7o="; + hash = "sha256-LzqY//205XEOd3/f8k1g4OYndRHMTVplBogGJf5Forw="; }; postPatch = '' From b78be66ad12f2b7b74497e14b977b2347f1e7e10 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 20 Apr 2023 20:49:42 +0300 Subject: [PATCH 243/337] qelectrotech: mark as broken on darwin --- pkgs/applications/misc/qelectrotech/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/applications/misc/qelectrotech/default.nix index 038fe11763d..3b97a69de22 100644 --- a/pkgs/applications/misc/qelectrotech/default.nix +++ b/pkgs/applications/misc/qelectrotech/default.nix @@ -73,5 +73,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; + broken = stdenv.isDarwin; }; } From e205b43f47a435ddff30a97d46cd6a1c0b098f9b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 25 Apr 2023 07:30:18 +0100 Subject: [PATCH 244/337] linuxPackages_latest.perf: fix python shebangs on 6.3+ Without the change `perf` build fails as: sh: line 1: pmu-events/metric_test.py: cannot execute: required file not found make[3]: *** [pmu-events/Build:32: pmu-events/metric_test.log] Error 1 Full build log: https://hydra.nixos.org/log/mp5a0fr1jhw3rvkp8azbh5xh0g1cjqhj-perf-linux-6.3.drv --- pkgs/os-specific/linux/kernel/perf/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index bd9bd6d95db..1ae1bae26fd 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation { # Linux scripts patchShebangs scripts + '' + lib.optionalString (lib.versionAtLeast kernel.version "6.3") '' + # perf-specific scripts + patchShebangs tools/perf/pmu-events + '' + '' cd tools/perf for x in util/build-id.c util/dso.c; do From 4536fdd9b17c930364d53839add23899416163d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 06:36:14 +0000 Subject: [PATCH 245/337] python310Packages.google-cloud-firestore: 2.10.1 -> 2.11.0 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 026328da618..a3134f96f5c 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JrM4asHN40vTuigojvT2lqI2iDuC8je9Yr8i10pU1aU="; + hash = "sha256-mA3FX3Cg7ldApxNGka21jNW9ljGKu+rF3MhfqmekDa4="; }; propagatedBuildInputs = [ From 07d9193e644558ab2a0f848e505071ea1439aaec Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 25 Apr 2023 09:39:59 +0300 Subject: [PATCH 246/337] stanc, cmdstan: 2.31.0 -> 2.32.0 --- pkgs/development/compilers/cmdstan/default.nix | 4 ++-- pkgs/development/compilers/stanc/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 9470db3d38c..5af4699eff5 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.31.0"; + version = "2.32.0"; src = fetchFromGitHub { owner = "stan-dev"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-Uh/ZhEnbhQwC8xGFjDzH9No3VRgVbHYk2KoC+e3YhJw="; + hash = "sha256-H8JXOqiSG9N+DD84S3iYvXnSgKUJuf7UZ7qT05Ti8xQ="; }; nativeBuildInputs = [ stanc ]; diff --git a/pkgs/development/compilers/stanc/default.nix b/pkgs/development/compilers/stanc/default.nix index b4d0c5e6823..3b35e3d214c 100644 --- a/pkgs/development/compilers/stanc/default.nix +++ b/pkgs/development/compilers/stanc/default.nix @@ -5,7 +5,7 @@ ocamlPackages.buildDunePackage rec { pname = "stanc"; - version = "2.31.0"; + version = "2.32.0"; minimalOCamlVersion = "4.12"; @@ -13,7 +13,7 @@ ocamlPackages.buildDunePackage rec { owner = "stan-dev"; repo = "stanc3"; rev = "v${version}"; - hash = "sha256-5GOyKVt3LHN1D6UysOZT8isVQLKexwEcK0rwI45dDcg="; + hash = "sha256-DZJb5Zcfki6vev1n+9zyokQTxEounCvTeYyH4BvSTZ0="; }; # Error: This expression has type [ `Use_Sys_unix ] From 209325aacb5535abe604d701ae4ff8fef5f53f34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 07:08:33 +0000 Subject: [PATCH 247/337] ibus-engines.table-others: 1.3.13 -> 1.3.15 --- .../inputmethods/ibus-engines/ibus-table-others/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index d725691a045..181bfd5e1fb 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.13"; + version = "1.3.15"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-XN11iOShWyzRzmo/Ke+1Qh//o4ZhsmJWimgA1by2VZo="; + sha256 = "sha256-nOj5gwhFodZv29hAN6S8EhQ+XlWp31FDOGIXtyAOM1E="; }; nativeBuildInputs = [ pkg-config ]; From c9031e998a73e01c3849023a8758e2ef961e9c2a Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 4 Apr 2023 15:04:53 +0800 Subject: [PATCH 248/337] jami: 20230313.0 -> 20230323.0 --- .../networking/instant-messengers/jami/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 2872eb739e4..d7b0a675bb5 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -5,7 +5,7 @@ , gitUpdater , ffmpeg_5 -# for daemon + # for daemon , autoreconfHook , perl # for pod2man , alsa-lib @@ -33,7 +33,7 @@ , webrtc-audio-processing , zlib -# for client + # for client , cmake , networkmanager # for libnm , python3 @@ -46,16 +46,17 @@ , qrencode , qtmultimedia , qtnetworkauth +, qtpositioning , qtsvg , qtwebengine , qtwebchannel , withWebengine ? true -# for pjsip + # for pjsip , fetchFromGitHub , pjsip -# for opendht + # for opendht , opendht }: @@ -64,14 +65,14 @@ let in stdenv.mkDerivation rec { pname = "jami"; - version = "20230313.0"; + version = "20230323.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-3kZ4nn6x1xsXWybyuaY9W07tEM6LFvLL4QtDRPRmob4="; + hash = "sha256-X8iIT8UtI2Vq0Ne5e2ahSPN4g7QLZGnq3SZV/NY+1pY="; fetchSubmodules = true; }; @@ -169,6 +170,7 @@ stdenv.mkDerivation rec { qtnetworkauth qtdeclarative qtmultimedia + qtpositioning qtsvg qtwebchannel ] ++ lib.optionals withWebengine [ From e73da62a1d41959ccfa5a5eb5a0464f45b66c32c Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Wed, 19 Apr 2023 14:33:01 +0200 Subject: [PATCH 249/337] boost182: init at 1.82.0 Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/development/libraries/boost/1.82.nix | 14 ++++++++++++++ pkgs/development/libraries/boost/default.nix | 1 + pkgs/development/libraries/boost/generic.nix | 2 +- pkgs/development/tools/boost-build/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 ++- 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/boost/1.82.nix diff --git a/pkgs/development/libraries/boost/1.82.nix b/pkgs/development/libraries/boost/1.82.nix new file mode 100644 index 00000000000..193d07ef756 --- /dev/null +++ b/pkgs/development/libraries/boost/1.82.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.82.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_82_0.html + sha256 = "a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6"; + }; +}) diff --git a/pkgs/development/libraries/boost/default.nix b/pkgs/development/libraries/boost/default.nix index b0e310973cf..b9b2c8ff7e6 100644 --- a/pkgs/development/libraries/boost/default.nix +++ b/pkgs/development/libraries/boost/default.nix @@ -32,4 +32,5 @@ in { boost179 = makeBoost ./1.79.nix; boost180 = makeBoost ./1.80.nix; boost181 = makeBoost ./1.81.nix; + boost182 = makeBoost ./1.82.nix; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 4268af7ee0b..2b704702613 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation { platforms = platforms.unix ++ platforms.windows; badPlatforms = optional (versionOlder version "1.59") "aarch64-linux" ++ optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin" - ++ optionals (versionOlder version "1.73") lib.platforms.riscv; + ++ optionals (versionOlder version "1.73") platforms.riscv; maintainers = with maintainers; [ hjones2199 ]; broken = diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index cc15d9a67cc..6b485b80ea1 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace src/build-system.jam \ --replace "default-toolset = darwin" "default-toolset = clang-darwin" + '' + lib.optionalString (useBoost ? version && lib.versionAtLeast useBoost.version "1.82") '' + patchShebangs --build src/engine/build.sh ''; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a709b6877de..9ac20986118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19507,11 +19507,12 @@ with pkgs; boost179 boost180 boost181 + boost182 ; boost16x = boost169; boost17x = boost179; - boost18x = boost181; + boost18x = boost182; boost = boost17x; boost_process = callPackage ../development/libraries/boost-process { }; From dc58a031c93abe0506be374d4a3b0a8920b87370 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 07:45:15 +0000 Subject: [PATCH 250/337] libdigidocpp: 3.14.12 -> 3.15.0 --- pkgs/development/libraries/libdigidocpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index c160e7602ce..9cf19fa3d31 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.12"; + version = "3.15.0"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-82AH18KcrkD7mHDy+2c9v7E3Kj7Cb7jCoLfmo09D8PU="; + hash = "sha256-CNHBPeodU2EzvmQBa9KI+1vGuuD25gSwdU9dVhVG04Q="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; From 4515e5ba123c523d69867ade391ef23a354ef80c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 07:56:03 +0000 Subject: [PATCH 251/337] dasel: 2.1.2 -> 2.2.0 --- pkgs/applications/misc/dasel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 48852268549..fdc29f23bb5 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-3zYBgDtptEmuAhLFnPt0eDvgTYltHDdQGX1JCem/UxE="; + sha256 = "sha256-DPfahZIb6Cp+E5GxIqNW+IruDZWBvJTRc7gxQOfeJqA="; }; - vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE="; + vendorHash = "sha256-+3RcjOZjmYu4eNpgczwY4Uyz1+poYA/TXc2Mb+VwRKc="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" From 3a10faf6a16580c8166fac6c16a79348dc138429 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:05:25 +0300 Subject: [PATCH 252/337] python3Packages.tensorflow: update darwin aarch64 deps hash --- pkgs/development/python-modules/tensorflow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 62ec1ab8fd4..41945236aa5 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -398,7 +398,7 @@ let else "sha256-JGLH64F81xwSUl9RCWJhBLNRBQandImsVafEF5s+ap0="; aarch64-linux = "sha256-g6JUZQQalCTSjvAarkI7+gq13cPhFg/O9LPQDGNvrII="; x86_64-darwin = "sha256-7O0zPs+damAjWXZn5C5SSWBp35C8QX3y4kCM7tYkM7s="; - aarch64-darwin = "sha256-qZvqXi6pvIrZpZdR4BcbOh2C/A4ZHJgXgFINhVJmmcs="; + aarch64-darwin = "sha256-US7uunEBDo2NKI9UHvgThbQ7rA05HjQlUthw0gIINaI="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; From 04b3c630c72e47c4802afbc05ade5042dc69d4c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 08:09:30 +0000 Subject: [PATCH 253/337] istioctl: 1.17.1 -> 1.17.2 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index a45002e34b7..37e0e6de173 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-6YoznN/wqgmNzBV0ukySwSQvnF4qQeH52uXlEgZTpig="; + sha256 = "sha256-YEkvY+Z+zM+9t+vnVk0gXJRTJd0u/Ryk3hYkbSHwP8M="; }; - vendorHash = "sha256-9A4Du5expdbFKFIrcPTADyRINhiPpsboqsbszg638LY="; + vendorHash = "sha256-LMmWhKwuy+HfqkLabTjlTd0f/6DYCGbEzpItQvckE9g="; nativeBuildInputs = [ installShellFiles ]; From f0fba3057986c307d0af90300a5f357df85e03ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 08:12:41 +0000 Subject: [PATCH 254/337] naev: 0.10.4 -> 0.10.5 --- pkgs/games/naev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index ca2efff3e90..37fa584b0f9 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "naev"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "naev"; repo = "naev"; rev = "v${version}"; - sha256 = "sha256-2cMRmKeoF6x5+95GoDgsoZG9QQo7qATrw/X+335l6FE="; + sha256 = "sha256-2jCGRZxa2N8J896YYPAN7it3uvNGYtoIH75HNqy0kEE="; fetchSubmodules = true; }; From 2b920e5a082fc168db055dc4724b21c0cbf6fb08 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 20 Feb 2023 00:36:04 +0100 Subject: [PATCH 255/337] flashrom-stable: init at v1.1 flashrom-stable is a fork of flashrom aiming stability. A proper NixOS module and udev support will be added later. Signed-off-by: Felix Singer --- pkgs/tools/misc/flashrom-stable/default.nix | 46 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/tools/misc/flashrom-stable/default.nix diff --git a/pkgs/tools/misc/flashrom-stable/default.nix b/pkgs/tools/misc/flashrom-stable/default.nix new file mode 100644 index 00000000000..168b355475b --- /dev/null +++ b/pkgs/tools/misc/flashrom-stable/default.nix @@ -0,0 +1,46 @@ +{ fetchgit +, installShellFiles +, lib +, libftdi1 +, libgpiod +, libjaylink +, libusb1 +, pciutils +, pkg-config +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "flashrom-stable"; + version = "1.1"; + + src = fetchgit { + url = "https://review.coreboot.org/flashrom-stable"; + rev = "272aae888ce5abf5e999d750ee4577407db32246"; + hash = "sha256-DR4PAING69+TMsyycGxt1cu0ba1tTlG36+H/pJ0oP4E="; + }; + + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + + buildInputs = [ + libftdi1 + libgpiod + libjaylink + libusb1 + pciutils + ]; + + makeFlags = [ "PREFIX=$(out)" "libinstall" ]; + + meta = with lib; { + homepage = "https://www.flashrom.org"; + description = "Utility for reading, writing, erasing and verifying flash ROM chips."; + license = with licenses; [ gpl2 gpl2Plus ]; + maintainers = with maintainers; [ felixsinger ]; + platforms = platforms.all; + broken = stdenv.isDarwin; # requires DirectHW + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 337b9e9185c..cc50a1a256d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7439,6 +7439,8 @@ with pkgs; flashrom = callPackage ../tools/misc/flashrom { }; + flashrom-stable = callPackage ../tools/misc/flashrom-stable { }; + flent = python3Packages.callPackage ../applications/networking/flent { }; flexoptix-app = callPackage ../tools/misc/flexoptix-app { }; From 47821e4c0ef333a897f1e7de4cdd99b3057ce72d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 08:20:24 +0000 Subject: [PATCH 256/337] step-kms-plugin: 0.8.0 -> 0.8.2 --- pkgs/tools/security/step-kms-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index 316729e4fe6..790d510255c 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-VHQuNJzOYr5aLQqlzx6mDPBOKw6OSPSXBiEopKLuUo0="; + hash = "sha256-1yJD5HHMUpcGV0PEN81Rizahd1+VlCCTtbcpV87mTWI="; }; - vendorHash = "sha256-o6mylylpfQyswXA0kCADjqYFE0XDW9ZYglwDMpFRiu8="; + vendorHash = "sha256-IKMSBssfiMSoCmR2OF2kkMb+DPPPmfDof6W23oNfTg0="; proxyVendor = true; From 57e73d23bb6cc89a25293e5cfb26787438b4efba Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 24 Apr 2023 17:35:35 +0000 Subject: [PATCH 257/337] rustc,rustPlatform.buildRustPackage: broaden platforms rustc supports way more platforms than Linux and Darwin. We might not be able to build it for every platform at the moment, but that's what meta.broken is for. There are other platforms that rustc can produce binaries for, but can't run on itself, so those are listed in the defaults for buildRustPackage. --- .../rust/build-rust-package/default.nix | 11 ++++++++++- pkgs/development/compilers/rust/rustc.nix | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 2cd30af56b7..73a3f12b20c 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -158,6 +158,15 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg meta = { # default to Rust's platforms - platforms = rustc.meta.platforms; + platforms = rustc.meta.platforms ++ [ + # Platforms without host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "armv7a-darwin" + "armv5tel-linux" "armv6l-linux" "armv7a-linux" "m68k-linux" + "riscv32-linux" + "armv6l-netbsd" + "x86_64-redox" + "wasm32-wasi" + ]; } // meta; }) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a1c61897993..75e8a451105 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -232,6 +232,19 @@ in stdenv.mkDerivation rec { description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = [ + # Platforms with host tools from + # https://doc.rust-lang.org/nightly/rustc/platform-support.html + "x86_64-darwin" "i686-darwin" "aarch64-darwin" + "i686-freebsd13" "x86_64-freebsd13" + "x86_64-solaris" + "aarch64-linux" "armv7l-linux" "i686-linux" "mipsel-linux" + "mips64el-linux" "powerpc64-linux" "powerpc64le-linux" + "riscv64-linux" "s390x-linux" "x86_64-linux" + "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" + "x86_64-netbsd" + "i686-openbsd" "x86_64-openbsd" + "i686-windows" "x86_64-windows" + ]; }; } From dc07c15817c650d0114f044c040e73459037ad2e Mon Sep 17 00:00:00 2001 From: Isabelle Date: Tue, 25 Apr 2023 10:33:41 +0200 Subject: [PATCH 258/337] wireshark: 4.0.4 -> 4.0.5 (#227852) --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 14f8db6a7e8..49bf77a483c 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -49,7 +49,7 @@ assert withQt -> qt5 != null; let - version = "4.0.4"; + version = "4.0.5"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -61,7 +61,7 @@ stdenv.mkDerivation { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-x7McplQVdLczTov+u9eqmT1Ons22KqRsCN65pUuwYGw="; + hash = "sha256-9U0V2oLVyzq+3HxvOuD8Uzj1tjoMtYBws43fn5RfGhQ="; }; cmakeFlags = [ From b63e0d77b8eaf7ccc529eaa0640b348690e538a7 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Fri, 14 Apr 2023 15:32:00 +0200 Subject: [PATCH 259/337] nixos/bird-lg: Rework command attribute generation Prior to this change, arguments were not escaped nor was the possiblity for arguments to be empty accounted for. This led to a kinda broken startup script were arguments were "shifted", e.g. leaving allowedIPs empty in order to use the default would cause `--bird` (the following arguments key) to be used as the value. This was also observable when e.g. the navbarBrand had a space in it where only everything until the first space would show up. With the new approach, all arguments are consistently escaped and empty ones left out. `extraConfig` now supports and prefers lists of strings instead of lines (still supported but warned). This is due to the fragility with respect to e.g. forgetting trailing backslashes after each line. `frontend.{servers,domain}` are unset by default since the frontend needs (the upstream project itself has no empty defaults here) needs them to be set. If not set, an error is caused at build-time. `proxy.birdSocket` has a new default: The projects README[^1] states `/var/run/bird/bird.ctl` as the current default value. And bird2 on NixOS does use this path too. [^1]: https://github.com/xddxdd/bird-lg-go#proxy --- nixos/modules/services/networking/bird-lg.nix | 100 ++++++++++++------ 1 file changed, 69 insertions(+), 31 deletions(-) diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index 11cfe3e7ec0..0b05fa8eecc 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -4,6 +4,48 @@ with lib; let cfg = config.services.bird-lg; + + stringOrConcat = sep: v: if builtins.isString v then v else concatStringsSep sep v; + + frontend_args = let + fe = cfg.frontend; + in { + "--servers" = concatStringsSep "," fe.servers; + "--domain" = fe.domain; + "--listen" = fe.listenAddress; + "--proxy-port" = fe.proxyPort; + "--whois" = fe.whois; + "--dns-interface" = fe.dnsInterface; + "--bgpmap-info" = concatStringsSep "," cfg.frontend.bgpMapInfo; + "--title-brand" = fe.titleBrand; + "--navbar-brand" = fe.navbar.brand; + "--navbar-brand-url" = fe.navbar.brandURL; + "--navbar-all-servers" = fe.navbar.allServers; + "--navbar-all-url" = fe.navbar.allServersURL; + "--net-specific-mode" = fe.netSpecificMode; + "--protocol-filter" = concatStringsSep "," cfg.frontend.protocolFilter; + }; + + proxy_args = let + px = cfg.proxy; + in { + "--allowed" = concatStringsSep "," px.allowedIPs; + "--bird" = px.birdSocket; + "--listen" = px.listenAddress; + "--traceroute_bin" = px.traceroute.binary; + "--traceroute_raw" = px.traceroute.rawOutput; + }; + + mkArgValue = value: + if isString value + then escapeShellArg value + else if isBool value + then boolToString value + else toString value; + + filterNull = filterAttrs (_: v: v != "" && v != null && v != []); + + argsAttrToList = args: mapAttrsToList (name: value: "${name} " + mkArgValue value ) (filterNull args); in { options = { @@ -44,14 +86,12 @@ in domain = mkOption { type = types.str; - default = ""; example = "dn42.lantian.pub"; description = lib.mdDoc "Server name domain suffixes."; }; servers = mkOption { type = types.listOf types.str; - default = [ ]; example = [ "gigsgigscloud" "hostdare" ]; description = lib.mdDoc "Server name prefixes."; }; @@ -134,10 +174,14 @@ in }; extraArgs = mkOption { - type = types.lines; - default = ""; + type = with types; either lines (listOf str); + default = [ ]; description = lib.mdDoc '' Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#frontend). + + :::{.note} + Passing lines (plain strings) is deprecated in favour of passing lists of strings. + ::: ''; }; }; @@ -160,8 +204,7 @@ in birdSocket = mkOption { type = types.str; - default = "/run/bird.ctl"; - example = "/var/run/bird/bird.ctl"; + default = "/var/run/bird/bird.ctl"; description = lib.mdDoc "Bird control socket path."; }; @@ -181,10 +224,14 @@ in }; extraArgs = mkOption { - type = types.lines; - default = ""; + type = with types; either lines (listOf str); + default = [ ]; description = lib.mdDoc '' Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#proxy). + + :::{.note} + Passing lines (plain strings) is deprecated in favour of passing lists of strings. + ::: ''; }; }; @@ -194,6 +241,16 @@ in ###### implementation config = { + + warnings = + lib.optional (cfg.frontend.enable && builtins.isString cfg.frontend.extraArgs) '' + Passing strings to `services.bird-lg.frontend.extraOptions' is deprecated. Please pass a list of strings instead. + '' + ++ lib.optional (cfg.proxy.enable && builtins.isString cfg.proxy.extraArgs) '' + Passing strings to `services.bird-lg.proxy.extraOptions' is deprecated. Please pass a list of strings instead. + '' + ; + systemd.services = { bird-lg-frontend = mkIf cfg.frontend.enable { enable = true; @@ -211,23 +268,8 @@ in }; script = '' ${cfg.package}/bin/frontend \ - --servers ${concatStringsSep "," cfg.frontend.servers } \ - --domain ${cfg.frontend.domain} \ - --listen ${cfg.frontend.listenAddress} \ - --proxy-port ${toString cfg.frontend.proxyPort} \ - --whois ${cfg.frontend.whois} \ - --dns-interface ${cfg.frontend.dnsInterface} \ - --bgpmap-info ${concatStringsSep "," cfg.frontend.bgpMapInfo } \ - --title-brand ${cfg.frontend.titleBrand} \ - --navbar-brand ${cfg.frontend.navbar.brand} \ - --navbar-brand-url ${cfg.frontend.navbar.brandURL} \ - --navbar-all-servers ${cfg.frontend.navbar.allServers} \ - --navbar-all-url ${cfg.frontend.navbar.allServersURL} \ - --net-specific-mode ${cfg.frontend.netSpecificMode} \ - --protocol-filter ${concatStringsSep "," cfg.frontend.protocolFilter } \ - --name-filter ${cfg.frontend.nameFilter} \ - --time-out ${toString cfg.frontend.timeout} \ - ${cfg.frontend.extraArgs} + ${concatStringsSep " \\\n " (argsAttrToList frontend_args)} \ + ${stringOrConcat " " cfg.frontend.extraArgs} ''; }; @@ -247,12 +289,8 @@ in }; script = '' ${cfg.package}/bin/proxy \ - --allowed ${concatStringsSep "," cfg.proxy.allowedIPs } \ - --bird ${cfg.proxy.birdSocket} \ - --listen ${cfg.proxy.listenAddress} \ - --traceroute_bin ${cfg.proxy.traceroute.binary} - --traceroute_raw ${boolToString cfg.proxy.traceroute.rawOutput} - ${cfg.proxy.extraArgs} + ${concatStringsSep " \\\n " (argsAttrToList proxy_args)} \ + ${stringOrConcat " " cfg.proxy.extraArgs} ''; }; }; From a2e2972ff3b1df8aa342300d6690b3615cc8cc70 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Fri, 14 Apr 2023 17:51:28 +0200 Subject: [PATCH 260/337] nixos/bird-lg: Add maintainers --- nixos/modules/services/networking/bird-lg.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index 0b05fa8eecc..8ef14c93a2e 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -304,4 +304,9 @@ in }; }; }; + + meta.maintainers = with lib.maintainers; [ + e1mo + tchekda + ]; } From fe492a885c1e043f8f4f1821b6930dfee1406c9e Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 25 Apr 2023 16:42:45 +0800 Subject: [PATCH 261/337] amberol: unstable-2023-01-12 -> 0.10.0 --- pkgs/applications/audio/amberol/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index ed421277f9d..a4acc2844b8 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "unstable-2023-01-12"; + version = "0.10.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; - rev = "0623386c813d0d68564002324958cef7217cec7f"; - hash = "sha256-nVL4ydTg4ncDCA9J9qWv+RPDC0Txr/qpo5XxIUiV0zQ="; + rev = version; + hash = "sha256-G1B+kDH1eWYA/j1t2xJPoGQasIJ77y+BKnnu/6VEWts="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-E0ivUWD3jP/T1GOJ11grDwcF+m92I+W2a2HhZX1bCso="; + hash = "sha256-5hy2u1flUKZCM4OPFhoT5b3R8v3zBGtwN+e6kwY3LQ4="; }; postPatch = '' From 19964a24dc4d62daa565794cebf8771a65860bab Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 25 Apr 2023 17:05:19 +0800 Subject: [PATCH 262/337] telegram-desktop: 4.8.0 -> 4.8.1 (#228060) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 03465c8ee3e..33c943e3bc9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.8.0"; + version = "4.8.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py src = fetchFromGitHub { @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1ari4kdjd99klrla0rn4cjjc54d6glf17s0q881f67vh2v5zdwf0"; + sha256 = "0mxxfh70dffkrq76nky3pwrk10s1q4ahxx2ddb58dz8igq6pl4zi"; }; patches = [ From 71d1beb95a360e4d083eed6b4c45b13eb757220a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 25 Apr 2023 17:21:21 +0800 Subject: [PATCH 263/337] libadwaita: Document why tests are disabled on darwin right now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 11/40 test-button-content FAIL 2.98s killed by signal 5 SIGTRAP >>> PYTHONDONTWRITEBYTECODE=yes MALLOC_PERTURB_=214 GTK_A11Y=none GSETTINGS_BACKEND=memory G_TEST_SRCDIR=/private/tmp/nix-build-libadwaita-1.3.2.drv-0/source/tests G_TEST_BUILDDIR=/private/tmp/nix-build-libadwaita-1.3.2.drv-0/source/build/tests G_DEBUG=gc-friendly,fatal-warnings MALLOC_CHECK_=2 /private/tmp/nix-build-libadwaita-1.3.2.drv-0/source/build/tests/test-button-content ✀ stdout: TAP version 13 # random seed: R02Se84baf70152144b0bb2dbf23cf179bf4 # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation local (GLocalVfs) for ‘gio-vfs’ # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation memory (GMemorySettingsBackend) for ‘gsettings-backend’ 1..5 # Start of Adwaita tests # Start of ButtonContent tests ok 1 /Adwaita/ButtonContent/icon_name ok 2 /Adwaita/ButtonContent/label ok 3 /Adwaita/ButtonContent/use_underline not ok /Adwaita/ButtonContent/style_class_button - Gdk-FATAL-CRITICAL: gdk_macos_monitor_get_workarea: assertion 'GDK_IS_MACOS_MONITOR (self)' failed Bail out! stderr: 2023-04-25 08:39:33.359 test-button-content[73233:738156655] XType: Using static font registry. --- pkgs/development/libraries/libadwaita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 520ea920bfc..772096c8f23 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -70,10 +70,10 @@ stdenv.mkDerivation rec { xvfb-run ]; - # Tests had to be disabled on Darwin because they fail with the same error as https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264947 on Hydra: + # Tests had to be disabled on Darwin because test-button-content fails # - # In file included from ../tests/test-style-manager.c:10: - # ../src/adw-settings-private.h:16:10: fatal error: 'adw-enums-private.h' file not found + # not ok /Adwaita/ButtonContent/style_class_button - Gdk-FATAL-CRITICAL: + # gdk_macos_monitor_get_workarea: assertion 'GDK_IS_MACOS_MONITOR (self)' failed doCheck = !stdenv.isDarwin; checkPhase = '' From aad577bd30b0ab16a7859973c88edd6d0d5becde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 6 Nov 2022 11:59:21 +0100 Subject: [PATCH 264/337] nodejs*: normalise names to better fit other packages Versioned package attributes are usually named like $pname_$version eg: nodejs-14_x -> nodejs_14 --- .../javascript.section.md | 2 +- nixos/modules/services/web-apps/peertube.nix | 4 +- nixos/modules/services/web-apps/wiki-js.nix | 2 +- pkgs/applications/editors/pulsar/update.mjs | 2 +- .../build-deps/default.nix | 2 +- .../web-ui/node-composition.nix | 2 +- .../misc/tandoor-recipes/frontend.nix | 6 +-- .../cluster/spacegun/node-composition.nix | 2 +- .../matrix-recorder/composition.nix | 2 +- .../matrix-recorder/default.nix | 4 +- pkgs/applications/networking/n8n/default.nix | 2 +- .../networking/n8n/node-composition.nix | 2 +- .../cz-cli/node-composition.nix | 2 +- pkgs/development/compilers/elm/default.nix | 4 +- .../elm/packages/node-composition.nix | 2 +- .../development/node-packages/composition.nix | 2 +- pkgs/development/node-packages/generate.sh | 2 +- pkgs/development/node-packages/overrides.nix | 2 +- .../github-runner/default.nix | 6 +-- .../tools/electron-fiddle/default.nix | 4 +- .../default.nix | 4 +- pkgs/development/tools/misc/kibana/7.x.nix | 4 +- .../web/netlify-cli/composition.nix | 2 +- .../web/newman/node-composition.nix | 2 +- pkgs/misc/base16-builder/node-packages.nix | 2 +- pkgs/servers/ariang/default.nix | 2 +- pkgs/servers/ariang/node-composition.nix | 2 +- pkgs/servers/audiobookshelf/default.nix | 4 +- pkgs/servers/code-server/default.nix | 8 ++-- .../servers/haste-server/node-composition.nix | 2 +- pkgs/servers/jellyfin/node-composition.nix | 2 +- .../misc/navidrome/ui/node-composition.nix | 2 +- pkgs/servers/mjolnir/node-composition.nix | 2 +- pkgs/servers/monitoring/karma/default.nix | 6 +-- .../monitoring/karma/generate-dependencies.sh | 2 +- .../monitoring/karma/node-composition.nix | 2 +- pkgs/servers/mx-puppet-discord/default.nix | 4 +- .../mx-puppet-discord/node-composition.nix | 2 +- pkgs/servers/openvscode-server/default.nix | 6 +-- pkgs/servers/polaris/node-composition.nix | 2 +- pkgs/servers/psitransfer/default.nix | 6 +-- pkgs/servers/psitransfer/node-composition.nix | 2 +- pkgs/servers/web-apps/discourse/default.nix | 8 ++-- pkgs/servers/web-apps/ethercalc/default.nix | 4 +- .../web-apps/ethercalc/node-packages.nix | 2 +- pkgs/servers/web-apps/whitebophir/default.nix | 4 +- .../web-apps/whitebophir/node-packages.nix | 2 +- pkgs/tools/admin/meshcentral/default.nix | 4 +- pkgs/tools/audio/botamusique/default.nix | 2 +- .../ldgallery/viewer/node-composition.nix | 2 +- pkgs/tools/misc/ntfy-sh/node-composition.nix | 2 +- pkgs/tools/networking/airfield/node.nix | 2 +- pkgs/tools/security/bitwarden/default.nix | 4 +- pkgs/tools/security/onlykey/onlykey.nix | 2 +- pkgs/tools/security/vaultwarden/webvault.nix | 4 +- pkgs/top-level/aliases.nix | 14 ++++++- pkgs/top-level/all-packages.nix | 42 +++++++++---------- 57 files changed, 117 insertions(+), 107 deletions(-) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 6d5e465ec33..fdb570ebc32 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -229,7 +229,7 @@ See `node2nix` [docs](https://github.com/svanderburg/node2nix) for more info. #### Pitfalls {#javascript-node2nix-pitfalls} - If upstream package.json does not have a "version" attribute, `node2nix` will crash. You will need to add it like shown in [the package.json section](#javascript-upstream-package-json). -- `node2nix` has some [bugs](https://github.com/svanderburg/node2nix/issues/238) related to working with lock files from NPM distributed with `nodejs-16_x`. +- `node2nix` has some [bugs](https://github.com/svanderburg/node2nix/issues/238) related to working with lock files from NPM distributed with `nodejs_16`. - `node2nix` does not like missing packages from NPM. If you see something like `Cannot resolve version: vue-loader-v16@undefined` then you might want to try another tool. The package might have been pulled off of NPM. ### yarn2nix {#javascript-yarn2nix} diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 7e418f2869c..65b3b70c48a 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -429,7 +429,7 @@ in { environment = env; - path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ]; + path = with pkgs; [ bashInteractive ffmpeg nodejs_16 openssl yarn python3 ]; script = '' #!/bin/sh @@ -859,7 +859,7 @@ in { home = cfg.package; }; }) - (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ]) + (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_16 pkgs.yarn ]) (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];}) ]; diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index b0210c8a5d2..22682002532 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -133,7 +133,7 @@ in { WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; DynamicUser = true; PrivateTmp = true; - ExecStart = "${pkgs.nodejs-16_x}/bin/node ${pkgs.wiki-js}/server"; + ExecStart = "${pkgs.nodejs_16}/bin/node ${pkgs.wiki-js}/server"; }; }; }; diff --git a/pkgs/applications/editors/pulsar/update.mjs b/pkgs/applications/editors/pulsar/update.mjs index 82e86be072d..2e4155d8742 100755 --- a/pkgs/applications/editors/pulsar/update.mjs +++ b/pkgs/applications/editors/pulsar/update.mjs @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell /* -#!nix-shell -i node -p nodejs-18_x +#!nix-shell -i node -p nodejs_18 */ import { promises as fs } from 'node:fs'; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix index 08f947ea46b..b795f708f18 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/build-deps/default.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix index 2f29f37d72c..12949e6195a 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix index 47dcde5aca5..2050d062d6a 100644 --- a/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }: +{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs_16 }: let common = callPackage ./common.nix { }; in @@ -16,8 +16,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ fixup_yarn_lock # Use Node JS 16 because of @achrinza/node-ipc@9.2.2 - nodejs-16_x - nodejs-16_x.pkgs.yarn + nodejs_16 + nodejs_16.pkgs.yarn ]; configurePhase = '' diff --git a/pkgs/applications/networking/cluster/spacegun/node-composition.nix b/pkgs/applications/networking/cluster/spacegun/node-composition.nix index 0c0b678d98f..b57a68b0da7 100644 --- a/pkgs/applications/networking/cluster/spacegun/node-composition.nix +++ b/pkgs/applications/networking/cluster/spacegun/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix index c1eafe304a9..f9be0da6d5a 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix index f2b02ebdec4..35510badf42 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/default.nix @@ -6,13 +6,13 @@ postInstall = '' mkdir "$out/bin" echo '#!/bin/sh' >> "$out/bin/matrix-recorder" - echo "'${pkgs.nodejs-14_x}/bin/node'" \ + echo "'${pkgs.nodejs_14}/bin/node'" \ "'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \ '"$@"' >> "$out/bin/matrix-recorder" echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html" echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html" echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html" - echo "'${pkgs.nodejs-14_x}/bin/node'" \ + echo "'${pkgs.nodejs_14}/bin/node'" \ "'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \ '.' >> "$out/bin/matrix-recorder-to-html" chmod a+x "$out/bin/matrix-recorder" diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 41ff2b74a06..8cc96f1b6e5 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }: +{ pkgs, nodejs_16, stdenv, lib, nixosTests }: let nodePackages = import ./node-composition.nix { diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix index ca76a98f5a6..6377a4b2c12 100644 --- a/pkgs/applications/networking/n8n/node-composition.nix +++ b/pkgs/applications/networking/n8n/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/applications/version-management/cz-cli/node-composition.nix b/pkgs/applications/version-management/cz-cli/node-composition.nix index 4dfddf3e5bc..5bd4f169fc8 100644 --- a/pkgs/applications/version-management/cz-cli/node-composition.nix +++ b/pkgs/applications/version-management/cz-cli/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 8ebe0d816de..69f88d3aaf4 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -3,7 +3,7 @@ let # To control nodejs version we pass down - nodejs = pkgs.nodejs-14_x; + nodejs = pkgs.nodejs_14; fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { }; @@ -116,7 +116,7 @@ let nodePkgs = pkgs.callPackage ./packages/node-composition.nix { inherit pkgs; - nodejs = pkgs.nodejs-14_x; + nodejs = pkgs.nodejs_14; inherit (pkgs.stdenv.hostPlatform) system; }; diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index bbb39db07b7..b6110ac4db9 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 6bbc431049e..d9c0daef783 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index bee53d7a1e6..1a65ebd6cd2 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -13,7 +13,7 @@ rm -f ./node-env.nix -i node-packages.json \ -o node-packages.nix \ -c composition.nix \ - --pkg-name nodejs-18_x + --pkg-name nodejs_18 # using --no-out-link in nix-build argument would cause the # gc to run before the script finishes diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index a1957bf935a..a4acdc0d1c4 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -281,7 +281,7 @@ final: prev: { }; manta = prev.manta.override ( oldAttrs: { - nativeBuildInputs = with pkgs; [ nodejs-14_x installShellFiles ]; + nativeBuildInputs = with pkgs; [ nodejs_14 installShellFiles ]; postInstall = '' # create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91 completion_cmds=$(find ./bin -type f -printf "%f\n") diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 36931247d12..6774499d8cc 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -9,7 +9,7 @@ , glibcLocales , lib , nixosTests -, nodejs-16_x +, nodejs_16 , stdenv , which }: @@ -156,7 +156,7 @@ buildDotnetModule rec { preCheck = '' mkdir -p _layout/externals - ln -s ${nodejs-16_x} _layout/externals/node16 + ln -s ${nodejs_16} _layout/externals/node16 ''; postInstall = '' @@ -193,7 +193,7 @@ buildDotnetModule rec { # externals/node16. As opposed to the official releases, we don't # link the Alpine Node flavors. mkdir -p $out/lib/externals - ln -s ${nodejs-16_x} $out/lib/externals/node16 + ln -s ${nodejs_16} $out/lib/externals/node16 # Install Nodejs scripts called from workflows install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix index f0ce8ce7686..102c3cbaf31 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -6,7 +6,7 @@ , git , lib , makeDesktopItem -, nodejs-16_x +, nodejs_16 , stdenvNoCC , util-linux , zip @@ -16,7 +16,7 @@ let pname = "electron-fiddle"; version = "0.32.1"; electron = electron_22; - nodejs = nodejs-16_x; + nodejs = nodejs_16; src = fetchFromGitHub { owner = "electron"; diff --git a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix index 98375eef01c..53581e0c1d3 100644 --- a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix +++ b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix @@ -1,10 +1,10 @@ { lib , buildNpmPackage -, nodejs-16_x +, nodejs_16 , fetchFromGitHub }: let - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; in buildNpmPackage' rec { pname = "docker-compose-language-service"; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index fa58d1fbbf4..69aa71a6f24 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -4,13 +4,13 @@ , stdenv , makeWrapper , fetchurl -, nodejs-16_x +, nodejs_16 , coreutils , which }: let - nodejs = nodejs-16_x; + nodejs = nodejs_16; inherit (builtins) elemAt; info = lib.splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix index ca76a98f5a6..6377a4b2c12 100644 --- a/pkgs/development/web/netlify-cli/composition.nix +++ b/pkgs/development/web/netlify-cli/composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix index 08f947ea46b..b795f708f18 100644 --- a/pkgs/development/web/newman/node-composition.nix +++ b/pkgs/development/web/newman/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index dacf1581ada..bde04ea963e 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { diff --git a/pkgs/servers/ariang/default.nix b/pkgs/servers/ariang/default.nix index 7217fd069ce..c604bfe9530 100644 --- a/pkgs/servers/ariang/default.nix +++ b/pkgs/servers/ariang/default.nix @@ -2,7 +2,7 @@ , stdenv , pkgs , fetchFromGitHub -, nodejs ? pkgs.nodejs-14_x +, nodejs ? pkgs.nodejs_14 }: stdenv.mkDerivation rec { diff --git a/pkgs/servers/ariang/node-composition.nix b/pkgs/servers/ariang/node-composition.nix index 80e4e292949..68f9f64e6cf 100644 --- a/pkgs/servers/ariang/node-composition.nix +++ b/pkgs/servers/ariang/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/audiobookshelf/default.nix b/pkgs/servers/audiobookshelf/default.nix index ae03bb5d3b0..893e9635f96 100644 --- a/pkgs/servers/audiobookshelf/default.nix +++ b/pkgs/servers/audiobookshelf/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs-16_x, tone, ffmpeg-full, util-linux, libwebp }: +{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_16, tone, ffmpeg-full, util-linux, libwebp }: let - nodejs = nodejs-16_x; + nodejs = nodejs_16; pname = "audiobookshelf"; version = "2.2.18"; diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 05808d605d2..8f0416c6ad3 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper , cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3 -, esbuild, nodejs-16_x, node-gyp, libsecret, xorg, ripgrep +, esbuild, nodejs_16, node-gyp, libsecret, xorg, ripgrep , AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-16_x; + nodejs = nodejs_16; python = python3; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; @@ -241,7 +241,7 @@ in stdenv.mkDerivation rec { ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent # create wrapper - makeWrapper "${nodejs-16_x}/bin/node" "$out/bin/code-server" \ + makeWrapper "${nodejs_16}/bin/node" "$out/bin/code-server" \ --add-flags "$out/libexec/code-server/out/node/entry.js" ''; diff --git a/pkgs/servers/haste-server/node-composition.nix b/pkgs/servers/haste-server/node-composition.nix index 03dc6f3e5be..5fb8e7ba569 100644 --- a/pkgs/servers/haste-server/node-composition.nix +++ b/pkgs/servers/haste-server/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/servers/jellyfin/node-composition.nix b/pkgs/servers/jellyfin/node-composition.nix index 80e4e292949..68f9f64e6cf 100644 --- a/pkgs/servers/jellyfin/node-composition.nix +++ b/pkgs/servers/jellyfin/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/misc/navidrome/ui/node-composition.nix b/pkgs/servers/misc/navidrome/ui/node-composition.nix index 08f947ea46b..b795f708f18 100644 --- a/pkgs/servers/misc/navidrome/ui/node-composition.nix +++ b/pkgs/servers/misc/navidrome/ui/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/servers/mjolnir/node-composition.nix b/pkgs/servers/mjolnir/node-composition.nix index 03dc6f3e5be..5fb8e7ba569 100644 --- a/pkgs/servers/mjolnir/node-composition.nix +++ b/pkgs/servers/mjolnir/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/servers/monitoring/karma/default.nix index 8980d913aec..416e388d8f4 100644 --- a/pkgs/servers/monitoring/karma/default.nix +++ b/pkgs/servers/monitoring/karma/default.nix @@ -5,7 +5,7 @@ , callPackage , fetchFromGitHub , nixosTests -, nodejs-18_x +, nodejs_18 }: let @@ -13,7 +13,7 @@ let inherit pkgs; inherit (stdenv.hostPlatform) system; # pin nodejs version - nodejs = nodejs-18_x; + nodejs = nodejs_18; }).nodeDependencies; in @@ -31,7 +31,7 @@ buildGoModule rec { vendorHash = "sha256-ZsXPA4KyKbc/bwkidyHNDg62mE8KlE+yIssOBZLmHVg="; nativeBuildInputs = [ - nodejs-18_x + nodejs_18 ]; postPatch = '' diff --git a/pkgs/servers/monitoring/karma/generate-dependencies.sh b/pkgs/servers/monitoring/karma/generate-dependencies.sh index e37e125b7b1..15354c7182b 100755 --- a/pkgs/servers/monitoring/karma/generate-dependencies.sh +++ b/pkgs/servers/monitoring/karma/generate-dependencies.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix nodejs-18_x gnused wget +#! nix-shell -i bash -p nodePackages.node2nix nodejs_18 gnused wget # Usage: ./generate-dependencies.sh # Use the same version format as in ./default.nix (without the 'v') diff --git a/pkgs/servers/monitoring/karma/node-composition.nix b/pkgs/servers/monitoring/karma/node-composition.nix index 6bbc431049e..d9c0daef783 100644 --- a/pkgs/servers/monitoring/karma/node-composition.nix +++ b/pkgs/servers/monitoring/karma/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index f53bcd9cc7a..be32bda9935 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitLab, pkgs, lib, nodejs-14_x, pkg-config +{ stdenv, fetchFromGitLab, pkgs, lib, nodejs_14, pkg-config , libjpeg, pixman, cairo, pango, which, postgresql }: let - nodejs = nodejs-14_x; + nodejs = nodejs_14; version = "0.1.1"; diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 2abd4105c9c..2042629fe9f 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import ../../.. { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index d8eccd3e107..b5b13302633 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper , cacert, moreutils, jq, git, pkg-config, yarn, python3 -, esbuild, nodejs-16_x, libsecret, xorg, ripgrep +, esbuild, nodejs_16, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: let system = stdenv.hostPlatform.system; - nodejs = nodejs-16_x; + nodejs = nodejs_16; yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"]; diff --git a/pkgs/servers/polaris/node-composition.nix b/pkgs/servers/polaris/node-composition.nix index edf4bf579d4..cc96551dc98 100644 --- a/pkgs/servers/polaris/node-composition.nix +++ b/pkgs/servers/polaris/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_12"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix index 791f656eeba..2ca5c95a9af 100644 --- a/pkgs/servers/psitransfer/default.nix +++ b/pkgs/servers/psitransfer/default.nix @@ -7,13 +7,13 @@ { stdenv , pkgs , lib -, nodejs-14_x +, nodejs_14 , fetchzip }: let - # nodejs-16_x fails with ENOTCACHED - nodejs = nodejs-14_x; + # nodejs_16 fails with ENOTCACHED + nodejs = nodejs_14; nodePackages = import ./node-composition.nix { inherit pkgs nodejs; diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix index 1de33eb05b8..7785ceeba4e 100644 --- a/pkgs/servers/psitransfer/node-composition.nix +++ b/pkgs/servers/psitransfer/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index b5b02fc70c8..504a96d3614 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -37,7 +37,7 @@ , yarn , fixup_yarn_lock , nodePackages -, nodejs-16_x +, nodejs_16 , plugins ? [] }@args: @@ -159,9 +159,9 @@ let cd ../.. mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/ - ln -s "${nodejs-16_x.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a + ln -s "${nodejs_16.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a - ln -s ${nodejs-16_x.libv8}/include vendor/v8/include + ln -s ${nodejs_16.libv8}/include vendor/v8/include mkdir -p ext/libv8-node echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml @@ -208,7 +208,7 @@ let nodePackages.uglify-js nodePackages.terser yarn - nodejs-16_x + nodejs_16 ]; outputs = [ "out" "javascripts" ]; diff --git a/pkgs/servers/web-apps/ethercalc/default.nix b/pkgs/servers/web-apps/ethercalc/default.nix index 270b2e4cff7..229e5341cd8 100644 --- a/pkgs/servers/web-apps/ethercalc/default.nix +++ b/pkgs/servers/web-apps/ethercalc/default.nix @@ -1,11 +1,11 @@ { stdenv , pkgs , lib -, nodejs-14_x +, nodejs_14 }: let - nodejs = nodejs-14_x; + nodejs = nodejs_14; nodePackages = import ./node-packages.nix { inherit pkgs nodejs; diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix index 862d2234009..bdc44fec6fd 100644 --- a/pkgs/servers/web-apps/ethercalc/node-packages.nix +++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/servers/web-apps/whitebophir/default.nix index 577a0518635..f9b5aff8447 100644 --- a/pkgs/servers/web-apps/whitebophir/default.nix +++ b/pkgs/servers/web-apps/whitebophir/default.nix @@ -1,12 +1,12 @@ { stdenv , pkgs , lib -, nodejs-16_x +, nodejs_16 , runtimeShell }: let - nodejs = nodejs-16_x; + nodejs = nodejs_16; nodePackages = import ./node-packages.nix { inherit pkgs nodejs; diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.nix b/pkgs/servers/web-apps/whitebophir/node-packages.nix index 87e4c4462b1..ebd06cd4a28 100644 --- a/pkgs/servers/web-apps/whitebophir/node-packages.nix +++ b/pkgs/servers/web-apps/whitebophir/node-packages.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index e3a5880fcd0..234f7d90567 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs-16_x, jq, dos2unix }: +{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_16, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage { version = "1.1.5"; @@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage { preFixup = '' mkdir -p $out/bin chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js - sed -i '1i#!${nodejs-16_x}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js + sed -i '1i#!${nodejs_16}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral ''; diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 249e9629a6f..c9bf6ed07cd 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -15,7 +15,7 @@ , nodePackages }: let - nodejs = pkgs.nodejs-14_x; + nodejs = pkgs.nodejs_14; nodeEnv = import ../../../development/node-packages/node-env.nix { inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; diff --git a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix index c85f89b5603..a621dc22dee 100644 --- a/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix +++ b/pkgs/tools/graphics/ldgallery/viewer/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/misc/ntfy-sh/node-composition.nix b/pkgs/tools/misc/ntfy-sh/node-composition.nix index a038d882e7f..f8182c1e6e5 100644 --- a/pkgs/tools/misc/ntfy-sh/node-composition.nix +++ b/pkgs/tools/misc/ntfy-sh/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index f9a1999f36d..d8876757051 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index b7434491ba9..f638c4bfca8 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -11,7 +11,7 @@ , makeDesktopItem , makeWrapper , moreutils -, nodejs-16_x +, nodejs_16 , pkg-config , python3 , rustPlatform @@ -22,7 +22,7 @@ let description = "A secure and free password manager for all of your devices"; icon = "bitwarden"; - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; version = "2023.3.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index a038d882e7f..f8182c1e6e5 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 43de28a914a..7cc2a7e429d 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -3,12 +3,12 @@ , fetchFromGitHub , git , nixosTests -, nodejs-16_x +, nodejs_16 , python3 }: let - buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; }; + buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; }; version = "2023.3.0b"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 28e9c8e40df..55e7e3dd17a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1121,9 +1121,19 @@ mapAliases ({ nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 - nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 - nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 + nodejs_10 = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 + nodejs-10_x = nodejs_10; # Added 2022-11-06 + nodejs_12 = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 + nodejs-12_x = nodejs_12; # Added 2022-11-06 + nodejs-14_x = nodejs_14; # Added 2022-11-06 + nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 + nodejs-16_x = nodejs_16; # Added 2022-11-06 nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 + nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 + nodejs-18_x = nodejs_18; # Added 2022-11-06 + nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 + nodejs-19_x = nodejs_19; # Added 2022-11-06 + nodejs-slim-19_x = nodejs-slim_19; # Added 2022-11-06 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 739980d2809..3126407fe6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3590,7 +3590,7 @@ with pkgs; play-with-mpv = callPackage ../tools/video/play-with-mpv { }; - plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs-16_x; }; + plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs_16; }; pam-reattach = callPackage ../os-specific/darwin/pam-reattach { }; @@ -6174,9 +6174,9 @@ with pkgs; hedgedoc = callPackage ../servers/web-apps/hedgedoc { inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }) mkYarnPackage; - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; colord = callPackage ../tools/misc/colord { }; @@ -9400,27 +9400,27 @@ with pkgs; nodenv = callPackage ../development/tools/nodenv { }; - nodejs = hiPrio nodejs-18_x; + nodejs = hiPrio nodejs_18; - nodejs-slim = nodejs-slim-18_x; + nodejs-slim = nodejs-slim_18; - nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { + nodejs_14 = callPackage ../development/web/nodejs/v14.nix { openssl = openssl_1_1; }; - nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { + nodejs-slim_14 = callPackage ../development/web/nodejs/v14.nix { openssl = openssl_1_1; enableNpm = false; }; - nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { }; - nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix { + nodejs_16 = callPackage ../development/web/nodejs/v16.nix { }; + nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { }; - nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix { + nodejs_18 = callPackage ../development/web/nodejs/v18.nix { }; + nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; - nodejs-19_x = callPackage ../development/web/nodejs/v19.nix { }; - nodejs-slim-19_x = callPackage ../development/web/nodejs/v19.nix { + nodejs_19 = callPackage ../development/web/nodejs/v19.nix { }; + nodejs-slim_19 = callPackage ../development/web/nodejs/v19.nix { enableNpm = false; }; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; @@ -9987,10 +9987,10 @@ with pkgs; }; mirakurun = callPackage ../applications/video/mirakurun { - yarn = yarn.override { nodejs = nodejs-16_x; }; + yarn = yarn.override { nodejs = nodejs_16; }; inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix { - nodejs = nodejs-16_x; - yarn = yarn.override { nodejs = nodejs-16_x; }; + nodejs = nodejs_16; + yarn = yarn.override { nodejs = nodejs_16; }; }) mkYarnPackage; }; @@ -20960,7 +20960,7 @@ with pkgs; }; isso = callPackage ../servers/isso { - nodejs = nodejs-14_x; + nodejs = nodejs_14; }; itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix { @@ -25224,7 +25224,7 @@ with pkgs; }; lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { - nodejs = nodejs-14_x; + nodejs = nodejs_14; }; lightgbm = callPackage ../development/libraries/lightgbm { }; @@ -25422,7 +25422,7 @@ with pkgs; outline = callPackage ../servers/web-apps/outline (lib.fix (super: { yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; }; yarn = yarn.override { inherit (super) nodejs; }; - nodejs = nodejs-16_x; + nodejs = nodejs_16; })); openbgpd = callPackage ../servers/openbgpd { }; @@ -29875,7 +29875,7 @@ with pkgs; epeg = callPackage ../applications/graphics/epeg { }; epgstation = callPackage ../applications/video/epgstation { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; inherit (gnome) epiphany; @@ -33000,7 +33000,7 @@ with pkgs; peek = callPackage ../applications/video/peek { }; peertube = callPackage ../servers/peertube { - nodejs = nodejs-16_x; + nodejs = nodejs_16; }; peroxide = callPackage ../applications/networking/peroxide { }; From 9dc7d17ed8744b1d3b8acc0d7150bfc825eadfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 14 Apr 2023 15:44:56 +0200 Subject: [PATCH 265/337] node2nix: use new name package name for nodejs We do not want to generate files with aliases in them --- pkgs/development/node-packages/overrides.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index a4acdc0d1c4..73ccd811286 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -341,23 +341,16 @@ final: prev: { src = fetchFromGitHub { owner = "svanderburg"; repo = "node2nix"; - rev = "026360084db8a27095aafdac7125d7f1a93046c8"; - sha256 = "sha256-zO/xGG10v7HGv58RLX5SFd7QOXAL2vRxCRM8IfRZ8JA="; + rev = "315e1b85a6761152f57a41ccea5e2570981ec670"; + sha256 = "sha256-8OxTOkwBPcnjyhXhxQEDd8tiaQoHt91zUJX5Ka+IXco="; }; nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = let patches = [ - # Needed to fix Node.js 16+ - PR svanderburg/node2nix#302 + # fix nodejs attr names (fetchpatch { - name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch"; - url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch"; - hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8="; - }) - # Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314 - (fetchpatch { - name = "convert-crlf-for-script-bin-files.patch"; - url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch"; - hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU="; + url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch"; + hash = "sha256-pe8Xm4mjPh9oKXugoMY6pRl8YYgtdw0sRXN+TienalU="; }) ]; in '' From a33e936aa62839761716c40d7a533af12d80a713 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 11:52:03 +0200 Subject: [PATCH 266/337] exploitdb: 2023-04-24 -> 2023-04-25 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-04-24...2023-04-25 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 8bd0c529f39..11983f28d68 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-04-24"; + version = "2023-04-25"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RJYyFHTt7Cm6N+ZTD7D6GW/gKhwPhOMriV2+/lFWN10="; + hash = "sha256-TadZ7lDknEKmp8GQIIVCpGq7YkU0MPjXTFSc+D7cZJo="; }; nativeBuildInputs = [ From 83c3fb2e8d9506c936cc00f5f080e2ee4f48c455 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 11:55:22 +0200 Subject: [PATCH 267/337] trufflehog: 3.32.1 -> 3.32.2 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.32.1...v3.32.2 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.32.2 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index eac792ea804..6828fa3d2e7 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.32.1"; + version = "3.32.2"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-CRgGQZf+97gvnMcZF6al4cEnf8ndQwoGBqGRZG865Nw="; + hash = "sha256-+iGk3pmmpiljnmX0yCL3/X+icWvukxVA5n32npVBGOM="; }; - vendorHash = "sha256-NnYQGbG4R/Ar0goOtymuohHO36t3UQhjg53ufneCFxQ="; + vendorHash = "sha256-sSpRu6zLIvllrDYdtrj3oD3pCVs9ucSXbu3IYTqjT+k="; # Test cases run git clone and require network access doCheck = false; From f3f15fa73ddf15fa66cc4f80cda4c5afb356306b Mon Sep 17 00:00:00 2001 From: maxine <35892750+maxeaubrey@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:56:46 +0200 Subject: [PATCH 268/337] networkmanager: 1.42.2 -> 1.42.6 (#227809) --- pkgs/tools/networking/networkmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 8bb2335ba6f..61165f6c000 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -58,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.42.2"; + version = "1.42.6"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-3P6cXJCdOMga6VzP6JWjKKKhTBHaz7f1B760Be/OBYA="; + sha256 = "sha256-jDiKw3daxrzrYF+uIb4sPiYcr+YGeZSonw36RhDtAnk="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; From 6f3959a81df445b658db0e7e8dc4728034f7fcd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 11:58:41 +0200 Subject: [PATCH 269/337] python311Packages.whirlpool-sixth-sense: 0.18.2 -> 0.18.3 --- .../python-modules/whirlpool-sixth-sense/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index aae90576e05..36ba90d6d71 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -7,13 +7,14 @@ , pytest-mock , pytestCheckHook , pythonOlder +, setuptools , websockets }: buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.2"; - format = "setuptools"; + version = "0.18.3"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,9 +22,13 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6vmevL/VDuBnsPeYxtBZkCi9SVuINpM6jVlNR1Y6AuA="; + hash = "sha256-GvebWPO+jKDJk7yuMgEctlvKLXeo95GlJUSuI+FMCRU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aioconsole aiohttp From 6a38c71d3ca2bcafbca9cdb49ff44d05cc6482bb Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Fri, 14 Apr 2023 14:09:49 +0200 Subject: [PATCH 270/337] bird-lg: unstable-2022-05-08 -> 1.2.0 Notable Changes from https://github.com/xddxdd/bird-lg-go/releases: - Use MTR for traceroute - usage of local whois command - more bird commands --- pkgs/servers/bird-lg/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/servers/bird-lg/default.nix index f5294c2a191..4e348ed508b 100644 --- a/pkgs/servers/bird-lg/default.nix +++ b/pkgs/servers/bird-lg/default.nix @@ -3,13 +3,13 @@ let generic = { modRoot, vendorSha256 }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "unstable-2022-05-08"; + version = "1.2.0"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; - rev = "348295b9aa954a92df2cf6b1179846a9486dafc0"; - sha256 = "sha256-2t8ZP9Uc0sJlqWiJMq3MVoARfMKsuTXJkuOid0oWgyY="; + rev = "v${version}"; + sha256 = "sha256-Ldp/c1UU5EFnKjlUqQ+Hh6rVEOYEX7kaDL36edr9pNA="; }; doDist = false; @@ -31,12 +31,12 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorSha256 = "sha256-WKuVGiSV5LZrJ8/672TRN6tZNQxdCktHV6nx0ZxCP4A="; + vendorSha256 = "sha256-lYOi3tfXYhsFaWgikDUoJYRm8sxFNFKiFQMlVx/8AkA="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorSha256 = "sha256-7LZeCY4xSxREsQ+Dc2XSpu2ZI8CLE0mz0yoThP7/OO4="; + vendorSha256 = "sha256-QHLq4RuQaCMjefs7Vl7zSVgjLMDXvIZcM8d6/B5ECZc="; }; in symlinkJoin { name = "bird-lg"; paths = [ bird-lg-frontend bird-lg-proxy ]; } From 3dc05fbe40e192001a5057dd0f514e0c3bf6cbc7 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Fri, 14 Apr 2023 14:36:06 +0200 Subject: [PATCH 271/337] nixos/bird-lg: Add support for traceroute-flags --- nixos/modules/services/networking/bird-lg.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index 8ef14c93a2e..dc861dbfd11 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -33,6 +33,7 @@ let "--bird" = px.birdSocket; "--listen" = px.listenAddress; "--traceroute_bin" = px.traceroute.binary; + "--traceroute_flags" = concatStringsSep " " px.traceroute.flags; "--traceroute_raw" = px.traceroute.rawOutput; }; @@ -216,6 +217,12 @@ in description = lib.mdDoc "Traceroute's binary path."; }; + flags = mkOption { + type = with types; listOf str; + default = [ ]; + description = lib.mdDoc "Flags for traceroute process"; + }; + rawOutput = mkOption { type = types.bool; default = false; From d4ade747dc84df574d7f45e7a67e6b635f39fca3 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Fri, 14 Apr 2023 14:41:09 +0200 Subject: [PATCH 272/337] bird-lg: Pass version and meta --- pkgs/servers/bird-lg/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/servers/bird-lg/default.nix index 4e348ed508b..3bd0df7072b 100644 --- a/pkgs/servers/bird-lg/default.nix +++ b/pkgs/servers/bird-lg/default.nix @@ -24,6 +24,7 @@ let meta = with lib; { description = "Bird Looking Glass"; homepage = "https://github.com/xddxdd/bird-lg-go"; + changelog = "https://github.com/xddxdd/bird-lg-go/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ tchekda ]; }; @@ -39,4 +40,9 @@ let vendorSha256 = "sha256-QHLq4RuQaCMjefs7Vl7zSVgjLMDXvIZcM8d6/B5ECZc="; }; in -symlinkJoin { name = "bird-lg"; paths = [ bird-lg-frontend bird-lg-proxy ]; } +symlinkJoin { + name = "bird-lg-${bird-lg-frontend.version}"; + paths = [ bird-lg-frontend bird-lg-proxy ]; +} // { + inherit (bird-lg-frontend) version meta; +} From e1b387b9214e908421709af7d0f477efba565e33 Mon Sep 17 00:00:00 2001 From: Basti Date: Tue, 25 Apr 2023 12:10:55 +0200 Subject: [PATCH 273/337] Update github owner and URL for mdcat (#228116) I renamed my Github account a while ago. --- pkgs/tools/text/mdcat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index b3b3c218634..0fdfae13302 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { version = "2.0.2"; src = fetchFromGitHub { - owner = "lunaryorn"; + owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; sha256 = "sha256-JevndaSGeIzLV/h4ljUwx6vL60aKWYzmKWOgQDPMAaA="; @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "cat for markdown"; - homepage = "https://github.com/lunaryorn/mdcat"; + homepage = "https://github.com/swsnr/mdcat"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; From f96b6538dff698905f95cbefd8dbf74a67ed7733 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 10:51:33 +0000 Subject: [PATCH 274/337] git-subrepo: 0.4.5 -> 0.4.6 --- pkgs/applications/version-management/git-subrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-subrepo/default.nix b/pkgs/applications/version-management/git-subrepo/default.nix index 23b8fd95cfd..39b054d2a30 100644 --- a/pkgs/applications/version-management/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-subrepo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-subrepo"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "ingydotnet"; repo = "git-subrepo"; rev = version; - sha256 = "sha256-ZU5yYaiear5AjlBqtzabmMJNUa2ypeJKW3sQPIcyskM="; + sha256 = "sha256-83N0Ek6DawUrOc6s2Utzi8776bX4UTGS/a/OffkV44Y="; }; nativeBuildInputs = [ From cb6fe05c78e2cd3d34882cc20bdd28def0213bd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 11:01:12 +0000 Subject: [PATCH 275/337] arkade: 0.9.12 -> 0.9.13 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index f07027a09fa..bf5f9b35a4f 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-90X+MRZXjKoXsUvfsUQUZcd90XcOIqyVXBbvEtPynPk="; + sha256 = "sha256-j7fqLkVRAH4EN90IQ/9y/uKfFsdXXTW6R/WFRhuKPGQ="; }; CGO_ENABLED = 0; From 01717419b3993de76177411c4677a690357297a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 13:14:41 +0200 Subject: [PATCH 276/337] python310Packages.aliyun-python-sdk-cdn: 3.8.5 -> 3.8.6 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 027e41f2266..825f53aa583 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.8.5"; + version = "3.8.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2bFiOvwbvYy7uw7h0LTX4szSBwgafSYOOixxv+zAYDo="; + hash = "sha256-WdpQfyPI3uegJaaIhdu1sXWgWFbyfpzXPKgRIXD+Dp0="; }; propagatedBuildInputs = [ From 8c051713653593e4c8c58795b648130bf450bf62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 11:22:08 +0000 Subject: [PATCH 277/337] duckscript: 0.8.17 -> 0.8.18 --- pkgs/development/tools/rust/duckscript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/duckscript/default.nix b/pkgs/development/tools/rust/duckscript/default.nix index b005ae9192e..683ef150c70 100644 --- a/pkgs/development/tools/rust/duckscript/default.nix +++ b/pkgs/development/tools/rust/duckscript/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "duckscript_cli"; - version = "0.8.17"; + version = "0.8.18"; src = fetchCrate { inherit pname version; - sha256 = "sha256-fEAm7HhRGYZpGL9I8h3wX8AnPs00pG/ui7Rm+PaXJpA="; + sha256 = "sha256-AbdGyRCeypmsBc2QdR4Tdl3MeUlK9xmNmB63axpUfFI="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoHash = "sha256-kll2q5HhcpizBDbWipj30F8WEQnjG1fndxCHoXBbik8="; + cargoHash = "sha256-Exsgt1yV3EiEewzDU4YLhSYGpzr4t2o5hm3evyAkO44="; meta = with lib; { description = "Simple, extendable and embeddable scripting language."; From 25671114cd9266e27b2609d94babdc66f52357a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Tue, 25 Apr 2023 13:33:29 +0200 Subject: [PATCH 278/337] cloud-init: add udhcpc support (#226216) * cloud-init: 22.4 -> 23.1.1 * cloud-init: add udhcpc support Cloud-init use as dhcp client, dhclient, which is coming from the unmaintained package, isc-dhcp-client (refer https://www.isc.org/dhcp/) which ended support in 2022. dhclient is deprecated in nixos Add patch to use `udhcpc` dhcp client coming from busybox instead. PR based on #226173 refs #215571 upstream PR: https://github.com/canonical/cloud-init/pull/2125 --- nixos/modules/services/system/cloud-init.nix | 1 + .../cloud-init/0001-add-nixos-support.patch | 8 +- .../cloud-init/0002-Add-Udhcpc-support.patch | 222 ++++++++++++++++++ .../virtualization/cloud-init/default.nix | 20 +- 4 files changed, 240 insertions(+), 11 deletions(-) create mode 100644 pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix index d75070dea43..82506596bc7 100644 --- a/nixos/modules/services/system/cloud-init.nix +++ b/nixos/modules/services/system/cloud-init.nix @@ -10,6 +10,7 @@ let cfg = config.services.cloud-init; openssh shadow util-linux + busybox ] ++ optional cfg.btrfs.enable btrfs-progs ++ optional cfg.ext4.enable e2fsprogs ; diff --git a/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch b/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch index 81ff2ef73ce..f79e3dda849 100644 --- a/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch +++ b/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch @@ -1,11 +1,11 @@ diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py -index 4a468cf8..c60c899b 100644 +index b82852e1..c998b21e 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py -@@ -55,6 +55,7 @@ OSFAMILIES = { - "virtuozzo", +@@ -74,6 +74,7 @@ OSFAMILIES = { ], - "suse": ["opensuse", "sles"], + "openEuler": ["openEuler"], + "OpenCloudOS": ["OpenCloudOS", "TencentOS"], + "nixos": ["nixos"], } diff --git a/pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch b/pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch new file mode 100644 index 00000000000..ef169483769 --- /dev/null +++ b/pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch @@ -0,0 +1,222 @@ +diff --git a/cloudinit/net/dhcp.py b/cloudinit/net/dhcp.py +index a9a1c980..2d83089b 100644 +--- a/cloudinit/net/dhcp.py ++++ b/cloudinit/net/dhcp.py +@@ -14,12 +14,48 @@ from io import StringIO + + import configobj + +-from cloudinit import subp, util ++from cloudinit import subp, util, temp_utils + from cloudinit.net import find_fallback_nic, get_devicelist + + LOG = logging.getLogger(__name__) + + NETWORKD_LEASES_DIR = "/run/systemd/netif/leases" ++UDHCPC_SCRIPT = """#!/bin/sh ++log() { ++ echo "udhcpc[$PPID]" "$interface: $2" ++} ++ ++[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 ++ ++case $1 in ++ bound|renew) ++ cat < "$LEASE_FILE" ++{ ++ "interface": "$interface", ++ "fixed-address": "$ip", ++ "subnet-mask": "$subnet", ++ "routers": "${router%% *}", ++ "static_routes" : "${staticroutes}" ++} ++JSON ++ ;; ++ ++ deconfig) ++ log err "Not supported" ++ exit 1 ++ ;; ++ ++ leasefail | nak) ++ log err "configuration failed: $1: $message" ++ exit 1 ++ ;; ++ ++ *) ++ echo "$0: Unknown udhcpc command: $1" >&2 ++ exit 1 ++ ;; ++esac ++""" + + + class NoDHCPLeaseError(Exception): +@@ -43,12 +79,14 @@ class NoDHCPLeaseMissingDhclientError(NoDHCPLeaseError): + + + def maybe_perform_dhcp_discovery(nic=None, dhcp_log_func=None, tmp_dir=None): +- """Perform dhcp discovery if nic valid and dhclient command exists. ++ """Perform dhcp discovery if nic valid and dhclient or udhcpc command ++ exists. + + If the nic is invalid or undiscoverable or dhclient command is not found, + skip dhcp_discovery and return an empty dict. + +- @param nic: Name of the network interface we want to run dhclient on. ++ @param nic: Name of the network interface we want to run the dhcp client ++ on. + @param dhcp_log_func: A callable accepting the dhclient output and error + streams. + @param tmp_dir: Tmp dir with exec permissions. +@@ -66,11 +104,16 @@ def maybe_perform_dhcp_discovery(nic=None, dhcp_log_func=None, tmp_dir=None): + "Skip dhcp_discovery: nic %s not found in get_devicelist.", nic + ) + raise NoDHCPLeaseInterfaceError() ++ udhcpc_path = subp.which("udhcpc") ++ if udhcpc_path: ++ return dhcp_udhcpc_discovery(udhcpc_path, nic, dhcp_log_func) + dhclient_path = subp.which("dhclient") +- if not dhclient_path: +- LOG.debug("Skip dhclient configuration: No dhclient command found.") +- raise NoDHCPLeaseMissingDhclientError() +- return dhcp_discovery(dhclient_path, nic, dhcp_log_func) ++ if dhclient_path: ++ return dhcp_discovery(dhclient_path, nic, dhcp_log_func) ++ LOG.debug( ++ "Skip dhclient configuration: No dhclient or udhcpc command found." ++ ) ++ raise NoDHCPLeaseMissingDhclientError() + + + def parse_dhcp_lease_file(lease_file): +@@ -107,6 +150,61 @@ def parse_dhcp_lease_file(lease_file): + return dhcp_leases + + ++def dhcp_udhcpc_discovery(udhcpc_cmd_path, interface, dhcp_log_func=None): ++ """Run udhcpc on the interface without scripts or filesystem artifacts. ++ ++ @param udhcpc_cmd_path: Full path to the udhcpc used. ++ @param interface: Name of the network interface on which to dhclient. ++ @param dhcp_log_func: A callable accepting the dhclient output and error ++ streams. ++ ++ @return: A list of dicts of representing the dhcp leases parsed from the ++ dhclient.lease file or empty list. ++ """ ++ LOG.debug("Performing a dhcp discovery on %s", interface) ++ ++ tmp_dir = temp_utils.get_tmp_ancestor(needs_exe=True) ++ lease_file = os.path.join(tmp_dir, interface + ".lease.json") ++ with contextlib.suppress(FileNotFoundError): ++ os.remove(lease_file) ++ ++ # udhcpc needs the interface up to send initial discovery packets. ++ # Generally dhclient relies on dhclient-script PREINIT action to bring the ++ # link up before attempting discovery. Since we are using -sf /bin/true, ++ # we need to do that "link up" ourselves first. ++ subp.subp(["ip", "link", "set", "dev", interface, "up"], capture=True) ++ udhcpc_script = os.path.join(tmp_dir, "udhcpc_script") ++ util.write_file(udhcpc_script, UDHCPC_SCRIPT, 0o755) ++ cmd = [ ++ udhcpc_cmd_path, ++ "-O", ++ "staticroutes", ++ "-i", ++ interface, ++ "-s", ++ udhcpc_script, ++ "-n", # Exit if lease is not obtained ++ "-q", # Exit after obtaining lease ++ "-f", # Run in foreground ++ "-v", ++ ] ++ ++ out, err = subp.subp( ++ cmd, update_env={"LEASE_FILE": lease_file}, capture=True ++ ) ++ ++ if dhcp_log_func is not None: ++ dhcp_log_func(out, err) ++ lease_json = util.load_json(util.load_file(lease_file)) ++ static_routes = lease_json["static_routes"].split() ++ if static_routes: ++ # format: dest1/mask gw1 ... destn/mask gwn ++ lease_json["static_routes"] = [ ++ i for i in zip(static_routes[::2], static_routes[1::2]) ++ ] ++ return [lease_json] ++ ++ + def dhcp_discovery(dhclient_cmd_path, interface, dhcp_log_func=None): + """Run dhclient on the interface without scripts or filesystem artifacts. + +diff --git a/tests/unittests/net/test_dhcp.py b/tests/unittests/net/test_dhcp.py +index 40340553..8913cf65 100644 +--- a/tests/unittests/net/test_dhcp.py ++++ b/tests/unittests/net/test_dhcp.py +@@ -12,6 +12,7 @@ from cloudinit.net.dhcp import ( + NoDHCPLeaseError, + NoDHCPLeaseInterfaceError, + NoDHCPLeaseMissingDhclientError, ++ dhcp_udhcpc_discovery, + dhcp_discovery, + maybe_perform_dhcp_discovery, + networkd_load_leases, +@@ -334,6 +335,43 @@ class TestDHCPParseStaticRoutes(CiTestCase): + ) + + ++class TestUDHCPCDiscoveryClean(CiTestCase): ++ maxDiff = None ++ ++ @mock.patch("cloudinit.net.dhcp.os.remove") ++ @mock.patch("cloudinit.net.dhcp.subp.subp") ++ @mock.patch("cloudinit.util.load_json") ++ @mock.patch("cloudinit.util.load_file") ++ @mock.patch("cloudinit.util.write_file") ++ def test_udhcpc_discovery( ++ self, m_write_file, m_load_file, m_loadjson, m_subp, m_remove ++ ): ++ """dhcp_discovery waits for the presence of pidfile and dhcp.leases.""" ++ m_subp.return_value = ("", "") ++ m_loadjson.return_value = { ++ "interface": "eth9", ++ "fixed-address": "192.168.2.74", ++ "subnet-mask": "255.255.255.0", ++ "routers": "192.168.2.1", ++ "static_routes": "10.240.0.1/32 0.0.0.0 0.0.0.0/0 10.240.0.1", ++ } ++ self.assertEqual( ++ [ ++ { ++ "fixed-address": "192.168.2.74", ++ "interface": "eth9", ++ "routers": "192.168.2.1", ++ "static_routes": [ ++ ("10.240.0.1/32", "0.0.0.0"), ++ ("0.0.0.0/0", "10.240.0.1"), ++ ], ++ "subnet-mask": "255.255.255.0", ++ } ++ ], ++ dhcp_udhcpc_discovery("/sbin/udhcpc", "eth9"), ++ ) ++ ++ + class TestDHCPDiscoveryClean(CiTestCase): + with_logs = True + +@@ -372,7 +410,7 @@ class TestDHCPDiscoveryClean(CiTestCase): + maybe_perform_dhcp_discovery() + + self.assertIn( +- "Skip dhclient configuration: No dhclient command found.", ++ "Skip dhclient configuration: No dhclient or udhcpc command found.", + self.logs.getvalue(), + ) + +-- +2.38.4 + diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 97c80ec560c..53e6a3a612f 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -10,21 +10,23 @@ , shadow , systemd , coreutils +, gitUpdater +, busybox }: python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "22.4"; + version = "23.1.1"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-MsT5t2da79Eb9FlTLPr2893JcF0ujNnToJTCQRT1QEo="; + hash = "sha256-w1UP7JIt/+6UlASB8kv2Lil+1sMTDIrADoYOT/WtaeE="; }; - patches = [ ./0001-add-nixos-support.patch ]; + patches = [ ./0001-add-nixos-support.patch ./0002-Add-Udhcpc-support.patch ]; prePatch = '' substituteInPlace setup.py \ @@ -72,7 +74,7 @@ python3.pkgs.buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ dmidecode cloud-utils.guest ]}/bin" + "--prefix PATH : ${lib.makeBinPath [ dmidecode cloud-utils.guest busybox ]}/bin" ]; disabledTests = [ @@ -82,6 +84,7 @@ python3.pkgs.buildPythonApplication rec { "test_path_env_gets_set_from_main" # tries to read from /etc/ca-certificates.conf while inside the sandbox "test_handler_ca_certs" + "TestRemoveDefaultCaCerts" # Doesn't work in the sandbox "TestEphemeralDhcpNoNetworkSetup" "TestHasURLConnectivity" @@ -112,13 +115,16 @@ python3.pkgs.buildPythonApplication rec { "cloudinit" ]; - passthru.tests = { inherit (nixosTests) cloud-init cloud-init-hostname; }; + passthru = { + tests = { inherit (nixosTests) cloud-init cloud-init-hostname; }; + updateScript = gitUpdater { ignoredVersions = ".ubuntu.*"; }; + }; meta = with lib; { - homepage = "https://cloudinit.readthedocs.org"; + homepage = "https://github.com/canonical/cloud-init"; description = "Provides configuration and customization of cloud instance"; license = with licenses; [ asl20 gpl3Plus ]; - maintainers = with maintainers; [ illustris ]; + maintainers = with maintainers; [ illustris jfroche ]; platforms = platforms.all; }; } From 7e0476043014bfe97937084cde8c3f3c4c0554a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 11:38:21 +0000 Subject: [PATCH 279/337] bacon: 2.7.0 -> 2.8.1 --- pkgs/development/tools/bacon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 2372788a884..0b994d80bba 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qN1Jpv6hoIKVGGQXzon8P0O12YlIB7Dam1UxXL3TQrY="; + hash = "sha256-3LoqG7t2InDBrfOk0vve/6C5Vjifq5L+Tt8ulMGuASg="; }; - cargoHash = "sha256-253j34Kxzsfe5UeiWRdV+2P0rbnTYig18cZ25HVKX+8="; + cargoHash = "sha256-k41hF7qhT9Y7IBp7rzpRP9pTIf1ZQsEyslaHmss+NhE="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 37057275a0fcced68a447a97a154269df93fcf93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 12:17:52 +0000 Subject: [PATCH 280/337] supabase-cli: 1.48.1 -> 1.50.13 --- pkgs/development/tools/supabase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 40b25ae388a..1c8e53b60e9 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.48.1"; + version = "1.50.13"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-BTUeGaWWkq1kMGInpu/zlJ7lFSSoiPlTDS/jjKe/uD4="; + sha256 = "sha256-e/jPtNzuETky8uwg1TnFOGKppSPuEkBiEfmPwiUM3V0="; }; - vendorSha256 = "sha256-PAsmUEw6nI2KTrvPCn2Dxm3mrM6f/O4i8P6P0UuDXzo="; + vendorSha256 = "sha256-j2iEeAn+4Tn3h8lVKoaYE+6W4R/q+JaAWXxHllZGLNs="; ldflags = [ "-s" "-w" "-X" "github.com/supabase/cli/cmd.version=${version}" ]; From ed312cb4f78d3d79c11769cb07880fcfaf582377 Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Tue, 25 Apr 2023 12:37:50 +0000 Subject: [PATCH 281/337] doc/default.nix: make the manual build on more than one core (#225921) * doc/default.nix: make the manual build on more than one core Let's build the manual with more than one core. Maybe people will take better care of it now that it is less painful to build. --- doc/Makefile | 3 +++ doc/default.nix | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/doc/Makefile b/doc/Makefile index ee98a3ee921..208f23f5023 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -19,6 +19,9 @@ pandoc_flags = --extract-media=$(pandoc_media_dir) \ .PHONY: all all: validate format out/html/index.html out/epub/manual.epub +.PHONY: render-md +render-md: ${MD_TARGETS} + .PHONY: debug debug: nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml" diff --git a/doc/default.nix b/doc/default.nix index ac405c37903..4f55c95a04c 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -20,6 +20,10 @@ in pkgs.stdenv.mkDerivation { ln -s ${doc-support} ./doc-support/result ''; + preBuild = '' + make -j$NIX_BUILD_CORES render-md + ''; + installPhase = '' dest="$out/share/doc/nixpkgs" mkdir -p "$(dirname "$dest")" From 72c1d14d767dabc402f50bb38f283ee14bc5f449 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 25 Apr 2023 14:38:42 +0200 Subject: [PATCH 282/337] gitlab-runner: 15.10.0 -> 15.11.0 (#228102) https://gitlab.com/gitlab-org/gitlab-runner/blob/v15.11.0/CHANGELOG.md --- .../tools/continuous-integration/gitlab-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index f4c651a8e85..f38dd58438b 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.10.0"; + version = "15.11.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-ASmhcaywnVb62lPZk1+0hHme7IgXylnk8DryhCjQ6dc="; + vendorHash = "sha256-4eSfNo5S/eottEN4AptGJq6pBDHkNud0Nj5GrqutADM="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-HwG23eqTPQFvziRKhbMdl5O4OlrC9lgha92J2hzRRS8="; + sha256 = "sha256-S4KdEepNWv8J5+r/GT8+8kAKU5fq2iwQU+qyoCY1s0o="; }; patches = [ From 0d1a36bfb4eaf63ea0bdae28ba7431ee90eefc72 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 25 Apr 2023 00:39:26 -0400 Subject: [PATCH 283/337] restic: 0.15.1 -> 0.15.2 --- pkgs/tools/backup/restic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 71756025196..b60ea95302b 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-KdPslVJHH+xdUuFfmLZumP2lHzkDrrAvpDaj38SuP8o="; + hash = "sha256-YJBHk/B8+q5f0k5i5hpucsJK4T/cRu9Jv7+O6vlT64Q="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-oetaCiXWEBUEf382l4sjO0SCPxkoh+bMTgIf/qJTQms="; + vendorHash = "sha256-GWFaCfiE8Ph2uBTBI0E47pH+EJsMsMr1NDuaIGvyXRM="; subPackages = [ "cmd/restic" ]; From 301559558f03fb961e333442eeb485d80b5f9544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 24 Apr 2023 22:34:06 -0700 Subject: [PATCH 284/337] restique: unstable-2021-05-03 -> unstable-2022-11-29 --- pkgs/applications/backup/restique/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/restique/default.nix b/pkgs/applications/backup/restique/default.nix index 744379f213d..6bc2ea8caf9 100644 --- a/pkgs/applications/backup/restique/default.nix +++ b/pkgs/applications/backup/restique/default.nix @@ -4,19 +4,20 @@ , cmake , libsecret , qtkeychain +, qttools , restic }: mkDerivation rec { pname = "restique"; - version = "unstable-2021-05-03"; + version = "unstable-2022-11-29"; src = fetchFromGitea { domain = "git.srcbox.net"; owner = "stefan"; repo = "restique"; - rev = "f83ea63c2e2f2a41e845f54c7fe2c391a528a121"; - sha256 = "0j1qihv7hd90xkfm4ksv74q6m7cq781fbdnc3l4spcd7h2p8lh0z"; + rev = "906b0b1726c26988c910baea9665f540c37c99c4"; + hash = "sha256-EYoADtYX+gm8T3/3gxTtdFOFGJf2rXryiTu8NIO0Ez4="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ mkDerivation rec { buildInputs = [ libsecret qtkeychain + qttools ]; qtWrapperArgs = [ From 402182b66d3864d80f613427edbaaa2feb178bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Apr 2023 05:41:07 -0700 Subject: [PATCH 285/337] libdeltachat: 1.113.0 -> 1.114.0 (#228081) Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.113.0...v1.114.0 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.114.0/CHANGELOG.md --- .../development/libraries/libdeltachat/Cargo.lock | 15 ++++++++------- .../libraries/libdeltachat/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 6bc23f2f804..c4e3ed733fb 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -1144,7 +1144,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.113.0" +version = "1.114.0" dependencies = [ "ansi_term", "anyhow", @@ -1175,6 +1175,7 @@ dependencies = [ "libc", "log", "mailparse", + "mime", "num-derive", "num-traits", "num_cpus", @@ -1218,7 +1219,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.113.0" +version = "1.114.0" dependencies = [ "anyhow", "async-channel", @@ -1241,7 +1242,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.113.0" +version = "1.114.0" dependencies = [ "ansi_term", "anyhow", @@ -1256,7 +1257,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.113.0" +version = "1.114.0" dependencies = [ "anyhow", "deltachat", @@ -1281,7 +1282,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.113.0" +version = "1.114.0" dependencies = [ "anyhow", "deltachat", @@ -2806,9 +2807,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 5f534c39321..48bd326ec62 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.113.0"; + version = "1.114.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-Ft7BMgHGeTEM3WQVhAEjtyYYCfVFa2+ZkbdmDF22X9A="; + hash = "sha256-fonrf4DZI5HhUY08yZmAHp2SKJYA2OywVBa31W7O1qU="; }; patches = [ From dcb1d8d5e88dd74289a62418408e06bcafabc088 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 12:44:01 +0000 Subject: [PATCH 286/337] cudatext: 1.191.0 -> 1.191.5 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 46b40abaa1a..5547bb8aeb3 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.191.0"; + version = "1.191.5"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-wn2pSzz4w8tQjVFEIfR3/1ddeTjQBQaKl26SxXbOXG0="; + hash = "sha256-jGIdDgSDgKXI9DHEmu2FRXjoFsvmxUbK5xoajLjX7zQ="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 57eecaabb4f..97d37f8db2a 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -16,8 +16,8 @@ }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.04.17", - "hash": "sha256-QllXTq9BCKedt/Pv14qOn1UoxZ57qz76OyptnjT92hA=" + "rev": "2023.04.22", + "hash": "sha256-12W0p18s15KFFIopgit8l/Bf1KjMZkP2kCAaeaoqfyQ=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,8 +26,8 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2023.04.17", - "hash": "sha256-EdtrKYZTP+1MQU5fLO6vYoU3EjS91PaSQnIxtgAs7TI=" + "rev": "2023.04.18", + "hash": "sha256-Eb8ynxZP3OQ7TGFZMbw8r0HXXvaoR6yotwnwK6nwZxg=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", From 3f4787cbf569100673c597cc812285b5ddaae5f5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 25 Apr 2023 15:50:18 +0300 Subject: [PATCH 287/337] audacity: 3.2.5 -> 3.3.0 --- pkgs/applications/audio/audacity/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 24d610f62d0..fcaebc059b1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -61,17 +61,19 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.2.5"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - hash = "sha256-tMz55fZh+TfvLEyApDqC0QMd2hEQLJsNQ6y2Xy0xgaQ="; + hash = "sha256-OQX3YFUdK9TR7ZuN2dZc6ZAWaqfftk5VH0qoOwbTAuM="; }; postPatch = '' mkdir src/private + substituteInPlace scripts/build/macOS/fix_bundle.py \ + --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" '' + lib.optionalString stdenv.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h @@ -151,13 +153,16 @@ stdenv.mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" + + # Fix duplicate store paths + "-DCMAKE_INSTALL_LIBDIR=lib" ]; # [ 57%] Generating LightThemeAsCeeCode.h... # ../../utils/image-compiler: error while loading shared libraries: # lib-theme.so: cannot open shared object file: No such file or directory preBuild = '' - export LD_LIBRARY_PATH=$PWD/utils + export LD_LIBRARY_PATH=$PWD/Release/lib/audacity ''; doCheck = false; # Test fails From 10b8dd6997023142fc980a265f55b3fb0edb2a9a Mon Sep 17 00:00:00 2001 From: wozeparrot Date: Tue, 25 Apr 2023 08:55:02 -0400 Subject: [PATCH 288/337] seaweedfs: 3.46 -> 3.47 (#228043) --- pkgs/applications/networking/seaweedfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 433519cb7e2..51ed1767697 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.46"; + version = "3.47"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-ur4GAgGyqbot3Z8GsJLAj6WUJJ0C7slubemJL021gLM="; + hash = "sha256-0RDzTS/bjcXeYBWqRq/oWwI0kEmxYkT6oqCBYRi3dnQ="; }; - vendorHash = "sha256-9DH/mkISdJCacpB8Nt9DA9fyHqOEdH1GpFZ6TuRQgAQ="; + vendorHash = "sha256-oXf+aZxf0jBiOqYzD9mTjYND0LjjQeHIZXIrqcEuyYk="; subPackages = [ "weed" ]; From 682a412541c90d13b87c7945c45d5dae21f2b913 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 13:19:59 +0000 Subject: [PATCH 289/337] python310Packages.azure-mgmt-cosmosdb: 9.0.0 -> 9.1.0 --- .../python-modules/azure-mgmt-cosmosdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 4637e74cc31..8b4d6c29592 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.0.0"; + version = "9.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-7bP8klNIp2skhNKU8s51zaxQOG6pYMCK9wk6ce5pySA="; + hash = "sha256-rLpuAgPUM/vgXj/ZnpkmNQl59OMZDtyIfJBkanQXczE="; }; propagatedBuildInputs = [ From a9ee8a268c2424c4261fed32b5e0b564876bc0c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 13:41:56 +0000 Subject: [PATCH 290/337] discord-ptb: 0.0.41 -> 0.0.42 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0a5afe093cd..205bc0d0f9f 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.26"; - ptb = "0.0.41"; + ptb = "0.0.42"; canary = "0.0.151"; } else { stable = "0.0.273"; @@ -18,7 +18,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "AhiZXgkXG/lroG7XAgcvJ7r5PSvzMFhamsxB1cXJOak="; + sha256 = "ZAMyAqyFEBJeTUqQzr5wK+BOFGURqhoHL8w2hJvL0vI="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 7f57b38cc89dfdd10bdc99f0525b84b981777c9f Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Apr 2023 09:51:19 -0400 Subject: [PATCH 291/337] static-web-server: 2.15.0 -> 2.16.0 (#228048) Diff: https://github.com/static-web-server/static-web-server/compare/v2.15.0...v2.16.0 Changelog: https://github.com/static-web-server/static-web-server/blob/v2.16.0/CHANGELOG.md --- pkgs/servers/static-web-server/Cargo.lock | 1624 -------------------- pkgs/servers/static-web-server/default.nix | 13 +- 2 files changed, 4 insertions(+), 1633 deletions(-) delete mode 100644 pkgs/servers/static-web-server/Cargo.lock diff --git a/pkgs/servers/static-web-server/Cargo.lock b/pkgs/servers/static-web-server/Cargo.lock deleted file mode 100644 index b2131545299..00000000000 --- a/pkgs/servers/static-web-server/Cargo.lock +++ /dev/null @@ -1,1624 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" - -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "brotli", - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - -[[package]] -name = "bcrypt" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df288bec72232f78c1ec5fe4e8f1d108aa0265476e93097593c803c8c02062a" -dependencies = [ - "base64 0.21.0", - "blowfish", - "getrandom", - "subtle", - "zeroize", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blowfish" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" -dependencies = [ - "byteorder", - "cipher", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -dependencies = [ - "iana-time-zone", - "num-integer", - "num-traits", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags", - "textwrap", - "unicode-width", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "cxx" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures-channel" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" - -[[package]] -name = "futures-sink" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" - -[[package]] -name = "futures-task" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" - -[[package]] -name = "futures-util" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" -dependencies = [ - "futures-core", - "futures-sink", - "futures-task", - "pin-project-lite", - "pin-utils", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "globset" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" -dependencies = [ - "aho-corasick", - "bstr", - "fnv", - "log", - "regex", - "serde", -] - -[[package]] -name = "h2" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "headers" -version = "0.3.8" -source = "git+https://github.com/joseluisq/hyper-headers.git?branch=headers_encoding#33002c471ce4ee94d2f4d47ed85f1b0a62595cfe" -dependencies = [ - "base64 0.13.1", - "bitflags", - "bytes", - "headers-core", - "http", - "httpdate", - "itertools", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "git+https://github.com/joseluisq/hyper-headers.git?branch=headers_encoding#33002c471ce4ee94d2f4d47ed85f1b0a62595cfe" -dependencies = [ - "http", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-serde" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e272971f774ba29341db2f686255ff8a979365a26fb9e4277f6b6d9ec0cdd5e" -dependencies = [ - "http", - "serde", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humansize" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" -dependencies = [ - "libm", -] - -[[package]] -name = "hyper" -version = "0.14.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "listenfd" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0500463acd96259d219abb05dc57e5a076ef04b2db9a2112846929b5f174c96" -dependencies = [ - "libc", - "uuid", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50686e0021c4136d1d453b2dfe059902278681512a34d4248435dc34b6b5c8ec" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.0", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "serde" -version = "1.0.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f2b4817415c6d4210bfe1c7bfcf4801b2d904cb4d0e1a8fdb651013c9e86b8" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d071a94a3fac4aff69d023a7f411e33f40f3483f8c5190b1953822b6b76d7630" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_ignored" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94eb4a4087ba8bdf14a9208ac44fddbf55c01a6195f7edfc511ddaff6cae45a6" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_json" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395627de918015623b32e7669714206363a7fc00382bf477e72c1f7533e8eafc" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "cc", - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signal-hook-tokio" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213241f76fb1e37e27de3b6aa1b068a2c333233b59cca6634f634b80a27ecf1e" -dependencies = [ - "futures-core", - "libc", - "signal-hook", - "tokio", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static-web-server" -version = "2.15.0" -dependencies = [ - "anyhow", - "async-compression", - "bcrypt", - "bytes", - "chrono", - "form_urlencoded", - "futures-util", - "globset", - "headers", - "http", - "http-serde", - "humansize", - "hyper", - "listenfd", - "mime_guess", - "num_cpus", - "percent-encoding", - "pin-project", - "rustls-pemfile", - "serde", - "serde_ignored", - "serde_json", - "serde_repr", - "signal-hook", - "signal-hook-tokio", - "structopt", - "tikv-jemallocator", - "tokio", - "tokio-rustls", - "tokio-util", - "toml", - "tracing", - "tracing-subscriber", - "windows-service", -] - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.3+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - -[[package]] -name = "tokio" -version = "1.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" -dependencies = [ - "nu-ansi-term", - "parking_lot", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "uuid" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-service" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" -dependencies = [ - "bitflags", - "widestring", - "windows-sys", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "zeroize" -version = "1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" diff --git a/pkgs/servers/static-web-server/default.nix b/pkgs/servers/static-web-server/default.nix index 1e4eeaf2b36..499de87d374 100644 --- a/pkgs/servers/static-web-server/default.nix +++ b/pkgs/servers/static-web-server/default.nix @@ -2,21 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "static-web-server"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "static-web-server"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TzMXVwtvslM57ucHT5NHMjsLex2VjuvyqP9gMdQXfFs="; + sha256 = "sha256-ZHJGUgFCguUszcpzXwAK1XH3Ds4b87pyiohabvIwMX4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "headers-0.3.8" = "sha256-zi9ytzjq5M1TtLJxibEnUdx42T+2v5uH9+3+3et6RXQ="; - }; - }; + cargoHash = "sha256-7JOJknBJuX0anzd6Oqp3HEzYtEQfRkcHdjNBzW59P+E="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -31,7 +26,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An asynchronus web server for static files-serving"; - homepage = "https://sws.joseluisq.net"; + homepage = "https://static-web-server.net/"; changelog = "https://github.com/static-web-server/static-web-server/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; From 05a8a32f6093d278975e27c0075530fc377a09e8 Mon Sep 17 00:00:00 2001 From: stepech <29132060+stepech@users.noreply.github.com> Date: Mon, 10 Apr 2023 02:06:45 +0200 Subject: [PATCH 292/337] burpsuite: 2023.2.4 -> 2023.3.5 https://portswigger.net/burp/releases --- 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 765391db2c5..32586ad24b0 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }: let - version = "2023.2.4"; + version = "2023.3.5"; src = fetchurl { name = "burpsuite.jar"; @@ -8,7 +8,7 @@ let "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "4e9cd298a03af8684306ca2dfe52e630f032c1df7ca8baecbd329c792137052f"; + sha256 = "ef1b1094bbe7388b5b4d515b8e42347243efb34a4d8acc27d9d553fe62f45fb5"; }; name = "burpsuite-${version}"; @@ -74,6 +74,6 @@ buildFHSEnv { license = licenses.unfree; platforms = jdk.meta.platforms; hydraPlatforms = [ ]; - maintainers = with maintainers; [ bennofs ]; + maintainers = with maintainers; [ bennofs stepech ]; }; } From 00fbb07c96eca5310455bd3d9731a535ed0edb74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 14:02:46 +0000 Subject: [PATCH 293/337] bpftrace: 0.17.0 -> 0.17.1 --- pkgs/os-specific/linux/bpftrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index cb58ed48bb1..0ba6db131b8 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-PBqq3u8zym+RY6xudJ66ItzDZEJBNvJDtve1GtxcOdQ="; + sha256 = "sha256-dEchHXZPWc+/Dui6P65EqxB8O/M7F47PZVsKSp80oXE="; }; buildInputs = with llvmPackages; From dd8fb54c4db75cce40b4c12e04dfbae13388050d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 14:25:30 +0000 Subject: [PATCH 294/337] jot: 0.1.1 -> 0.1.2 --- pkgs/applications/misc/jot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/jot/default.nix b/pkgs/applications/misc/jot/default.nix index c6552e2d09f..abfcc8e8eca 100644 --- a/pkgs/applications/misc/jot/default.nix +++ b/pkgs/applications/misc/jot/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jot"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "araekiel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CgS9I05Om4JxAbPN0vxh2Y7dftIkVnZkRP7PY4kOfpw="; + sha256 = "sha256-Z8szd6ArwbGiHw7SeAah0LrrzUbcQYygX7IcPUYNxvM="; }; - cargoSha256 = "sha256-8nRO01/hUKT6Jt7/3Sw2+aLU6hITSNl6nn9UEAvfyJY="; + cargoHash = "sha256-x61lOwMOOLD3RTdy3Ji+c7zcA1PCn09u75MyrPX/NbE="; meta = with lib; { description = "Rapid note management for the terminal"; From e76ecd244a70805302ab7e628b239733845fceb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 14:29:26 +0000 Subject: [PATCH 295/337] algolia-cli: 1.3.4 -> 1.3.5 --- pkgs/development/tools/algolia-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 2aba7638eb5..ae242cac44f 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-OclNhqJ7BJwpwu8EWjZuIw/an4K7dETjynrU0Ju1yak="; + hash = "sha256-tz05j2XkA3Dh1RlQf8KHuPSqGhbFc0fxSe0LC2d5FYU="; }; vendorHash = "sha256-QgNL7pp0KH1RUV69BFVtHpaLHrPp4UQhEtOEiRmfAi0="; From 7c222dcc925b103e0141de4835a1b4cb09b93b77 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Apr 2023 10:36:40 -0400 Subject: [PATCH 296/337] supabase-cli: fix version --- pkgs/development/tools/supabase-cli/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 1c8e53b60e9..4020bf2fb19 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -18,7 +18,11 @@ buildGoModule rec { vendorSha256 = "sha256-j2iEeAn+4Tn3h8lVKoaYE+6W4R/q+JaAWXxHllZGLNs="; - ldflags = [ "-s" "-w" "-X" "github.com/supabase/cli/cmd.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X=github.com/supabase/cli/internal/utils.Version=${version}" + ]; doCheck = false; # tests are trying to connect to localhost From ecba9311a1381b1ebc4fbdde5cf2c96c2fec7b8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 14:40:28 +0000 Subject: [PATCH 297/337] kubernetes-controller-tools: 0.11.3 -> 0.11.4 --- .../development/tools/kubernetes-controller-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index 0ddbf8f5d5a..0092c76f128 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F+cGJbxXIHrgn9OcIMh2am9g4PBLkdC037tV/9znPSg="; + sha256 = "sha256-cOXN6DZH8uiJNPRZrSr2QIsENZUQrreqYJB6OFALFeA="; }; patches = [ ./version.patch ]; From 7fb8a68efa06d078d9e25e673e4072d05f46ebb6 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Wed, 26 Apr 2023 00:55:10 +1000 Subject: [PATCH 298/337] flutter: Fix linux-x64-profile/linux-x64-flutter-gtk artifact hash This was accidentally copied from linux-x64-release. --- pkgs/development/compilers/flutter/engine-artifacts/hashes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index e3453748b05..34f1ccb2e12 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -64,7 +64,7 @@ "linux-x64-flutter-gtk.zip" = "sha256-boICnuJF4zqGb7kaN5haO/df9hC9KeJidt3uIK06S7M="; }; "linux-x64-profile" = { - "linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY="; + "linux-x64-flutter-gtk.zip" = "sha256-AnkLMPW3mwiXdiDz3Zo802QZRi+8EMCy4Mx2ODSbMOU="; }; "linux-x64-release" = { "linux-x64-flutter-gtk.zip" = "sha256-RAsgupVF18IxLaP8tJ7XRQ8y/um46nlpA8fDITPwLqY="; From d921f57b57ba0026f96001498c3c0a9f713630a6 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Apr 2023 10:57:22 -0400 Subject: [PATCH 299/337] trufflehog: fix version --- pkgs/tools/security/trufflehog/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index eac792ea804..fc678bda23a 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -16,6 +16,12 @@ buildGoModule rec { vendorHash = "sha256-NnYQGbG4R/Ar0goOtymuohHO36t3UQhjg53ufneCFxQ="; + ldflags = [ + "-s" + "-w" + "-X=github.com/trufflesecurity/trufflehog/v3/pkg/version.BuildVersion=${version}" + ]; + # Test cases run git clone and require network access doCheck = false; From 2d6a94441161829de87785a073b68ecc08c921a7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Apr 2023 11:04:23 -0400 Subject: [PATCH 300/337] supabase-cli: add version test --- pkgs/development/tools/supabase-cli/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 4020bf2fb19..769546e3056 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -2,6 +2,8 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, testers +, supabase-cli , nix-update-script }: @@ -38,7 +40,12 @@ buildGoModule rec { --zsh <($out/bin/supabase completion zsh) ''; - passthru.updateScript = nix-update-script { }; + passthru = { + tests.version = testers.testVersion { + package = supabase-cli; + }; + updateScript = nix-update-script { }; + }; meta = with lib; { description = "A CLI for interacting with supabase"; From 88045d404c4f121b367ee5e9423e64974a57d6e9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Apr 2023 11:05:29 -0400 Subject: [PATCH 301/337] trufflehog: add version test --- pkgs/tools/security/trufflehog/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index fc678bda23a..1fdfb7e8d45 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -1,6 +1,8 @@ { lib , fetchFromGitHub , buildGoModule +, testers +, trufflehog }: buildGoModule rec { @@ -29,6 +31,12 @@ buildGoModule rec { rm $out/bin/{generate,snifftest} ''; + passthru = { + tests.version = testers.testVersion { + package = trufflehog; + }; + }; + meta = with lib; { description = "Find credentials all over the place"; homepage = "https://github.com/trufflesecurity/trufflehog"; From e64a3fdef2a2093e0a360efbe01d7e701c5facb6 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Tue, 25 Apr 2023 23:08:04 +0800 Subject: [PATCH 302/337] godns: 2.9.4 -> 2.9.6 --- pkgs/tools/networking/godns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index 98c7d5bca2d..9fb86db1a00 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "godns"; - version = "2.9.4"; + version = "2.9.6"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-7AIr35vsjI5jamvdA1EwTwkr8MiEOjTntFeeg4b7RCw="; + hash = "sha256-PrjkZxMgj2+jttkXVkn1JoLKGfBOMMbTLimngUDEuX8="; }; - vendorHash = "sha256-+wnaTrY7Mt6bCNTRZbJDFD75RCHyz5gtFi4DN0ng0/M="; + vendorHash = "sha256-y2DRQ4nryUCrGUHmEuJSrYDjJ3X4sAcyWOp6ZKcoSSo="; # Some tests require internet access, broken in sandbox doCheck = false; From b6c5e7e2308d6f96995ccfa07a492fd0543e7c21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 15:54:05 +0000 Subject: [PATCH 303/337] mdbook-kroki-preprocessor: 0.1.2 -> 0.2.0 --- pkgs/tools/text/mdbook-kroki-preprocessor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix b/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix index c8bc79c2a6f..07fd2cd634d 100644 --- a/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix +++ b/pkgs/tools/text/mdbook-kroki-preprocessor/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-kroki-preprocessor"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "joelcourtney"; repo = "mdbook-kroki-preprocessor"; rev = "v${version}"; - hash = "sha256-1TJuUzfyMycWlOQH67LR63/ll2GDZz25I3JfScy/Jnw="; + hash = "sha256-3BxIhJK0YWZBEbbNwMKixo1icEn+QKJwoskgIEaZcGQ="; }; - cargoHash = "sha256-IKwDWymAQ1OMQN8Op+DcvqPikoLdOz6lltbhCgOAles="; + cargoHash = "sha256-9jIB80vtskpR3/QYhaA0JFw6IhIsS9VnCnJtE5RfDRk="; nativeBuildInputs = [ pkg-config From 4d0494ab6788302e6a90e650334aa454166b8f30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 16:07:57 +0000 Subject: [PATCH 304/337] libytnef: 2.0 -> 2.1.1 --- pkgs/development/libraries/libytnef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libytnef/default.nix b/pkgs/development/libraries/libytnef/default.nix index a4f358fa546..59d4a8ce09e 100644 --- a/pkgs/development/libraries/libytnef/default.nix +++ b/pkgs/development/libraries/libytnef/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libytnef"; - version = "2.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Yeraze"; repo = "ytnef"; rev = "v${version}"; - sha256 = "sha256-P5eTH5pKK+v4LCMAe6JbEbTYOJypmLMYVDYk5tGVZ14="; + sha256 = "sha256-VlgvbU8yNHyVRKqaNqqCpLBsndltfAk33BuzvFuViqU="; }; nativeBuildInputs = [ autoreconfHook ]; From f265ce9bb7c4a7fc460b584f7bd7829f5da555e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 16:51:14 +0000 Subject: [PATCH 305/337] oksh: 7.2 -> 7.3 --- pkgs/shells/oksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oksh/default.nix b/pkgs/shells/oksh/default.nix index a9533894a83..d90c4003cb8 100644 --- a/pkgs/shells/oksh/default.nix +++ b/pkgs/shells/oksh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "oksh"; - version = "7.2"; + version = "7.3"; src = fetchFromGitHub { owner = "ibara"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-3EIWFlL2TJiRfAZ7kWtt2iEB2yAnTWbuf5LlFJjXdgk="; + sha256 = "sha256-uGiPbkIeKH9zu+xKJJLCYFnyejWLdq7bE59yub3f3KM="; }; strictDeps = true; From de175e0766e83fb6235fa5514e1ab7abd234414b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 17:01:22 +0000 Subject: [PATCH 306/337] litefs: 0.3.0 -> 0.4.0 --- pkgs/development/tools/database/litefs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/litefs/default.nix b/pkgs/development/tools/database/litefs/default.nix index 481ee47c724..2c299d5c555 100644 --- a/pkgs/development/tools/database/litefs/default.nix +++ b/pkgs/development/tools/database/litefs/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "litefs"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fNZ0PtgMgCGB1b1HLJsmbm/I8wa3auHimL1ktf6wA9M="; + sha256 = "sha256-CmWtQzoY/xY/LZL2swhYtDzPvpVOvKlhUH3plDEHrGI="; }; - vendorSha256 = "sha256-w77JQNk1QZFJVrn9yuvKOemggV9e0FuqhVWK3d4umuY="; + vendorHash = "sha256-1I18ITgFPpUv0mPrt1biJmQV9qd9HB23zJmnDp5WzkA="; subPackages = [ "cmd/litefs" ]; From 559277490ba258f90832cffded3b03a42d042277 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 17:13:06 +0000 Subject: [PATCH 307/337] yacreader: 9.11.0 -> 9.12.0 --- pkgs/applications/graphics/yacreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index ba6370a5a41..75f0f87c41a 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.11.0"; + version = "9.12.0"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-/fSIV+4j516PgHGn6zF+TfVaVW/lVWykf5J8bnQuttg="; + sha256 = "sha256-sIQxUiTGQCcHmxBp0Mf49e/XVaJe7onlLHiorMlNLZ8="; }; nativeBuildInputs = [ qmake pkg-config ]; From 366ce2dd353caa03ad5344bbfeece91cef46a984 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 17:19:03 +0000 Subject: [PATCH 308/337] gamecube-tools: 1.0.4 -> 1.0.6 --- pkgs/development/tools/gamecube-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix index d7715d67acb..9b854d3671e 100644 --- a/pkgs/development/tools/gamecube-tools/default.nix +++ b/pkgs/development/tools/gamecube-tools/default.nix @@ -2,7 +2,7 @@ , freeimage, libGL }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.6"; pname = "gamecube-tools"; nativeBuildInputs = [ autoreconfHook ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "devkitPro"; repo = "gamecube-tools"; rev = "v${version}"; - sha256 = "sha256-0iMY2LokfsYgHzIuFc8RlrVlJCURqVqprP54PG4oW0M="; + sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU="; }; meta = with lib; { From 363bbd4233f7b8bc4024d40c45f5fb8cf1962173 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 24 Apr 2023 22:24:15 -0400 Subject: [PATCH 309/337] python310Packages.nipype: unbreak --- .../python-modules/nipype/default.nix | 27 ++++++------- .../python-modules/nipype/neurdflib.nix | 38 ------------------- 2 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 pkgs/development/python-modules/nipype/neurdflib.nix diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 4252df40fa4..3c295a72cc2 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -1,7 +1,8 @@ { lib, stdenv , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, pythonRelaxDepsHook # python dependencies , click , python-dateutil @@ -9,6 +10,7 @@ , filelock , funcsigs , future +, looseversion , mock , networkx , nibabel @@ -26,9 +28,7 @@ , simplejson , traits , xvfbwrapper -, pytest-cov , codecov -, sphinx # other dependencies , which , bash @@ -40,17 +40,11 @@ , useNeurdflib ? false }: -let - - # This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo. - neurdflib = callPackage ./neurdflib.nix { }; - -in - buildPythonPackage rec { pname = "nipype"; version = "1.8.5"; - disabled = isPy27; + disabled = pythonOlder "3.7"; + format = "setuptools"; src = fetchPypi { inherit pname version; @@ -63,9 +57,11 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - sphinx + pythonRelaxDepsHook ]; + pythonRelaxDeps = [ "traits" ]; + propagatedBuildInputs = [ click python-dateutil @@ -73,6 +69,7 @@ buildPythonPackage rec { filelock funcsigs future + looseversion networkx nibabel numpy @@ -80,11 +77,12 @@ buildPythonPackage rec { prov psutil pydot + rdflib scipy simplejson traits xvfbwrapper - ] ++ [ (if useNeurdflib then neurdflib else rdflib) ]; + ]; nativeCheckInputs = [ pybids @@ -94,7 +92,6 @@ buildPythonPackage rec { pytest pytest-forked pytest-xdist - pytest-cov which ]; @@ -102,7 +99,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display' + LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display and not test_no_et_multiproc' ''; pythonImportsCheck = [ "nipype" ]; diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix deleted file mode 100644 index 6fb1ee04569..00000000000 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isodate -, html5lib -, sparqlwrapper -, networkx -, nose -, python -}: - -buildPythonPackage rec { - pname = "neurdflib"; - version = "5.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50"; - }; - - propagatedBuildInputs = [ isodate html5lib sparqlwrapper ]; - - nativeCheckInputs = [ networkx nose ]; - - # Python 2 syntax - # Failing doctest - doCheck = false; - - checkPhase = '' - ${python.interpreter} run_tests.py - ''; - - meta = with lib; { - description = "A temporary convenience package for changes waiting to be merged into the primary rdflib repo"; - homepage = "https://pypi.org/project/neurdflib"; - license = licenses.bsd3; - }; -} From c3a60a4ece65217f54b52f3a507dee80a2fa2ebf Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 25 Apr 2023 11:08:11 -0700 Subject: [PATCH 310/337] corerad: 1.2.1 -> 1.2.2 https://github.com/mdlayher/corerad/blob/main/CHANGELOG.md#v122 --- pkgs/tools/networking/corerad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 47187961ffe..bf24bba428a 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "sha256-JhdR1UKHnzXIUoe1shb3IZne3q198NLwRROEYuKsnW4="; + sha256 = "sha256-cBP4jJhnIx+UwcbuQ3xbpImkLX4jSnsyvwfOEs31On4="; }; - vendorSha256 = "sha256-w15dRxIBzDN5i4RNEDuSfCHHb4wc4fw1B2wjlTk40iE="; + vendorSha256 = "sha256-RkwfHjWu40AW+7zLc+sY5p2nyy3YPHk5sjt6foC103k="; # Since the tarball pulled from GitHub doesn't contain git tag information, # we fetch the expected tag's timestamp from a file in the root of the From 6a3ecb40bd32a942c9a8563c692bc108cba59c3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 20:19:52 +0200 Subject: [PATCH 311/337] python311Packages.appthreat-vulnerability-db: 5.0.3 -> 5.0.4 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v5.0.3...v5.0.4 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v5.0.4 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 9a9c0f233e2..68d058d0937 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.0.3"; + version = "5.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-3cCXpckhZEJnTbt0Id9NCmKVr7vmtM186Bp94HWW2Zo="; + hash = "sha256-MdjzQsZfMU295aQt9SepRCwutihidya3Dga/E1fFL9o="; }; propagatedBuildInputs = [ From e5e680a99abc3cd0a7b808441d2555893546613f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 20:25:22 +0200 Subject: [PATCH 312/337] qovery-cli: 0.58.3 -> 0.58.6 Diff: https://github.com/Qovery/qovery-cli/compare/v0.58.3...v0.58.6 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.58.6 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 1931f57c7b2..140b536dfca 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.58.3"; + version = "0.58.6"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-1r0ssR5jTvPiR5snhJ+wROISFOz/qIHT51ZrVA+nW5w="; + hash = "sha256-LgxI0W3t1HyJEP8XBHd59LU3YUV0EOOnysmChOzWURs="; }; vendorHash = "sha256-w40zewXGB76kMgP0GzUtyncBBnCDgxcGJ7EO107WWN0="; From 358b0f3f258d08da0e00158d1c72ad857032c05c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 20:27:00 +0200 Subject: [PATCH 313/337] python310Packages.teslajsonpy: 3.8.0 -> 3.8.1 Diff: https://github.com/zabuldon/teslajsonpy/compare/refs/tags/v3.8.0...v3.8.1 Changelog: https://github.com/zabuldon/teslajsonpy/releases/tag/v3.8.1 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index aa4f022562d..a2c9a31a80e 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.8.0"; + version = "3.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JKKHLg99hl2XnqRfBCT0t9QyQEY1YEwBsKb3pB5CNRA="; + hash = "sha256-RPR1ek1gpbermSRaGqT2v31UVB6044E2ZxIqv1yr2bs="; }; nativeBuildInputs = [ From c634094e7b103b68935b8aae2e040819e9815f63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 18:37:06 +0000 Subject: [PATCH 314/337] diffr: 0.1.4 -> 0.1.5 --- pkgs/tools/text/diffr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 85d78ffb732..ee12b39c3ec 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "diffr"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "mookid"; repo = pname; rev = "v${version}"; - sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; + sha256 = "sha256-ylZE2NtTXbGqsxE72ylEQCacTyxBO+/WgvEpoXd5OZI="; }; - cargoSha256 = "0pn3vqv13n29h8069a38306vjlzlxf1m08ldv7lpzgqxhl8an00r"; + cargoHash = "sha256-RmQu55OnKfeuDGcJrfjhMKnxDatdowkvh3Kh4N8I8Sg="; buildInputs = (lib.optional stdenv.isDarwin Security); From a7b0ff0a0de9d5576fe15fa9083c933cfd430902 Mon Sep 17 00:00:00 2001 From: Lukas Kohler Date: Tue, 25 Apr 2023 21:09:54 +0200 Subject: [PATCH 315/337] bugdom,nanosaur,nanosaur2,otto-matic: add desktop files (#215525) --- pkgs/games/bugdom/default.nix | 2 ++ pkgs/games/nanosaur/default.nix | 2 ++ pkgs/games/nanosaur2/default.nix | 2 ++ pkgs/games/otto-matic/default.nix | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index 9bceef01290..01db213de98 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { mv Data $out/share/bugdom install -Dm755 {.,$out/bin}/Bugdom wrapProgram $out/bin/Bugdom --run "cd $out/share/bugdom" + install -Dm644 $src/packaging/bugdom.desktop $out/share/applications/bugdom.desktop + install -Dm644 $src/packaging/bugdom-desktopicon.png $out/share/pixmaps/bugdom-desktopicon.png '') + '' runHook postInstall diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index 32c2a0b9ecc..45f695edf9f 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mv Nanosaur Data ReadMe.txt "$out/" makeWrapper $out/Nanosaur $out/bin/Nanosaur --chdir "$out" + install -Dm644 $src/packaging/nanosaur.desktop $out/share/applications/nanosaur.desktop + install -Dm644 $src/packaging/nanosaur-desktopicon.png $out/share/pixmaps/nanosaur-desktopicon.png runHook postInstall ''; diff --git a/pkgs/games/nanosaur2/default.nix b/pkgs/games/nanosaur2/default.nix index e4e0919cd30..28ea13ebff3 100644 --- a/pkgs/games/nanosaur2/default.nix +++ b/pkgs/games/nanosaur2/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mv Nanosaur2 Data ReadMe.txt "$out/" makeWrapper $out/Nanosaur2 $out/bin/Nanosaur2 --chdir "$out" + install -Dm644 $src/packaging/nanosaur2.desktop $out/share/applications/nanosaur2.desktop + install -Dm644 $src/packaging/nanosaur2-desktopicon.png $out/share/pixmaps/nanosaur2-desktopicon.png runHook postInstall ''; diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index a3d75bc34aa..7f066b743af 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" mv OttoMatic Data ReadMe.txt "$out/" makeWrapper $out/OttoMatic $out/bin/OttoMatic --chdir "$out" - + install -Dm644 $src/packaging/io.jor.ottomatic.desktop $out/share/applications/io.jor.ottomatic.desktop + install -Dm644 $src/packaging/io.jor.ottomatic.png $out/share/pixmaps/io.jor.ottomatic.png runHook postInstall ''; From e7b19cb4ff7ce72ea15f872b6cdc67d89df57000 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 19:25:16 +0000 Subject: [PATCH 316/337] python310Packages.pylibacl: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/pylibacl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index 6bc0d74b5ba..e1280764972 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pylibacl"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "88a0a4322e3a62d797d61f96ec7f38d1c471c48a3cc3cedb32ab5c20aa98d9ff"; + sha256 = "sha256-7UludMpUUtXUzr4j3yKepGJzWpZSi5+ijjzh96K+0xo="; }; # ERROR: testExtended (tests.test_acls.AclExtensions) From a02917d9da89456905947cf1ed5444bc7a4c3be2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 25 Apr 2023 22:28:23 +0300 Subject: [PATCH 317/337] darwin.dtrace: get rid of darling --- .../darwin/apple-source-releases/dtrace/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 3b51022d59b..afff7897488 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,9 +1,9 @@ { appleDerivation, xcbuildHook, CoreSymbolication, apple_sdk -, xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }: +, xnu, bison, flex, stdenv, fixDarwinDylibNames }: appleDerivation { nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ]; - buildInputs = [ CoreSymbolication apple_sdk.frameworks.CoreSymbolication darling xnu ]; + buildInputs = [ CoreSymbolication apple_sdk.frameworks.CoreSymbolication xnu ]; # -fcommon: workaround build failure on -fno-common toolchains: # duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o env.NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon"; @@ -21,6 +21,8 @@ appleDerivation { --replace /usr/bin/ld ${stdenv.cc.bintools.bintools}/bin/ld \ --replace /usr/lib/dtrace/dt_cpp.h $out/include/dt_cpp.h \ --replace /usr/lib/dtrace $out/lib/dtrace + substituteInPlace libproc/libproc.c \ + --replace "#include " "" ''; # hack to handle xcbuild's broken lex handling From 3071232f9fa8ab69597a0b8e533c1b31f9892695 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 19:32:13 +0000 Subject: [PATCH 318/337] oci-seccomp-bpf-hook: 1.2.8 -> 1.2.9 --- pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index d6f8b4c9533..40ef0796dfa 100644 --- a/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.8"; + version = "1.2.9"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-0SSiVnCWs3NLefnmZn1oCc7nwTrSzDsyjPszVBRQVH0="; + sha256 = "sha256-KPO9xqLgPML6smoO7P50yP81b4iCvRFIR74ciUiva7o="; }; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "man" ]; nativeBuildInputs = [ From 15da64d45eb71fb06b24d61e09cd1a9e1837c581 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 19:38:05 +0000 Subject: [PATCH 319/337] spicedb-zed: 0.10.0 -> 0.10.1 --- pkgs/servers/spicedb/zed.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 6f13caff076..b0bb58d9190 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-kmbZ0fi7rbJUsMREOH+IxHIDfZ2qy+AD8Px9pu4eSxM="; + hash = "sha256-hSm8k4QnUDaKNOX7f019nDwWijrqljZ3X0g7hE1TdsY="; }; - vendorHash = "sha256-4Y/98VEZWjk2k4UPtGEumOMbjjR4V1OnPvj5mxuX/DQ="; + vendorHash = "sha256-aRXlyj8QHGsynSc09Earwz6eihRW3bu21+OTtiWPCCg="; meta = with lib; { description = "Command line for managing SpiceDB"; From f1f0ef95cc4b5eb6a30bda28bce1838819bb2a81 Mon Sep 17 00:00:00 2001 From: Yt Date: Tue, 25 Apr 2023 15:41:16 -0400 Subject: [PATCH 320/337] tauri-mobile: init at unstable-2023-04-25 (#228178) --- .../tools/rust/tauri-mobile/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/tools/rust/tauri-mobile/default.nix diff --git a/pkgs/development/tools/rust/tauri-mobile/default.nix b/pkgs/development/tools/rust/tauri-mobile/default.nix new file mode 100644 index 00000000000..3ccc1c186ce --- /dev/null +++ b/pkgs/development/tools/rust/tauri-mobile/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, git +, darwin +, makeWrapper +}: + +let + inherit (darwin.apple_sdk.frameworks) CoreServices; + pname = "tauri-mobile"; + version = "unstable-2023-04-25"; +in +rustPlatform.buildRustPackage { + inherit pname version; + src = fetchFromGitHub { + owner = "tauri-apps"; + repo = pname; + rev = "c2abaf54135bf65b1165a38d3b1d84e8d57f5d6c"; + sha256 = "sha256-WHyiswe64tkNhhgmHquv9YPLQAU1yTJ/KglTqEPBcOM="; + }; + + # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at + # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 + # sourceRoot = "source/tooling/cli"; + + cargoHash = "sha256-Kc1BikwUYSpPShRtAPbHCdfVzo6zwjiO3QeqRkO+WhY="; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + nativeBuildInputs = [ pkg-config git makeWrapper ]; + + preInstall = '' + mkdir -p $out/share/ + # the directory created in the build process is .tauri-mobile, a hidden directory + shopt -s dotglob + for temp_dir in $HOME/*; do + cp -R $temp_dir $out/share + done + ''; + + meta = with lib; { + description = "Rust on mobile made easy! "; + homepage = "https://tauri.app/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd7511a3980..c936794323c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16229,6 +16229,7 @@ with pkgs; cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { }; cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { }; + tauri-mobile = callPackage ../development/tools/rust/tauri-mobile { }; cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; cargo-vet = callPackage ../development/tools/rust/cargo-vet { From 12b91012e550a0935b0a842802875f3c86fe7fca Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 25 Apr 2023 22:45:59 +0300 Subject: [PATCH 321/337] darwin.darling: drop --- .../Libsystem/default.nix | 28 +++++++++- pkgs/os-specific/darwin/darling/default.nix | 51 ------------------- pkgs/top-level/darwin-packages.nix | 2 - 3 files changed, 26 insertions(+), 55 deletions(-) delete mode 100644 pkgs/os-specific/darwin/darling/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 6f8124dbac4..aa93a32c562 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -1,12 +1,36 @@ -{ lib, stdenv, buildPackages +{ lib, stdenv, buildPackages, fetchzip , appleDerivation', xnu, Libc, Libm, libdispatch, Libinfo , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto , copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libplatform, libpthread -, mDNSResponder, launchd, libutilHeaders, hfsHeaders, darling, darwin-stubs +, mDNSResponder, launchd, libutilHeaders, hfsHeaders, darwin-stubs , headersOnly ? false , withLibresolv ? !headersOnly }: +let + darling.src = fetchzip { + url = "https://github.com/darlinghq/darling/archive/d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b.tar.gz"; + sha256 = "11b51fw47nl505h63bgx5kqiyhf3glhp1q6jkpb6nqfislnzzkrf"; + postFetch = '' + # The archive contains both `src/opendirectory` and `src/OpenDirectory`, + # pre-create the directory to choose the canonical case on + # case-insensitive filesystems. + mkdir -p $out/src/OpenDirectory + + cd $out + tar -xzf $downloadedFile --strip-components=1 + rm -r $out/src/libm + + # If `src/opendirectory` and `src/OpenDirectory` refer to different + # things, then combine them into `src/OpenDirectory` to match the result + # on case-insensitive filesystems. + if [ "$(stat -c %i src/opendirectory)" != "$(stat -c %i src/OpenDirectory)" ]; then + mv src/opendirectory/* src/OpenDirectory/ + rmdir src/opendirectory + fi + ''; + }; +in appleDerivation' stdenv { dontBuild = true; dontFixup = true; diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix deleted file mode 100644 index 22fb6d3b07c..00000000000 --- a/pkgs/os-specific/darwin/darling/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{stdenv, lib, fetchzip}: - -stdenv.mkDerivation rec { - pname = "darling"; - name = pname; - - src = fetchzip { - url = "https://github.com/darlinghq/darling/archive/d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b.tar.gz"; - sha256 = "11b51fw47nl505h63bgx5kqiyhf3glhp1q6jkpb6nqfislnzzkrf"; - postFetch = '' - # The archive contains both `src/opendirectory` and `src/OpenDirectory`, - # pre-create the directory to choose the canonical case on - # case-insensitive filesystems. - mkdir -p $out/src/OpenDirectory - - cd $out - tar -xzf $downloadedFile --strip-components=1 - rm -r $out/src/libm - - # If `src/opendirectory` and `src/OpenDirectory` refer to different - # things, then combine them into `src/OpenDirectory` to match the result - # on case-insensitive filesystems. - if [ "$(stat -c %i src/opendirectory)" != "$(stat -c %i src/OpenDirectory)" ]; then - mv src/opendirectory/* src/OpenDirectory/ - rmdir src/opendirectory - fi - ''; - }; - - # only packaging sandbox for now - buildPhase = '' - cc -c src/sandbox/sandbox.c -o src/sandbox/sandbox.o - cc -dynamiclib -flat_namespace src/sandbox/sandbox.o -o libsystem_sandbox.dylib - ''; - - installPhase = '' - mkdir -p $out/lib - cp -rL src/sandbox/include/ $out/ - cp libsystem_sandbox.dylib $out/lib/ - - mkdir -p $out/include - cp src/libaks/include/* $out/include - ''; - - meta = with lib; { - maintainers = with maintainers; [ matthewbauer ]; - license = licenses.gpl3; - description = "Darwin/macOS emulation layer for Linux"; - platforms = platforms.darwin; - }; -} diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 68b50fa9ab0..732b0404040 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -216,8 +216,6 @@ impure-cmds // appleSourcePackages // chooseLibs // { # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { }; - darling = callPackage ../os-specific/darwin/darling/default.nix { }; - libtapi = callPackage ../os-specific/darwin/libtapi {}; ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; From c88c6276ced39f2ffd9ff38a516c9ad471180802 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 19:47:27 +0000 Subject: [PATCH 322/337] signal-cli: 0.11.8 -> 0.11.9.1 --- .../networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index cf2080b52bc..cfe014b902e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.11.8"; + version = "0.11.9.1"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - hash = "sha256-lpCPPYkT+q9oYR32rHUGTJI4TmTvy01ttpJxeTSGxVo="; + hash = "sha256-LhTv3ycJXr2vt0vyXfCd1ABro4q7CfBma63Zd1osBhA="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; From 547983434e5c235a4db95c436ef46cb27f38f4fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 19:48:59 +0000 Subject: [PATCH 323/337] playwright: 1.31.1 -> 1.32.1 --- pkgs/development/python-modules/playwright/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index c58b3bb6bb0..35deda3f92b 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -15,7 +15,7 @@ let in buildPythonPackage rec { pname = "playwright"; - version = "1.31.1"; + version = "1.32.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "playwright-python"; rev = "v${version}"; - hash = "sha256-zVJiRIJDWmFdMCGK9siewiYgjeeTuOPY1wWxArcZDJg"; + hash = "sha256-rguobFaepTOL2duHRdFV5o2JSsBlYiA7rY3/RyHvoMc="; }; patches = [ From 55bbc843d08047bfd027cd9441c30a87ba623632 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 20:05:20 +0000 Subject: [PATCH 324/337] numix-solarized-gtk-theme: 20210831 -> 20230408 --- pkgs/data/themes/numix-solarized/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index efc8236c451..af06075de7d 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-solarized-gtk-theme"; - version = "20210831"; + version = "20230408"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = version; - sha256 = "1q8qhpw0hfv625sm626zp4vbz2106b0g5m11ygk87s6kbxrfg6lr"; + sha256 = "sha256-r5xCe8Ew+/SuCUaZ0yjlumORTy/y1VwbQQjQ6uEyGsY="; }; nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ]; From b204eda24e823e2dbf99776ac1713103ebc3da3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 20:13:57 +0000 Subject: [PATCH 325/337] gvm-libs: 22.4.6 -> 22.5.0 --- pkgs/development/libraries/gvm-libs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 8e3667afc20..8b5bb4c4246 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.4.6"; + version = "22.5.0"; src = fetchFromGitHub { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HG9DwUX0rTE7Fc5AOl98u/JEfvfd0iwn3fvsIG8lsfU="; + hash = "sha256-QHAkPZoLQG+UQ1YNdad+XYOywqLqIW1vBmcFkuf3pXU="; }; nativeBuildInputs = [ From d5da9413eb86303b7fa677858e4c17278b9ae04a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Apr 2023 20:14:53 +0000 Subject: [PATCH 326/337] glooctl: 1.13.12 -> 1.13.14 --- pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 1381f4c92f2..ee5c8957a74 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.12"; + version = "1.13.14"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-JGmt07aXcxbPH772oWTD7YPvLLuxZGy8rdXEN1EgCNc="; + hash = "sha256-zqwehcLiBj75+oeNJJXw1ateA1aukCUo+rNxFe59iGc="; }; subPackages = [ "projects/gloo/cli/cmd" ]; From 4ed0e8d00a2bb9852bfa9e6de2392ceb87e53b9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 22:22:09 +0200 Subject: [PATCH 327/337] python310Packages.aiounifi: 46 -> 47 Diff: https://github.com/Kane610/aiounifi/compare/refs/tags/v46...v47 Changelog: https://github.com/Kane610/aiounifi/releases/tag/v47 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 42e89147d68..6ecd275dcab 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "46"; + version = "47"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M6N7KTFYmtjmRSiIYummn2GbO3XemQzCEW+6GVXq9ZI="; + hash = "sha256-/BdSB7CD/ob8vinYDZVy0FNU23PSCiHF8jHGQUDsm1w="; }; propagatedBuildInputs = [ From 3ff244ba2025905d310dc303bea714ea950d3a7d Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Tue, 25 Apr 2023 21:54:23 +0100 Subject: [PATCH 328/337] texlive.combine: wrap all time-dependent commands with faketime (#227873) --- .../tools/typesetting/tex/texlive/combine.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 80070cc6cfa..9ccd2cfe761 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -235,19 +235,13 @@ in (buildEnv { ln -sf fmtutil "$out/bin/mktexfmt" texlinks "$out/bin" && wrapBin - FORCE_SOURCE_DATE=1 fmtutil --sys --all | grep '^fmtutil' # too verbose - #texlinks "$out/bin" && wrapBin # do we need to regenerate format links? - # tex intentionally ignores SOURCE_DATE_EPOCH even when FORCE_SOURCE_DATE=1 - # https://salsa.debian.org/live-team/live-build/-/blob/master/examples/hooks/reproducible/0139-reproducible-texlive-binaries-fmt-files.hook.chroot#L52 - if [[ -f "$TEXMFSYSVAR"/web2c/tex/tex.fmt ]] - then - faketime $(date --utc -d@$SOURCE_DATE_EPOCH --iso-8601=seconds) tex -output-directory "$TEXMFSYSVAR"/web2c/tex -ini -jobname=tex -progname=tex tex.ini - fi - if [[ -f "$TEXMFSYSVAR"/web2c/luahbtex/lualatex.fmt ]] - then - faketime $(date --utc -d@$SOURCE_DATE_EPOCH --iso-8601=seconds) luahbtex --output-directory="$TEXMFSYSVAR"/web2c/luahbtex -ini -jobname=lualatex -progname=lualatex lualatex.ini - fi + # many formats still ignore SOURCE_DATE_EPOCH even when FORCE_SOURCE_DATE=1 + # libfaketime fixes non-determinism related to timestamps ignoring FORCE_SOURCE_DATE + # we cannot fix further randomness caused by luatex; for further details, see + # https://salsa.debian.org/live-team/live-build/-/blob/master/examples/hooks/reproducible/2006-reproducible-texlive-binaries-fmt-files.hook.chroot#L52 + FORCE_SOURCE_DATE=1 TZ= faketime -f '@1980-01-01 00:00:00 x0.001' fmtutil --sys --all | grep '^fmtutil' # too verbose + #texlinks "$out/bin" && wrapBin # do we need to regenerate format links? # Disable unavailable map files echo y | updmap --sys --syncwithtrees --force @@ -298,14 +292,20 @@ in (buildEnv { # MkIV uses its own lookup mechanism and we need to initialize # caches for it. + # We use faketime to fix the embedded timestamps and patch the uuids + # with some random but constant values. '' if [[ -e "$out/bin/mtxrun" ]]; then - mtxrun --generate + substitute "$TEXMFDIST"/scripts/context/lua/mtxrun.lua mtxrun.lua \ + --replace 'cache_uuid=osuuid()' 'cache_uuid="e2402e51-133d-4c73-a278-006ea4ed734f"' \ + --replace 'uuid=osuuid(),' 'uuid="242be807-d17e-4792-8e39-aa93326fc871",' + FORCE_SOURCE_DATE=1 TZ= faketime -f '@1980-01-01 00:00:00 x0.001' luatex --luaonly mtxrun.lua --generate fi '' + bin.cleanBrokenLinks + # Get rid of all log files. They are not needed, but take up space - # and render the build unreproducible by their embedded timestamps. + # and render the build unreproducible by their embedded timestamps + # and other non-deterministic diagnostics. '' find "$TEXMFSYSVAR"/web2c -name '*.log' -delete '' From 1ee74c1439d48f8829e749a46bdacd40f3f1cf7b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Apr 2023 20:38:06 -0300 Subject: [PATCH 329/337] calc: add meta.changelog --- pkgs/applications/science/math/calc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 43b53e56c08..f81f7074824 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; # The licensing situation depends on readline (see section 3 of the LGPL) # If linked against readline then GPLv2 otherwise LGPLv2.1 + changelog = "https://github.com/lcn2/calc/blob/v${version}/CHANGES"; license = with licenses; if enableReadline then gpl2Only else lgpl21Only; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; From fc519cb40bb8b2978504814daf7a194f815d6da3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Apr 2023 20:43:50 -0300 Subject: [PATCH 330/337] calc: refactor meta --- pkgs/applications/science/math/calc/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index f81f7074824..053426d9075 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -39,14 +39,16 @@ stdenv.mkDerivation rec { "USE_READLINE=-DUSE_READLINE" ]; - meta = with lib; { - description = "C-style arbitrary precision calculator"; + meta = { homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; + description = "C-style arbitrary precision calculator"; + changelog = "https://github.com/lcn2/calc/blob/v${version}/CHANGES"; # The licensing situation depends on readline (see section 3 of the LGPL) # If linked against readline then GPLv2 otherwise LGPLv2.1 - changelog = "https://github.com/lcn2/calc/blob/v${version}/CHANGES"; - license = with licenses; if enableReadline then gpl2Only else lgpl21Only; - maintainers = with maintainers; [ matthewbauer ]; - platforms = platforms.all; + license = if enableReadline + then lib.licenses.gpl2Only + else lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.all; }; } From 2137fe7093a1a8ed713b1a5df40c6bfef07eea7b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Apr 2023 20:44:41 -0300 Subject: [PATCH 331/337] calc: remove references to pname --- pkgs/applications/science/math/calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 053426d9075..041dde8bac3 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "https://github.com/lcn2/calc/releases/download/v${version}/${pname}-${version}.tar.bz2" - "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" + "https://github.com/lcn2/calc/releases/download/v${version}/calc-${version}.tar.bz2" + "http://www.isthe.com/chongo/src/calc/calc-${version}.tar.bz2" ]; sha256 = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A="; }; From 580519cfcda476f1408f03038a40762ceb460716 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Apr 2023 20:45:04 -0300 Subject: [PATCH 332/337] calc: rewrite the arguments attrset --- pkgs/applications/science/math/calc/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 041dde8bac3..74c8454a5c3 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -1,5 +1,12 @@ -{ stdenv, lib, fetchurl, util-linux, makeWrapper -, enableReadline ? true, readline, ncurses }: +{ lib +, stdenv +, fetchurl +, makeWrapper +, ncurses +, readline +, util-linux +, enableReadline ? true +}: stdenv.mkDerivation rec { pname = "calc"; From f4a6e456c1d94218387a49c34b4f651fe6327a44 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Apr 2023 20:45:26 -0300 Subject: [PATCH 333/337] calc: use hash instead of sha256 --- pkgs/applications/science/math/calc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 74c8454a5c3..f76722f6715 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { "https://github.com/lcn2/calc/releases/download/v${version}/calc-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/calc-${version}.tar.bz2" ]; - sha256 = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A="; + hash = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A="; }; postPatch = '' From c3a3f7737a43ea66ec58436c8105f2729173e1a5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Apr 2023 20:45:55 -0300 Subject: [PATCH 334/337] calc: realign lists --- pkgs/applications/science/math/calc/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index f76722f6715..c345a396814 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -26,9 +26,17 @@ stdenv.mkDerivation rec { --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' ''; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ util-linux ] - ++ lib.optionals enableReadline [ readline ncurses ]; + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + util-linux + ] + ++ lib.optionals enableReadline [ + ncurses + readline + ]; makeFlags = [ "T=$(out)" @@ -41,7 +49,8 @@ stdenv.mkDerivation rec { # Handle LDFLAGS defaults in calc "DEFAULT_LIB_INSTALL_PATH=$(out)/lib" - ] ++ lib.optionals enableReadline [ + ] + ++ lib.optionals enableReadline [ "READLINE_LIB=-lreadline" "USE_READLINE=-DUSE_READLINE" ]; From 88d37af1e95e31ab21dd6832846424b7fde60876 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 23 Apr 2023 20:46:56 -0300 Subject: [PATCH 335/337] calc: use overlay-style overridable attributes --- pkgs/applications/science/math/calc/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index c345a396814..13ccdc86808 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -8,14 +8,14 @@ , enableReadline ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "calc"; version = "2.14.1.5"; src = fetchurl { urls = [ - "https://github.com/lcn2/calc/releases/download/v${version}/calc-${version}.tar.bz2" - "http://www.isthe.com/chongo/src/calc/calc-${version}.tar.bz2" + "https://github.com/lcn2/calc/releases/download/v${finalAttrs.version}/calc-${finalAttrs.version}.tar.bz2" + "http://www.isthe.com/chongo/src/calc/calc-${finalAttrs.version}.tar.bz2" ]; hash = "sha256-bPacYnEJBdQsIP+Z8D/ODskyEcvhgAy3ra4wasYMo6A="; }; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; description = "C-style arbitrary precision calculator"; - changelog = "https://github.com/lcn2/calc/blob/v${version}/CHANGES"; + changelog = "https://github.com/lcn2/calc/blob/v${finalAttrs.version}/CHANGES"; # The licensing situation depends on readline (see section 3 of the LGPL) # If linked against readline then GPLv2 otherwise LGPLv2.1 license = if enableReadline @@ -67,4 +67,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ matthewbauer ]; platforms = lib.platforms.all; }; -} +}) From c118bf9672120c551fa418845d02825e235a4fc7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 23 Apr 2023 23:38:40 +0200 Subject: [PATCH 336/337] palemoon: 32.1.0 -> 32.1.1 --- pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index c361fbd07e9..74150b75fa2 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,7 +45,7 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "32.1.0"; + version = "32.1.1"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-yfXcHoPdTknryYFV8mBWHvzs68oELqsJjTC/nT4SMB8="; + sha256 = "sha256-Z9dBYO5AGDYRLlnEfHUu6thgc2a8OK/tPuRzwp0j9J8="; }; nativeBuildInputs = [ From d4bde02d3204f05d07ddade9fcb5efe3c86866f2 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 25 Apr 2023 23:26:26 +0200 Subject: [PATCH 337/337] gh: 2.27.0 -> 2.28.0 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index a01dc126cda..2f79120759c 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-WjKHV/GfoPFRTKUJy7ht1H6zbt+EqJk6e9ysjaAkelw="; + hash = "sha256-FceyGNQwA6SFg97FtX4ATlevpLzG/FPVSoKBznWIfC8="; }; - vendorHash = "sha256-+8/cA0UxyVu7nyLhHYBWmn8Vs0O/EYepqTAOVU4gwt4="; + vendorHash = "sha256-iTPdOolvWINUSSYiPZAwn5ZF44x/x1tIWnKUHAn8ITA="; nativeBuildInputs = [ installShellFiles ];