From 7f78cd20fd376c33952de2f4b6df7b501e1c10bc Mon Sep 17 00:00:00 2001 From: James Atkins Date: Sun, 9 Jun 2024 12:21:51 -0500 Subject: [PATCH 001/114] nixos/changedetection-io: fix creation of data dir Create data directory using tmpfiles if it is not in the standard location. Do not run mkdir manually. --- nixos/modules/services/web-apps/changedetection-io.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/changedetection-io.nix b/nixos/modules/services/web-apps/changedetection-io.nix index f0d72b1e4d69..32448486cc95 100644 --- a/nixos/modules/services/web-apps/changedetection-io.nix +++ b/nixos/modules/services/web-apps/changedetection-io.nix @@ -129,9 +129,6 @@ in services.changedetection-io = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - preStart = '' - mkdir -p ${cfg.datastorePath} - ''; serviceConfig = { User = cfg.user; Group = cfg.group; @@ -153,7 +150,7 @@ in Restart = "on-failure"; }; }; - tmpfiles.rules = mkIf defaultStateDir [ + tmpfiles.rules = mkIf (!defaultStateDir) [ "d ${cfg.datastorePath} 0750 ${cfg.user} ${cfg.group} - -" ]; }; From cfae44ae9c90dc070dba9702140b9e3f24043bc5 Mon Sep 17 00:00:00 2001 From: flurie Date: Tue, 1 Oct 2024 18:29:02 -0400 Subject: [PATCH 002/114] bazel: 7.1.2 -> 7.3.1 --- .../build-managers/bazel/bazel_7/default.nix | 474 +++++++++++------- .../bazel/bazel_7/test_source_sort.patch | 12 + pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 307 insertions(+), 183 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bazel/bazel_7/test_source_sort.patch diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 661eb1a71aa9..4a457551785d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -1,49 +1,52 @@ -{ stdenv +{ + stdenv, # nix tooling and utilities -, callPackage -, lib -, fetchurl -, makeWrapper -, writeTextFile -, substituteAll -, writeShellApplication -, makeBinaryWrapper + lib, + fetchurl, + makeWrapper, + writeTextFile, + substituteAll, + writeShellApplication, + makeBinaryWrapper, + autoPatchelfHook, + buildFHSEnv, # this package (through the fixpoint glass) -, bazel_self + # TODO probably still need for tests at some point + bazel_self, # native build inputs -, runtimeShell -, zip -, unzip -, bash -, coreutils -, which -, gawk -, gnused -, gnutar -, gnugrep -, gzip -, findutils -, diffutils -, gnupatch -, file -, installShellFiles -, lndir -, python3 + runtimeShell, + zip, + unzip, + bash, + coreutils, + which, + gawk, + gnused, + gnutar, + gnugrep, + gzip, + findutils, + diffutils, + gnupatch, + file, + installShellFiles, + lndir, + python3, # Apple dependencies -, cctools -, libcxx -, sigtool -, CoreFoundation -, CoreServices -, Foundation -, IOKit + cctools, + libcxx, + sigtool, + CoreFoundation, + CoreServices, + Foundation, + IOKit, # Allow to independently override the jdks used to build and run respectively -, buildJdk -, runJdk + buildJdk, + runJdk, # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). -, enableNixHacks ? false -, version ? "7.1.2" + enableNixHacks ? false, + version ? "7.3.1", }: let @@ -51,27 +54,7 @@ let src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-nPbtIxnIFpGdlwFe720MWULNGu1I4DxzuggV2VPtYas="; - }; - - # Use builtins.fetchurl to avoid IFD, in particular on hydra - #lockfile = builtins.fetchurl { - # url = "https://raw.githubusercontent.com/bazelbuild/bazel/release-${version}/MODULE.bazel.lock"; - # sha256 = "sha256-5xPpCeWVKVp1s4RVce/GoW2+fH8vniz5G1MNI4uezpc="; - #}; - # Use a local copy of the above lockfile to make ofborg happy. - lockfile = ./MODULE.bazel.lock; - - # Two-in-one format - distDir = repoCache; - repoCache = callPackage ./bazel-repository-cache.nix { - inherit lockfile; - - # We use the release tarball that already has everything bundled so we - # should not need any extra external deps. But our nonprebuilt java - # toolchains hack needs just one non bundled dep. - requiredDepNamePredicate = name: - null != builtins.match "rules_java~.*~toolchains~remote_java_tools" name; + hash = "sha256-8FAfkMn8dM1pM9vcWeF7jWJy1sCfi448QomFxYlxR8c="; }; defaultShellUtils = @@ -117,8 +100,126 @@ let unzip which zip + runJdk + makeWrapper ]; + # Bootstrap an existing Bazel so we can vendor deps with vendor mode + bazel_bootstrap = stdenv.mkDerivation rec { + name = "bazel_bootstrap"; + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64"; + hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI="; + }; + + nativeBuildInputs = defaultShellUtils; + buildInputs = [ + stdenv.cc.cc + autoPatchelfHook + ]; + + dontUnpack = true; + dontPatch = true; + dontBuild = true; + dontStrip = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 $src $out/bin/bazel + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/bazel \ + --prefix PATH : ${lib.makeBinPath nativeBuildInputs} + ''; + }; + + # The bootstrapped Bazel did not work on its own for vendoring, but a wrapped FHS did + bazel_fhs = buildFHSEnv { + name = "bazel"; + targetPkgs = _: [ bazel_bootstrap ]; + runScript = "bazel"; + }; + + # A FOD that vendors the Bazel dependencies using Bazel's new vendor mode. + # See https://bazel.build/versions/7.3.0/external/vendor for details. + # Note that it may be possible to vendor less than the full set of deps in + # the future, as this is approximately 16GB. + bazel_deps = stdenv.mkDerivation { + name = "bazel_deps"; + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + hash = "sha256-8FAfkMn8dM1pM9vcWeF7jWJy1sCfi448QomFxYlxR8c="; + }; + inherit version; + sourceRoot = "."; + patches = [ + # The repo rule that creates a manifest of the bazel source for testing + # the cli is not reproducible. This patch ensures that it is by sorting + # the results in the repo rule rather than the downstream genrule. + ./test_source_sort.patch + ]; + patchFlags = [ + "--no-backup-if-mismatch" + "-p1" + ]; + nativeBuildInputs = [ + unzip + bazel_fhs + ]; + configurePhase = '' + runHook preConfigure + + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + mkdir vendor_dir + + runHook postConfigure + ''; + dontFixup = true; + buildPhase = '' + runHook preBuild + export HOME=$TMP + (cd bazel_src; ${bazel_fhs}/bin/bazel --server_javabase=${runJdk} mod deps --curses=no; + ${bazel_fhs}/bin/bazel --server_javabase=${runJdk} vendor \ + --curses=no \ + --vendor_dir ../vendor_dir \ + --verbose_failures \ + --experimental_strict_java_deps=off \ + --strict_proto_deps=off \ + --tool_java_runtime_version=local_jdk_21 \ + --java_runtime_version=local_jdk_21 \ + --tool_java_language_version=21 \ + --java_language_version=21) + + # Some post-fetch fixup is necessary, because the deps come with some + # baggage that is not reproducible. Luckily, this baggage does not factor + # into the final product, so removing it is enough. + + # the GOCACHE is poisonous! + rm -rf vendor_dir/gazelle~~non_module_deps~bazel_gazelle_go_repository_cache/gocache + + # so are .pyc files apparently + find vendor_dir -name "*.pyc" -type f -delete + + runHook postBuild + ''; + + installPhase = '' + mkdir -p $out/vendor_dir + cp -r --reflink=auto vendor_dir/* $out/vendor_dir + ''; + + outputHashMode = "recursive"; + outputHash = "sha256-xW+KZIsOGrDV7WIcg/elHpFEmfs1TfFky3bVqCdWr9k="; + outputHashAlgo = "sha256"; + + }; + defaultShellPath = lib.makeBinPath defaultShellUtils; bashWithDefaultShellUtilsSh = writeShellApplication { @@ -174,87 +275,88 @@ stdenv.mkDerivation rec { inherit version src; inherit sourceRoot; - patches = [ - # Remote java toolchains do not work on NixOS because they download binaries, - # so we need to use the @local_jdk//:jdk - # It could in theory be done by registering @local_jdk//:all toolchains, - # but these java toolchains still bundle binaries for ijar and stuff. So we - # need a nonprebult java toolchain (where ijar and stuff is built from - # sources). - # There is no such java toolchain, so we introduce one here. - # By providing no version information, the toolchain will set itself to the - # version of $JAVA_HOME/bin/java, just like the local_jdk does. - # To ensure this toolchain gets used, we can set - # --{,tool_}java_runtime_version=local_jdk and rely on the fact no java - # toolchain registered by default uses the local_jdk, making the selection - # unambiguous. - # This toolchain has the advantage that it can use any ambiant java jdk, - # not only a given, fixed version. It allows bazel to work correctly in any - # environment where JAVA_HOME is set to the right java version, like inside - # nix derivations. - # However, this patch breaks bazel hermeticity, by picking the ambiant java - # version instead of the more hermetic remote_jdk prebuilt binaries that - # rules_java provide by default. It also requires the user to have a - # JAVA_HOME set to the exact version required by the project. - # With more code, we could define java toolchains for all the java versions - # supported by the jdk as in rules_java's - # toolchains/local_java_repository.bzl, but this is not implemented here. - # To recover vanilla behavior, non NixOS users can set - # --{,tool_}java_runtime_version=remote_jdk, effectively reverting the - # effect of this patch and the fake system bazelrc. - ./java_toolchain.patch + patches = + [ + # Remote java toolchains do not work on NixOS because they download binaries, + # so we need to use the @local_jdk//:jdk + # It could in theory be done by registering @local_jdk//:all toolchains, + # but these java toolchains still bundle binaries for ijar and stuff. So we + # need a nonprebult java toolchain (where ijar and stuff is built from + # sources). + # There is no such java toolchain, so we introduce one here. + # By providing no version information, the toolchain will set itself to the + # version of $JAVA_HOME/bin/java, just like the local_jdk does. + # To ensure this toolchain gets used, we can set + # --{,tool_}java_runtime_version=local_jdk and rely on the fact no java + # toolchain registered by default uses the local_jdk, making the selection + # unambiguous. + # This toolchain has the advantage that it can use any ambiant java jdk, + # not only a given, fixed version. It allows bazel to work correctly in any + # environment where JAVA_HOME is set to the right java version, like inside + # nix derivations. + # However, this patch breaks bazel hermeticity, by picking the ambiant java + # version instead of the more hermetic remote_jdk prebuilt binaries that + # rules_java provide by default. It also requires the user to have a + # JAVA_HOME set to the exact version required by the project. + # With more code, we could define java toolchains for all the java versions + # supported by the jdk as in rules_java's + # toolchains/local_java_repository.bzl, but this is not implemented here. + # To recover vanilla behavior, non NixOS users can set + # --{,tool_}java_runtime_version=remote_jdk, effectively reverting the + # effect of this patch and the fake system bazelrc. + ./java_toolchain.patch - # Bazel integrates with apple IOKit to inhibit and track system sleep. - # Inside the darwin sandbox, these API calls are blocked, and bazel - # crashes. It seems possible to allow these APIs inside the sandbox, but it - # feels simpler to patch bazel not to use it at all. So our bazel is - # incapable of preventing system sleep, which is a small price to pay to - # guarantee that it will always run in any nix context. - # - # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses - # NIX_BUILD_TOP env var to conditionnally disable sleep features inside the - # sandbox. - # - # If you want to investigate the sandbox profile path, - # IORegisterForSystemPower can be allowed with - # - # propagatedSandboxProfile = '' - # (allow iokit-open (iokit-user-client-class "RootDomainUserClient")) - # ''; - # - # I do not know yet how to allow IOPMAssertion{CreateWithName,Release} - ./darwin_sleep.patch + # Bazel integrates with apple IOKit to inhibit and track system sleep. + # Inside the darwin sandbox, these API calls are blocked, and bazel + # crashes. It seems possible to allow these APIs inside the sandbox, but it + # feels simpler to patch bazel not to use it at all. So our bazel is + # incapable of preventing system sleep, which is a small price to pay to + # guarantee that it will always run in any nix context. + # + # See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses + # NIX_BUILD_TOP env var to conditionnally disable sleep features inside the + # sandbox. + # + # If you want to investigate the sandbox profile path, + # IORegisterForSystemPower can be allowed with + # + # propagatedSandboxProfile = '' + # (allow iokit-open (iokit-user-client-class "RootDomainUserClient")) + # ''; + # + # I do not know yet how to allow IOPMAssertion{CreateWithName,Release} + ./darwin_sleep.patch - # Fix DARWIN_XCODE_LOCATOR_COMPILE_COMMAND by removing multi-arch support. - # Nixpkgs toolcahins do not support that (yet?) and get confused. - # Also add an explicit /usr/bin prefix that will be patched below. - ./xcode_locator.patch + # Fix DARWIN_XCODE_LOCATOR_COMPILE_COMMAND by removing multi-arch support. + # Nixpkgs toolcahins do not support that (yet?) and get confused. + # Also add an explicit /usr/bin prefix that will be patched below. + ./xcode_locator.patch - # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' - # This is breaking the build of any C target. This patch removes the last - # argument if it's found to be an empty string. - ../trim-last-argument-to-gcc-if-empty.patch + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' + # This is breaking the build of any C target. This patch removes the last + # argument if it's found to be an empty string. + ../trim-last-argument-to-gcc-if-empty.patch - # --experimental_strict_action_env (which may one day become the default - # see bazelbuild/bazel#2574) hardcodes the default - # action environment to a non hermetic value (e.g. "/usr/local/bin"). - # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. - # So we are replacing this bazel paths by defaultShellPath, - # improving hermeticity and making it work in nixos. - (substituteAll { - src = ../strict_action_env.patch; - strictActionEnvPatch = defaultShellPath; - }) + # --experimental_strict_action_env (which may one day become the default + # see bazelbuild/bazel#2574) hardcodes the default + # action environment to a non hermetic value (e.g. "/usr/local/bin"). + # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. + # So we are replacing this bazel paths by defaultShellPath, + # improving hermeticity and making it work in nixos. + (substituteAll { + src = ../strict_action_env.patch; + strictActionEnvPatch = defaultShellPath; + }) - # bazel reads its system bazelrc in /etc - # override this path to a builtin one - (substituteAll { - src = ../bazel_rc.patch; - bazelSystemBazelRCPath = bazelRC; - }) - ] - # See enableNixHacks argument above. - ++ lib.optional enableNixHacks ./nix-hacks.patch; + # bazel reads its system bazelrc in /etc + # override this path to a builtin one + (substituteAll { + src = ../bazel_rc.patch; + bazelSystemBazelRCPath = bazelRC; + }) + ] + # See enableNixHacks argument above. + ++ lib.optional enableNixHacks ./nix-hacks.patch; postPatch = let @@ -339,10 +441,6 @@ stdenv.mkDerivation rec { -e 's!/bin/bash!${bashWithDefaultShellUtils}/bin/bash!g' \ -e 's!shasum -a 256!sha256sum!g' - # Augment bundled repository_cache with our extra paths - ${lndir}/bin/lndir ${repoCache}/content_addressable \ - $PWD/derived/repository_cache/content_addressable - # Add required flags to bazel command line. # XXX: It would suit a bazelrc file better, but I found no way to pass it. # It seems that bazel bootstrapping ignores it. @@ -350,15 +448,16 @@ stdenv.mkDerivation rec { sedVerbose compile.sh \ -e "/bazel_build /a\ --verbose_failures \\\\" \ -e "/bazel_build /a\ --curses=no \\\\" \ - -e "/bazel_build /a\ --features=-layering_check \\\\" \ - -e "/bazel_build /a\ --experimental_strict_java_deps=off \\\\" \ - -e "/bazel_build /a\ --strict_proto_deps=off \\\\" \ -e "/bazel_build /a\ --toolchain_resolution_debug='@bazel_tools//tools/jdk:(runtime_)?toolchain_type' \\\\" \ - -e "/bazel_build /a\ --tool_java_runtime_version=local_jdk_17 \\\\" \ - -e "/bazel_build /a\ --java_runtime_version=local_jdk_17 \\\\" \ - -e "/bazel_build /a\ --tool_java_language_version=17 \\\\" \ - -e "/bazel_build /a\ --java_language_version=17 \\\\" \ + -e "/bazel_build /a\ --tool_java_runtime_version=local_jdk_21 \\\\" \ + -e "/bazel_build /a\ --java_runtime_version=local_jdk_21 \\\\" \ + -e "/bazel_build /a\ --tool_java_language_version=21 \\\\" \ + -e "/bazel_build /a\ --java_language_version=21 \\\\" \ -e "/bazel_build /a\ --extra_toolchains=@bazel_tools//tools/jdk:all \\\\" \ + -e "/bazel_build /a\ --vendor_dir=../vendor_dir \\\\" \ + -e "/bazel_build /a\ --repository_disable_download \\\\" \ + -e "/bazel_build /a\ --announce_rc \\\\" \ + -e "/bazel_build /a\ --nobuild_python_zip \\\\" \ # Also build parser_deploy.jar with bootstrap bazel # TODO: Turn into a proper patch @@ -407,25 +506,30 @@ stdenv.mkDerivation rec { # Bazel starts a local server and needs to bind a local address. __darwinAllowLocalNetworking = true; - buildInputs = [ buildJdk bashWithDefaultShellUtils ] ++ defaultShellUtils; + buildInputs = [ + buildJdk + bashWithDefaultShellUtils + ] ++ defaultShellUtils; # when a command can’t be found in a bazel build, you might also # need to add it to `defaultShellPath`. - nativeBuildInputs = [ - installShellFiles - makeWrapper - python3 - unzip - which - zip - python3.pkgs.absl-py # Needed to build fish completion - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - cctools - libcxx - Foundation - CoreFoundation - CoreServices - ]; + nativeBuildInputs = + [ + installShellFiles + makeWrapper + python3 + unzip + which + zip + python3.pkgs.absl-py # Needed to build fish completion + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + cctools + libcxx + Foundation + CoreFoundation + CoreServices + ]; # Bazel makes extensive use of symlinks in the WORKSPACE. # This causes problems with infinite symlinks if the build output is in the same location as the @@ -437,12 +541,15 @@ stdenv.mkDerivation rec { mkdir bazel_src shopt -s dotglob extglob mv !(bazel_src) bazel_src + # Augment bundled repository_cache with our extra paths + mkdir vendor_dir + ${lndir}/bin/lndir ${bazel_deps}/vendor_dir vendor_dir + rm vendor_dir/VENDOR.bazel + find vendor_dir -maxdepth 1 -type d -printf "pin(\"@@%P\")\n" > vendor_dir/VENDOR.bazel ''; buildPhase = '' runHook preBuild - - # Increasing memory during compilation might be necessary. - # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + export HOME=$(mktemp -d) # If EMBED_LABEL isn't set, it'd be auto-detected from CHANGELOG.md # and `git rev-parse --short HEAD` which would result in @@ -452,6 +559,7 @@ stdenv.mkDerivation rec { # Note that .bazelversion is always correct and is based on bazel-* # executable name, version checks should work fine export EMBED_LABEL="${version}- (@non-git)" + echo "Stage 1 - Running bazel bootstrap script" ${bash}/bin/bash ./bazel_src/compile.sh @@ -554,16 +662,18 @@ stdenv.mkDerivation rec { # Save paths to hardcoded dependencies so Nix can detect them. # This is needed because the templates get tar’d up into a .jar. - postFixup = '' - mkdir -p $out/nix-support - echo "${defaultShellPath}" >> $out/nix-support/depends - # The string literal specifying the path to the bazel-rc file is sometimes - # stored non-contiguously in the binary due to gcc optimisations, which leads - # Nix to miss the hash when scanning for dependencies - echo "${bazelRC}" >> $out/nix-support/depends - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - echo "${cctools}" >> $out/nix-support/depends - ''; + postFixup = + '' + mkdir -p $out/nix-support + echo "${defaultShellPath}" >> $out/nix-support/depends + # The string literal specifying the path to the bazel-rc file is sometimes + # stored non-contiguously in the binary due to gcc optimisations, which leads + # Nix to miss the hash when scanning for dependencies + echo "${bazelRC}" >> $out/nix-support/depends + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends + ''; dontStrip = true; dontPatchELF = true; @@ -571,14 +681,16 @@ stdenv.mkDerivation rec { passthru = { # Additional tests that check bazel’s functionality. Execute # - # nix-build . -A bazel_7.tests + # nix-build . -A bazel_73.tests # # in the nixpkgs checkout root to exercise them locally. - tests = callPackage ./tests.nix { - inherit Foundation bazel_self lockfile repoCache; - }; + # tests = callPackage ./tests.nix { + # inherit Foundation bazel_self lockfile repoCache; + # }; + # TODO tests have not been updated yet and will likely need a rewrite + # tests = callPackage ./tests.nix { inherit Foundation bazel_deps bazel_self; }; # For ease of debugging - inherit distDir repoCache lockfile; + inherit bazel_deps bazel_fhs; }; } diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/test_source_sort.patch b/pkgs/development/tools/build-managers/bazel/bazel_7/test_source_sort.patch new file mode 100644 index 000000000000..3ddd0d109e00 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/test_source_sort.patch @@ -0,0 +1,12 @@ +--- a/src/test/shell/bazel/list_source_repository.bzl ++++ b/src/test/shell/bazel/list_source_repository.bzl +@@ -32,7 +32,8 @@ def _impl(rctx): + if "SRCS_EXCLUDES" in rctx.os.environ: + srcs_excludes = rctx.os.environ["SRCS_EXCLUDES"] + r = rctx.execute(["find", "-L", str(workspace), "-type", "f"]) +- rctx.file("find.result.raw", r.stdout.replace(str(workspace) + "/", "")) ++ stdout = "\n".join(sorted(r.stdout.splitlines())) ++ rctx.file("find.result.raw", stdout.replace(str(workspace) + "/", "")) + rctx.file("BUILD", """ + genrule( + name = "sources", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1463ac224a84..e794ba9307cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17143,8 +17143,8 @@ with pkgs; bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 { inherit (darwin) sigtool; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit; - buildJdk = jdk17_headless; - runJdk = jdk17_headless; + buildJdk = jdk21_headless; + runJdk = jdk21_headless; stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; From 95a4a50c0907d37a39672e0884e2a8ffa3192732 Mon Sep 17 00:00:00 2001 From: Alexander Flurie Date: Sat, 7 Sep 2024 11:42:09 -0400 Subject: [PATCH 003/114] make bazel bootstrap multi-platform --- .../tools/build-managers/bazel/bazel_7/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 4a457551785d..40be93c5b6b7 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -107,9 +107,18 @@ let # Bootstrap an existing Bazel so we can vendor deps with vendor mode bazel_bootstrap = stdenv.mkDerivation rec { name = "bazel_bootstrap"; - src = fetchurl { + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64"; hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI="; + } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64"; + hash = "sha256-olrlIia/oXWleXp12E+LGXv+F1m4/S4jj/t7p2/xGdM="; + } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-darwin-x86_64"; + hash = "sha256-e5RRZTrhzoTMk2NRRl9m2K5+h1/+5mJNW2vF8h0uftc="; + } else fetchurl { # stdenv.hostPlatform.system == "aarch64-darwin" + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-darwin-arm64"; + hash = "sha256-ciNBdqm+cIrNR1Wu2wt+wGGb6m9i9aE8LhRqL4BJ0Y4="; }; nativeBuildInputs = defaultShellUtils; @@ -681,7 +690,7 @@ stdenv.mkDerivation rec { passthru = { # Additional tests that check bazel’s functionality. Execute # - # nix-build . -A bazel_73.tests + # nix-build . -A bazel_7.tests # # in the nixpkgs checkout root to exercise them locally. # tests = callPackage ./tests.nix { From 8e8d4a6c365d752d4b1601817cc5a7e97bb96b26 Mon Sep 17 00:00:00 2001 From: Alexander Flurie Date: Sat, 7 Sep 2024 13:34:51 -0400 Subject: [PATCH 004/114] set meta.sourceProvenance for bazel bootstrap --- .../development/tools/build-managers/bazel/bazel_7/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 40be93c5b6b7..28b247bf00e6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -107,6 +107,7 @@ let # Bootstrap an existing Bazel so we can vendor deps with vendor mode bazel_bootstrap = stdenv.mkDerivation rec { name = "bazel_bootstrap"; + src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64"; hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI="; @@ -144,6 +145,8 @@ let wrapProgram $out/bin/bazel \ --prefix PATH : ${lib.makeBinPath nativeBuildInputs} ''; + + meta.sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; # The bootstrapped Bazel did not work on its own for vendoring, but a wrapped FHS did From 76bf576d03c5187f3c57335c3222d665ba2e0123 Mon Sep 17 00:00:00 2001 From: Alexander Flurie Date: Tue, 10 Sep 2024 18:08:43 -0400 Subject: [PATCH 005/114] use camelCase for FODs, fix deps FOD --- .../build-managers/bazel/bazel_7/default.nix | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 28b247bf00e6..886d17acb583 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -149,8 +149,7 @@ let meta.sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; - # The bootstrapped Bazel did not work on its own for vendoring, but a wrapped FHS did - bazel_fhs = buildFHSEnv { + bazelFhs = buildFHSEnv { name = "bazel"; targetPkgs = _: [ bazel_bootstrap ]; runScript = "bazel"; @@ -160,13 +159,9 @@ let # See https://bazel.build/versions/7.3.0/external/vendor for details. # Note that it may be possible to vendor less than the full set of deps in # the future, as this is approximately 16GB. - bazel_deps = stdenv.mkDerivation { - name = "bazel_deps"; - src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-8FAfkMn8dM1pM9vcWeF7jWJy1sCfi448QomFxYlxR8c="; - }; - inherit version; + bazelDeps = stdenv.mkDerivation { + name = "bazelDeps"; + inherit src version; sourceRoot = "."; patches = [ # The repo rule that creates a manifest of the bazel source for testing @@ -180,7 +175,7 @@ let ]; nativeBuildInputs = [ unzip - bazel_fhs + bazelFhs ]; configurePhase = '' runHook preConfigure @@ -196,8 +191,8 @@ let buildPhase = '' runHook preBuild export HOME=$TMP - (cd bazel_src; ${bazel_fhs}/bin/bazel --server_javabase=${runJdk} mod deps --curses=no; - ${bazel_fhs}/bin/bazel --server_javabase=${runJdk} vendor \ + (cd bazel_src; ${bazelFhs}/bin/bazel --server_javabase=${runJdk} mod deps --curses=no; + ${bazelFhs}/bin/bazel --server_javabase=${runJdk} vendor \ --curses=no \ --vendor_dir ../vendor_dir \ --verbose_failures \ @@ -215,7 +210,10 @@ let # the GOCACHE is poisonous! rm -rf vendor_dir/gazelle~~non_module_deps~bazel_gazelle_go_repository_cache/gocache - # so are .pyc files apparently + # as is the go versions file (changes when new versions show up) + rm -f vendor_dir/rules_go~~go_sdk~go_default_sdk/versions.json + + # and so are .pyc files find vendor_dir -name "*.pyc" -type f -delete runHook postBuild @@ -227,7 +225,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-xW+KZIsOGrDV7WIcg/elHpFEmfs1TfFky3bVqCdWr9k="; + outputHash = "sha256-GjktM25K4OPrww1o9jB38h0FwJrcJo7TR0x0owZV9I0="; outputHashAlgo = "sha256"; }; @@ -555,7 +553,7 @@ stdenv.mkDerivation rec { mv !(bazel_src) bazel_src # Augment bundled repository_cache with our extra paths mkdir vendor_dir - ${lndir}/bin/lndir ${bazel_deps}/vendor_dir vendor_dir + ${lndir}/bin/lndir ${bazelDeps}/vendor_dir vendor_dir rm vendor_dir/VENDOR.bazel find vendor_dir -maxdepth 1 -type d -printf "pin(\"@@%P\")\n" > vendor_dir/VENDOR.bazel ''; @@ -700,9 +698,9 @@ stdenv.mkDerivation rec { # inherit Foundation bazel_self lockfile repoCache; # }; # TODO tests have not been updated yet and will likely need a rewrite - # tests = callPackage ./tests.nix { inherit Foundation bazel_deps bazel_self; }; + # tests = callPackage ./tests.nix { inherit Foundation bazelDeps bazel_self; }; # For ease of debugging - inherit bazel_deps bazel_fhs; + inherit bazelDeps bazelFhs; }; } From 3de687a6b6faaed2ecbde08b3de5e63262b7ead3 Mon Sep 17 00:00:00 2001 From: flurie Date: Mon, 16 Sep 2024 23:52:29 -0400 Subject: [PATCH 006/114] get linux/aarch64-darwin builds working --- .../build-managers/bazel/bazel_7/default.nix | 182 ++++++++++-------- 1 file changed, 102 insertions(+), 80 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 886d17acb583..9c409779aeb0 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -100,33 +100,40 @@ let unzip which zip - runJdk makeWrapper ]; # Bootstrap an existing Bazel so we can vendor deps with vendor mode - bazel_bootstrap = stdenv.mkDerivation rec { - name = "bazel_bootstrap"; + bazelBootstrap = stdenv.mkDerivation rec { + name = "bazelBootstrap"; - src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64"; - hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI="; - } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64"; - hash = "sha256-olrlIia/oXWleXp12E+LGXv+F1m4/S4jj/t7p2/xGdM="; - } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-darwin-x86_64"; - hash = "sha256-e5RRZTrhzoTMk2NRRl9m2K5+h1/+5mJNW2vF8h0uftc="; - } else fetchurl { # stdenv.hostPlatform.system == "aarch64-darwin" - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-darwin-arm64"; - hash = "sha256-ciNBdqm+cIrNR1Wu2wt+wGGb6m9i9aE8LhRqL4BJ0Y4="; - }; + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64"; + hash = "sha256-05fHtz47OilpOVYawB17VRVEDpycfYTIHBmwYCOyPjI="; + } + else if stdenv.hostPlatform.system == "aarch64-linux" then + fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64"; + hash = "sha256-olrlIia/oXWleXp12E+LGXv+F1m4/S4jj/t7p2/xGdM="; + } + else if stdenv.hostPlatform.system == "x86_64-darwin" then + fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64"; + hash = "sha256-e5RRZTrhzoTMk2NRRl9m2K5+h1/+5mJNW2vF8h0uftc="; + } + else + fetchurl { + # stdenv.hostPlatform.system == "aarch64-darwin" + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64"; + hash = "sha256-mB+CpHC60TSTIrb1HJxv+gqikdqxAU+sQRVDwS5mHf8="; + }; nativeBuildInputs = defaultShellUtils; buildInputs = [ stdenv.cc.cc - autoPatchelfHook - ]; + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) autoPatchelfHook; dontUnpack = true; dontPatch = true; @@ -151,7 +158,7 @@ let bazelFhs = buildFHSEnv { name = "bazel"; - targetPkgs = _: [ bazel_bootstrap ]; + targetPkgs = _: [ bazelBootstrap ]; runScript = "bazel"; }; @@ -159,76 +166,90 @@ let # See https://bazel.build/versions/7.3.0/external/vendor for details. # Note that it may be possible to vendor less than the full set of deps in # the future, as this is approximately 16GB. - bazelDeps = stdenv.mkDerivation { - name = "bazelDeps"; - inherit src version; - sourceRoot = "."; - patches = [ - # The repo rule that creates a manifest of the bazel source for testing - # the cli is not reproducible. This patch ensures that it is by sorting - # the results in the repo rule rather than the downstream genrule. - ./test_source_sort.patch - ]; - patchFlags = [ - "--no-backup-if-mismatch" - "-p1" - ]; - nativeBuildInputs = [ - unzip - bazelFhs - ]; - configurePhase = '' - runHook preConfigure + bazelDeps = + let + bazelForDeps = if stdenv.hostPlatform.isDarwin then bazelBootstrap else bazelFhs; + in + stdenv.mkDerivation { + name = "bazelDeps"; + inherit src version; + sourceRoot = "."; + patches = [ + # The repo rule that creates a manifest of the bazel source for testing + # the cli is not reproducible. This patch ensures that it is by sorting + # the results in the repo rule rather than the downstream genrule. + ./test_source_sort.patch + ]; + patchFlags = [ + "--no-backup-if-mismatch" + "-p1" + ]; + nativeBuildInputs = [ + unzip + runJdk + bazelForDeps + ]; + configurePhase = '' + runHook preConfigure - mkdir bazel_src - shopt -s dotglob extglob - mv !(bazel_src) bazel_src - mkdir vendor_dir + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + mkdir vendor_dir - runHook postConfigure - ''; - dontFixup = true; - buildPhase = '' - runHook preBuild - export HOME=$TMP - (cd bazel_src; ${bazelFhs}/bin/bazel --server_javabase=${runJdk} mod deps --curses=no; - ${bazelFhs}/bin/bazel --server_javabase=${runJdk} vendor \ - --curses=no \ - --vendor_dir ../vendor_dir \ - --verbose_failures \ - --experimental_strict_java_deps=off \ - --strict_proto_deps=off \ - --tool_java_runtime_version=local_jdk_21 \ - --java_runtime_version=local_jdk_21 \ - --tool_java_language_version=21 \ - --java_language_version=21) + runHook postConfigure + ''; + dontFixup = true; + buildPhase = '' + runHook preBuild + export HOME=$TMP + (cd bazel_src; ${bazelForDeps}/bin/bazel --server_javabase=${runJdk} mod deps --curses=no; + ${bazelForDeps}/bin/bazel --server_javabase=${runJdk} vendor src:bazel_nojdk \ + --curses=no \ + --vendor_dir ../vendor_dir \ + --verbose_failures \ + --experimental_strict_java_deps=off \ + --strict_proto_deps=off \ + --tool_java_runtime_version=local_jdk_21 \ + --java_runtime_version=local_jdk_21 \ + --tool_java_language_version=21 \ + --java_language_version=21) - # Some post-fetch fixup is necessary, because the deps come with some - # baggage that is not reproducible. Luckily, this baggage does not factor - # into the final product, so removing it is enough. + # Some post-fetch fixup is necessary, because the deps come with some + # baggage that is not reproducible. Luckily, this baggage does not factor + # into the final product, so removing it is enough. - # the GOCACHE is poisonous! - rm -rf vendor_dir/gazelle~~non_module_deps~bazel_gazelle_go_repository_cache/gocache + # the GOCACHE is poisonous! + rm -rf vendor_dir/gazelle~~non_module_deps~bazel_gazelle_go_repository_cache/gocache - # as is the go versions file (changes when new versions show up) - rm -f vendor_dir/rules_go~~go_sdk~go_default_sdk/versions.json + # as is the go versions file (changes when new versions show up) + rm -f vendor_dir/rules_go~~go_sdk~go_default_sdk/versions.json - # and so are .pyc files - find vendor_dir -name "*.pyc" -type f -delete + # and so are .pyc files + find vendor_dir -name "*.pyc" -type f -delete - runHook postBuild - ''; + runHook postBuild + ''; - installPhase = '' - mkdir -p $out/vendor_dir - cp -r --reflink=auto vendor_dir/* $out/vendor_dir - ''; + installPhase = '' + mkdir -p $out/vendor_dir + cp -r --reflink=auto vendor_dir/* $out/vendor_dir + ''; - outputHashMode = "recursive"; - outputHash = "sha256-GjktM25K4OPrww1o9jB38h0FwJrcJo7TR0x0owZV9I0="; - outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = + if stdenv.hostPlatform.system == "x86_64-linux" then + "sha256-GjktM25K4OPrww1o9jB38h0FwJrcJo7TR0x0owZV9I0=" + else if stdenv.hostPlatform.system == "aarch64-linux" then + "sha256-T7vVWLlRzhaWneKMgMdgjUpBwRuGZ9ZFtD2AQvH9krI=" + else if stdenv.hostPlatform.system == "aarch64-darwin" then + "sha256-zv39lLMwfOr0MfK8dZ0alEwXpWdf97XEc6ciAoO4OK0=" + else + # x86_64-darwin + lib.fakeSha256; + outputHashAlgo = "sha256"; - }; + }; defaultShellPath = lib.makeBinPath defaultShellUtils; @@ -647,6 +668,7 @@ stdenv.mkDerivation rec { #!${runtimeShell} -e exit 1 EOF + chmod +x tools/bazel # first call should fail if tools/bazel is used @@ -701,6 +723,6 @@ stdenv.mkDerivation rec { # tests = callPackage ./tests.nix { inherit Foundation bazelDeps bazel_self; }; # For ease of debugging - inherit bazelDeps bazelFhs; + inherit bazelDeps bazelFhs bazelBootstrap; }; } From bee45a2c281a40246b2993b4c03c20f2a5e937bc Mon Sep 17 00:00:00 2001 From: flurie Date: Tue, 17 Sep 2024 09:08:15 -0400 Subject: [PATCH 007/114] correct x86_64-linux deps sha --- pkgs/development/tools/build-managers/bazel/bazel_7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 9c409779aeb0..049b3e8c31b3 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -239,7 +239,7 @@ let outputHashMode = "recursive"; outputHash = if stdenv.hostPlatform.system == "x86_64-linux" then - "sha256-GjktM25K4OPrww1o9jB38h0FwJrcJo7TR0x0owZV9I0=" + "sha256-ugi2F0xTDVWDCYKknSk3dTbnI78WluDMq4QvlLWtCts=" else if stdenv.hostPlatform.system == "aarch64-linux" then "sha256-T7vVWLlRzhaWneKMgMdgjUpBwRuGZ9ZFtD2AQvH9krI=" else if stdenv.hostPlatform.system == "aarch64-darwin" then From 77c941be7f5a88d0bbf8f65fd17bb3c361a8b43a Mon Sep 17 00:00:00 2001 From: flurie Date: Tue, 1 Oct 2024 17:59:55 -0400 Subject: [PATCH 008/114] fix deps and hashes for darwin --- .../tools/build-managers/bazel/bazel_7/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 049b3e8c31b3..d12218cdddb6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -121,7 +121,7 @@ let else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64"; - hash = "sha256-e5RRZTrhzoTMk2NRRl9m2K5+h1/+5mJNW2vF8h0uftc="; + hash = "sha256-LraN6MSVJQ3NzkyeLl5LvGxf+VNDJiVo/dVJIkyF1jU="; } else fetchurl { @@ -228,6 +228,10 @@ let # and so are .pyc files find vendor_dir -name "*.pyc" -type f -delete + # bazel-external is auto-generated and should be removed + # see https://bazel.build/external/vendor#vendor-symlinks for more details + rm vendor_dir/bazel-external + runHook postBuild ''; @@ -243,10 +247,10 @@ let else if stdenv.hostPlatform.system == "aarch64-linux" then "sha256-T7vVWLlRzhaWneKMgMdgjUpBwRuGZ9ZFtD2AQvH9krI=" else if stdenv.hostPlatform.system == "aarch64-darwin" then - "sha256-zv39lLMwfOr0MfK8dZ0alEwXpWdf97XEc6ciAoO4OK0=" + "sha256-E6j31Sl+aGs6+Xdx+c0Xi6ryfYZ/ms5/HzIyc3QpMHY=" else # x86_64-darwin - lib.fakeSha256; + "sha256-VVuNGY4+SFDhcv9iEo8JToYPzqk9NQCrYlLhhae89MM="; outputHashAlgo = "sha256"; }; From bd5023c4ea26c08d8e702ae9099e421e2f1e3654 Mon Sep 17 00:00:00 2001 From: flurie Date: Tue, 1 Oct 2024 18:56:04 -0400 Subject: [PATCH 009/114] fix deps hashes for linux --- .../tools/build-managers/bazel/bazel_7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index d12218cdddb6..bcdfc9397192 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -243,9 +243,9 @@ let outputHashMode = "recursive"; outputHash = if stdenv.hostPlatform.system == "x86_64-linux" then - "sha256-ugi2F0xTDVWDCYKknSk3dTbnI78WluDMq4QvlLWtCts=" + "sha256-II5R2YjaIejcO4Topdcz1H268eplYsYrW2oLJHKEkYw=" else if stdenv.hostPlatform.system == "aarch64-linux" then - "sha256-T7vVWLlRzhaWneKMgMdgjUpBwRuGZ9ZFtD2AQvH9krI=" + "sha256-n8RMKf8OxJsEkcxLe7xZgMu9RyeU58NESFF9F0nLNC4=" else if stdenv.hostPlatform.system == "aarch64-darwin" then "sha256-E6j31Sl+aGs6+Xdx+c0Xi6ryfYZ/ms5/HzIyc3QpMHY=" else From 46016bada3730c22055eb010818024ff46fd96e6 Mon Sep 17 00:00:00 2001 From: flurie Date: Tue, 1 Oct 2024 19:59:27 -0400 Subject: [PATCH 010/114] fix whitespace --- pkgs/development/tools/build-managers/bazel/bazel_7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index bcdfc9397192..7772413cee04 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -230,7 +230,7 @@ let # bazel-external is auto-generated and should be removed # see https://bazel.build/external/vendor#vendor-symlinks for more details - rm vendor_dir/bazel-external + rm vendor_dir/bazel-external runHook postBuild ''; From 6aae06b8ce27bc07bd62de7e20d8da44af521295 Mon Sep 17 00:00:00 2001 From: flurie Date: Wed, 2 Oct 2024 11:38:46 -0400 Subject: [PATCH 011/114] use mktemp instead of TMP for deps --- pkgs/development/tools/build-managers/bazel/bazel_7/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 7772413cee04..703f25e34d96 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -202,7 +202,7 @@ let dontFixup = true; buildPhase = '' runHook preBuild - export HOME=$TMP + export HOME=$(mktemp -d) (cd bazel_src; ${bazelForDeps}/bin/bazel --server_javabase=${runJdk} mod deps --curses=no; ${bazelForDeps}/bin/bazel --server_javabase=${runJdk} vendor src:bazel_nojdk \ --curses=no \ From 097532a3ccd20a41bb3dd5bc76013a7d9be0ad2f Mon Sep 17 00:00:00 2001 From: flurie Date: Sun, 20 Oct 2024 16:11:42 -0400 Subject: [PATCH 012/114] add libtool to darwin bazel deps --- .../development/tools/build-managers/bazel/bazel_7/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 703f25e34d96..149f6bcd533d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -35,6 +35,7 @@ # Apple dependencies cctools, libcxx, + libtool, sigtool, CoreFoundation, CoreServices, @@ -188,7 +189,7 @@ let unzip runJdk bazelForDeps - ]; + ] ++ lib.optional (stdenv.hostPlatform.isDarwin) libtool; configurePhase = '' runHook preConfigure From cbcd37e27b5634cab6f787964d43a7ff0f33fc3e Mon Sep 17 00:00:00 2001 From: whtsht Date: Mon, 28 Oct 2024 22:46:38 +0900 Subject: [PATCH 013/114] maintainers: add whtsht --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cb00954eda12..7f5d66a4318d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23149,6 +23149,12 @@ githubId = 7121530; name = "Wolf Honoré"; }; + whtsht = { + email = "whiteshirt0079@gmail.com"; + github = "whtsht"; + githubId = 85547207; + name = "Hinata Toma"; + }; wietsedv = { email = "wietsedv@proton.me"; github = "wietsedv"; From 7aa21ca5d32f9f0ac1d7f2053ed1d7f03ec564a5 Mon Sep 17 00:00:00 2001 From: Kristian Nedrevold-Hansen Date: Wed, 18 Sep 2024 22:25:21 +0200 Subject: [PATCH 014/114] bleep: 0.0.7 -> 0.0.9 --- pkgs/by-name/bl/bleep/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix index 190f971ffb82..a209372f64ab 100644 --- a/pkgs/by-name/bl/bleep/package.nix +++ b/pkgs/by-name/bl/bleep/package.nix @@ -6,6 +6,7 @@ makeWrapper, lib, zlib, + testers, }: let platform = @@ -18,15 +19,15 @@ let hash = { - x86_64-linux = "sha256-dB8reN5rTlY5czFH7BaRya7qBa6czAIH2NkFWZh81ek="; - x86_64-darwin = "sha256-tpUcduCPCbVVaYZZOhWdPlN6SW3LGZPWSO9bDStVDms="; - aarch64-darwin = "sha256-V8QGF3Dpuy9I6CqKsJRHBHRdaLhc4XKZkv/rI7zs+qQ="; + x86_64-linux = "sha256-Tp354ecJAZfTRrg1Rmot7nFGYfcp0ZBEn/ygTRkCBCM="; + x86_64-darwin = "sha256-1tgFHdbrGGVofhSxJIw1oXkI6q5SJvN8L9bqRyj75j8="; + aarch64-darwin = "sha256-UB0SoUwg9C8F8F2/CTKVNcqAofHkU7Rop04mMwBSIyY="; } ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); in stdenvNoCC.mkDerivation (finalAttrs: { pname = "bleep"; - version = "0.0.7"; + version = "0.0.9"; src = fetchzip { url = "https://github.com/oyvindberg/bleep/releases/download/v${finalAttrs.version}/bleep-${platform}.tar.gz"; @@ -59,6 +60,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { --zsh <(bleep install-tab-completions-zsh --stdout) \ ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "bleep --help | sed -n '/Bleeping/s/[^0-9.]//gp'"; + }; + meta = { homepage = "https://bleep.build/"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; From bca5688b013f19d8f3fa73979d0cd2039070863c Mon Sep 17 00:00:00 2001 From: whtsht Date: Mon, 28 Oct 2024 22:47:22 +0900 Subject: [PATCH 015/114] ecsk: init at 0.9.3 Co-authored-by: Aleksana --- pkgs/by-name/ec/ecsk/package.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/ec/ecsk/package.nix diff --git a/pkgs/by-name/ec/ecsk/package.nix b/pkgs/by-name/ec/ecsk/package.nix new file mode 100644 index 000000000000..5a38c1d025ff --- /dev/null +++ b/pkgs/by-name/ec/ecsk/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + fetchgit, +}: + +buildGoModule rec { + pname = "ecsk"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "yukiarrr"; + repo = "ecsk"; + rev = "refs/tags/v${version}"; + hash = "sha256-1nrV7NslOIXQDHsc7c5YfaWhoJ8kfkEQseoVVeENrHM="; + fetchSubmodules = true; + }; + + vendorHash = "sha256-Eyqpc7GyG/7u/I4tStADQikxcbIatjeAJN9wUDgzdFY="; + + subPackages = [ "cmd/ecsk" ]; + + meta = { + description = "Interactively call Amazon ECS APIs, copy files between ECS and local, and view logs"; + license = lib.licenses.mit; + mainProgram = "ecsk"; + homepage = "https://github.com/yukiarrr/ecsk"; + maintainers = with lib.maintainers; [ whtsht ]; + }; +} From 12b06705433588471ab7d3eaa3ac5232d9f735fb Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Sat, 2 Nov 2024 14:53:01 +0100 Subject: [PATCH 016/114] maintainers: add arminius-smh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fd827cd72b9..03f7829181e1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1822,6 +1822,12 @@ githubId = 10587952; name = "Armijn Hemel"; }; + arminius-smh = { + email = "armin@sprejz.de"; + github = "arminius-smh"; + githubId = 159054879; + name = "Armin Manfred Sprejz"; + }; arnarg = { email = "arnarg@fastmail.com"; github = "arnarg"; From bd112af16a933ac573b2e97eb1932e6769a13511 Mon Sep 17 00:00:00 2001 From: arminius-smh Date: Sat, 2 Nov 2024 15:09:11 +0100 Subject: [PATCH 017/114] hyprlauncher: init at 0.1.2 --- pkgs/by-name/hy/hyprlauncher/package.nix | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/hy/hyprlauncher/package.nix diff --git a/pkgs/by-name/hy/hyprlauncher/package.nix b/pkgs/by-name/hy/hyprlauncher/package.nix new file mode 100644 index 000000000000..6f81ac39dd0c --- /dev/null +++ b/pkgs/by-name/hy/hyprlauncher/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + glib, + pango, + gtk4, + wrapGAppsHook4, +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprlauncher"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "hyprutils"; + repo = "hyprlauncher"; + rev = "refs/tags/v${version}"; + hash = "sha256-SxsCfEHrJpFSi2BEFFqmJLGJIVzkluDU6ogKkTRT9e8="; + }; + + cargoHash = "sha256-MENreS+DXdJIurWUqHbeb0cCJlRnjjW1bmGdg0QoxlQ="; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + buildInputs = [ + glib + pango + gtk4 + ]; + + meta = { + description = "GUI for launching applications, written in Rust"; + homepage = "https://github.com/hyprutils/hyprlauncher"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ arminius-smh ]; + platforms = lib.platforms.linux; + mainProgram = "hyprlauncher"; + }; +} From 31fd3a6fe95deee382055dcc4244c2cfa20ef17b Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 5 Nov 2024 16:15:20 +0100 Subject: [PATCH 018/114] cocoapods: 1.15.1 -> 1.16.2 --- .../tools/cocoapods/Gemfile-beta.lock | 54 ++++++----- pkgs/development/tools/cocoapods/Gemfile.lock | 54 ++++++----- .../tools/cocoapods/gemset-beta.nix | 95 ++++++++++--------- pkgs/development/tools/cocoapods/gemset.nix | 95 ++++++++++--------- 4 files changed, 160 insertions(+), 138 deletions(-) diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock index 363d1f9a30a0..f4bd57b14ec4 100644 --- a/pkgs/development/tools/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/tools/cocoapods/Gemfile-beta.lock @@ -5,29 +5,32 @@ GEM base64 nkf rexml - activesupport (7.1.3) + activesupport (7.2.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) base64 (0.2.0) - bigdecimal (3.1.6) + benchmark (0.3.0) + bigdecimal (3.1.8) claide (1.1.0) - cocoapods (1.15.2) + cocoapods (1.16.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.15.2) + cocoapods-core (= 1.16.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -41,8 +44,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.15.2) + xcodeproj (>= 1.27.0, < 2.0) + cocoapods-core (1.16.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -62,43 +65,42 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.16.3) + ffi (1.17.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.7.1) - minitest (5.22.2) + json (2.7.6) + logger (1.6.1) + minitest (5.25.1) molinillo (0.8.0) - mutex_m (0.2.0) - nanaimo (0.3.0) + nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) nkf (0.2.0) public_suffix (4.0.7) - rexml (3.2.6) + rexml (3.3.9) ruby-macho (2.5.1) - ruby2_keywords (0.0.5) + securerandom (0.3.1) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.24.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) PLATFORMS ruby @@ -107,4 +109,4 @@ DEPENDENCIES cocoapods (>= 1.7.0.beta.1) BUNDLED WITH - 2.4.20 + 2.5.9 diff --git a/pkgs/development/tools/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock index 194f5e8a84bf..93dbeec2e4de 100644 --- a/pkgs/development/tools/cocoapods/Gemfile.lock +++ b/pkgs/development/tools/cocoapods/Gemfile.lock @@ -5,29 +5,32 @@ GEM base64 nkf rexml - activesupport (7.1.3) + activesupport (7.2.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) base64 (0.2.0) - bigdecimal (3.1.6) + benchmark (0.3.0) + bigdecimal (3.1.8) claide (1.1.0) - cocoapods (1.15.2) + cocoapods (1.16.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.15.2) + cocoapods-core (= 1.16.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -41,8 +44,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.15.2) + xcodeproj (>= 1.27.0, < 2.0) + cocoapods-core (1.16.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -62,43 +65,42 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.16.3) + ffi (1.17.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.7.1) - minitest (5.22.2) + json (2.7.6) + logger (1.6.1) + minitest (5.25.1) molinillo (0.8.0) - mutex_m (0.2.0) - nanaimo (0.3.0) + nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) nkf (0.2.0) public_suffix (4.0.7) - rexml (3.2.6) + rexml (3.3.9) ruby-macho (2.5.1) - ruby2_keywords (0.0.5) + securerandom (0.3.1) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.24.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) PLATFORMS ruby @@ -107,4 +109,4 @@ DEPENDENCIES cocoapods BUNDLED WITH - 2.4.20 + 2.5.9 diff --git a/pkgs/development/tools/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix index 022ce3a0f668..381bf3a188f3 100644 --- a/pkgs/development/tools/cocoapods/gemset-beta.nix +++ b/pkgs/development/tools/cocoapods/gemset-beta.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v"; + sha256 = "12ijz1mmg70agw4d91hjdyzvma3dzs52mchasslxyn7p9j960qs3"; type = "gem"; }; - version = "7.1.3"; + version = "7.2.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -52,15 +52,25 @@ }; version = "0.2.0"; }; + benchmark = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wghmhwjzv4r9mdcny4xfz2h2cm7ci24md79rvy2x65r4i99k9sc"; + type = "gem"; + }; + version = "0.3.0"; + }; bigdecimal = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.8"; }; CFPropertyList = { dependencies = ["base64" "nkf" "rexml"]; @@ -89,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02h9lk5w0ilz39cdl7fil0fpmfbzyc23whkgp4rx2a6hx0yibxgh"; + sha256 = "0phyvpx78jlrpvldbxjmzq92mfx6l66va2fz2s5xpwrdydhciw8g"; type = "gem"; }; - version = "1.15.2"; + version = "1.16.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -100,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0di1g9k1f6i80yxzdl3rdlfdk2w89dv6k5m06444rbg1gzcm09ij"; + sha256 = "0ay1dwjg79rfa6mbfyy96in0k364dgn7s8ps6v7n07k9432bbcab"; type = "gem"; }; - version = "1.15.2"; + version = "1.16.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -182,10 +192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -198,15 +208,14 @@ version = "2.4.1"; }; drb = { - dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; escape = { groups = ["default"]; @@ -234,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; fourflusher = { groups = ["default"]; @@ -285,30 +294,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.6"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "03q7kbadhbyfnz21abv2b9dyqnjvxpd51ppqihg40rrimw1vm6id"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.6"; + }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.22.2"; + version = "5.25.1"; }; molinillo = { groups = ["default"]; @@ -320,25 +339,15 @@ }; version = "0.8.0"; }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; - }; nanaimo = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; + sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; nap = { groups = ["default"]; @@ -385,10 +394,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.9"; }; ruby-macho = { groups = ["default"]; @@ -400,15 +409,15 @@ }; version = "2.5.1"; }; - ruby2_keywords = { + securerandom = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; type = "gem"; }; - version = "0.0.5"; + version = "0.3.1"; }; typhoeus = { dependencies = ["ethon"]; @@ -438,9 +447,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56"; + sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc"; type = "gem"; }; - version = "1.24.0"; + version = "1.27.0"; }; } diff --git a/pkgs/development/tools/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix index d89ae9ca3aa4..092d4f15ae56 100644 --- a/pkgs/development/tools/cocoapods/gemset.nix +++ b/pkgs/development/tools/cocoapods/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09zrw3sydkk6lwzjhzia38wg1as5aab2lgnysfdr1qxh39zi7z7v"; + sha256 = "12ijz1mmg70agw4d91hjdyzvma3dzs52mchasslxyn7p9j960qs3"; type = "gem"; }; - version = "7.1.3"; + version = "7.2.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -50,15 +50,25 @@ }; version = "0.2.0"; }; + benchmark = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wghmhwjzv4r9mdcny4xfz2h2cm7ci24md79rvy2x65r4i99k9sc"; + type = "gem"; + }; + version = "0.3.0"; + }; bigdecimal = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.8"; }; CFPropertyList = { dependencies = ["base64" "nkf" "rexml"]; @@ -87,10 +97,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02h9lk5w0ilz39cdl7fil0fpmfbzyc23whkgp4rx2a6hx0yibxgh"; + sha256 = "0phyvpx78jlrpvldbxjmzq92mfx6l66va2fz2s5xpwrdydhciw8g"; type = "gem"; }; - version = "1.15.2"; + version = "1.16.2"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -98,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0di1g9k1f6i80yxzdl3rdlfdk2w89dv6k5m06444rbg1gzcm09ij"; + sha256 = "0ay1dwjg79rfa6mbfyy96in0k364dgn7s8ps6v7n07k9432bbcab"; type = "gem"; }; - version = "1.15.2"; + version = "1.16.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -176,10 +186,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -192,15 +202,14 @@ version = "2.4.1"; }; drb = { - dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; escape = { source = { @@ -226,10 +235,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; fourflusher = { groups = ["default"]; @@ -273,30 +282,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "0k31wcgnvcvd14snz0pfqj976zv6drfsnq6x8acz10fiyms9l8nw"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.6"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; + sha256 = "03q7kbadhbyfnz21abv2b9dyqnjvxpd51ppqihg40rrimw1vm6id"; type = "gem"; }; - version = "2.7.1"; + version = "2.7.6"; + }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.22.2"; + version = "5.25.1"; }; molinillo = { groups = ["default"]; @@ -308,25 +327,15 @@ }; version = "0.8.0"; }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; - }; nanaimo = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma"; + sha256 = "08q73nchv8cpk28h1sdnf5z6a862fcf4mxy1d58z25xb3dankw7s"; type = "gem"; }; - version = "0.3.0"; + version = "0.4.0"; }; nap = { source = { @@ -369,10 +378,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.9"; }; ruby-macho = { groups = ["default"]; @@ -384,15 +393,15 @@ }; version = "2.5.1"; }; - ruby2_keywords = { + securerandom = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; type = "gem"; }; - version = "0.0.5"; + version = "0.3.1"; }; typhoeus = { dependencies = ["ethon"]; @@ -422,9 +431,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56"; + sha256 = "1lslz1kfb8jnd1ilgg02qx0p0y6yiq8wwk84mgg2ghh58lxsgiwc"; type = "gem"; }; - version = "1.24.0"; + version = "1.27.0"; }; } From 920eac097f5c355adc0321d44f24032b1faa38a7 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Wed, 19 Jun 2024 14:03:47 +0200 Subject: [PATCH 019/114] gfie: init at 4.2 --- pkgs/by-name/gf/gfie/package.nix | 51 ++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/gf/gfie/package.nix diff --git a/pkgs/by-name/gf/gfie/package.nix b/pkgs/by-name/gf/gfie/package.nix new file mode 100644 index 000000000000..acd0a99a4de4 --- /dev/null +++ b/pkgs/by-name/gf/gfie/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchurl, + dpkg, + autoPatchelfHook, + qt5, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "gfie"; + version = "4.2"; + + src = fetchurl { + url = "http://greenfishsoftware.org/dl/gfie/gfie-${finalAttrs.version}.deb"; + hash = "sha256-hyL0t66jRTVF1Hq2FRUobsfjLGmYgsMGDE/DBdoXhCI="; + }; + + unpackCmd = "dpkg -x $curSrc source"; + + nativeBuildInputs = [ + dpkg + autoPatchelfHook + qt5.wrapQtAppsHook + ]; + + buildInputs = with qt5; [ + qtbase + qtsvg + qtwebengine + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv usr/share opt $out + ln -s $out/opt/gfie-${finalAttrs.version}/gfie $out/bin/gfie + + runHook postInstall + ''; + + meta = { + description = "Powerful open source image editor, especially suitable for creating icons, cursors, animations and icon libraries"; + homepage = "http://greenfishsoftware.org/gfie.php"; + license = with lib.licenses; [ gpl3 ]; + maintainers = with lib.maintainers; [ pluiedev ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "gfie"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) From 2a27662845330f07c481baf066053b6b53f5afd8 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Fri, 12 Jul 2024 16:26:49 -0700 Subject: [PATCH 020/114] maintainers: add jhol --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 61a95b7f88f6..cd10e324cba3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10253,6 +10253,13 @@ githubId = 2502736; name = "James Hillyerd"; }; + jhol = { + name = "Joel Holdsworth"; + email = "joel@airwebreathe.org.uk"; + github = "jhol"; + githubId = 1449493; + keys = [ { fingerprint = "08F7 2546 95DE EAEF 03DE B0E4 D874 562D DC99 D889"; } ]; + }; jhollowe = { email = "jhollowe@johnhollowell.com"; github = "jhollowe"; From c2a6507f0591367017d46574884f92493fb01a29 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Fri, 19 Apr 2024 17:25:14 -0700 Subject: [PATCH 021/114] sphinxcontrib-moderncmakedomain init at 3.29.0 --- .../default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix diff --git a/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix new file mode 100644 index 000000000000..524c9b094674 --- /dev/null +++ b/pkgs/development/python-modules/sphinxcontrib-moderncmakedomain/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + defusedxml, + fetchPypi, + hatchling, + pytestCheckHook, + sphinx, +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-moderncmakedomain"; + version = "3.29.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "sphinxcontrib_moderncmakedomain"; + hash = "sha256-NYfe8kH/JXfQu+8RgQoILp3sG3ij1LSgZiQLXz3BtbI="; + }; + + build-system = [ hatchling ]; + + dependencies = [ sphinx ]; + + nativeCheckInputs = [ + defusedxml + pytestCheckHook + sphinx + ]; + + pythonNamespaces = [ "sphinxcontrib" ]; + + meta = with lib; { + description = "Sphinx extension which renders CMake documentation"; + homepage = "https://github.com/scikit-build/moderncmakedomain"; + license = licenses.bsd3; + maintainers = with maintainers; [ jhol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d823896acbb3..58cc5ae01c5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14933,6 +14933,8 @@ self: super: with self; { sphinxcontrib-log-cabinet = callPackage ../development/python-modules/sphinxcontrib-log-cabinet { }; + sphinxcontrib-moderncmakedomain = callPackage ../development/python-modules/sphinxcontrib-moderncmakedomain { }; + sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { }; sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { }; From 10a2c9d7b8fad0ed4f3f869281ffb1778bf9aec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 05:26:30 +0000 Subject: [PATCH 022/114] superhtml: 0.5.0 -> 0.5.1 --- pkgs/by-name/su/superhtml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix index e12dfd5fbbd6..8990c1298687 100644 --- a/pkgs/by-name/su/superhtml/package.nix +++ b/pkgs/by-name/su/superhtml/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "superhtml"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; rev = "refs/tags/v${version}"; - hash = "sha256-E4IVDYps6K+SdemkfwtTjOE+Rdu8m4Itfd3Kv0XO7qk="; + hash = "sha256-ubFFFHlYTYmivVI5hd/Mj+jFIBuPQ/IycNv3BLxkeuc="; }; nativeBuildInputs = [ From 1a118d8c4af04e90cc855fcbabe31448ce424f77 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Thu, 31 Oct 2024 09:42:02 +0100 Subject: [PATCH 023/114] evremap: init at 0-unstable-2024-06-17 --- pkgs/by-name/ev/evremap/package.nix | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/ev/evremap/package.nix diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix new file mode 100644 index 000000000000..8771aac00093 --- /dev/null +++ b/pkgs/by-name/ev/evremap/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libevdev, + nix-update-script, +}: +rustPlatform.buildRustPackage { + pname = "evremap"; + version = "0-unstable-2024-06-17"; + + src = fetchFromGitHub { + owner = "wez"; + repo = "evremap"; + rev = "cc618e8b973f5c6f66682d1477b3b868a768c545"; + hash = "sha256-aAAnlGlSFPOK3h8UuAOlFyrKTEuzbyh613IiPE7xWaA="; + }; + + cargoHash = "sha256-uFej58+51+JX36K1Rr1ZmBe7rHojOjmTO2VWINS6MvU="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libevdev ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Keyboard input remapper for Linux/Wayland systems"; + homepage = "https://github.com/wez/evremap"; + maintainers = with lib.maintainers; [ pluiedev ]; + license = with lib.licenses; [ mit ]; + mainProgram = "evremap"; + }; +} From 5bcd7350a4ae728d558f2bc244b8b20bcb01842b Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Fri, 8 Nov 2024 13:23:09 +0800 Subject: [PATCH 024/114] fcitx5-rime: allow empty `rimeDataPkgs` --- pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 1b34b1260aac..ae6a36658fd2 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { rimeDataDrv = symlinkJoin { name = "fcitx5-rime-data"; paths = rimeDataPkgs; + postBuild = "mkdir -p $out/share/rime-data"; }; postInstall = '' From 41e907f884b5a2da94dae41e6195469359b09f5c Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Thu, 31 Oct 2024 23:11:07 +0100 Subject: [PATCH 025/114] nixos/evremap: init module --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/evremap.nix | 167 ++++++++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 nixos/modules/services/misc/evremap.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 73ccad6714df..9ea2e8b5a5ed 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -121,6 +121,8 @@ - [HomeBox](https://github.com/sysadminsmedia/homebox), an inventory and organization system built for the home user. Available as [services.homebox](#opt-services.homebox.enable). +- [evremap](https://github.com/wez/evremap), a keyboard input remapper for Linux/Wayland systems. Available as [services.evremap](options.html#opt-services.evremap). + - [matrix-hookshot](https://matrix-org.github.io/matrix-hookshot), a Matrix bot for connecting to external services. Available as [services.matrix-hookshot](#opt-services.matrix-hookshot.enable). - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various Git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0537dbf3ad1c..eef106a91229 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -752,6 +752,7 @@ ./services/misc/etebase-server.nix ./services/misc/etesync-dav.nix ./services/misc/evdevremapkeys.nix + ./services/misc/evremap.nix ./services/misc/felix.nix ./services/misc/flaresolverr.nix ./services/misc/forgejo.nix diff --git a/nixos/modules/services/misc/evremap.nix b/nixos/modules/services/misc/evremap.nix new file mode 100644 index 000000000000..9508955d8171 --- /dev/null +++ b/nixos/modules/services/misc/evremap.nix @@ -0,0 +1,167 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.evremap; + format = pkgs.formats.toml { }; + + key = lib.types.strMatching "KEY_[[:upper:]]+" // { + description = "key ID prefixed with KEY_"; + }; + + mkKeyOption = + description: + lib.mkOption { + type = key; + description = '' + ${description} + + You can get a list of keys by running `evremap list-keys`. + ''; + }; + mkKeySeqOption = + description: + (mkKeyOption description) + // { + type = lib.types.listOf key; + }; + + dualRoleModule = lib.types.submodule { + options = { + input = mkKeyOption "The key that should be remapped."; + hold = mkKeySeqOption "The key sequence that should be output when the input key is held."; + tap = mkKeySeqOption "The key sequence that should be output when the input key is tapped."; + }; + }; + + remapModule = lib.types.submodule { + options = { + input = mkKeySeqOption "The key sequence that should be remapped."; + output = mkKeySeqOption "The key sequence that should be output when the input sequence is entered."; + }; + }; +in +{ + options.services.evremap = { + enable = lib.mkEnableOption "evremap, a keyboard input remapper for Linux/Wayland systems"; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + + options = { + device_name = lib.mkOption { + type = lib.types.str; + example = "AT Translated Set 2 keyboard"; + description = '' + The name of the device that should be remapped. + + You can get a list of devices by running `evremap list-devices` with elevated permissions. + ''; + }; + + dual_role = lib.mkOption { + type = lib.types.listOf dualRoleModule; + default = [ ]; + example = [ + { + input = "KEY_CAPSLOCK"; + hold = [ "KEY_LEFTCTRL" ]; + tap = [ "KEY_ESC" ]; + } + ]; + description = '' + List of dual-role remappings that output different key sequences based on whether the + input key is held or tapped. + ''; + }; + + remap = lib.mkOption { + type = lib.types.listOf remapModule; + default = [ ]; + example = [ + { + input = [ + "KEY_LEFTALT" + "KEY_UP" + ]; + output = [ "KEY_PAGEUP" ]; + } + ]; + description = '' + List of remappings. + ''; + }; + }; + }; + + description = '' + Settings for evremap. + + See the [upstream documentation](https://github.com/wez/evremap/blob/master/README.md#configuration) + for how to configure evremap. + ''; + default = { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.evremap ]; + + hardware.uinput.enable = true; + + systemd.services.evremap = { + description = "evremap - keyboard input remapper"; + wantedBy = [ "multi-user.target" ]; + + script = "${lib.getExe pkgs.evremap} remap ${format.generate "evremap.toml" cfg.settings}"; + + serviceConfig = { + DynamicUser = true; + User = "evremap"; + SupplementaryGroups = [ + config.users.groups.input.name + config.users.groups.uinput.name + ]; + Restart = "on-failure"; + RestartSec = 5; + TimeoutSec = 20; + + # Hardening + ProtectClock = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectHostname = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectHome = true; + ProcSubset = "pid"; + + PrivateTmp = true; + PrivateNetwork = true; + PrivateUsers = true; + + RestrictRealtime = true; + RestrictNamespaces = true; + RestrictAddressFamilies = "none"; + + MemoryDenyWriteExecute = true; + LockPersonality = true; + IPAddressDeny = "any"; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@resources" + "~@privileged" + ]; + UMask = "0027"; + }; + }; + }; +} From 656e14918fbdcbe369013ab155ed2798cd2bd22f Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 8 Nov 2024 17:00:55 +0000 Subject: [PATCH 026/114] pcsx2-bin: 2.1.231 -> 2.3.10 --- pkgs/by-name/pc/pcsx2-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix index 71b64e23672f..11d008c559f2 100644 --- a/pkgs/by-name/pc/pcsx2-bin/package.nix +++ b/pkgs/by-name/pc/pcsx2-bin/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pcsx2-bin"; - version = "2.1.231"; + version = "2.3.10"; src = fetchurl { url = "https://github.com/PCSX2/pcsx2/releases/download/v${finalAttrs.version}/pcsx2-v${finalAttrs.version}-macos-Qt.tar.xz"; - hash = "sha256-c1Tvti8NatGct0OAwcWdFNBQhv6Zwiy2ECJ2qyCs9qA="; + hash = "sha256-szQgGIBH+h/mH18zY3RQGiyhoYwQ07+rq/zX3uNfgME="; }; nativeBuildInputs = [ makeWrapper ]; From 7d05609d5b234d3c3ab4f0d6cdb2f1a26cad0ca3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Nov 2024 19:42:07 +0000 Subject: [PATCH 027/114] netmaker-full: 0.25.0 -> 0.26.0 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 20d4f831d78b..1a4edc965a7f 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-1mrodzW51nbqfWQjjmHYnInJd61FsWtQcYbKhJAiQ8Q="; + hash = "sha256-f6R7Dc5M3MUjsCXvQAqamU9FFuqYEZoxYKwKhk4ilPc="; }; - vendorHash = "sha256-/iuXnnO8OhGhQWg5nU/hza4yZMSIHKOTPFqojgY8w74="; + vendorHash = "sha256-g9JyIuqYJZK47xQYM0+d1hcHcNBGLH3lW60hI6UkD84="; inherit subPackages; From ba8520ef16d00a8be29909437bed3aee6729b3ff Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 22:32:31 +0100 Subject: [PATCH 028/114] python312Packages.uarray: unbreak, switch to new build system --- .../python-modules/uarray/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index a151ba1f1d80..b4233ea654eb 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -2,14 +2,17 @@ lib, buildPythonPackage, fetchFromGitHub, + scikit-build-core, setuptools, setuptools-scm, + cmake, + ninja, matchpy, numpy, astunparse, typing-extensions, - pytest7CheckHook, - pytest-cov, + pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -24,11 +27,15 @@ buildPythonPackage rec { hash = "sha256-q9lMU/xA+G2x38yZy3DxCpXTEmg1lZhZ8GFIHDIKE24="; }; - nativeBuildInputs = [ + build-system = [ + scikit-build-core setuptools setuptools-scm + cmake + ninja ]; - build-system = [ setuptools ]; + + dontUseCmakeConfigure = true; dependencies = [ astunparse @@ -38,8 +45,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest7CheckHook - pytest-cov + pytestCheckHook + pytest-cov-stub ]; # Tests must be run from outside the source directory From c20abf409b2fa4572398ed7a5920699be0c735e0 Mon Sep 17 00:00:00 2001 From: nanari <> Date: Sat, 9 Nov 2024 07:49:46 +0800 Subject: [PATCH 029/114] linux-wallpaperengine: 0-unstable-2024-10-13 -> 0-unstable-2024-11-8 --- pkgs/by-name/li/linux-wallpaperengine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix index 87fd5a7d73de..d4cf661455e8 100644 --- a/pkgs/by-name/li/linux-wallpaperengine/package.nix +++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix @@ -160,13 +160,13 @@ let in stdenv.mkDerivation { pname = "linux-wallpaperengine"; - version = "0-unstable-2024-10-13"; + version = "0-unstable-2024-11-8"; src = fetchFromGitHub { owner = "Almamu"; repo = "linux-wallpaperengine"; - rev = "ec60a8a57153e49e3684c864a6d809fe9601336b"; - hash = "sha256-M77Wp6tCXO2oFgfZ0+mdBT07CCYLsDDyHjeHtaDVvu8="; + rev = "4a063d0b84d331a0086b3f4605358ee177328d41"; + hash = "sha256-IRTGFxHPRRRSg0J07pq8fpo1XbMT4aZC+wMVimZlH/Y="; }; nativeBuildInputs = [ From da4bf61402cd30013f586bb51f4189179a625bf9 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 10 Nov 2024 05:35:55 +0800 Subject: [PATCH 030/114] dart.fvp: init --- .../dart/package-source-builders/default.nix | 1 + .../package-source-builders/fvp/default.nix | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/compilers/dart/package-source-builders/fvp/default.nix diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index 48c31cc28cdd..00bee092f69e 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -2,6 +2,7 @@ { flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { }; + fvp = callPackage ./fvp { }; handy_window = callPackage ./handy-window { }; matrix = callPackage ./matrix { }; media_kit_libs_linux = callPackage ./media_kit_libs_linux { }; diff --git a/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix b/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix new file mode 100644 index 000000000000..4393d9825d4d --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix @@ -0,0 +1,20 @@ +{ + stdenv, + mdk-sdk, +}: + +{ version, src, ... }: + +stdenv.mkDerivation rec { + pname = "fvp"; + inherit version src; + inherit (src) passthru; + + installPhase = '' + runHook preInstall + mkdir $out + tar -xf ${mdk-sdk.src} -C ./linux + cp -r ./* $out/ + runHook postInstall + ''; +} From a2143e6870204313596c502aa921ec68a31742d9 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 10 Nov 2024 05:40:39 +0800 Subject: [PATCH 031/114] dart.flutter_volume_controller: init --- .../dart/package-source-builders/default.nix | 1 + .../flutter_volume_controller/default.nix | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/compilers/dart/package-source-builders/flutter_volume_controller/default.nix diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index 00bee092f69e..73bd36b9dfb7 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -2,6 +2,7 @@ { flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { }; + flutter_volume_controller = callPackage ./flutter_volume_controller { }; fvp = callPackage ./fvp { }; handy_window = callPackage ./handy-window { }; matrix = callPackage ./matrix { }; diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_volume_controller/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_volume_controller/default.nix new file mode 100644 index 000000000000..b582ac0448c0 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/flutter_volume_controller/default.nix @@ -0,0 +1,25 @@ +{ + stdenv, + mdk-sdk, +}: + +{ version, src, ... }: + +stdenv.mkDerivation rec { + pname = "flutter_volume_controller"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + substituteInPlace linux/CMakeLists.txt \ + --replace-fail '# Include ALSA' 'find_package(PkgConfig REQUIRED)' \ + --replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)' + ''; + + installPhase = '' + runHook preInstall + mkdir $out + cp -r ./* $out/ + runHook postInstall + ''; +} From b3c8c88550fb8e96e5e8072866871e783d3cfa0c Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 10 Nov 2024 05:43:18 +0800 Subject: [PATCH 032/114] kazumi: remove customSourceBuilders --- pkgs/by-name/ka/kazumi/package.nix | 48 ++---------------------------- 1 file changed, 3 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index f42f1f48afd8..2b12a9d88184 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, flutter, - stdenv, webkitgtk_4_1, alsa-lib, libayatana-appindicator, @@ -11,7 +10,6 @@ wrapGAppsHook3, gst_all_1, at-spi2-atk, - fetchurl, }: let version = "1.4.1"; @@ -21,14 +19,9 @@ let rev = version; hash = "sha256-LRlJo2zuE3Y3i4vBcjxIYQEDVJ2x85Fn77K4LVtTlg8="; }; - mdk-sdk = fetchurl { - url = "https://github.com/wang-bin/mdk-sdk/releases/download/v0.29.1/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0="; - }; in flutter.buildFlutterApplication { pname = "kazumi"; - inherit version src; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -52,41 +45,6 @@ flutter.buildFlutterApplication { gst_all_1.gst-plugins-base ]; - customSourceBuilders = { - flutter_volume_controller = - { version, src, ... }: - stdenv.mkDerivation rec { - pname = "flutter_volume_controller"; - inherit version src; - inherit (src) passthru; - postPatch = '' - substituteInPlace linux/CMakeLists.txt \ - --replace-fail '# Include ALSA' 'find_package(PkgConfig REQUIRED)' \ - --replace-fail 'find_package(ALSA REQUIRED)' 'pkg_check_modules(ALSA REQUIRED alsa)' - ''; - installPhase = '' - runHook preInstall - mkdir $out - cp -r ./* $out/ - runHook postInstall - ''; - }; - fvp = - { version, src, ... }: - stdenv.mkDerivation rec { - pname = "fvp"; - inherit version src; - inherit (src) passthru; - installPhase = '' - runHook preInstall - tar -xf ${mdk-sdk} -C ./linux - mkdir $out - cp -r ./* $out/ - runHook postInstall - ''; - }; - }; - gitHashes = { desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM="; webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE="; @@ -94,8 +52,8 @@ flutter.buildFlutterApplication { postInstall = '' mkdir -p $out/share/applications/ $out/share/icons/hicolor/512x512/apps/ - cp ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications - cp ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png + install -Dm0644 ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications/io.github.Predidit.Kazumi.desktop + install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png ''; meta = { @@ -104,6 +62,6 @@ flutter.buildFlutterApplication { mainProgram = "kazumi"; license = with lib.licenses; [ gpl3Plus ]; maintainers = with lib.maintainers; [ aucub ]; - platforms = lib.platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From ee851d03825c9deb7c395611edb8a8e88efeffba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 10:29:34 +0000 Subject: [PATCH 033/114] juju: 3.5.3 -> 3.5.4 --- pkgs/by-name/ju/juju/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix index 915bb54563e4..e570976e5c0c 100644 --- a/pkgs/by-name/ju/juju/package.nix +++ b/pkgs/by-name/ju/juju/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "3.5.3"; + version = "3.5.4"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-PdNUmPfPYqOYEphY0ZlwEikUV/bKSPOGQuAJsi8+g/E="; + hash = "sha256-0vLZfnbLnGESYtdX9QYJhlglIc5UCTwfYnjtKNn92Pc="; }; - vendorHash = "sha256-FCN+0Wx2fYQcj5CRgPubAWbGGyVQcSSfu/Om6SUB6TQ="; + vendorHash = "sha256-xc+v34GLQ+2nKNJhMX020utObpganRIWjtwOHr5M2dY="; subPackages = [ "cmd/juju" From 461ee9ef59346bf67da16424e056b0e7a12b875d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 08:38:25 +0000 Subject: [PATCH 034/114] oauth2-proxy: 7.6.0 -> 7.7.1 --- pkgs/by-name/oa/oauth2-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oa/oauth2-proxy/package.nix b/pkgs/by-name/oa/oauth2-proxy/package.nix index cdae9ae2351a..64ae693f6b40 100644 --- a/pkgs/by-name/oa/oauth2-proxy/package.nix +++ b/pkgs/by-name/oa/oauth2-proxy/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.6.0"; + version = "7.7.1"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-7DmeXl/aDVFdwUiuljM79CttgjzdTVsSeAYrETuJG0M="; + sha256 = "sha256-SKewLChFKPx1aEKYRqw6IxjLdpKehqcnPT6oQoP8uaU="; rev = "v${version}"; }; - vendorHash = "sha256-ihFNFtfiCGGyJqB2o4SMYleKdjGR4P5JewkynOsC1f0="; + vendorHash = "sha256-MBsvTYJ8G/WeTp8wQJhBDrKjJX/7Utve4mh1yXbD6uc="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; From 534d50a55a73c595b73fe39f4f6c91301d3abcc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Nov 2024 10:19:19 +0000 Subject: [PATCH 035/114] python312Packages.openmm: 8.1.2 -> 8.2.0 --- pkgs/by-name/op/openmm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix index 35aa46d270c2..eb469159df3a 100644 --- a/pkgs/by-name/op/openmm/package.nix +++ b/pkgs/by-name/op/openmm/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "openmm"; - version = "8.1.2"; + version = "8.2.0"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-2UFccB+xXAw3uRw0G1TKlqTVl9tUl1sRPFG4H05vq04="; + hash = "sha256-p0zjr8ONqGK4Vbnhljt16DeyeZ0bR1kE+YdiIlw/1L0="; }; # "This test is stochastic and may occassionally fail". It does. From 01f62844b8404c2f5a254231cb7c5be3c4601db5 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 10 Nov 2024 11:19:09 +0800 Subject: [PATCH 036/114] kazumi: 1.4.1 -> 1.4.2 --- pkgs/by-name/ka/kazumi/package.nix | 4 +-- pkgs/by-name/ka/kazumi/pubspec.lock.json | 32 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 2b12a9d88184..c1aa591850d9 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -12,12 +12,12 @@ at-spi2-atk, }: let - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; rev = version; - hash = "sha256-LRlJo2zuE3Y3i4vBcjxIYQEDVJ2x85Fn77K4LVtTlg8="; + hash = "sha256-irX+BmvJ/WI92RQmaSoBQuUqAEiy3bEstZmKMKHTvPY="; }; in flutter.buildFlutterApplication { diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index c8ef02337d05..3569d87f264f 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -210,11 +210,11 @@ "dependency": "direct main", "description": { "name": "canvas_danmaku", - "sha256": "3e5f72c169484898b6a2e0022fa66753f6d70adfa3be25f45748037ae99c2010", + "sha256": "e5eebd19588cae528123fa14c0ad080fdc96881c3018f944f910024988ddb67e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "characters": { "dependency": "transitive", @@ -955,11 +955,11 @@ "dependency": "transitive", "description": { "name": "package_info_plus", - "sha256": "df3eb3e0aed5c1107bb0fdb80a8e82e778114958b1c5ac5644fb1ac9cae8a998", + "sha256": "da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.1.0" + "version": "8.1.1" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1265,11 +1265,11 @@ "dependency": "direct main", "description": { "name": "scrollview_observer", - "sha256": "fa408bcfd41e19da841eb53fc471f8f952d5ef818b854d2505c4bb3f0c876381", + "sha256": "8537ba32e5a15ade301e5c77ae858fd8591695defaad1821eca9eeb4ac28a157", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.22.0" + "version": "1.23.0" }, "shared_preferences": { "dependency": "transitive", @@ -1421,11 +1421,11 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "79a297dc3cc137e758c6a4baf83342b039e5a6d2436fcdf3f96a00adaaf2ad62", + "sha256": "2d7299468485dca85efeeadf5d38986909c5eb0cd71fd3db2c2f000e6c9454bb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "sqflite_android": { "dependency": "transitive", @@ -1451,11 +1451,11 @@ "dependency": "transitive", "description": { "name": "sqflite_darwin", - "sha256": "769733dddf94622d5541c73e4ddc6aa7b252d865285914b6fcd54a63c4b4f027", + "sha256": "96a698e2bc82bd770a4d6aab00b42396a7c63d9e33513a56945cbccb594c2474", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1-1" + "version": "2.4.1" }, "sqflite_platform_interface": { "dependency": "transitive", @@ -1821,11 +1821,11 @@ "dependency": "transitive", "description": { "name": "webview_flutter_android", - "sha256": "74693a212d990b32e0b7055d27db973a18abf31c53942063948cdfaaef9787ba", + "sha256": "dec83a8da0a2dcd8a25418534cc59348dbc2855fa1dd0cc929c62b6029fde392", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.0.1" }, "webview_flutter_platform_interface": { "dependency": "transitive", @@ -1841,11 +1841,11 @@ "dependency": "transitive", "description": { "name": "webview_flutter_wkwebview", - "sha256": "d4034901d96357beb1b6717ebf7d583c88e40cfc6eb85fe76dd1bf0979a9f251", + "sha256": "f14ee08021772fed913da8daebcfdeb46be457081e521e93e9918fe6cd1ce9e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.16.0" + "version": "3.16.1" }, "webview_windows": { "dependency": "direct main", @@ -1862,11 +1862,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454", + "sha256": "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.7.2" + "version": "5.8.0" }, "win32_registry": { "dependency": "transitive", From c6739f6df803b10560618fbaf49fa9e1ace6c83b Mon Sep 17 00:00:00 2001 From: pagedmov Date: Sun, 10 Nov 2024 01:12:08 -0500 Subject: [PATCH 037/114] maintainers: add pagedMov --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ccdf946882eb..65b53cc6369b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16501,6 +16501,13 @@ githubId = 120342602; name = "Michael Paepcke"; }; + pagedMov = { + email = "kylerclay@proton.me"; + github = "pagedMov"; + githubId = 19557376; + name = "Kyler Clay"; + keys = [ { fingerprint = "784B 3623 94E7 8F11 0B9D AE0F 56FD CFA6 2A93 B51E"; } ]; + }; paholg = { email = "paho@paholg.com"; github = "paholg"; From 9ef61e41e1ea776b3267bcd52e7cf65e1ffeb6c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Nov 2024 16:32:13 +0000 Subject: [PATCH 038/114] sqlboiler: 4.16.2 -> 4.17.0 --- pkgs/by-name/sq/sqlboiler/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sq/sqlboiler/package.nix b/pkgs/by-name/sq/sqlboiler/package.nix index 75342c9c863b..ef4df4ec2660 100644 --- a/pkgs/by-name/sq/sqlboiler/package.nix +++ b/pkgs/by-name/sq/sqlboiler/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sqlboiler"; - version = "4.16.2"; + version = "4.17.0"; src = fetchFromGitHub { owner = "volatiletech"; repo = "sqlboiler"; rev = "refs/tags/v${version}"; - hash = "sha256-akfXYFgBbG/GCatoT820w4adXWqfG9wvHuChaqkewXs="; + hash = "sha256-6qTbF/b6QkxkutoP80owfxjp7Y1WpbZsF6w1XSRHo3Q="; }; - vendorHash = "sha256-BTrQPWThfJ7gWXi/Y1l/s2BmkW5lVYS/PP0WRwntQxA="; + vendorHash = "sha256-ZGGoTWSbGtsmrEQcZI40z6QF6qh4t3LN17Sox4KHQMA="; tags = [ "mysql" From fe095ccfeceb2c8de2c7e712e6dc88ccc00ac628 Mon Sep 17 00:00:00 2001 From: genga Date: Sun, 10 Nov 2024 23:59:21 +0300 Subject: [PATCH 039/114] notonoto: init at 0.0.3 --- pkgs/by-name/no/notonoto/package.nix | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/no/notonoto/package.nix diff --git a/pkgs/by-name/no/notonoto/package.nix b/pkgs/by-name/no/notonoto/package.nix new file mode 100644 index 000000000000..37f953baf87a --- /dev/null +++ b/pkgs/by-name/no/notonoto/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation rec { + pname = "notonoto"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "yuru7"; + repo = "NOTONOTO"; + rev = "refs/tags/v${version}"; + hash = "sha256-1dbx4yC8gL41OEAE/LNDyoDb4xhAwV5h8oRmdlPULUo="; + }; + + installPhase = '' + runHook preInstall + + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/notonoto {} \; + + runHook postInstall + ''; + + meta = { + description = "Programming font that combines Noto Sans Mono and Noto Sans JP"; + homepage = "https://github.com/yuru7/NOTONOTO"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ genga898 ]; + mainProgram = "notonoto"; + }; + +} From 9b4051c09872e12b0cd2a3aafdcefcc4f2e4dc8a Mon Sep 17 00:00:00 2001 From: Chen Date: Mon, 11 Nov 2024 10:18:36 +0800 Subject: [PATCH 040/114] lngen: unstable-2023-10-17 -> unstable-2024-10-22 --- pkgs/by-name/ln/lngen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ln/lngen/package.nix b/pkgs/by-name/ln/lngen/package.nix index d84e3556cd5e..690764ca99f4 100644 --- a/pkgs/by-name/ln/lngen/package.nix +++ b/pkgs/by-name/ln/lngen/package.nix @@ -5,12 +5,12 @@ haskellPackages.mkDerivation { pname = "lngen"; - version = "unstable-2023-10-17"; + version = "unstable-2024-10-22"; src = fetchFromGitHub { owner = "plclub"; repo = "lngen"; - rev = "c7645001404e0e2fec2c56f128e30079b5b3fac6"; - hash = "sha256-2vUYHtl9yAadwdTtsjTI0klP+nRSYGXVpaSwD9EBTTI="; + rev = "c034c8d95264e6a5d490bc4096534ccd54f0d393"; + hash = "sha256-XzcB/mNXure6aZRmwgUWGHSEaknrbP8Onk2CisVuhiw="; }; isLibrary = true; isExecutable = true; From d2e1e70038a054fb5168d67714cd39c7994fcc5b Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 7 Nov 2024 11:46:13 -0500 Subject: [PATCH 041/114] litecli: 1.11.0 -> 1.12.3 --- pkgs/by-name/li/litecli/package.nix | 40 +++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/li/litecli/package.nix b/pkgs/by-name/li/litecli/package.nix index 9a20f12c0f60..cece9764e1b5 100644 --- a/pkgs/by-name/li/litecli/package.nix +++ b/pkgs/by-name/li/litecli/package.nix @@ -1,24 +1,36 @@ -{ lib -, python3Packages -, fetchPypi +{ + lib, + python3Packages, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.11.0"; + version = "1.12.3"; - src = fetchPypi { - inherit pname version; - hash = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; + pyproject = true; + + src = fetchFromGitHub { + owner = "dbcli"; + repo = "litecli"; + rev = "v${version}"; + hash = "sha256-TPwzXfb4n6wTe6raQ5IowKdhGkKrf2pmSS2+Q03NKYk="; }; - propagatedBuildInputs = with python3Packages; [ - cli-helpers - click - configobj - prompt-toolkit - pygments - sqlparse + dependencies = + with python3Packages; + [ + cli-helpers + click + configobj + prompt-toolkit + pygments + sqlparse + ] + ++ cli-helpers.optional-dependencies.styles; + + build-system = with python3Packages; [ + setuptools ]; nativeCheckInputs = with python3Packages; [ From c8cacce22f42dd78a9fa40eaf99ed8d9b0c2d1b7 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 11 Nov 2024 12:07:33 +0800 Subject: [PATCH 042/114] mar1d: nixfmt --- pkgs/by-name/ma/mar1d/package.nix | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ma/mar1d/package.nix b/pkgs/by-name/ma/mar1d/package.nix index 0bd6026e32d6..cc9b09b8932b 100644 --- a/pkgs/by-name/ma/mar1d/package.nix +++ b/pkgs/by-name/ma/mar1d/package.nix @@ -1,14 +1,15 @@ -{ stdenv -, lib -, SDL2 -, SDL2_mixer -, libGLU -, libconfig -, meson -, ninja -, pkg-config -, fetchFromGitHub -, fetchpatch +{ + stdenv, + lib, + SDL2, + SDL2_mixer, + libGLU, + libconfig, + meson, + ninja, + pkg-config, + fetchFromGitHub, + fetchpatch, }: stdenv.mkDerivation rec { @@ -22,7 +23,11 @@ stdenv.mkDerivation rec { owner = "Radvendii"; }; - nativeBuildInputs = [ meson ninja pkg-config ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; buildInputs = [ SDL2 From 49fb875eeec0c603d30b20da61c4437e0db92ca5 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 11 Nov 2024 12:23:16 +0800 Subject: [PATCH 043/114] mar1d: fix build --- pkgs/by-name/ma/mar1d/package.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ma/mar1d/package.nix b/pkgs/by-name/ma/mar1d/package.nix index cc9b09b8932b..60e4d5ad3552 100644 --- a/pkgs/by-name/ma/mar1d/package.nix +++ b/pkgs/by-name/ma/mar1d/package.nix @@ -12,7 +12,7 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "MAR1D"; version = "unstable-2023-02-02"; @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { owner = "Radvendii"; }; + env = { + NIXPKGS_CFLAGS_COMPILE = toString [ + "-Wno-error=array-parameter" + ]; + }; + nativeBuildInputs = [ meson ninja @@ -45,7 +51,7 @@ stdenv.mkDerivation rec { }) ]; - meta = with lib; { + meta = { description = "First person Super Mario Bros"; mainProgram = "MAR1D"; longDescription = '' @@ -55,8 +61,8 @@ stdenv.mkDerivation rec { You must view the world as mario does, as a one dimensional line. ''; homepage = "https://mar1d.com"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ taeer ]; - platforms = platforms.unix; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ taeer ]; + platforms = lib.platforms.unix; }; -} +}) From f257eded3e1c95bd833976b34ac1ee22e5fc6d91 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Fri, 6 Sep 2024 22:11:59 +0200 Subject: [PATCH 044/114] scmutils: init at 20230902 --- pkgs/by-name/sc/scmutils/package.nix | 68 ++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pkgs/by-name/sc/scmutils/package.nix diff --git a/pkgs/by-name/sc/scmutils/package.nix b/pkgs/by-name/sc/scmutils/package.nix new file mode 100644 index 000000000000..2b9c56b56027 --- /dev/null +++ b/pkgs/by-name/sc/scmutils/package.nix @@ -0,0 +1,68 @@ +{ + stdenv, + fetchurl, + lib, + mitschemeX11, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "scmutils"; + version = "20230902"; + + src = fetchurl { + url = "https://groups.csail.mit.edu/mac/users/gjs/6946/mechanics-system-installation/native-code/${finalAttrs.pname}-src-${finalAttrs.version}.tar.gz"; + hash = "sha256-9/shOxoKwJ4uDTHmvXqhemgy3W+GUCmoqFm5e1t3W0M="; + }; + + buildInputs = [ mitschemeX11 ]; + + configurePhase = '' + runHook preConfigure + ln -r -s kernel/ghelper-pro.scm kernel/ghelper.scm + ln -r -s solve/nnsolve.scm solve/solve.scm + substituteInPlace load.scm \ + --replace-fail '/usr/local/scmutils/' "$out/lib/mit-scheme/" + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + echo '(load "compile")' | mit-scheme --no-init-file --batch-mode --interactive + echo '(load "load") (disk-save "edwin-mechanics.com")' | mit-scheme --no-init-file --batch-mode --interactive + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/lib/mit-scheme/" "$out/share/scmutils" "$out/bin" + cp edwin-mechanics.com "$out/lib/mit-scheme/" + declare -r TARGET="$out/lib/mit-scheme/" + for SRC in $(find * -type f -name '*.bci'); do + install -d "$TARGET"scmutils/"$(dirname "$SRC")" + cp -a "$SRC" "$TARGET"scmutils/"$SRC" + done + # Convenience script to load the band + declare -r CMD="exec ${mitschemeX11}/bin/mit-scheme --band $out/lib/mit-scheme/edwin-mechanics.com" + echo "#!$SHELL" > $out/bin/scmutils + echo "$CMD" "\"\$@\"" >> $out/bin/scmutils + echo "#!$SHELL" > $out/bin/edwin-scmutils + echo "$CMD" "--edit" "\"\$@\"" >> $out/bin/edwin-scmutils + chmod uog+rx "$out/bin/scmutils" "$out/bin/edwin-scmutils" + ln -r -s "$out/bin/edwin-scmutils" "$out/bin/mechanics" + runHook postInstall + ''; + + meta = { + description = "Scheme library for mathematical physics"; + + longDescription = '' + Scmutils system is an integrated library of procedures, + embedded in the programming language Scheme, and intended + to support teaching and research in mathematical physics + and electrical engineering. + ''; + + homepage = "https://groups.csail.mit.edu/mac/users/gjs/6.5160/installation.html"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.fbeffa ]; + }; +}) From eb7b4b4957fa6ba3d50af6a3db1bcddb524fdaeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 11:29:05 +0000 Subject: [PATCH 045/114] gomplate: 4.1.0 -> 4.2.0 --- pkgs/by-name/go/gomplate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gomplate/package.nix b/pkgs/by-name/go/gomplate/package.nix index 40532ac9dd0a..ef2296e889de 100644 --- a/pkgs/by-name/go/gomplate/package.nix +++ b/pkgs/by-name/go/gomplate/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gomplate"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "hairyhenderson"; repo = "gomplate"; rev = "refs/tags/v${version}"; - hash = "sha256-shbG0q86wlSjoCK2K7hNdUCwNPiQp94GWQJ1e71A1T0="; + hash = "sha256-PupwL0VzZiWz+96Mv1o6QSmj7iLyvVIQMcdRlGqmpRs="; }; - vendorHash = "sha256-UKqSKypAm6gt2JUCZh/DyfWo8uJeMp0M+4FiqwzzHIA="; + vendorHash = "sha256-1BOrffMtYz/cEsVaMseZQJlGsAdax+c1CvebwP8jaL4="; ldflags = [ "-s" From 7c0ea48e2dc1de8b5cb924c0ee264f6361595604 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Mon, 11 Nov 2024 07:11:34 -0600 Subject: [PATCH 046/114] mopidy: format file --- pkgs/applications/audio/mopidy/mopidy.nix | 40 +++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 12eab45c52a2..958706bac4e7 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, wrapGAppsNoGuiHook -, gst_all_1, glib-networking, gobject-introspection +{ + lib, + stdenv, + fetchFromGitHub, + pythonPackages, + wrapGAppsNoGuiHook, + gst_all_1, + glib-networking, + gobject-introspection, }: pythonPackages.buildPythonApplication rec { @@ -24,17 +31,22 @@ pythonPackages.buildPythonApplication rec { gst-plugins-rs ]; - propagatedBuildInputs = [ - gobject-introspection - ] ++ (with pythonPackages; [ - gst-python - pygobject3 - pykka - requests - setuptools - tornado - ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python - ); + propagatedBuildInputs = + [ + gobject-introspection + ] + ++ ( + with pythonPackages; + [ + gst-python + pygobject3 + pykka + requests + setuptools + tornado + ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python + ); propagatedNativeBuildInputs = [ gobject-introspection @@ -49,6 +61,6 @@ pythonPackages.buildPythonApplication rec { mainProgram = "mopidy"; license = licenses.asl20; maintainers = [ maintainers.fpletz ]; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } From 9cdc8770231b93adc65c74219868f48b4d51e7a6 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Mon, 11 Nov 2024 07:13:38 -0600 Subject: [PATCH 047/114] mopidy: include the PipeWire GStreamer plugin --- pkgs/applications/audio/mopidy/mopidy.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 958706bac4e7..b82d17d06cd4 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -7,6 +7,7 @@ gst_all_1, glib-networking, gobject-introspection, + pipewire, }: pythonPackages.buildPythonApplication rec { @@ -55,6 +56,12 @@ pythonPackages.buildPythonApplication rec { # There are no tests doCheck = false; + preFixup = '' + gappsWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${pipewire}/lib/gstreamer-1.0" + ) + ''; + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Extensible music server that plays music from local disk, Spotify, SoundCloud, and more"; From 83be9f1b3b8f2b0f0de8aab64933cff5483e4870 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Mon, 11 Nov 2024 15:11:51 +0100 Subject: [PATCH 048/114] python312Packages.datalad: disable failing test Test test_subsuperdataset_save fails with: CommandError: 'git -c diff.ignoreSubmodules=none -c core.quotepath=false ls-files -z -m -d' failed with exitcode 128 --- pkgs/development/python-modules/datalad/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix index 2ab56ef6da2d..c61c0566c163 100644 --- a/pkgs/development/python-modules/datalad/default.nix +++ b/pkgs/development/python-modules/datalad/default.nix @@ -221,6 +221,9 @@ buildPythonPackage rec { # pbcopy not found "test_wtf" + + # CommandError: 'git -c diff.ignoreSubmodules=none -c core.quotepath=false ls-files -z -m -d' failed with exitcode 128 + "test_subsuperdataset_save" ]; nativeCheckInputs = [ From c479e5b604d14877515ad77cceeb1d0cac1adff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 11 Nov 2024 16:36:01 +0100 Subject: [PATCH 049/114] element-web: passthru conf to allow extending it via modules without discarding already set config --- .../instant-messengers/element/element-web-wrapper.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix b/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix index c9a143ecb49e..e6dc8fb84c7d 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix @@ -23,4 +23,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + + passthru = { + inherit conf; + }; } From 8cd0099261fc950649e9b8d5aa40d13388751f8b Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 21 Jun 2024 22:37:38 +0100 Subject: [PATCH 050/114] protoc-gen-swift: init at 1.28.2 --- pkgs/by-name/pr/protoc-gen-swift/package.nix | 57 ++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/pr/protoc-gen-swift/package.nix diff --git a/pkgs/by-name/pr/protoc-gen-swift/package.nix b/pkgs/by-name/pr/protoc-gen-swift/package.nix new file mode 100644 index 000000000000..5ca8f50928fc --- /dev/null +++ b/pkgs/by-name/pr/protoc-gen-swift/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromGitHub, + swiftPackages, + swift, + swiftpm, + nix-update-script, +}: +let + stdenv = swiftPackages.stdenv; +in +stdenv.mkDerivation (finalAttrs: { + pname = "protoc-gen-swift"; + version = "1.28.2"; + + src = fetchFromGitHub { + owner = "apple"; + repo = "swift-protobuf"; + rev = "${finalAttrs.version}"; + hash = "sha256-YOEr73xDjNrc4TTkIBY8AdAUX2MBtF9ED1UF2IjTu44="; + }; + + nativeBuildInputs = [ + swift + swiftpm + ]; + + # Not needed for darwin, as `apple-sdk` is implicit and part of the stdenv + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + swiftPackages.Foundation + swiftPackages.Dispatch + ]; + + # swiftpm fails to found libdispatch.so on Linux + LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux ( + lib.makeLibraryPath [ + swiftPackages.Dispatch + ] + ); + + installPhase = '' + runHook preInstall + install -Dm755 .build/release/protoc-gen-swift $out/bin/protoc-gen-swift + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Protobuf plugin for generating Swift code"; + homepage = "https://github.com/apple/swift-protobuf"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ matteopacini ]; + mainProgram = "protoc-gen-swift"; + inherit (swift.meta) platforms badPlatforms; + }; +}) From 570197c30500972e852b38df1a1b1bb5b74c680f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 17:13:46 +0000 Subject: [PATCH 051/114] prometheus-junos-czerwonk-exporter: 0.12.4 -> 0.12.5 --- .../servers/monitoring/prometheus/junos-czerwonk-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix index e05a5d5c5ab8..3f6360db3f14 100644 --- a/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/junos-czerwonk-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "junos-czerwonk-exporter"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "czerwonk"; repo = "junos_exporter"; rev = version; - sha256 = "sha256-L6D2gJ6Vt80J6ERJE9I483L9c2mufHzuAbStODaiOy4="; + sha256 = "sha256-iNUNZnSaBXGr8QFjHxW4/9Msuqerq8FcSQ74I2l8h7o="; }; vendorHash = "sha256-qHs6KuBmJmmkmR23Ae7COadb2F7N8CMUmScx8JFt98Q="; From 3559aa4fa3d9b9ee2d31317c813ae2f889829c3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 18:31:49 +0000 Subject: [PATCH 052/114] librime: 1.11.2 -> 1.12.0 --- pkgs/by-name/li/librime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/librime/package.nix b/pkgs/by-name/li/librime/package.nix index 6ff2abb11de9..6cd7788caf97 100644 --- a/pkgs/by-name/li/librime/package.nix +++ b/pkgs/by-name/li/librime/package.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-QHuzpitxSYQ4EcBPY1f0R5zl4UFtefu0bFXA76Iv+j0="; + sha256 = "sha256-NwtWpH1FxIZP/+oOJbsaEmySLxXlxkCCIG+SEGo242Q="; }; nativeBuildInputs = [ cmake pkg-config ]; From 67c88f3c4b9771055631f574bfa545d59061755d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 Nov 2024 12:15:02 -0800 Subject: [PATCH 053/114] immich: re-add perl to $PATH Otherwise logging in to Immich fails with [Nest] 2432071 - 11/11/2024, 9:12:55 PM ERROR [Api:Error: BatchCluster has ended, cannot enqueue -ver -ignoreMinorErrors -execute at BatchCluster.enqueueTask (/nix/store/s68j9ryvlcfayh8wc6s8mbqwbhhsb742-immich-1.120.1/node_modules/batch-cluster/dist/BatchCluster.js:186:25) at f (/nix/store/s68j9ryvlcfayh8wc6s8mbqwbhhsb742-immich-1.120.1/node_modules/exiftool-vendored/dist/ExifTool.js:402:38) at async g (/nix/store/s68j9ryvlcfayh8wc6s8mbqwbhhsb742-immich-1.120.1/node_modules/exiftool-vendored/dist/AsyncRetry.js:8:20)~92ys7db8] Unknown error: Error: BatchCluster has ended, cannot enqueue -ver -ignoreMinorErrors -execute --- pkgs/by-name/im/immich/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index bb1778ee207f..eb0d2395ab3e 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -23,6 +23,7 @@ imagemagick, libraw, libheif, + perl, vips, }: let @@ -188,8 +189,6 @@ buildNpmPackage' { # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH rm -r node_modules/exiftool-vendored.* - substituteInPlace node_modules/exiftool-vendored/dist/DefaultExifToolOptions.js \ - --replace-fail "checkPerl: !(0, IsWin32_1.isWin32)()," "checkPerl: false," ''; installPhase = '' @@ -212,6 +211,7 @@ buildNpmPackage' { lib.makeBinPath [ exiftool jellyfin-ffmpeg + perl # exiftool-vendored checks for Perl even if exiftool comes from $PATH ] }" From cbab3526ee3876f62e2ee4729c36c7e0800d98bb Mon Sep 17 00:00:00 2001 From: pagedmov Date: Sun, 10 Nov 2024 01:12:19 -0500 Subject: [PATCH 054/114] tinyfetch: init at 0.2 --- pkgs/by-name/ti/tinyfetch/package.nix | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/ti/tinyfetch/package.nix diff --git a/pkgs/by-name/ti/tinyfetch/package.nix b/pkgs/by-name/ti/tinyfetch/package.nix new file mode 100644 index 000000000000..728d85a7afb4 --- /dev/null +++ b/pkgs/by-name/ti/tinyfetch/package.nix @@ -0,0 +1,40 @@ +{ + stdenv, + fetchFromGitHub, + lib, +}: + +stdenv.mkDerivation rec { + pname = "tinyfetch"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "abrik1"; + repo = "tinyfetch"; + rev = "refs/tags/${version}"; + hash = "sha256-I0OurcPKKZntZn7Bk9AnWdpSrU9olGp7kghdOajPDeQ="; + }; + + sourceRoot = "${src.name}/src"; + + buildPhase = '' + runHook preBuild + $CC tinyfetch.c -o tinyfetch + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 tinyfetch -t $out/bin + runHook postInstall + ''; + + meta = { + description = "Simple fetch in C which is tiny and fast"; + homepage = "https://github.com/abrik1/tinyfetch"; + license = lib.licenses.mit; + mainProgram = "tinyfetch"; + maintainers = with lib.maintainers; [ pagedMov ]; + platforms = lib.platforms.unix; + }; +} From 0bc675c40f5c4aaa07657cdb4cbf6ea903bfc6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 Nov 2024 14:16:08 -0800 Subject: [PATCH 055/114] immich-machine-learning: drop superfluous patch --- pkgs/by-name/im/immich-machine-learning/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 7d29efca5603..6d46e20d575e 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -19,9 +19,6 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml --replace-fail 'fastapi-slim' 'fastapi' - - # AttributeError: module 'cv2' has no attribute 'Mat' - substituteInPlace app/test_main.py --replace-fail ": cv2.Mat" "" ''; pythonRelaxDeps = [ From 0d0a2ad4d7b14229bf067f8d6d97f1e2bdd9dff9 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Nov 2024 23:38:23 +0100 Subject: [PATCH 056/114] xmlcopyeditor: move to pkgs/by-name --- .../default.nix => by-name/xm/xmlcopyeditor/package.nix} | 3 --- .../editors => by-name/xm}/xmlcopyeditor/xmlcopyeditor.patch | 0 pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 7 deletions(-) rename pkgs/{applications/editors/xmlcopyeditor/default.nix => by-name/xm/xmlcopyeditor/package.nix} (94%) rename pkgs/{applications/editors => by-name/xm}/xmlcopyeditor/xmlcopyeditor.patch (100%) diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix similarity index 94% rename from pkgs/applications/editors/xmlcopyeditor/default.nix rename to pkgs/by-name/xm/xmlcopyeditor/package.nix index 0c58d35042ae..413efe921d08 100644 --- a/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix @@ -11,7 +11,6 @@ , pcre2 , wxGTK32 , xercesc -, Cocoa }: stdenv.mkDerivation rec { @@ -46,8 +45,6 @@ stdenv.mkDerivation rec { pcre2 wxGTK32 xercesc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch b/pkgs/by-name/xm/xmlcopyeditor/xmlcopyeditor.patch similarity index 100% rename from pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch rename to pkgs/by-name/xm/xmlcopyeditor/xmlcopyeditor.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3226511390c..cb6d050c45d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16680,10 +16680,6 @@ with pkgs; stdenv = gcc9Stdenv; }; - xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - xmp = callPackage ../applications/audio/xmp { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio; }; From fd70778e9b5f71e01e2a1b3de829b9e9e032e1d4 Mon Sep 17 00:00:00 2001 From: nat Date: Tue, 12 Nov 2024 00:01:59 +0100 Subject: [PATCH 057/114] linuxPackages.rtl8821cu: unstable-2024-05-03 -> unstable-2024-09-27 --- pkgs/os-specific/linux/rtl8821cu/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 9d83d4b4c28a..440a66ca341f 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2024-05-03"; + version = "${kernel.version}-unstable-2024-09-27"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821cu-20210916"; - rev = "3eacc28b721950b51b0249508cc31e6e54988a0c"; - hash = "sha256-JP7mvwhnKqmkb/B0l4vhc11TBjjUA1Ubzbj/IVEXvBM="; + rev = "2dce552dc6aa0cdab427bfa810c3df002eab0078"; + hash = "sha256-8hGAfZyDCGl0RnPnYjc7iMEulZvoIGe2ghfIfoiz7ZI="; }; hardeningDisable = [ "pic" ]; @@ -18,9 +18,9 @@ stdenv.mkDerivation { prePatch = '' substituteInPlace ./Makefile \ - --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ - --replace /sbin/depmod \# \ - --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + --replace-fail /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace-fail /sbin/depmod \# \ + --replace-fail '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; preInstall = '' From c9d87673b9f05c5b65d34848a281b42ca18f2516 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 23:12:45 +0000 Subject: [PATCH 058/114] python312Packages.pyvicare: 2.35.0 -> 2.36.0 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 2d60fc3af1f2..6c73cf71f324 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.35.0"; + version = "2.36.0"; pyproject = true; src = fetchFromGitHub { owner = "openviess"; repo = "PyViCare"; rev = "refs/tags/${version}"; - hash = "sha256-5VvbbCQTc2EG7YsQlPd3BRwDtJzIuEX2yLs2RWFeFDM="; + hash = "sha256-WkdW1sSA/nVHK8Pp2sOkj3qYc8se4MT6WM4AoQvI5i8="; }; postPatch = '' From 106603e4e924bdaaadeb67567dd8484ec17751c8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Nov 2024 00:14:00 +0100 Subject: [PATCH 059/114] xmlcopyeditor: reformat --- pkgs/by-name/xm/xmlcopyeditor/package.nix | 32 +++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix index 413efe921d08..1bfae3fb9c0e 100644 --- a/pkgs/by-name/xm/xmlcopyeditor/package.nix +++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchurl -, aspell -, boost -, expat -, intltool -, pkg-config -, libxml2 -, libxslt -, pcre2 -, wxGTK32 -, xercesc +{ + lib, + stdenv, + fetchurl, + aspell, + boost, + expat, + intltool, + pkg-config, + libxml2, + libxslt, + pcre2, + wxGTK32, + xercesc, }: stdenv.mkDerivation rec { @@ -54,7 +55,10 @@ stdenv.mkDerivation rec { homepage = "https://xml-copy-editor.sourceforge.io/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ candeira wegank ]; + maintainers = with maintainers; [ + candeira + wegank + ]; mainProgram = "xmlcopyeditor"; }; } From 0994c14cca3f2336f518d2d5460c9bb4621cdd1f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Nov 2024 00:15:02 +0100 Subject: [PATCH 060/114] xmlcopyeditor: refactor --- pkgs/by-name/xm/xmlcopyeditor/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix index 1bfae3fb9c0e..ee5e1562e9b4 100644 --- a/pkgs/by-name/xm/xmlcopyeditor/package.nix +++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix @@ -14,13 +14,13 @@ xercesc, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xmlcopyeditor"; version = "1.3.1.0"; src = fetchurl { - url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz"; - sha256 = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE="; + url = "mirror://sourceforge/xml-copy-editor/xmlcopyeditor-${finalAttrs.version}.tar.gz"; + hash = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE="; }; patches = [ ./xmlcopyeditor.patch ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # with an rvalue of type 'const xmlError *' (aka 'const _xmlError *') postPatch = '' substituteInPlace src/wraplibxml.cpp \ - --replace "xmlErrorPtr err" "const xmlError *err" + --replace-fail "xmlErrorPtr err" "const xmlError *err" ''; nativeBuildInputs = [ @@ -50,15 +50,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "Fast, free, validating XML editor"; homepage = "https://xml-copy-editor.sourceforge.io/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ candeira wegank ]; mainProgram = "xmlcopyeditor"; }; -} +}) From d9eab9528a96be0f2d82d36eb97538b819e596ff Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Nov 2024 00:15:30 +0100 Subject: [PATCH 061/114] xmlcopyeditor: fix darwin build --- pkgs/by-name/xm/xmlcopyeditor/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/xm/xmlcopyeditor/package.nix b/pkgs/by-name/xm/xmlcopyeditor/package.nix index ee5e1562e9b4..6e614460b8b6 100644 --- a/pkgs/by-name/xm/xmlcopyeditor/package.nix +++ b/pkgs/by-name/xm/xmlcopyeditor/package.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: { xercesc ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + enableParallelBuilding = true; meta = { From bcaf5a6dad3555170d456c0375b0f9c3c7dc11fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 23:29:30 +0000 Subject: [PATCH 062/114] python312Packages.psrpcore: 0.3.0 -> 0.3.1 --- pkgs/development/python-modules/psrpcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/psrpcore/default.nix b/pkgs/development/python-modules/psrpcore/default.nix index 8003780b86c2..12d951f5a480 100644 --- a/pkgs/development/python-modules/psrpcore/default.nix +++ b/pkgs/development/python-modules/psrpcore/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "psrpcore"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = "psrpcore"; rev = "refs/tags/v${version}"; - hash = "sha256-YThumRHMOTyhP6/EmNEew47v/X4Y1aYg1nvgZJz2XUg="; + hash = "sha256-svfqTOKKFKMphIPnvXfAbPZrp1GTV2D+33I0Rajfv1Y="; }; build-system = [ setuptools ]; From 1278531dfa9cb9c0afd4834d324a9da8b08fcfcf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 22:33:11 +0100 Subject: [PATCH 063/114] python312Packages.uarray: add pbsds to maintainers --- pkgs/development/python-modules/uarray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index b4233ea654eb..777bfd3c6fb2 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -65,6 +65,6 @@ buildPythonPackage rec { description = "Universal array library"; homepage = "https://github.com/Quansight-Labs/uarray"; license = licenses.bsd0; - maintainers = [ ]; + maintainers = [ lib.maintainers.pbsds ]; }; } From 350822b00fc339f450a51d4d8f030ddfd8efbb3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 00:06:59 +0000 Subject: [PATCH 064/114] ticker: 4.6.3 -> 4.7.0 --- pkgs/by-name/ti/ticker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/ticker/package.nix b/pkgs/by-name/ti/ticker/package.nix index da8624a06baa..b5c26e335870 100644 --- a/pkgs/by-name/ti/ticker/package.nix +++ b/pkgs/by-name/ti/ticker/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.6.3"; + version = "4.7.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EjQLJG1/AEnOKGcGh2C1HdRAVUnZLhehxTtpWlvD+jw="; + hash = "sha256-CSOaLFINg1ppTecDAI0tmFY8QMGwWKaeLly+9XI3YPM="; }; - vendorHash = "sha256-bWdyypcIagbKTMnhT0X4UmoPVjyTasCSud6pX1L3oIc="; + vendorHash = "sha256-XrZdv6QpR1HGN2o/Itbw+7hOkgVjzvx3jwlHeaJ2m0U="; ldflags = [ "-s" From 4f582c92b199ff3fce4d81b8fcf41a75efe8348b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 00:40:29 +0000 Subject: [PATCH 065/114] rustlings: 6.3.0 -> 6.4.0 --- pkgs/by-name/ru/rustlings/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rustlings/package.nix b/pkgs/by-name/ru/rustlings/package.nix index 2d05eee496f1..80eecb46dbcd 100644 --- a/pkgs/by-name/ru/rustlings/package.nix +++ b/pkgs/by-name/ru/rustlings/package.nix @@ -12,7 +12,7 @@ }: let pname = "rustlings"; - version = "6.3.0"; + version = "6.4.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "rust-lang"; repo = "rustlings"; rev = "v${version}"; - hash = "sha256-te7DYgbEtWWSSvO28ajkJucRb3c9L8La1wfGW0WSxW0="; + hash = "sha256-VdIIcpyoCuid3MECVc9aKeIOUlxGlxcG7znqbqo9pjc="; }; - cargoHash = "sha256-Vq4Os4CKkEz4HggIZhlbIo9Cu+BVJPdybL1CNvz5wEQ="; + cargoHash = "sha256-AU6OUGSWuxKmdoQLk+UiFzA7NRviDAgXrBDMdkjxOpA="; # Disabled test that does not work well in an isolated environment checkFlags = [ From bf93f13ddfc03ee52f598b40cb7aad572299e7a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 00:23:50 +0000 Subject: [PATCH 066/114] python312Packages.schwifty: 2024.9.0 -> 2024.11.0 --- pkgs/development/python-modules/schwifty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 02a70e00ecec..ca6beb124865 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2024.9.0"; + version = "2024.11.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-rO6fUCFYfCVPxfd+vvzWL+sMDDqA/qRSPUUTB90E8zA="; + hash = "sha256-0KrtAxaEA7Qz3lFdZj3wlRaUGucBUoUNo6/jwkIlX2o="; }; build-system = [ From e31fad4b17481ef7334bd511d298b39cfc7d6b15 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 12 Nov 2024 09:51:14 +0900 Subject: [PATCH 067/114] python312Packages.schwifty: remove unnecessary pytest-cov --- pkgs/development/python-modules/schwifty/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index ca6beb124865..d94adfdc7ba7 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -18,7 +18,6 @@ # tests pytestCheckHook, - pytest-cov, pythonOlder, }: @@ -50,7 +49,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytest-cov pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); From adb6230342231c88207d9d85da90e25c82adde0f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 12 Nov 2024 02:09:38 +0100 Subject: [PATCH 068/114] python312Packages.wirerope: 0.4.7 -> 0.4.8 Diff: https://github.com/youknowone/wirerope/compare/0.4.7...0.4.8 Changelog: https://github.com/youknowone/wirerope/releases/tag/0.4.8 --- pkgs/development/python-modules/wirerope/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wirerope/default.nix b/pkgs/development/python-modules/wirerope/default.nix index d63f70905372..67976f7329fd 100644 --- a/pkgs/development/python-modules/wirerope/default.nix +++ b/pkgs/development/python-modules/wirerope/default.nix @@ -4,20 +4,21 @@ fetchFromGitHub, setuptools, six, + nix-update-script, pytestCheckHook, pytest-cov-stub, }: buildPythonPackage rec { pname = "wirerope"; - version = "0.4.7"; + version = "0.4.8"; pyproject = true; src = fetchFromGitHub { owner = "youknowone"; repo = "wirerope"; rev = version; - hash = "sha256-Xi6I/TXttjCregknmZUhV5GAiNR/HmEi4wCZiCmp0DQ="; + hash = "sha256-Qb0gTCtVWdvZnwS6+PHoBr0syHtpfRI8ugh7zO7k9rk="; }; build-system = [ setuptools ]; @@ -31,6 +32,8 @@ buildPythonPackage rec { pytest-cov-stub ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Wrappers for class callables"; homepage = "https://github.com/youknowone/wirerope"; From 98e8b66dfccfdb414e53ff3b76eeab2cddec4193 Mon Sep 17 00:00:00 2001 From: DCsunset Date: Tue, 12 Nov 2024 01:40:36 +0000 Subject: [PATCH 069/114] dufs: 0.42.0 -> 0.43.0 Diff: https://github.com/sigoden/dufs/compare/v0.42.0...v0.43.0 Changelog: https://github.com/sigoden/dufs/blob/v0.43.0/CHANGELOG.md --- pkgs/by-name/du/dufs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix index b7dfb2d3b643..d863342e1aa5 100644 --- a/pkgs/by-name/du/dufs/package.nix +++ b/pkgs/by-name/du/dufs/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dufs"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "dufs"; rev = "v${version}"; - hash = "sha256-eada2xQlzB1kknwitwxZhFiv6myTbtYHHFkQtppa0tc="; + hash = "sha256-KkuP9UE9VT9aJ50QH1Y/2f+t0tLOMyNovxCaLq0Jz0s="; }; - cargoHash = "sha256-juT3trREV7LmjBz+x7Od4XoTGuL1XRhknbU4Nopg2HU="; + cargoHash = "sha256-KyFE8TpbkSZQE3CL7jbvSE3JDWjnyqhiWXO7LZ4ZpgI="; nativeBuildInputs = [ installShellFiles ]; From bc5033805af00effef677af1d978b9a9c5c3ecf6 Mon Sep 17 00:00:00 2001 From: Noah Gitsham Date: Tue, 12 Nov 2024 01:52:37 +0000 Subject: [PATCH 070/114] nixos/fail2ban: fix typo bellow -> below --- nixos/modules/services/security/fail2ban.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix index b6ce42d7318c..8be2faa5754d 100644 --- a/nixos/modules/services/security/fail2ban.nix +++ b/nixos/modules/services/security/fail2ban.nix @@ -177,7 +177,7 @@ in type = types.nullOr types.str; example = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; description = '' - "bantime.formula" used by default to calculate next value of ban time, default value bellow, + "bantime.formula" used by default to calculate next value of ban time, default value below, the same ban time growing will be reached by multipliers 1, 2, 4, 8, 16, 32 ... ''; }; From 2e64240e309f5ceb58d465eb0ae2659c0c085752 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Nov 2024 00:44:29 +0000 Subject: [PATCH 071/114] nixf: 2.4.0 -> 2.5.0 --- pkgs/development/tools/language-servers/nixd/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index ffa06bb33933..6dcb59966dde 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-8F97zAu+icDC9ZYS7m+Y58oZQ7R3gVuXMvzAfgkVmJo="; + hash = "sha256-dFPjQcY3jtHIsdR0X1s0qbHtBFroRhHoy/NldEFxlZ0="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2f0a06c379b..ec776a57a86e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7936,7 +7936,6 @@ with pkgs; inherit (callPackages ../development/tools/language-servers/nixd { llvmPackages = llvmPackages_16; - nix = nixVersions.nix_2_19; }) nixf nixt nixd; ansible-later = callPackage ../tools/admin/ansible/later.nix { }; From 443037916c5d39e52cf0fa1a14f8bdcad43933ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 02:20:39 +0000 Subject: [PATCH 072/114] hyperfine: 1.18.0 -> 1.19.0 --- pkgs/tools/misc/hyperfine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index e4922824d729..0058187255de 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "hyperfine"; rev = "v${version}"; - hash = "sha256-9YfnCHiG9TDOsEAcrrb0GOxdq39Q+TiltWKwnr3ObAQ="; + hash = "sha256-c8yK9U8UWRWUSGGGrAds6zAqxAiBLWq/RcZ6pvYNpgk="; }; - cargoHash = "sha256-E2y/hQNcpW6b/ZJBlsp+2RDH2OgpX4kbn36aBHA5X6U="; + cargoHash = "sha256-Ia9L7RxYmhFzTVOzegxAmsgBmx30PPqyVFELayL3dq8="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; From 576d95005ba7ada604fa401ca4588a8fe3bceb98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 02:49:10 +0000 Subject: [PATCH 073/114] ndstool: 2.1.2 -> 2.3.1 --- pkgs/by-name/nd/ndstool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nd/ndstool/package.nix b/pkgs/by-name/nd/ndstool/package.nix index 6bbc5f50d644..6a61ff825ff2 100644 --- a/pkgs/by-name/nd/ndstool/package.nix +++ b/pkgs/by-name/nd/ndstool/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ndstool"; - version = "2.1.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "devkitPro"; repo = "ndstool"; rev = "v${version}"; - sha256 = "0isnm0is5k6dgi2n2c3mysyr5hpwikp5g0s3ix7ms928z04l8ccm"; + sha256 = "sha256-121xEmbt1WBR1wi4RLw9/iLHqkpyXImXKiCNnLCYnJs="; }; nativeBuildInputs = [ autoconf automake ]; From cc129d204b35a11059549fdca76802aac86dd1c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 03:46:45 +0000 Subject: [PATCH 074/114] python312Packages.tensorly: 0.8.2 -> 0.9.0 --- pkgs/development/python-modules/tensorly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 20bd49a8a9ba..245791e71cd9 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tensorly"; - version = "0.8.2"; + version = "0.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kYKyLY2V6M53co+26ZTZP4U6bHkFebKI5Uhh1x1/N58="; + hash = "sha256-kj32N0hwdI/DS0WwpH4cr3xhq+3X53edodU3/SEorqw="; }; propagatedBuildInputs = [ From bfc13702c327366f6837ea0df3c1fe2783c211c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 03:48:05 +0000 Subject: [PATCH 075/114] redka: 0.5.2 -> 0.5.3 --- pkgs/by-name/re/redka/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/redka/package.nix b/pkgs/by-name/re/redka/package.nix index 53ba16d568d4..debc2180892a 100644 --- a/pkgs/by-name/re/redka/package.nix +++ b/pkgs/by-name/re/redka/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redka"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "nalgeon"; repo = "redka"; rev = "v${version}"; - hash = "sha256-KpfXnhwz3uUdG89XdNqm1WyKwYhA5ImDg4DzzefKMz8="; + hash = "sha256-CCTPhcarLFs2wyhu7OqifunVSil2QU61JViY3uTjVg8="; }; vendorHash = "sha256-aX0X6TWVEouo884LunCt+UzLyvDHgmvuxdV0wh0r7Ro="; From 8e90e66e1d19440181dff63f5fe0c5bfd54699c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 04:07:16 +0000 Subject: [PATCH 076/114] swapspace: 1.18 -> 1.18.1 --- pkgs/by-name/sw/swapspace/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sw/swapspace/package.nix b/pkgs/by-name/sw/swapspace/package.nix index d9749c23c55e..c9250663c8e0 100644 --- a/pkgs/by-name/sw/swapspace/package.nix +++ b/pkgs/by-name/sw/swapspace/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "swapspace"; - version = "1.18"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Tookmund"; repo = "Swapspace"; rev = "v${version}"; - sha256 = "sha256-tzsw10cpu5hldkm0psWcFnWToWQejout/oGHJais6yw="; + sha256 = "sha256-KrPdmF1H7WFI78ZJlLqDyfxbs7fymSUQpXL+7XjN9bI="; }; nativeBuildInputs = [ From ae91d5c54d4c2fb6829d9134ac72f0b7bb2dca55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 04:28:03 +0000 Subject: [PATCH 077/114] picocrypt: 1.43 -> 1.44 --- pkgs/by-name/pi/picocrypt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index d77509135d0e..f0c21da89d75 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -15,18 +15,18 @@ buildGoModule rec { pname = "picocrypt"; - version = "1.43"; + version = "1.44"; src = fetchFromGitHub { owner = "Picocrypt"; repo = "Picocrypt"; rev = "refs/tags/${version}"; - hash = "sha256-xxlmerEGujBvghC+OpMW0gkDl7zPOW4r6cM7T6qOc6A="; + hash = "sha256-+0co9JwXGJVXStyQSggJACQlQYwQ3dQtLsTAeCavLa8="; }; sourceRoot = "${src.name}/src"; - vendorHash = "sha256-QeNFXmWeA/hkYdFzJoHj61bo/DmGWakdhFRLtSYG7+Y="; + vendorHash = "sha256-zJDPIRRckrlbmEpxXXMxeguxdcwVS9beHbM1dr5eMz8="; ldflags = [ "-s" From 3c6420ad8281971978d743623e2cb73becabfc77 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:01:54 -0800 Subject: [PATCH 078/114] rav1e: remove build-time dependency on libgit2 --- pkgs/by-name/ra/rav1e/package.nix | 36 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index e8834ac131e4..34dda9e57e3e 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -4,15 +4,12 @@ stdenv, rustPlatform, fetchCrate, - pkg-config, cargo-c, darwin, - libgit2, libiconv, nasm, nix-update-script, testers, - zlib, rav1e, }: @@ -27,28 +24,29 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY="; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ cargo-c - libgit2 nasm ]; - buildInputs = - [ zlib ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + ]; - # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library - # and linking it with cctools ld64. - postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")' - # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern. - substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"' - ''; + postPatch = + '' + # remove feature that requires libgit2 and is only used to print a version string + substituteInPlace Cargo.toml --replace-fail '"git_version",' "" + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' + # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library + # and linking it with cctools ld64. + substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")' + + # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern. + substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"' + ''; checkType = "debug"; From c4a4f958cb5af702f61f88d0e762af1700c6a705 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:03:00 -0800 Subject: [PATCH 079/114] rav1e: use new Darwin SDK pattern --- pkgs/by-name/ra/rav1e/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index 34dda9e57e3e..523b8e1de6a0 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -5,8 +5,6 @@ rustPlatform, fetchCrate, cargo-c, - darwin, - libiconv, nasm, nix-update-script, testers, @@ -29,11 +27,6 @@ rustPlatform.buildRustPackage rec { nasm ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.Security - ]; - postPatch = '' # remove feature that requires libgit2 and is only used to print a version string From 30efc7f5e7fe9b4b622710bec6e4c7507f2b2327 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 05:08:47 +0000 Subject: [PATCH 080/114] function-runner: 6.2.1 -> 6.3.0 --- pkgs/by-name/fu/function-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix index 6ea238f53523..c70677e9d0af 100644 --- a/pkgs/by-name/fu/function-runner/package.nix +++ b/pkgs/by-name/fu/function-runner/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "6.2.1"; + version = "6.3.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5X/d6phYXmJcCacHvGkk5o/J91SdlFamxJrqc5X/Y4Y="; + sha256 = "sha256-DJX9P3Dauzc8qrpvqIGgr85gwIPeYwVDyFlIVh1RIq0="; }; - cargoHash = "sha256-D6BTP/a3wOpcOLnGUASyBL3pzAieAllLzEZuaEv2Oco="; + cargoHash = "sha256-rlQGAHISrLuXTsoM9RWRD3roQi/sgU6BPBlOj0ecgn4="; meta = with lib; { description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; From 886f12c333ec041e2801f1c7ad3c6ac32c232e25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 05:17:56 +0000 Subject: [PATCH 081/114] picocrypt-cli: 2.08 -> 2.09 --- pkgs/by-name/pi/picocrypt-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/picocrypt-cli/package.nix b/pkgs/by-name/pi/picocrypt-cli/package.nix index 931043d6dcd7..a3b4ed76e659 100644 --- a/pkgs/by-name/pi/picocrypt-cli/package.nix +++ b/pkgs/by-name/pi/picocrypt-cli/package.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "picocrypt-cli"; - version = "2.08"; + version = "2.09"; src = fetchFromGitHub { owner = "Picocrypt"; repo = "CLI"; rev = version; - hash = "sha256-6/VmacOXQOCkjLFyzDPyohOueF3WKJu7XCAD9oiFXEc="; + hash = "sha256-DV+L3s479PqSiqi2xigZWwXVNCdkayD0wCpnlR0TljY="; }; sourceRoot = "${src.name}/picocrypt"; - vendorHash = "sha256-QIeuqdoC17gqxFgKJ/IU024dgofBCizWTj2S7CCmED4="; + vendorHash = "sha256-F+t/VL9IzBfz8cfpaw+aEPxTPGUq3SbWbyqPWeLrh6E="; ldflags = [ "-s" From 97ab1baaae4e3ab11fa1aa61c5ad64a88bfff1ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 05:24:36 +0000 Subject: [PATCH 082/114] fastcompmgr: 0.4 -> 0.5 --- pkgs/by-name/fa/fastcompmgr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastcompmgr/package.nix b/pkgs/by-name/fa/fastcompmgr/package.nix index 6a02b0940296..8d46db2f1f7b 100644 --- a/pkgs/by-name/fa/fastcompmgr/package.nix +++ b/pkgs/by-name/fa/fastcompmgr/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fastcompmgr"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "tycho-kirchner"; repo = "fastcompmgr"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-FrPM6k4280SNnmi/jiwKU/O2eBue+5h8aNDCiIqZ3+c="; + hash = "sha256-yH/+E2IBe9KZxKTiP8oNcb9fJcZ0ukuenqTSv97ed44="; }; nativeBuildInputs = [ pkgs.pkg-config ]; From 3ed6235eaa22b0b931e0df8ade951fdc16d3e9d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 06:28:37 +0000 Subject: [PATCH 083/114] buildah-unwrapped: 1.37.3 -> 1.38.0 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index c41de9d2b4b1..d89a0e3c60f3 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.37.3"; + version = "1.38.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-YYmgxlW80y6HOlRQbG3N+wTZM5pB58ZzZHEOa6vWbRw="; + hash = "sha256-avQdK7+kMrPc8rp/2nTiUC/ZTW8nUem9v3u0xsE0oGM="; }; outputs = [ "out" "man" ]; From b6098e4888a7e38d302b072fe14efb9a06fd8ad2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 12 Nov 2024 08:14:15 +0100 Subject: [PATCH 084/114] python312Packages.sismic: 1.6.7 -> 1.6.8 --- pkgs/development/python-modules/sismic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sismic/default.nix b/pkgs/development/python-modules/sismic/default.nix index 0a6cd34b3856..2453723727b1 100644 --- a/pkgs/development/python-modules/sismic/default.nix +++ b/pkgs/development/python-modules/sismic/default.nix @@ -11,7 +11,7 @@ }: let - version = "1.6.7"; + version = "1.6.8"; in buildPythonPackage { pname = "sismic"; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "AlexandreDecan"; repo = "sismic"; rev = "refs/tags/${version}"; - hash = "sha256-EP78Wc2f6AKqbGBW8wVP0wogEbTo0ndjlRRd+fsUvCo="; + hash = "sha256-0g39jJI3UIniJY/oHQMZ53GCOJIbqdVeOED9PWxlw6E="; }; pythonRelaxDeps = [ "behave" ]; From 8fc316c972eb37c655a5976020cae956e3058c80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 07:53:25 +0000 Subject: [PATCH 085/114] scalr-cli: 0.16.0 -> 0.16.2 --- pkgs/by-name/sc/scalr-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scalr-cli/package.nix b/pkgs/by-name/sc/scalr-cli/package.nix index 4672e5e0bb57..364a5f0c981a 100644 --- a/pkgs/by-name/sc/scalr-cli/package.nix +++ b/pkgs/by-name/sc/scalr-cli/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "scalr-cli"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "Scalr"; repo = "scalr-cli"; rev = "v${version}"; - hash = "sha256-9osB3bsc8IvH1ishG9uiIUnAwC1yZd0rFhiZdzYucI8="; + hash = "sha256-Pw3ZEmQHlRmhEINQRQ21aCt6t1f7aqH/n8zfIzOF0lo="; }; vendorHash = "sha256-0p4f+KKD04IFAUQG8F3b+2sx9suYemt3wbgSNNOOIlk="; From aa9193b7e3609907fca298c702d9b1e2be6883c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 07:55:11 +0000 Subject: [PATCH 086/114] python312Packages.yfinance: 0.2.48 -> 0.2.49 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 36a381551864..9d5fe8500840 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.48"; + version = "0.2.49"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-7m5N2l80Cg6+NDiW0x49WtHkc6fu07s0BqKlHFCc1v0="; + hash = "sha256-rZU7xMTVabXMOQYGJnZjkDcfegBzHNsx8VNPvKKWEIQ="; }; build-system = [ setuptools ]; From 9a67ee8a4940f022a44a8fd31ef798533fe46545 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 12 Nov 2024 08:32:11 +0100 Subject: [PATCH 087/114] ocamlPackages.ppx_deriving_cmdliner: add missing dependency result --- .../ocaml-modules/ppx_deriving_cmdliner/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix index f5d769efcfd6..d956856327f0 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix @@ -6,6 +6,7 @@ , cmdliner , ppx_deriving , ppxlib +, result , gitUpdater }: @@ -14,7 +15,6 @@ buildDunePackage rec { version = "0.6.1"; minimalOCamlVersion = "4.11"; - duneVersion = "3"; src = fetchFromGitHub { owner = "hammerlab"; @@ -36,6 +36,7 @@ buildDunePackage rec { cmdliner ppx_deriving ppxlib + result ]; doCheck = true; From 23bb0ee13f5ba79fc9a30c2d783239d43e7a1bcb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 12 Nov 2024 08:32:16 +0100 Subject: [PATCH 088/114] =?UTF-8?q?ocamlPackages.ppx=5Fderiving:=205.2.1?= =?UTF-8?q?=20=E2=86=92=206.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ppx_deriving/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 1e79e8a1ffa8..a2f002071748 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -13,7 +13,10 @@ }: let params = - if lib.versionAtLeast ppxlib.version "0.20" then { + if lib.versionAtLeast ppxlib.version "0.32" then { + version = "6.0.3"; + sha256 = "sha256-N0qpezLF4BwJqXgQpIv6IYwhO1tknkRSEBRVrBnJSm0="; + } else if lib.versionAtLeast ppxlib.version "0.20" then { version = "5.2.1"; sha256 = "11h75dsbv3rs03pl67hdd3lbim7wjzh257ij9c75fcknbfr5ysz9"; } else if lib.versionAtLeast ppxlib.version "0.15" then { @@ -30,7 +33,7 @@ buildDunePackage rec { inherit (params) version; src = fetchurl { - url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-v${version}.tbz"; + url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-${lib.optionalString (lib.versionOlder version "6.0") "v"}${version}.tbz"; inherit (params) sha256; }; @@ -41,11 +44,10 @@ buildDunePackage rec { propagatedBuildInputs = lib.optional (lib.versionOlder version "5.2") ocaml-migrate-parsetree ++ [ ppx_derivers - result - ]; + ] ++ lib.optional (lib.versionOlder version "6.0") result + ; - doCheck = lib.versionAtLeast ocaml.version "4.08" - && lib.versionOlder ocaml.version "5.0"; + doCheck = lib.versionAtLeast ocaml.version "4.08"; checkInputs = [ (if lib.versionAtLeast version "5.2" then ounit2 else ounit) ]; From 78614e78eca8277275962a66fe7ffcacacd5e1c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 08:23:40 +0000 Subject: [PATCH 089/114] tui-journal: 0.12.0 -> 0.12.1 --- pkgs/by-name/tu/tui-journal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix index 2947c31ce94d..c2828a4057a3 100644 --- a/pkgs/by-name/tu/tui-journal/package.nix +++ b/pkgs/by-name/tu/tui-journal/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-A3uSbd3tXrXe3jvlppndyg3L2gi5eiaxIrPTKqD5vog="; + hash = "sha256-BVTH5NF0/9wLHwTgXUO+v97d332SwAgTeWbVoQjgRfA="; }; - cargoHash = "sha256-b3loo6ZzZs3XwBI4JT9oth57vP3Aaulp24B7YDSnhhQ="; + cargoHash = "sha256-BnFWv/DcJ8WR67QV/gLK6dBaFvcm7NT4yfCQv0V0mSk="; nativeBuildInputs = [ pkg-config From efc5f2f17b1f8b33b40f1b02f1bdb26b2ab3b95e Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 12 Nov 2024 09:10:51 +0000 Subject: [PATCH 090/114] miru: 5.5.6 -> 5.5.8 --- pkgs/by-name/mi/miru/darwin.nix | 2 +- pkgs/by-name/mi/miru/linux.nix | 2 +- pkgs/by-name/mi/miru/package.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/miru/darwin.nix b/pkgs/by-name/mi/miru/darwin.nix index 4f46c45c68fe..0e996826d007 100644 --- a/pkgs/by-name/mi/miru/darwin.nix +++ b/pkgs/by-name/mi/miru/darwin.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip"; - hash = "sha256-odMJ5OCXDajm4z+oHCqtpew+U73ymghmDa/F019dAcY="; + hash = "sha256-GTw5RislcL5s6gwUeCmLglXt/BZEpq3aau/ij1E7kso="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mi/miru/linux.nix b/pkgs/by-name/mi/miru/linux.nix index d5dc55ce7269..cf935ffa7c85 100644 --- a/pkgs/by-name/mi/miru/linux.nix +++ b/pkgs/by-name/mi/miru/linux.nix @@ -19,7 +19,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha256-yfavGhH/QROChWB0MxYt8+dssYo0+/1bV+h2Ce951RE="; + hash = "sha256-4ueVgIcIi/RIFRoDKStiNqszfaIXZ9dfagddzCVaSRs="; }; extraInstallCommands = diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index 3e65d4814405..1c602002225b 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -5,7 +5,7 @@ }: let pname = "miru"; - version = "5.5.6"; + version = "5.5.8"; meta = with lib; { description = "Stream anime torrents, real-time with no waiting for downloads"; homepage = "https://miru.watch"; From 9588bbde8ad70143990baa01dfdf3931c449959b Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Tue, 12 Nov 2024 09:14:31 +0000 Subject: [PATCH 091/114] miru: with lib; cleanup --- pkgs/by-name/mi/miru/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix index 1c602002225b..3c325b038233 100644 --- a/pkgs/by-name/mi/miru/package.nix +++ b/pkgs/by-name/mi/miru/package.nix @@ -6,17 +6,17 @@ let pname = "miru"; version = "5.5.8"; - meta = with lib; { + meta = { description = "Stream anime torrents, real-time with no waiting for downloads"; homepage = "https://miru.watch"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ d4ilyrun matteopacini ]; mainProgram = "miru"; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; longDescription = '' From db3e4ba22d9463ae8a6fa5cc6e11553e8b77f8cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 09:25:59 +0000 Subject: [PATCH 092/114] wlink: 0.0.9 -> 0.1.0 --- pkgs/by-name/wl/wlink/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wl/wlink/package.nix b/pkgs/by-name/wl/wlink/package.nix index 2b8e2c4a377f..05d51ac168a3 100644 --- a/pkgs/by-name/wl/wlink/package.nix +++ b/pkgs/by-name/wl/wlink/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "wlink"; - version = "0.0.9"; + version = "0.1.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Jr494jsw9nStU88j1rHc3gyQR1jcMfDIyQ2u0SwkXt0="; + hash = "sha256-YiplnKcebDVEHoSP8XTPl0qXUwu2g32M864wbc3dyX8="; }; - cargoHash = "sha256-rPiSEfRFESYxFOat92oMUABvmz0idZu/I1S7I3g5BgY="; + cargoHash = "sha256-JZ10VhFbrjIOiKRrYltdcVnv315QasgmDWlMzUUmNhw="; nativeBuildInputs = [ pkg-config ]; From 564eb95ad6951d337d69a1eddb7e9d80991b95cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 09:27:53 +0000 Subject: [PATCH 093/114] python312Packages.meraki: 1.51.0 -> 1.52.0 --- pkgs/development/python-modules/meraki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index d6ab3cc7fc55..14ff9dcf67e1 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.51.0"; + version = "1.52.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3JUUTi+6oe+mDn4n9NtlWXji4j3E6AZODZZ+PEvSSzg="; + hash = "sha256-8fNrHRZZ58FW0UOBdbUUzI3y+Y6kAyue4uHnPoODdzw="; }; propagatedBuildInputs = [ From ab1f1910e05a7a0e959f458e3438da3a0a054f0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 06:39:53 +0000 Subject: [PATCH 094/114] python312Packages.htmltools: 0.5.3 -> 0.6.0 --- pkgs/development/python-modules/htmltools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/htmltools/default.nix b/pkgs/development/python-modules/htmltools/default.nix index f7375cab0b77..3bb83d269109 100644 --- a/pkgs/development/python-modules/htmltools/default.nix +++ b/pkgs/development/python-modules/htmltools/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "htmltools"; - version = "0.5.3"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "posit-dev"; repo = "py-htmltools"; rev = "refs/tags/v${version}"; - hash = "sha256-+BSbJdWmqoEQGEJWBgoTVe4bbvlGJiMyfvvj0lAy9ZA="; + hash = "sha256-ugtDYs5YaVo7Yy9EodyRrypHQUjmOIPpsyhwNnZkiko="; }; build-system = [ From ea22e00b75426cbcb94fe8e095d1fe4de2b7e9cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 05:36:03 +0000 Subject: [PATCH 095/114] python312Packages.python-docs-theme: 2024.6 -> 2024.10 --- .../python-modules/python-docs-theme/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 012157d46507..5e1dcc66c635 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -9,21 +9,21 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2024.6"; + version = "2024.10"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "python"; repo = "python-docs-theme"; rev = "refs/tags/${version}"; - hash = "sha256-YKKF2e1La8jsCRS3M+LT+KmK0HxCRGQOof3MlVkMAuY="; + hash = "sha256-JwuIV+hkBIst8EtC3Xmu/KYTV+SZvD4rb9wHimKLL94="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ sphinx ]; + dependencies = [ sphinx ]; pythonImportsCheck = [ "python_docs_theme" ]; From 7652fcf8b9e80327b5f13680e55526ad0527f0d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Oct 2024 17:34:07 +0000 Subject: [PATCH 096/114] python312Packages.pyphen: 0.16.0 -> 0.17.0 --- .../python-modules/pyphen/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pyphen/default.nix b/pkgs/development/python-modules/pyphen/default.nix index b8464e1852bb..4cc14534185b 100644 --- a/pkgs/development/python-modules/pyphen/default.nix +++ b/pkgs/development/python-modules/pyphen/default.nix @@ -2,28 +2,24 @@ lib, buildPythonPackage, fetchPypi, - flit, + flit-core, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "pyphen"; - version = "0.16.0"; - format = "pyproject"; + version = "0.17.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-LABrPd8HLJVxq5dgbZqzwmqS6s7UwNWf0dJpiPMI9BM="; + hash = "sha256-HROs0c43o4TXYSlUrmx4AbtMUxbaDiuTeyEnunAqPaQ="; }; - nativeBuildInputs = [ flit ]; - - preCheck = '' - sed -i '/addopts/d' pyproject.toml - ''; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; From 0ae1cd185b7e98a8a7c1803ab45769db0651043d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Oct 2024 23:33:38 +0000 Subject: [PATCH 097/114] python312Packages.exchangelib: 5.4.3 -> 5.5.0 --- .../python-modules/exchangelib/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 0f6e58d0cb2c..b1898d0e917f 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -1,12 +1,10 @@ { lib, - backports-zoneinfo, buildPythonPackage, cached-property, defusedxml, dnspython, fetchFromGitHub, - flake8, isodate, lxml, oauthlib, @@ -20,7 +18,6 @@ requests-ntlm, requests-gssapi, requests-oauthlib, - requests-kerberos, requests-mock, setuptools, tzdata, @@ -29,16 +26,16 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "5.4.3"; + version = "5.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ecederstrand"; repo = "exchangelib"; rev = "refs/tags/v${version}"; - hash = "sha256-SX5F0OXKdxA2HoDwvCe4M7RftdjUEdQuFbxRyuABC4E="; + hash = "sha256-nu1uhsUc4NhVE08RtaD8h6KL6DFzA8mPcCJ/cX2UYME="; }; pythonRelaxDeps = [ "defusedxml" ]; @@ -56,10 +53,9 @@ buildPythonPackage rec { requests requests-ntlm requests-oauthlib - requests-kerberos tzdata tzlocal - ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; + ]; optional-dependencies = { complete = [ @@ -73,7 +69,6 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - flake8 psutil python-dateutil pytz From 90fb183cc70766248e6cd90e9382157bb9425b74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 10:50:31 +0000 Subject: [PATCH 098/114] codeql: 2.19.1 -> 2.19.3 --- pkgs/by-name/co/codeql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix index c981487935c5..14d1661ebfba 100644 --- a/pkgs/by-name/co/codeql/package.nix +++ b/pkgs/by-name/co/codeql/package.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.19.1"; + version = "2.19.3"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-OUfNlaGNJDRkg5OGVPakB2TfEP4GFNVVFpXKW8SBpfM="; + hash = "sha256-MLX4xyK0nFMyiXCL3+q0kOjP3S7uK1tVF9lnhyxbTSE="; }; nativeBuildInputs = [ From b91f647a35c4e18a73adf617e6ef9eb5f3baa503 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Tue, 12 Nov 2024 12:34:43 +0100 Subject: [PATCH 099/114] element-desktop: 1.11.84 -> 1.11.85 Fixes 3 vulnerabilities: * CVE-2024-51750 / GHSA-w36j-v56h-q9pc * CVE-2024-51749 / GHSA-5486-384g-mcx2 * CVE-2024-50336 / GHSA-xvg8-m4x3-w6xr https://github.com/element-hq/element-desktop/releases/tag/v1.11.85 --- .../networking/instant-messengers/element/pin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index ebaac79e619b..6b0ac73be531 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.84"; + "version" = "1.11.85"; "hashes" = { - "desktopSrcHash" = "sha256-XpXyLMYaxXTnDeJJio729TFMLn5BpUQnSb4/Rn434uo="; + "desktopSrcHash" = "sha256-KNt7UgQBKoieV3IV/qFjk6PKYlgjHk4tLA8cZZlYtIw="; "desktopYarnHash" = "1wh867yw7ic3nx623c5dknn9wk4zgq9b000p9mdf79spfp57lqlw"; - "webSrcHash" = "sha256-va3r2Gk1zaP2fK/RGmU7wj52jVYo4PI5Gm/rRQGpuvo="; - "webYarnHash" = "0w48744ick4ji1vwh9ma6ywsb4j5hfq4knw86zqqh0ciflylcywc"; + "webSrcHash" = "sha256-JR7kA2thttBle+BT/zH8QjIjp5mJPsRMYx8nd/I3IEw="; + "webYarnHash" = "0f38gizj9cnb7dqj10wljxkbjfabznh3s407n9vsl7ig0hm91zf9"; }; } From 78d00070372b978dfd3140ef3f68c10ab093601b Mon Sep 17 00:00:00 2001 From: miampf Date: Fri, 11 Oct 2024 21:01:00 +0200 Subject: [PATCH 100/114] plymouth-blahaj-theme: init at 1.0.0 --- .../pl/plymouth-blahaj-theme/package.nix | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/pl/plymouth-blahaj-theme/package.nix diff --git a/pkgs/by-name/pl/plymouth-blahaj-theme/package.nix b/pkgs/by-name/pl/plymouth-blahaj-theme/package.nix new file mode 100644 index 000000000000..fa5a829a7b30 --- /dev/null +++ b/pkgs/by-name/pl/plymouth-blahaj-theme/package.nix @@ -0,0 +1,48 @@ +{ + stdenvNoCC, + fetchurl, + lib, +}: + +stdenvNoCC.mkDerivation rec { + pname = "plymouth-blahaj-theme"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/190n/plymouth-blahaj/releases/download/v${version}/blahaj.tar.gz"; + sha256 = "sha256-JSCu/3SK1FlSiRwxnjQvHtPGGkPc6u/YjaoIvw0PU8A="; + }; + + patchPhase = '' + runHook prePatch + + shopt -s extglob + + # deal with all the non ascii stuff + mv !(*([[:graph:]])) blahaj.plymouth + sed -i 's/\xc3\xa5/a/g' blahaj.plymouth + sed -i 's/\xc3\x85/A/g' blahaj.plymouth + + runHook postPatch + ''; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/plymouth/themes/blahaj + cp * $out/share/plymouth/themes/blahaj + find $out/share/plymouth/themes/ -name \*.plymouth -exec sed -i "s@\/usr\/@$out\/@" {} \; + + runHook postInstall + ''; + + meta = { + description = "Plymouth theme featuring IKEA's 1m soft toy shark"; + homepage = "https://github.com/190n/plymouth-blahaj"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ miampf ]; + }; +} From 216f83d2cd8747f448fd87940047df520e2e0a76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 11:55:07 +0000 Subject: [PATCH 101/114] lxgw-neoxihei: 1.207 -> 1.211 --- pkgs/by-name/lx/lxgw-neoxihei/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 72480f5c108a..f98a6cebb11a 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.207"; + version = "1.211"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-voFR2qkomj1CRv4OWtrYJmpVxoUl6db/HnkaobCmBzY="; + hash = "sha256-w3Rk0NDYXPzzg1JGsC6zIvr0SiM3ZzHHW9NwHNAhnaM="; }; dontUnpack = true; From a9eb46aa3df4515179d0413724aeb7c79a68a594 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 12:09:30 +0000 Subject: [PATCH 102/114] gittuf: 0.6.2 -> 0.7.0 --- pkgs/by-name/gi/gittuf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index 8dfca387e94a..a8035b0e7e37 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gittuf"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "gittuf"; repo = pname; rev = "v${version}"; - hash = "sha256-iPaYwZUnIu9GeyY4kBhj+9gIINYx+pGSWJqPekh535g="; + hash = "sha256-IS330rgX6nXerqbaKslq1UvPnBVezZs8Q97IQvSs4sE="; }; - vendorHash = "sha256-mafN+Nrr0AtfMjnXNoEIuz90kJa58pgY2vUOlv7v+TE="; + vendorHash = "sha256-2EEE7M16MO0M9X0W1tPXBiKlokXMoHSJjscdjaerEjE="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${version}" ]; From 44f08394de161e607cf7f36f15843eb6378d69fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 12:13:23 +0000 Subject: [PATCH 103/114] civo: 1.1.91 -> 1.1.92 --- pkgs/by-name/ci/civo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index d68c7628defe..e7b176e71db7 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.1.91"; + version = "1.1.92"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-1RemtyaIyL5OqAfl+njL/DeFXPMUT5vghXwHOjmsgl0="; + hash = "sha256-nsH/6OVvCOU4f9UZNFOm9AtyN9L4tXB285580g3SsxE="; }; - vendorHash = "sha256-dzhSfC864ievkbM0Mt6itlAzlk3211tQmpFrCYFR0s8="; + vendorHash = "sha256-G3ijLi3ZbURVHkjUwylFWwxRyxroppVUFJveKw5qLq8="; nativeBuildInputs = [ installShellFiles ]; From 8c8d460d631e65b91ab07cb06f58456d4dd2dcf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 12:22:18 +0000 Subject: [PATCH 104/114] cloudflare-dynamic-dns: 4.3.5 -> 4.3.9 --- pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix index 7d9397caf65f..2890cb1cc971 100644 --- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "cloudflare-dynamic-dns"; - version = "4.3.5"; + version = "4.3.9"; src = fetchFromGitHub { owner = "zebradil"; repo = "cloudflare-dynamic-dns"; rev = "refs/tags/${version}"; - hash = "sha256-9WJeWWgI96+LjMFl7TkDc7udsLvi54eAN3Y9iv2e+F4="; + hash = "sha256-kM2arX2QOZd0FzE2gDHZlN58hpBs92AJHVd9P8oaEdU="; }; - vendorHash = "sha256-KtTZcFYzJOH2qwoeHYfksXN7sDVV9ERCFVrrqzdh3M0="; + vendorHash = "sha256-JMjpVp99PliZnPh34MKRZ52AuHMjNSupndmnpeIc18Y="; subPackages = "."; From acbab2f03f2c8ceef2851897753d810f6046d5a6 Mon Sep 17 00:00:00 2001 From: Felix Date: Tue, 12 Nov 2024 13:24:30 +0100 Subject: [PATCH 105/114] libamqpcpp: build with cmake support (#349764) Co-authored-by: Sandro --- pkgs/by-name/li/libamqpcpp/package.nix | 27 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/li/libamqpcpp/package.nix b/pkgs/by-name/li/libamqpcpp/package.nix index 8905f2c4da3e..dfabbdb40c3a 100644 --- a/pkgs/by-name/li/libamqpcpp/package.nix +++ b/pkgs/by-name/li/libamqpcpp/package.nix @@ -1,29 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, openssl }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + openssl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libamqpcpp"; version = "4.3.27"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-iaOXdDIJOBXHyjE07CvU4ApTh71lmtMCyU46AV+MGXQ="; }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl ]; patches = [ ./libamqpcpp-darwin.patch ]; - makeFlags = [ "PREFIX=$(out)" ]; - enableParallelBuilding = true; + doCheck = true; - meta = with lib; { + meta = { description = "Library for communicating with a RabbitMQ server"; homepage = "https://github.com/CopernicaMarketingSoftware/AMQP-CPP"; - license = licenses.asl20; - maintainers = [ maintainers.mjp ]; - platforms = platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mjp ]; + platforms = lib.platforms.all; }; -} +}) From ae8c3f20687c8a9cff4c3d5f75611994daa31c38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 12 Nov 2024 22:36:06 +1000 Subject: [PATCH 106/114] python312Packages.aiorussound: 4.0.5 -> 4.1.0 (#355359) https://github.com/noahhusby/aiorussound/releases/tag/4.1.0 --- pkgs/development/python-modules/aiorussound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix index 6e702e7927cb..14b03313faa5 100644 --- a/pkgs/development/python-modules/aiorussound/default.nix +++ b/pkgs/development/python-modules/aiorussound/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiorussound"; - version = "4.0.5"; + version = "4.1.0"; pyproject = true; # requires newer f-strings introduced in 3.12 @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "noahhusby"; repo = "aiorussound"; rev = "refs/tags/${version}"; - hash = "sha256-W0vhVK1SmnTsNuXpDn2e1BrBnsdBwgiNyXucC+ASg1M="; + hash = "sha256-uMVmP4wXF6ln5A/iECf075B6gVnEzQxDTEPcyv5osyM="; }; build-system = [ poetry-core ]; From ec9bdee8594ef47c3758b4e8fec88c886a468166 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 13:33:06 +0000 Subject: [PATCH 107/114] python312Packages.google-cloud-bigquery: 3.26.0 -> 3.27.0 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 82018221e002..3d29e7ee1646 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.26.0"; + version = "3.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery"; inherit version; - hash = "sha256-7b3HiL7qZZ4EwK9/5NzW2RVTRLmJUaDVBVvS8V2kuiM="; + hash = "sha256-N5xSQFTXsJD6VtDCJmLMbmRYpiKbZ1TA5xd+OnNCHSw="; }; build-system = [ setuptools ]; From 5368df695cac94ca9ebfc33e1711c843bf1f6f0b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Nov 2024 15:23:21 +0100 Subject: [PATCH 108/114] firefox-unwrapped: 132.0.1 -> 132.0.2 https://www.mozilla.org/en-US/firefox/132.0.2/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index ab496ff9a60a..8385e3b2f52f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -5,10 +5,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "132.0.1"; + version = "132.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "10d5b05f61628deb9a69cb34b2cf3c75bb6b8768f5a718cef2157d5feb1671ede0d583439562e1c1221914eb6ed37fdf415dd651b1465c056be174136cd80b9d"; + sha512 = "9ea95d9fb1a941ac5a5b50da67e224f3ccf8c401f26cb61bb74ad7f4e1e8706d469c4b6325714f2cb9cdf50c32710377d6bca18dd65b55db2c39ef2b27a57fae"; }; extraPatches = [ From 9173aeb879d1ce24a74d5392a6401bfdee82f06f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Nov 2024 15:23:55 +0100 Subject: [PATCH 109/114] firefox-bin-unwrapped: 132.0.1 -> 132.0.2 https://www.mozilla.org/en-US/firefox/132.0.2/releasenotes/ --- .../browsers/firefox-bin/release_sources.nix | 826 +++++++++--------- 1 file changed, 413 insertions(+), 413 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5bd03d6ee752..291824af230f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1035 +1,1035 @@ { - version = "132.0.1"; + version = "132.0.2"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ach/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ach/firefox-132.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "47b84223ff9a935cd43385a91f8966550459b119c04a21920c5b30c0e389aada"; + sha256 = "87ceb264c19e6b2551974769a68196b699bb49ece436baf32c9c9e3e1a0be4bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/af/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/af/firefox-132.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "114bc2d0b6ea8b3aecfdb5c3cc2018d9d459e4aab297d03f971b73abc39dda04"; + sha256 = "9abb2282f991e5d65db2d6b974996a77db7e0d9f5a2ba59eca816c4387f21d24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/an/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/an/firefox-132.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5a022acb822c8d2890a96a0066c07e7b0302f1271e804ad6ac078dd6c119d83d"; + sha256 = "fb972e651859f342f34e23526a0f7f0e6b2a225555144a8ba1a8866e16058c7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ar/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ar/firefox-132.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ffd6d05fb7f5a4f6b5b18005b9d93b463461113f5ad355a0485ede9c86fdc3a1"; + sha256 = "f5c42ee9098ebb6612e19f46b4dac3e4cab41b5c9445e16fe86edf23655c5ca0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ast/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ast/firefox-132.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8e923498967ce623ca89a76ff11d9d46da0fa401a557c0fbb5b1dde5c07c895d"; + sha256 = "16cc81fa3c8658ffb07e29bd85dc4afadd743eeac0643c570dbbe5a1d9ea6ab1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/az/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/az/firefox-132.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "5b7402b3f71966dfdd2142b1fb4926f03a27c7065b6a82271c218e24ec85d4b8"; + sha256 = "68a9c717e74a1e8797adc0b5718b3b961ec26e2198a01f1c701c6600cb40a57e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/be/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/be/firefox-132.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5fd0f8f2d7307bc20586a85b46f762fbc98232264f3d9f3d50dfb6675540cc56"; + sha256 = "3b9397bfd46004a7d6aa9b45ec52c8aa6132e6ab095467f601d5aa0a11223913"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/bg/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/bg/firefox-132.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4c5e925f17d872d294015b589805d19fadb84336bc4497fbca96754332fc0b98"; + sha256 = "feb2f6b433aebe62edfcfea9c2d23aba67416b60766d92100276f09435e57aea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/bn/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/bn/firefox-132.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "3b82cd68b340d110b555108f90aa7b816d150a4f8ef537bf723e6a36f3aa3025"; + sha256 = "f6038ebae4040c80e670276c70d28a55c57163b78caa4187dab847231e0f728a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/br/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/br/firefox-132.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "87c1f982953abf12b52673db37019c3934d90bc7d700f00d29c88b94fb2b21eb"; + sha256 = "df32158e771d2c819c50b665ea046496a5380cc99da89a35411ccbc51639cfbb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/bs/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/bs/firefox-132.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "651f43d35eef5960570c189d4405e3c37b134af3e52bb0adbee6a587c92ee86c"; + sha256 = "f53c319fc43baa6d018df3dfec3cf468338b59939d5caa1fc951965aff18ed42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ca-valencia/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ca-valencia/firefox-132.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "fd7643a7d660044e67cc78d83a684e2c16c48af5c405d84543cd177141e25b5b"; + sha256 = "c3b48283aee0c853a02372d5003afaf77de33cf1455761cb649e4c7f58457d63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ca/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ca/firefox-132.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9b4d7fdb976fead278dc2c02bdf98d9e203443d3cfc0aa532a53c0e1e4fb4990"; + sha256 = "eaa66d070b02f7c73a5989c655ff40f788230d397b02a60eb717a1d5525d1b7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/cak/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/cak/firefox-132.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "836bc334d065becf93cb41f7770c381ba7a086bac85eccb11cd2fd6205c95c15"; + sha256 = "f3321fd493765608c7ae85d4748e9ff80991dd657c62ef3f814c17782efa09c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/cs/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/cs/firefox-132.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "cc4cd32169b8d9bf53a2c3641cd9aa0a82781c5a52b75ab8efabf7c8434d6c35"; + sha256 = "148eda2e8d420809229dd458cd17cdcc184408b194c7a44687bac76e59efd60a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/cy/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/cy/firefox-132.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4ad8cc5b6ec8393b2205aa36d0e4150819aec2850062ea6a766fd90bd37e6232"; + sha256 = "cd16fc708a89f0fffc2db2cab545067e27d30c6cab5a735213b59789acdce420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/da/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/da/firefox-132.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7fb6abe531f1a8eba83aa3af01c4f10476af48c435f41c0ff0cce1171797ad27"; + sha256 = "22ce6fecfacbde2c14b55a2b67733d688b49346a028d4ede24d70633849a1cfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/de/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/de/firefox-132.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "cb10b158628410262d776b26426009c918ac6f334699942bd767b6a6cee3c9f4"; + sha256 = "4673aeee5ef90c23870150f5c9486c4c54b99ade314fcedcff771d83235fa52d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/dsb/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/dsb/firefox-132.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "67d6ace053d277c976cbe8ab221c6b879491b59c3de9cc3c83cf7a40d65fcd5e"; + sha256 = "193f04072e3b595981e79cae173c771a91a4dad5f3d3aede329e48d0e5a64d2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/el/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/el/firefox-132.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b0f575e5ae740dc57e27dfaf6523da4588696122412ba4d0d3151c5282d6c69f"; + sha256 = "e352d13c0e6bc3d7c5737321daeaa093f600544957f502f78fdb23244dfc3f20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/en-CA/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/en-CA/firefox-132.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "9379b3d8f77a893d76a0ea60bfe2bba9ecd0fb9f4ba3577a09f4ad4ee4fdbb58"; + sha256 = "46cf1b6b4459785651bbc13e6074b27e6520698b51eab5e1708e508dfbd0b402"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/en-GB/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/en-GB/firefox-132.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "7ce4f3ad198bf08d05cc20de71367082539504cd161dd9b989638be563f8838c"; + sha256 = "16b215a5a8234bd49e061b7608081ed3a91dbff07e5ade754bd26a728cd33ee5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/en-US/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/en-US/firefox-132.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ecdcb4787263cacd31aa3a1b62c14f1d3b69af44a0b40f9eb040852f401097c1"; + sha256 = "777d47f8b8710ab450582dc0dc0cdf8f43c2291249b3eaf740ee28ee34cda139"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/eo/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/eo/firefox-132.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "b0f6abe885db37f87e4ab94e74cd0379069473c2a24222dd91e881f6d1dfe881"; + sha256 = "cee4e74fdf106b9df849f7103b209ba17581fc5d16d6fdce0d8a6d8595e40fb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/es-AR/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/es-AR/firefox-132.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ba1a7572a12a9699811cd87ddfdaaf5896bafa26c1b85e534b3571cc003d05fd"; + sha256 = "13b75dcf77e5f9e44fd0c5c085e4d97f76561868cb61fe95535c4433bdf5d390"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/es-CL/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/es-CL/firefox-132.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "319c9544dc8afc0b4654eac94c04d2eac4a4eb32282b0e58baa3be2c3e3b0f0d"; + sha256 = "b84745a9a3581e1a8f15879e975fd6236b0331910eaba6fab5951059bdec89a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/es-ES/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/es-ES/firefox-132.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28141f043e4d693eb5a8fdd96d0df5a2f8c0c55e93f91b3af61fb285c020d9a9"; + sha256 = "5e10e8804e4244889936136bc5bc7e45deb9be9814d4ea501a37d53a35e4360f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/es-MX/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/es-MX/firefox-132.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "f1ce02fd9502a55ce1dc6814bde81172ea7f87f9726c6768602eee1b5e005e43"; + sha256 = "006fc7493cbffc6213260dc8b1f64470c60b8e0de5b8862904c1724b81e790f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/et/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/et/firefox-132.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9c2f778b8ed8e02e89f6f2a02b0466f2a843a3a540a64253f7f4586d473de1ae"; + sha256 = "5914b5b0ea91c0929126715dbf0ea9b4c4a689913d08a9c03034debc7ef5d7f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/eu/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/eu/firefox-132.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "971baaa0d303deccc66aa36f104476756d52fcd6bcec19bb6968935ebb0048a1"; + sha256 = "42a6deaa0447287e240410508bfd25d9b2e0c45cfa8f609b9c0fe2ae31c8ab4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fa/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/fa/firefox-132.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "64aa0f1e578546b16f7a0fe5a0681b109b75c36298297213330b34de35be7042"; + sha256 = "3379049471b7ecd132b6bec23d774e371942566570836ae4afdc043c27573063"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ff/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ff/firefox-132.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "8cb3d0e913a635722c0e925205c3a743a5117f166b95d6d5cebf49443aadbd87"; + sha256 = "bc6c0f0b7b8897fc4f7b2d2c28152c6807598b79ea634374b23d6f03de0a1d61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fi/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/fi/firefox-132.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "031dfa6336c32b957c95a5b1ed4de085320a365921d49ce36f2afeb9b6c11c26"; + sha256 = "63a0d9e19fc2e68acb6c06a93aa17a3c4320f3cb33dbb2d4bce617d22c1c8d09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/fr/firefox-132.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e651ef0a1fb63933b02d4ce5733e1843586cbcd44747ca99584491cf1a094cc6"; + sha256 = "f228938e9946878d14bf56d0cdd48b7dd6a05dbd52ca8d7fd3b45a3fd7604e53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fur/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/fur/firefox-132.0.2.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "b045c7ef875bedb66e4c89ccce008004dc893d73b139259f5b8b30ebc4d30bd1"; + sha256 = "bc71fc182d7d53ca5c0f81c9456946404a2d2340fd750b8ba23c35a97b13c84c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/fy-NL/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/fy-NL/firefox-132.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e64eb98eb45157d55523ab99c34b5d642739a55aba9b9e3bc77d717de0471841"; + sha256 = "7eedf2f8d943f2e9087937d9f510838f169859977afae55caa6b560ce86b90ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ga-IE/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ga-IE/firefox-132.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "39c27bb01af27a436500d13977b0a79f4f6fb2c3ed38bf02477ace5de9bc446e"; + sha256 = "715097b84a63aed02d1e2aeef3e780b83dff692042f47ee37cd3be4b7e54b2fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/gd/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/gd/firefox-132.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3cf7babe7ed87ebd722ea48498b762dd272fd81df83d2694c38708a749b8a87a"; + sha256 = "bb3f45035f05a272bea8dda3b9f7641af8b8ce56425e11a3fed5d866c126e059"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/gl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/gl/firefox-132.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7d01435f588c9682d885ca450557a93ed798701f9f25507458501400b00ebc40"; + sha256 = "32c837576b7e78f3c67277af824773264068ad094a08f66fb6f7e9d942af8188"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/gn/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/gn/firefox-132.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "50f1b786b8690ddcaaf69b6faac6b0fd04cdbe3cbbf44ce67a650b57b67267ae"; + sha256 = "092cfb95e68c9f4dec67cafe0eb66a3772f5ee2da81a71bc5db4929f63d10bee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/gu-IN/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/gu-IN/firefox-132.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d4ee862005c5f839eee0d2a00c4504f492a6f8a87c32fd881750caa80b04ba27"; + sha256 = "88166c2e88b67f511aa03e7cb43b211a7e432390b6db01c9e7b2f55b083273b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/he/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/he/firefox-132.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c7af8bcdc184029c73dc6731c6f89d341d7f127ca8185affe16827ead0217eb5"; + sha256 = "2efae465cd2fea4ea4a100367b81699ce05970ba09bebcfde86d88b815bea97d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hi-IN/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/hi-IN/firefox-132.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "56845aeae594f1f30e1a489585c49b4beedc43bdc39ea2259185092ce8894f17"; + sha256 = "a811bf5b196f5f305aa17db1d81772938e829361f3746e2b7874c1cbc783b470"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/hr/firefox-132.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "c59bdf5e83b7bb247304a25aa78b3ba838b72c27e8d766a390a30f13810a432f"; + sha256 = "8a9ffd5849b469cf858c4b29f2647b173358952cfa9d519235aa82d9edaa690c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hsb/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/hsb/firefox-132.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "20644637c58cd030e6a2c1737746d9f040aadd4992f491ee93faa264c463a1ae"; + sha256 = "dc5915c3bb74908e8c95f61359f3db4b30a6b5dd521c385cfc95f46c5cc95ce4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hu/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/hu/firefox-132.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ac7ebf57f4ad56c74ce0cf0689fd7ec487009b97ad1eeec53313eba7b01418b9"; + sha256 = "520ca6d0aca17e6fce786455b83fe80949377655be52dd84ed17bad99bb302a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/hy-AM/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/hy-AM/firefox-132.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ece495c6d2b37c68015d72f144102a86881b164b34a137ff2ca4f86c58b197aa"; + sha256 = "9d1b7b6021376ea0b32ef7069d0e87fa46c074f04b229a93eac23a3fe4794049"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ia/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ia/firefox-132.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "0e3abe6b6dd819f8a1074928510386f3bf62604ddd5c283576273881674b4d6a"; + sha256 = "2795f8b6b2ebd014adf283e0acc4957d5bd2bbdf28a7bf86e65262c6892fcb12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/id/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/id/firefox-132.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ca0969a72d8b663a6ab421147d0240936c98dd98cfb36ca4d59efb56b816e069"; + sha256 = "b4fc888f2b0c0718cdbb786424a2821e4348c4de7854b882ab5be6d6416d276f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/is/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/is/firefox-132.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a7ed3a77731410a38f946feddd0e8d56080e99a6fd3ad605808fdeee0d8b607c"; + sha256 = "17c2118379de8d04312feff5d081ff5855dbc51a3f49f49933c5bf6326645630"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/it/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/it/firefox-132.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "bded4a3c8398d1efa37eccf2b67f6e2e6c70dc407016879a314f749ae512aa20"; + sha256 = "c60c01252a620a8a7221d0be407ee484746334efa1bb1b99f348aca86d7239d2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ja/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ja/firefox-132.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "33124d63d6e5ffed051dc210e59be728f7c0cdb8c10440c193b0c3407a232b08"; + sha256 = "f2203605bc7d7458f5031e3462e14a366c751b054dc3dad372d9d91618b1d0d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ka/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ka/firefox-132.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7318127470dff1429ec32dee34b87fa48684c55a3eefe82058e4b7e88bbaa221"; + sha256 = "34a035a150398cfdfb7b79c549b5efdeed566f539a2875a884c1d6b9c19b6508"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/kab/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/kab/firefox-132.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "16ca5425d0d7a270aa0c4a26461db8207042c030fd175821c51d529adf458de1"; + sha256 = "2d5473db7b1c955e547e3a3fba5f2385e8f9f4dec11bb78f8acb33e29c017aca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/kk/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/kk/firefox-132.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c8666a61f1d8c2936fd5eb160c1e600047395bfe111dc74df8e6a8cd42041e08"; + sha256 = "e93a469d93c08f14bfb65c996187470bab90a1ea75f534222aff20898acd2970"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/km/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/km/firefox-132.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "80396bb4dc0e5c8738aae21864d6a749b86d36b8ac72aafa611401461f864e9a"; + sha256 = "a8d05bb81a165abcc553c7052ef62d6667ca12084baed6f3248b81f7e93b2b33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/kn/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/kn/firefox-132.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c01f99a70977bcc79f41aab992d7b635918f202b5b8004c75adb3f3a29677e8c"; + sha256 = "ae7542fe10bdf15547632768107ab9a263afed6fdf4c9a7268f0278977a47f17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ko/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ko/firefox-132.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "256f388cc35fdf16a5a2580e032141d8bf017bb0e06833882a76fb7821313e54"; + sha256 = "c246e7917c504948c023664013e0ea039f29e43d7c76896d6c186340a267d9af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/lij/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/lij/firefox-132.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "15a8f74b24bf17c5def54376a07fb23835a4401dbd330c98992247f8dfe059b4"; + sha256 = "c7a3530c96213dd7f5ea5d10d5c164252ba16bf5a5e2c803112722733c7d3e1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/lt/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/lt/firefox-132.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "63708543ac979967d1251f12080e20a398be24a2b77954750a7bda330793f4a4"; + sha256 = "147294dd150b71b4d36bfe9ae3a9608800627d767098f47639afa6aed8140109"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/lv/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/lv/firefox-132.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "6d94313b47e95ece58f7aaddf58cebc676ab0e84eb4ac970a7336541fa22eb6e"; + sha256 = "7faf24383f83147d8985259b4e3ed1840bdd25c5719e4215b7a46bd54ef66382"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/mk/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/mk/firefox-132.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "ba90a2d3d217ae797a8cd9a8abcc87111cf572d3a71e816b0d0d29860d9ed322"; + sha256 = "540423e1e623902f3d6d73a8ce8ff8328eb70cb75b90f4ba06ecbe1f2483ebb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/mr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/mr/firefox-132.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4849c0edd39401752bdf8c5b38d36cad9f2ad1db9313d9aefa4c85f5d4e12413"; + sha256 = "5c493ae1b5c00bb7379f5650d3d96fb0770c481b07c02fae3639882e817b262e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ms/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ms/firefox-132.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "79a680ca26c7030180accbe6eb22915e37aed05c87165d67c9e3f434769f16d5"; + sha256 = "980d4b698af0c27ccbf9412b2fd055bdff7f7f60784a8519c309174cb662a96a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/my/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/my/firefox-132.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "412deba2701601a6a2f0625e1c5ab88576fda77f4ae046f1bf4cce9476bc96f9"; + sha256 = "d0a79ee0be5c58d3cb9a493d3c6e83b59b2cda5cf45d6a42ae271bd4dc1d06f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/nb-NO/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/nb-NO/firefox-132.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a523ec4d4f6b169b09d8568d96abce9cac0dad0859910ec56dbff844e5f1d9f9"; + sha256 = "04062cc26488c0896f43d83d8d4b7190665e46ea30fb0e0953aa2c31341240de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ne-NP/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ne-NP/firefox-132.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "5f45fb24422620270000e0186a5266c91ed84ce95159cd23ad92b77ce6616780"; + sha256 = "61f088ac8551d46ddd77dbf0c31b5825b83f8882669bdf1e3bfe0e73f424b645"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/nl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/nl/firefox-132.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6c4fda05ea425efba6e125685ca40d947cf9b5144fa555bdbecb8c71740e639f"; + sha256 = "c257d43bed91004f57cd7b6abd4720878f5e3f965b500778e12a44f854578deb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/nn-NO/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/nn-NO/firefox-132.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "818fe6724adf8bb06f288ef03a254648fa10f2e2cb0539e7f4bbdea66d8c6d66"; + sha256 = "f242b7d8f6be7b920ed946da9e765cccb784e76110a53691a93ca1e77ee369e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/oc/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/oc/firefox-132.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9d9fc1e6ea70b6f103a7e1404280ee7ab55254395575f0009454d815db83a93e"; + sha256 = "1bc7e132b5a1381d999d7e45dc58b8b958dbcfbaa508abc0cbdc75057f6b41f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/pa-IN/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/pa-IN/firefox-132.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "964419c29d54d7695812148fca0a57beb886b0cd48f6129afad48237d20879af"; + sha256 = "fa66fc43ebb444b06ff5aaefe5075c7b241799116bf141b4aca0c106135ad5d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/pl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/pl/firefox-132.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "db7442e4357b2e24234e7ee398529ffc4a136ffa375c90f3aa94873c6ccfbb46"; + sha256 = "982c3dbfcf51b75f46b5c6532b96b3e336bce081a47f319278f00431cc2b2363"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/pt-BR/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/pt-BR/firefox-132.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "270748ab2a741a74f37072f8138b4943713a198661647ce813ecef243beaaaca"; + sha256 = "c964ed0ed848a9a1d4825750430d420304bbb80bfc8a6561b4fdec347be72a76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/pt-PT/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/pt-PT/firefox-132.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "983562e080a1e60a8024e88d0cb4ccdd65e8d506bd55bee04fbaf850afeb7331"; + sha256 = "a441100fcc2d8de9adac0d6cd1d9dc81133d3a2d7ef8c2205eb48be299e134a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/rm/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/rm/firefox-132.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b9772ec2269b8317b71791f2f1acc51fd1ed00e66d69b4f5437ff4e06c1b3e28"; + sha256 = "3f482bc1530a434df753d4f92faa166cd036ff367c63426c12ed1f9be0b98091"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ro/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ro/firefox-132.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "52ebf5b2732bb8a634e461ad251be0868904de35f6c42e1e3c500f90bf72252c"; + sha256 = "578494f69ccd62390086be024160969ec099d405c3c49051b4b76575faf2817f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ru/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ru/firefox-132.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f55f2a0b14d0bc37108aa94ac59a5051a5fa82099c20646e4a1e967114facd0c"; + sha256 = "9c9693eb0cedb1d5c48803c9cbebeffa8ca9d9fd981c5e1f4de023baace4685b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sat/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/sat/firefox-132.0.2.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "fcf53650f6681db0bbe2af0d3b76201be6cf42a8142bec8356bca09c73ff3b3a"; + sha256 = "22023ca36dc044175fa3522f2c0848d982b0f4427457c108942bf91a7d37f970"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sc/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/sc/firefox-132.0.2.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "152775bd7024df45e0b89cceb5045c4c7b7dc7ec3b76ab50978e6ebe821cc03e"; + sha256 = "9719037e2b6869ff1919e0d2e2d572e1f45c73f26b94e2f5b6e001e9b70defed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sco/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/sco/firefox-132.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "502423aa6aedd0f934c543a9017999a201b32c4f4bfa9f717d8bf7aa275614b1"; + sha256 = "035f5c2e622db010f2ce4fdff0625189736c20759a688226fff0782e2e00ffad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/si/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/si/firefox-132.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f3aaec008abc3c552301c467719d736646733c78fe04622da886a5da00a2c51b"; + sha256 = "2d41fdc10b109122f42098394f926f3704d9c1ac78d7d228706fe557bcb94677"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sk/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/sk/firefox-132.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f07f14d01cac61d2acf875deb0a190c766c2849830fba82139cc189bc0dd2422"; + sha256 = "9f27f9354bd809ab6317b3155c82a83b36afce724392f14412fd76337f4d54ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/skr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/skr/firefox-132.0.2.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "012b4f34a4e27a1555be4c0cf1e014a122edb1d9c080f25e899dacd407fe2b4a"; + sha256 = "c8520bdf8abf0a71ed0d9ecf385d33abff8ad29ef10c0a6b3031a0020e7ec323"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/sl/firefox-132.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d8edcc77afe822492735f85e05b891b29f15afae083b8d7fa37abea0e4eb92fd"; + sha256 = "04c52408efef6649b44140e96bc2884cca1034476de15785de68f319bf8948a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/son/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/son/firefox-132.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "843157a5938ae6e0355fae687d23443e0d08c392ca75d997331211884e335a8a"; + sha256 = "14eef88acf4aef3da7c075f941197caa33ee6d7439342bd81c40d70b0927190b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sq/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/sq/firefox-132.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "df0e6d44e4a07ed2b951ed803acf82be466f125dc00cb891f0d421e6b0cc08fe"; + sha256 = "248a7db061dcdb44cf4cb768fd2eb979a15dbb6ed0fc434ffac3f5d9f5fd4d48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/sr/firefox-132.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4385481d260f535fa76458340c1ad789ee63b5e1ff10d89d5dce9879c470e761"; + sha256 = "0643cadab89d65b996532e32c5bed23cc516aaa089a09250bdb9119dc0aab9c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/sv-SE/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/sv-SE/firefox-132.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a665164ef48862988b5ce86a61f7166415c616264c2ebf2ec4725f53d1fef17c"; + sha256 = "26a098c22562cc1749aac96327de7efaae2882709b766dd32697b63204f32b5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/szl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/szl/firefox-132.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ae5704848629f0987c088da4bfc7371f883677ac6a6b490e756b19c26d814776"; + sha256 = "b96e297f6d1ae505d85c1b6d26a8ce62bc96463d96a888dc9b355838c267cf32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ta/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ta/firefox-132.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "c294c9f524d053c37056d8515c9d17bf70d50243f24c888ec0a5987499e7a126"; + sha256 = "6f8342c91ffb4695be922b9137ff1c6aabd11771033639fd961f63319879523f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/te/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/te/firefox-132.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "80f04a99022b19c780ad689fa6bd7fb8e986fffeddc8b61ad2da6d9816b5a043"; + sha256 = "cf3e42f0696ac2696b0e85d205e5964dab8fae9e0165d0eb82f5c0935442ccf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/tg/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/tg/firefox-132.0.2.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "f69eee5f1a25e2c217a615c9d06f0c98631bf771fb4e83963d54441f80ee773e"; + sha256 = "61c2f4463c6a05e4b8c9523d269d99b4ba94a63dd22337f51e8f1ed190b8650c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/th/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/th/firefox-132.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d8109b4d48f5b9ee483627b5460ba81bd512eb5c43c41e308332a41837576e92"; + sha256 = "52781e2de5c0369600f77737d338f081b1f54399d42afc0a651848de0a617cea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/tl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/tl/firefox-132.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2dacb535f2bf3343afcefe320d4ca4e24a7b1f608a19c6480d025bded1c53a28"; + sha256 = "a10cc390a77b1adb04b0e890797499915c4de1629a8df1ef00dec448179a5365"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/tr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/tr/firefox-132.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a04aab371b072d576a96395e19c7e820805c95d901d35bb6cd27e725ea7fcfce"; + sha256 = "69db3d577f4e38827317e7c3550ffbbd8acc750416030cc7e436dee334dbd0c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/trs/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/trs/firefox-132.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c4083094538a5fecaad941b5f7e1feed74c828abdf2a5940a38718b54e623cca"; + sha256 = "875b662fdcd7c02da8088ab933c0e72447148c5cdcb6cc48a798885df1a37a0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/uk/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/uk/firefox-132.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "078a675fea5733463ed8fcd4f170f46f08e6ec4758a40f2bfe4b56b6c3e9add9"; + sha256 = "bd2d3ca9c9cb5cf35dda5188dad0d3e0e34dddad8230b6a77ea923aca454a763"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/ur/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/ur/firefox-132.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "0476c85a4a655a2e1b0cf00fa8c32457479e820801460d7860981a2fde7be1a3"; + sha256 = "d2ef33f76fe1c70460733a2b97997abfaefbeed3d6ff9234a94f3b7fb7faf842"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/uz/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/uz/firefox-132.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9621022d22709e3a0b5664bbd7f32910a283644384baee0c3fd1ebdbec9a4c0d"; + sha256 = "0e2a81f1fa9a6bb59354e74dcaf8f96e5e10c70d83f34e1306e89039fa6b2dd1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/vi/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/vi/firefox-132.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "3d924162a9e89e296aabcbf7eac55c2ba6366261d4e636596be20ec1a357f4ab"; + sha256 = "195f540778dfe9279ea16df18ca56306727ad5956cd5a27bbfa87934fb1410c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/xh/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/xh/firefox-132.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a357a7b377882ccefd0d055c0cf868a26e64d70e252232ff1f3a4d022348cf10"; + sha256 = "8372e4f6c95f2c8af8c7f59cfb72acb1c86ccf42dc7b528b529acf43aa26625e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/zh-CN/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/zh-CN/firefox-132.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e6dbe2988665dacfcf259f8abd97f355a06eafce514c5d75d6f7182e29e547b6"; + sha256 = "8a91ab45692871175e0e8c3e2248467db5227295c3ca1675aeca8994e13833ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-x86_64/zh-TW/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-x86_64/zh-TW/firefox-132.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5f89bc5e888e1b0ebb73ba70f8596dc8368f17b03167b908337c20745742d525"; + sha256 = "4cfe7039ef5dbf3a17bed5e05883c472fd282cec941e29e2312f0b1d10add6da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ach/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ach/firefox-132.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "94687ff3ba1781e321a8152464f7fba7ed061f33c18c73495e3498ce99cc450c"; + sha256 = "8101e1b761ae73fb1dd52746715d45e840f7e58fe95de54043502afcc0d04f65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/af/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/af/firefox-132.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "23642db5c3a0b6761d63f3add669f52b26e5243197ab2da0376dc872c56a4696"; + sha256 = "e8b9d4dd5ade392a667ea8b69923630a815174eb6bd48eac06038a93cd5d41ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/an/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/an/firefox-132.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "9d882d117fb730cd7f3be06fe67e15cae77f163f32158b36293517db2bc123eb"; + sha256 = "efaae741c0e8fcced70ea9a362369dd7466e23b4ad2ca1a09c4c99d72fc83bdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ar/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ar/firefox-132.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "7ced0486b90a21492700cc96d2851d67e08dc77ce689c5612ddbaa13d11182c6"; + sha256 = "605d7f3efa59497f518bf32867ec646b585313bc7e9164dfb6d047ac7b8952e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ast/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ast/firefox-132.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "baf75a0119dcc3e84935a86e43b53fb9129b10f4b13bde3489e663179ab9bbf6"; + sha256 = "7c4bbf87e057f9dcd52ec6c7567fb449385bd3f03ecd750f59d9f5dccc8cfb52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/az/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/az/firefox-132.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "edb5750eac5563b652df26347396f0ebdf0b99a8ceb8cd31c46b79a8a43a09b6"; + sha256 = "1172e73c296b6d1e835cf59fe283b006aa2bbbc041546844b3050d640e85cd52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/be/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/be/firefox-132.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5efd2ad80269b115038c227fa8c8d741a8add0b0520e9dc5dcf530c98547436e"; + sha256 = "137a1684db5a47d737d44b2b28c4fe7f463dfcadd458ef39ef681d4c0a85876c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/bg/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/bg/firefox-132.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "946dd18b5fd5f5315271c571cdd74924ca1979908ebb106b46f8822c3ecb115a"; + sha256 = "cabd4a693626c862c2dbe2efa25027c0fe84dbeb001c5e0a72e57298a27bc4c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/bn/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/bn/firefox-132.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "92d3fe743f4619a4567218decf45050485ce0ddbbffd9342d62065ffd663c1dd"; + sha256 = "8cd7636ce5c27fb11cabbc5455068ebf7d33b016750e4c935bd74743215a1156"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/br/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/br/firefox-132.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "cc4436d4f70fa1de17f7b628f0b12082f329ef293c7d069bf89b23d1f45cc2c9"; + sha256 = "3626f51f61e1dd0cddc654d9ed4a001336a6f5f64cc213c1f4984d7de515aae1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/bs/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/bs/firefox-132.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "506ef2e4e128c17f874fbb5fd03581418bb651262fd5234de23e019063a9e32a"; + sha256 = "e4649da696c0cfc9fcd994c292c63f9dc1216df8b648fbdc17a29d1c3632d48f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ca-valencia/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ca-valencia/firefox-132.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b66250866db88ceb57dc8405a76a5ef9e41f6ef02447656bdd537c954da3705c"; + sha256 = "b9819c741c1f7a3e9c0dfd489a2f79a80d9428abdcc7556b2433fa68fd9dc861"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ca/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ca/firefox-132.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c59d6a5eed8b812f8e5d57d1af5c265b3e0a8770b8f95a7c570a04247edd7e73"; + sha256 = "6bcf742160c886a27153c7c880610b9c16d424d0ebc4b9fc560adb8852ced9f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/cak/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/cak/firefox-132.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5f0c49d2673e4835745c19b81abc2c0d659609c3b2fbfd0c43dc5bd7931bf4c0"; + sha256 = "62788ec915895d69323a07dd7d36977e99f4d106dbc358ce26171813ed6a32fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/cs/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/cs/firefox-132.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5ca703ae292af5619a6411c2c800c3e9ef3062a69cd8970cabc0426bd123d3b1"; + sha256 = "822211dd6e3ed4aea365ac38282ce45b7c91e94fcf5fc064a3e77b44da886342"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/cy/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/cy/firefox-132.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f14fe9b479319d8924773d021da63b4f2047a3aee237464a74c1a6a2781330e2"; + sha256 = "1b05e794c78ae6873c7343cac903f0fa07ebb186d3e4afbdc93f5e3c711190a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/da/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/da/firefox-132.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "20ea1a9e22966b23649be9521384ed18161dd8e7933e3ef9b07371dfc3c95112"; + sha256 = "916af58831b7911d114d7539468b7099c8cbcc36c2e10d70373e20b0b005507f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/de/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/de/firefox-132.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "89559594d491410beb0322aa3717ba6b4da2c2d83fc8c54d0dc207a696994422"; + sha256 = "b97868ac8114194cceba50c03f5ac737b6686c6048b51bb3142168d815281659"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/dsb/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/dsb/firefox-132.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8732c03c200e4a4c1eb6fbf89ffba698f79f9934c61db62a6404c4efb38a0620"; + sha256 = "94195e8ef66a4422c2d15c5533f354ae9428f5dc0bb6893dd8c83461f421ef63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/el/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/el/firefox-132.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "68a9d94de2c7f35a8a94632ef277b9544871c1dcd3e5ce9632a464fcc85fe581"; + sha256 = "ca4a445280d29117087102fc5f6279403de0a381d8119683ec3b278d13551e02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/en-CA/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/en-CA/firefox-132.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "ed84543704573b00c8a2fbbe448f7d87544b205c7738c9b8e4a38cb0d96c1b45"; + sha256 = "53af5f1821e960aff79e91315377eff44fe5689f9bbe3854732277e530cdab7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/en-GB/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/en-GB/firefox-132.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0b3c164810bc509aa0d6f9c77fc55fc6ca3b543f3115499761ed65cb83f3083f"; + sha256 = "0a39a9cb1ab6e46a19d7e41ed736d8e3d60b0c6ffbb5a749a545fb6c37bb0fab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/en-US/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/en-US/firefox-132.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "f110d84bd70501264612a229210a6e52f1279e7349a32665200f60be685aaf27"; + sha256 = "8cda58e19a0f33f82de8d3f25e6d239dea9dd4413e2ca9240f2cf926357fc563"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/eo/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/eo/firefox-132.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "41f619245cba46a0dc112f94ef8e02d9f81fa0977ff9de920566d67c0fa621a3"; + sha256 = "a8a25bba28c1c9aecdbf0348a866b4682e055213df2f568d2ff24d77ca5ddd20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/es-AR/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/es-AR/firefox-132.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e739c4bf84fe7608ad74c62328d34b3781f65adb81572cff745dd87f05386bf0"; + sha256 = "6cfde944fecbf1ae37fdc01183db41c0acd66928be8042e28f415e1af233a425"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/es-CL/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/es-CL/firefox-132.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "c56b23545229975963b063deef16140079d69487a03e6eadf4b4477786cf4f05"; + sha256 = "80e268dc524e795fe3d09e90cf04747c566f86a994862c95096d95becee6b982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/es-ES/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/es-ES/firefox-132.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4d2c3f0d945b9f557303e4166646e98c837b9c5c9647e694a324cd7b4b5e83d9"; + sha256 = "b7eac7e90832ea57e5f2a4537502ee2c03d92c9cca2f0732d52d32cedddd1094"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/es-MX/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/es-MX/firefox-132.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "37015a38e3736a634e22c1e429db1106b71c8c31438d60e4cce99c0de8e94fd3"; + sha256 = "923c671cec39e6e547112f131728e128ef66ec9f7075a93db220b9da64366468"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/et/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/et/firefox-132.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e54423d2c59850c7daef105786c8ed95804e4f91b0958f2b20e0e452e7adcf3b"; + sha256 = "8729919029d59de55c9c39aabd6345879ff63cfff13d560585bbace9d9692d44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/eu/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/eu/firefox-132.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c3c9794312401a3a012911eceaec3bd998a08a57a8278d7f1b121a5e0982783c"; + sha256 = "5dc10e797e42490382e5551e2bb701921349f8556ccdb3f3a921610f07322b96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fa/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/fa/firefox-132.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "63049a1cbb3ef6d90a81f835bee3539417f1394613324e06da2a4e3f54270689"; + sha256 = "b168cb457bd0105f1a78cf9f3d6d5c8afa7d0c3eade996ac5695c34bebd61d2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ff/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ff/firefox-132.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1488cd36b7ab218acb0ba3156d4caf66ae0e761bf81218d357fdd8c6c71fdb54"; + sha256 = "a2cdf4d42f1336232de360fa2547ddad5c6b834b19c3642a65914f23cf9145a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fi/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/fi/firefox-132.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "bc3bdf5f7b669be68cb885b7c8c35ba5cd8d7f8f409a5f0f4df0e3c401ed1d7d"; + sha256 = "48a8580896d88a6802764ce8aa6c069409a4dd6e54e7b3415e92a709c008fd87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/fr/firefox-132.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "778b3f07de8bb19a624b964fe5f4b5e8604d4eb6d601eda68ea186534f9fbbc5"; + sha256 = "13839edb2b1e41a5a0c719404ed5857a5ccae42adc8ab42bfc1cad7553d59538"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fur/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/fur/firefox-132.0.2.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "43b60741b30738625d4de4c3bb08d45d78099e023be695205746957bba59b83d"; + sha256 = "f43aa7e915fa6165f8985048f4a3f1701fa04a9255c736e3705b07620c2c2e73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/fy-NL/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/fy-NL/firefox-132.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "99c3aef86b7d75cace0a3065674c530e1bbbdd06ba4240e4f0bf66308a2741b1"; + sha256 = "6a3e98a6fe007ea0a10d5ccecbeb3529afed32286ee5f47d7a1fbbc0e61b3a5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ga-IE/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ga-IE/firefox-132.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "d159147ba16014a544e0fef7a0770e3bd4d1a0c829a7209e9bef2a43e950e115"; + sha256 = "ab8a26f5a158825b37be64864932bdc364ad722790ffef97595b6511f946c24c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/gd/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/gd/firefox-132.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6a615ad74bef45a874d0bfa8844470e2f2666853fedfd74d81e8f224ace5bb88"; + sha256 = "323d6876fda495e75dbb627e25c0f77ea820e95fee2770851d3d98061ea28741"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/gl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/gl/firefox-132.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "3ca182f613f60182a3e30faffd478af6beb64ca21b309c64ab54fa2a826f6aa1"; + sha256 = "dcf0fe08a9a4e8a8df791c7fb07b002ab0b7feeb1ac23dc4927640710b027b33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/gn/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/gn/firefox-132.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "48c042083355b53ddc653d5afaf73ea2a655d477c3cccf09551096dab7386781"; + sha256 = "b8bf815c09f407b5ca9994075b39d81777c9488110cbc80dad7bd971dfd96e97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/gu-IN/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/gu-IN/firefox-132.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "eb58b994ee858f80780dcdc8b13f681308987ec26374389081d00db561cdf064"; + sha256 = "7b3986a4ee77f678ba16469bf6b2d3a15ef7dca581f2352050a5c77215f866c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/he/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/he/firefox-132.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4150c460f13ed67dc0600b641207411354f1931d478535d88a445b92c6c87fe8"; + sha256 = "21ef59e05a08409f6c8516d83ed2c7446e06123384e1781a83f59eadd88022aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hi-IN/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/hi-IN/firefox-132.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "88d388df325d366d46e926557f62dc54928fe83477b7a828d132d1d19b1d9f6e"; + sha256 = "84d73845b949cb4e444aee1796b32dd1a5a75acb1f4437f6098d33c5963b2e4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/hr/firefox-132.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2176af6a8c181dabb4fb3312caa4de13faef1e39c87e26efa93ee7e2b1eaccfd"; + sha256 = "e7ce22fa078c257b848e18535cab1857bb3a2e5a34fec0ba6bbb3efa32a73128"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hsb/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/hsb/firefox-132.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7646d7839a85a809c893687b7938f6699d62a198a625bb09765e61d1fc602b33"; + sha256 = "e2e3f644a71ad087fd0f93e40d7f5031b4d471121920e803efc56359c444dea8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hu/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/hu/firefox-132.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c1645f1a49b2c402f91565b8330e3d41adf9b55e58191a64e3a72f71acd4b0b1"; + sha256 = "a86a52ac5fa9f7f02c346edace96dfee1f776f2e25d5092930ce4c518c955161"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/hy-AM/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/hy-AM/firefox-132.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "afa56f6090ffd56f117dc35faae126cfdf3f20b3bd566eb566a5a1011700ab18"; + sha256 = "6932446f1bf0b80cfecd41fda247de7be4896a091b16af91f9fe82e2cf43a040"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ia/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ia/firefox-132.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "427c8046e9ecbc45238832ee6c24cf97dc9f827ff5fdfca5895226089e7ce598"; + sha256 = "4f94a4c204898cf608a55e4d0db237cdebcd64e24d90d955ec25c2c2eea39059"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/id/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/id/firefox-132.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "14c1eb9502d3dcf2ac6d630de8300979625851ccf154d5b6de369f5490892550"; + sha256 = "6370e29a5da76d00709234f34a2e16337ad7e51f7398b023712845743e0994a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/is/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/is/firefox-132.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "33ad79abf3615c97f0657250da90a64cd5fe56afc0cfa3a0c33f4801f43d48ff"; + sha256 = "898ff04be271d19a39c03f6df9f3c950ff2e1185cd9e6c8a71e7d32394418de1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/it/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/it/firefox-132.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "255bc03c94e84e572edbb922f16097603281650c1ac3c0a971256f73c90521b4"; + sha256 = "cf7b92878ead9fd07436b0a24a4bc3604fc168a8968cff6c347e1fe9fd29696c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ja/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ja/firefox-132.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4cf08aed1a456394d61e44f1dee3140146efb25337a6048fcbc1ac8a2c83d7e5"; + sha256 = "78e263bf5c6927d138302bd665cd49e4c99658f4a53199ac24755f08dc1535a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ka/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ka/firefox-132.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9fd4258e64c0a26faf3e33763ef30848118e38a8512358e26e104355dae5230d"; + sha256 = "99ad4dbe5a764feff5eae343d0115919cc897ac6a682ea0a335fc76cdc0870a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/kab/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/kab/firefox-132.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "9351e18b482c7303d84832d817e658ee213be9722c43fdc690fe1b511128749a"; + sha256 = "08466653e1d25870c82790345a1015050b1783179c622c08713ee95ae8346d6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/kk/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/kk/firefox-132.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c4c3eb6114f2164474cf79a50a2d05a9fd1ca73a8568431e6a88055b70978768"; + sha256 = "6e986858d359e7fb3922c93ed0a04493826d71f12853c4269f3279fa782a9a6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/km/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/km/firefox-132.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e1f608b0ce6886109f64ba3fea8ec187f1b90eb05e8d1adc59f12ad5357048ce"; + sha256 = "e4895827029841c0460e0f6ec048243f9c4137b0add9a0a0dc2e28f60cd55937"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/kn/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/kn/firefox-132.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7d93828ea972156589e4f1d1dc431fdcca4c72de89ea64022b1b6357a57c7e42"; + sha256 = "719db9c4248bf1d85e9379bcb7a214e205720ac4be09b622e67389dcfebd0684"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ko/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ko/firefox-132.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "011f47255992976e652bccaf1a96bebbe72c2e403d09cc9507ce09338cd5c8e1"; + sha256 = "e391d6bbad7a247c54c546ce388b67fd739c23ee5e13129c7ade9a78df3b00a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/lij/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/lij/firefox-132.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6e7fb11809a0aca94d5273bdd3af1c20d2f1735e18b6ef895ee3df88ebcba418"; + sha256 = "f41cece8029e7064b48ec873338bd0a0d06745238fdf83f142de6a47c1d82d7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/lt/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/lt/firefox-132.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a229ea0a76db79f527024dd9b7b9607f657cceb69bcea5e135c27f485fcaa527"; + sha256 = "a3302533f1b9cb6e5a683343b5235b8ce478ed25641f657f418901bba053d913"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/lv/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/lv/firefox-132.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9f6983e5f1c04f9f2b6a0d2fe917471f0b284b38b325b1628cb37cf933437859"; + sha256 = "1697760efc2c88c4ed2a3aa7a899c8cfb303758b94c41bb305c717093afe0aa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/mk/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/mk/firefox-132.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "aeaaa35d2d32458c773e9476a339db83e1a12dc0f7a917d864cf8ff5f55e5c08"; + sha256 = "332884a1e0b0b90c26a2e14abb3f6647c7113d7c6f35dc0721de0d7327b89b40"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/mr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/mr/firefox-132.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "95f5260f023711231dcdf95b0188e30182854b0571cc73acec1bd0a0d4b26691"; + sha256 = "14fa90185cf9bd110e429c16c446800ae292fae25266fb698821e31077fce2a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ms/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ms/firefox-132.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4303f6b28ed6b8f5d28675f1673ff7f5ba3d780aac824bb6a65ec63d6b8fb069"; + sha256 = "5df44acefe733dd9a29864871e0e05090dd08135731ab880cbe45586b5816ebb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/my/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/my/firefox-132.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "bb1cc65918876315c6f74f7a7c11391abdf4d1295606c3f7e15fec12404f8332"; + sha256 = "105d3477dc79635c2ebe6019b72572f2fa963b867aa887933db738004e1183ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/nb-NO/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/nb-NO/firefox-132.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2302bc25508284dcf30fc06fc89b905c72e9320bb41ffa6569fbe376d6278079"; + sha256 = "09917868aa2b8063bd970dbc2e6bd468b2208d1f3694d92b5031223ec52c00aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ne-NP/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ne-NP/firefox-132.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d00e26c8eada6c77b961e7cd65b1d16a43ffae23e3f054c9b33dc92d191aa682"; + sha256 = "466e2e138bc06e7d249b13d5807d7d947bd7cd8789d8af6239af5638f5bebcd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/nl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/nl/firefox-132.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "33171180256652ab96a71029a92af5740084567d93720ca033b688a0c03643f0"; + sha256 = "c86f7dfddf3523c5fa0501ea578a6c34dcbbcee4d4ad229a0de66ca77373b820"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/nn-NO/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/nn-NO/firefox-132.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "471eb07e8312c80dd8ab7d02a7f5850452f704e59219b071c7bae11447b4e677"; + sha256 = "003080f89b1c9f901132a3cd36b9deb86dcb7e0ae0448423b66e9be472b04ab0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/oc/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/oc/firefox-132.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "cb43f9507849ba82eb1b0b0d6906abcbae361144ce3e1f8e4d5c99a8c9581e07"; + sha256 = "34e0820633aacb1aabeeba8703366f79ccac9bb4c8bc29e067c81015410f18d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/pa-IN/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/pa-IN/firefox-132.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "46c26c8d9f92b8c52e7417e4d846c71da96bafcff19ef866d6f0f2e1c20f9a46"; + sha256 = "caf2b0d790f81278947bf0d1c74bdbebafb6065af19627468d892e8e6c680a78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/pl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/pl/firefox-132.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "556971bf7658027a77554ce35b2b5b0bc3c71fc1ae6335dca36abfef6af04ab5"; + sha256 = "5643c497968e64a3c5a35dd10da7d896df8577b355f2197b5e3f19d79a8bd1b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/pt-BR/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/pt-BR/firefox-132.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "39afba412d650fbf08b093e109582d3375537cc38763d0eb64cb0453be8a4925"; + sha256 = "b6625e9e63d1e8b26d8db1bf2befa03b250aa9c1a4ef494dd2bdbd3823ad6f3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/pt-PT/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/pt-PT/firefox-132.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "46e319b3527070b308a8ae5fd63b62a68a5c1beaba0cf0e51dea574b7f7375fc"; + sha256 = "e9abfb3a95e108fad21e83a13a4b30da4102114a7de09f4c84b571d2257b5497"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/rm/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/rm/firefox-132.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3de69cefca0c904c90445eca5e2ddd2ed3579948dbfbcc550ae6cfd1d382e151"; + sha256 = "53829c7ad288241217f1d980ae13211c4d1aa9fda35393cfd257b998c2bc3cd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ro/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ro/firefox-132.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c887a74f84688c82de334dbe175f290750c3c7c499b1f3dddadef72ff0663cf4"; + sha256 = "1eab51d27b682eb588814ceadbcd92055d9a1e5ffb7da127c94469654a8f74f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ru/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ru/firefox-132.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1ac581656facc08d573b7ac821226ae65c76278e914ab54f63fc2b5c92bc84d5"; + sha256 = "d9f3fa4d81b2f6a63715c7ce458fdddd707389d069607e1f18bf980c9550b803"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sat/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/sat/firefox-132.0.2.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "ab857b37630d2bbe326c20a859246958afae06473899471eb8115e2a5776c3b5"; + sha256 = "8f6496d01a0e8e0a4d067740568b25521dce1ebfe48387687c949de1b0ecbdc5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sc/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/sc/firefox-132.0.2.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "e7d7b5987fb06153e1670d2b575e0b9e7e9192d43ae18cbcfbc7b27add5206bb"; + sha256 = "239dcbe4a82e3a9fa995f57f4393209cdaf0c753b2aede1fbe713ae3b03e1f11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sco/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/sco/firefox-132.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a765f1ebcf07ed0f0aa450d063f0022f04bc1739b4cac3ad1dfe65549b9a35e2"; + sha256 = "aa2a71e945ffdf3b41cc7574bb7798beaa6a7c6df5724f97199e3711b17a7ec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/si/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/si/firefox-132.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "72690ed181c0147495ea3959bedb75af33da853c6bf29d44d6a67d9da641f940"; + sha256 = "784c79e393ecf71575f60daeb4a2b63dd8533a72c7334000d3ddae6b996259fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sk/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/sk/firefox-132.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3f95ed090abdb1e9162cee8a9f02b282a947465484716a3a89ddee49daf9527e"; + sha256 = "2ffb22558923d4cd82019f558a748d9f92936858d5ee8099be5136e6129368ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/skr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/skr/firefox-132.0.2.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "d163fe4fd1f0fa221a68b5ab12617d5aad44efa3ef9c673db68dfd2ed55bc3ab"; + sha256 = "2e0775e1f9fad520f313cafa0f4aa56fb962f322ade096a6bf3b8a08dffdc5a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/sl/firefox-132.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "bb60a789c62f829f67413e18f3f6380757a0eaa35c87309572ea2eda3d7b987d"; + sha256 = "6b7d726a5ac2624c75bcd0ce0e6eaab353c23aa485788c8c2ca26d5441b93a04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/son/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/son/firefox-132.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "278a45ed39b9904de0e564681f9b05a3692e4241f7f2d97e482e941d33aedaa7"; + sha256 = "f9dede055bb76f2c5b07da51f215cc8058bf93cd726d41635c60af9a6c252f6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sq/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/sq/firefox-132.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9292b727d7249633213c05567910b48c7f640d26a9ee3f6fb124949899765bbe"; + sha256 = "0acac313d74ec8791a7f02cdd399dd099a3a2b5daae02474386b8cf1e5351085"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/sr/firefox-132.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "7a006d7dc8c45821411968825db9ff6791a784d4b448943e106d520dc88bf963"; + sha256 = "0496a33c0fadb7a1db0753e6ba1e96bf38b13454d3b0e7fe10fabc5a391bde11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/sv-SE/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/sv-SE/firefox-132.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "cdb4cce92b117f8715570df94789aaf233e00f6ba85ba7f110175dd901c35d5d"; + sha256 = "95f28e13222a43849b35fe8224b0c0e3e2a391ec4275e0f3dda0bb5bdcb98930"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/szl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/szl/firefox-132.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "298e0afe56c372bab56e372bdb66d4ddb98b20af2fbe6f06d683ff9009d45dd1"; + sha256 = "ba350e507fb0678b3f7776a7f496aab5e8b4a792c92ddda983f56bb6ba4170af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ta/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ta/firefox-132.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "8adec58d7627afeef18b9bfc260c915bca1e47e332f5c14de9153391d444a0ee"; + sha256 = "8cc003dbe7161d1b2a7179ae9bfb5139ee572f260ab78ec07cd5f70dca316cb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/te/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/te/firefox-132.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8602b05ef62faa0fb8c1527604421fc7508c0d991f463302599c053d99b663b5"; + sha256 = "3e5ef99b3f44d7b934e47f2c6a5e749ebb4b0c12cbf651c0d5c996e0f381942c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/tg/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/tg/firefox-132.0.2.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "f375673d67968da3d7a6635ca39472afa2bc665c1cfaa4448a497532b75a1b13"; + sha256 = "ab80c75de1861c727d665379c7c2e682474cd2779240c47c63e7bff62cd22943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/th/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/th/firefox-132.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8019c3c56f90321da3db22d50f34a74a1b9216d960d82fabe35bda10d2770c06"; + sha256 = "2560af4486885d9ff223de355d6583dbf4295df7789ff446d372549dc2625b13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/tl/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/tl/firefox-132.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "57644392b534f616cffd66cdd3529e8285f312a615f150870abc622755d1099a"; + sha256 = "3571e6d70cbc25ad22b1c2d4bcff4bc7dede8a104c604c1563837982c094c40b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/tr/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/tr/firefox-132.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d5057fae21f2e02b39f08c5a3153a25e84b21395d83c9ce298e5f66c7557ed41"; + sha256 = "14f37d9ce182142ae9fe54145a54acfd146245bd8735a6883e4732491cc851bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/trs/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/trs/firefox-132.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "3d380217a51ab4ab14bdfa44e23bd64acee3613ecbe4b2a27bef068496e1a740"; + sha256 = "eab23f88f64c6b99f007848824d2df8fd013ddba5845bdfe458c02e1e2b08ce6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/uk/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/uk/firefox-132.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2aee72e5e298d4d193641e63746726b270de9207f1fa9250f867d8a8ef604f24"; + sha256 = "c3473ba8e2588b7d0b9c3faf9af9d41fe1ae2fb2e3247c6a280dd29c59c11c27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/ur/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/ur/firefox-132.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d83ba021597807390c850ab7a8eae73327daf291cd3781d865865f67fdf1497f"; + sha256 = "387d3762342d24d6c4a64b99a2098e72ce850275a354152d341008bdd389d4c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/uz/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/uz/firefox-132.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "529ad02be2b27d07d38bfd0998667076e720d01cd08cdef622324e91befa2098"; + sha256 = "44ec233b6022b3195ca5add373f1bd8b44d7494f8973bde13e952fb4dce34295"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/vi/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/vi/firefox-132.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c31bc8e3839cf7a0c7b29ac807429d09e11388ea144348c2540b4f502497c0f8"; + sha256 = "ca80b2cee04c92478b15be12f4db642fed23f1a68097ad0770f5f70238e797e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/xh/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/xh/firefox-132.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "429b9d994550994126581cc2c23906a69dcb0c724f3fdd3ffcaf3f88fa56ee12"; + sha256 = "bc8776aa00680a5443229236f0f669a508a82584f12d8b20b44bc868ba6f8313"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/zh-CN/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/zh-CN/firefox-132.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a0d7c9a402e85064b851df041d256296eb6735a89356162aeb81386f9ef34301"; + sha256 = "7a8911ba25d64cb9c4ca8c194ea688b5608531d6360bef9a72a15833702bc989"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.1/linux-i686/zh-TW/firefox-132.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/132.0.2/linux-i686/zh-TW/firefox-132.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "fbb13bb185a4a8c8619038e32aa3797d7762d7d95854c5c1014c9a557e2c1f0a"; + sha256 = "4c55a942b3057eb3e8f11b1dc634fe342a54a9d561bb155a32d893f78e3bceb9"; } ]; } From df8b26b3f795ed5eef2e98de88fe80efb949eb13 Mon Sep 17 00:00:00 2001 From: alvar <8402811+oxzi@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:42:16 +0000 Subject: [PATCH 110/114] icinga2: 2.14.2 -> 2.14.3 (#355443) Fixes critical CVE-2024-49369 by updating Icinga 2 to 2.14.3. - https://github.com/Icinga/icinga2/releases/tag/v2.14.3 - https://github.com/Icinga/icinga2/security/advisories/GHSA-j7wq-r9mg-9wpv - https://icinga.com/blog/2024/11/12/critical-icinga-2-security-releases-2-14-3/ - https://icinga.com/blog/2024/11/04/icinga2-security-pre-announcement/ --- pkgs/servers/monitoring/icinga2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 1425dc07fdf5..1b833e9ccbaf 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.14.2"; + version = "2.14.3"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-vUtLGkTLGObx3zbfRTboNVsl9AmpAkHc+IhWhnKupSM="; + hash = "sha256-QXe/+yQlyyOa78eEiudDni08SCUP3nhTYVpbmVUVKA8="; }; patches = [ From 1253fadac437369cb2ff830bd4a414664f3c61af Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 12 Nov 2024 10:18:06 -0500 Subject: [PATCH 111/114] buildkite-agent: 3.85.1 -> 3.86.0 Diff: https://github.com/buildkite/agent/compare/v3.85.1...v3.86.0 --- pkgs/by-name/bu/buildkite-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index c0d608ec8ed1..b2482372a9d1 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -13,16 +13,16 @@ }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.85.1"; + version = "3.86.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - hash = "sha256-aRgjXzwTC1wCWZ7n0MJpNHcHZgvendFPr4vCrBnCJCk="; + hash = "sha256-qvwJ8NFFJbD9btTAs8x7V4tbDDo4L7O679XYp2t9MpE="; }; - vendorHash = "sha256-UMnDVxZgqI4430IlA8fSygKEOT86RjCwuzGsvkQ8XIo="; + vendorHash = "sha256-Ovi1xK+TtWli6ZG0s5Pu0JGAjtbyUWBgiKCBybVbcXk="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash From 0b700c72b77c2dda8ae62b03ad6a9962f4f2d5aa Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 12 Nov 2024 15:20:52 +0000 Subject: [PATCH 112/114] Revert "rav1e: use new Darwin SDK pattern" Too many rebuilds. This reverts commit c4a4f958cb5af702f61f88d0e762af1700c6a705. --- pkgs/by-name/ra/rav1e/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index 523b8e1de6a0..34dda9e57e3e 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -5,6 +5,8 @@ rustPlatform, fetchCrate, cargo-c, + darwin, + libiconv, nasm, nix-update-script, testers, @@ -27,6 +29,11 @@ rustPlatform.buildRustPackage rec { nasm ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + ]; + postPatch = '' # remove feature that requires libgit2 and is only used to print a version string From 10002648a5f59927bb759e65135f2626f577976b Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 12 Nov 2024 15:21:01 +0000 Subject: [PATCH 113/114] Revert "rav1e: remove build-time dependency on libgit2" Too many rebuilds. This reverts commit 3c6420ad8281971978d743623e2cb73becabfc77. --- pkgs/by-name/ra/rav1e/package.nix | 36 ++++++++++++++++--------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index 34dda9e57e3e..e8834ac131e4 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -4,12 +4,15 @@ stdenv, rustPlatform, fetchCrate, + pkg-config, cargo-c, darwin, + libgit2, libiconv, nasm, nix-update-script, testers, + zlib, rav1e, }: @@ -24,29 +27,28 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VyQ6n2kIJ7OjK6Xlf0T0GNsBvgESRETzKZDZzAn8ZuY="; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ cargo-c + libgit2 nasm ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = + [ zlib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Security + ]; - postPatch = - '' - # remove feature that requires libgit2 and is only used to print a version string - substituteInPlace Cargo.toml --replace-fail '"git_version",' "" - '' - + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' - # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library - # and linking it with cctools ld64. - substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")' - - # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern. - substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"' - ''; + # Darwin uses `llvm-strip`, which results in link errors when using `-x` to strip the asm library + # and linking it with cctools ld64. + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' + substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")' + # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern. + substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"' + ''; checkType = "debug"; From b8ec4cb089bb9058fd7eb8eaaef7cd0fb4bf96a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Nov 2024 15:30:03 +0000 Subject: [PATCH 114/114] python312Packages.emborg: 1.40 -> 1.41 --- pkgs/development/python-modules/emborg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index 6a48c2b84b83..fc081fb06ec2 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "emborg"; - version = "1.40"; + version = "1.41"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "emborg"; rev = "refs/tags/v${version}"; - hash = "sha256-1cgTKYt2/HiPxsar/nIr4kk2dRMYCJZQilhr+zs1AEg="; + hash = "sha256-ViELR5pbGZc1vMxluHWBARuP6N031u+75WmJEYdckJo="; }; nativeBuildInputs = [ flit-core ];