From 5205c73d9311bcf458ed0fe1f4ce381bf3842b3d Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Thu, 29 Jun 2023 18:26:51 +0200 Subject: [PATCH 001/189] nixos/gitea: add WORK_PATH to config this is in preparation for 1.20, which needs this option set --- nixos/modules/services/misc/gitea.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 72fad73bae50..7e7ac355edda 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -15,6 +15,7 @@ let APP_NAME = ${cfg.appName} RUN_USER = ${cfg.user} RUN_MODE = prod + WORK_PATH = ${cfg.stateDir} ${generators.toINI {} cfg.settings} From 84ada07d731fc43c854d38220e59556d4bddb5af Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 7 Apr 2023 00:03:43 -0700 Subject: [PATCH 002/189] xdg-utils: mark broken if cross --- pkgs/tools/X11/xdg-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 49a8269b8d40..35557ce447f1 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation rec { license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; platforms = platforms.all; + broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; } From 758bf4cb8a7cf53eb0695e7bc28fc7f8820b2489 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Fri, 7 Apr 2023 00:16:36 -0700 Subject: [PATCH 003/189] chromium: late-bind xdg-utils if broken xdg-utils does not cross-compile. Let's late-bind (using the runtime $PATH) in this scenario so a native-built xdg-utils can be used instead. --- pkgs/applications/networking/browsers/chromium/common.nix | 6 +++++- pkgs/applications/networking/browsers/chromium/default.nix | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 36e25939962a..4cd7eb485bcb 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -139,7 +139,10 @@ let bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libcap - xdg-utils minizip libwebp + ] ++ lib.optionals (!xdg-utils.meta.broken) [ + xdg-utils + ] ++ [ + minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 nasm @@ -225,6 +228,7 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' + '' + lib.optionalString (!xdg-utils.meta.broken) '' sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3b4826930ec0..5e65f7f817c2 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -213,8 +213,10 @@ in stdenv.mkDerivation { export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + '' + lib.optionalString (!xdg-utils.meta.broken) '' # Mainly for xdg-open but also other xdg-* tools (this is only a fallback; \$PATH is suffixed so that other implementations can be used): export PATH="\$PATH\''${PATH:+:}${xdg-utils}/bin" + '' + '' . w From c25897c1f327ebba6f73ef7ed6b9b6c93a2f3101 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 18:26:11 -0700 Subject: [PATCH 004/189] chromium: take llvmPackages from pkgsBuildTarget `llvmPackages.clang` is used in the `gnFlags` attrset, so we need to indicate explicitly which "on" platform (the build) and which "for" platform (the host) we want. This commit does that. --- pkgs/applications/networking/browsers/chromium/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 5e65f7f817c2..cb77883601cd 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -16,10 +16,11 @@ , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" +, pkgsBuildTarget }: let - llvmPackages = llvmPackages_16; + llvmPackages = pkgsBuildTarget.llvmPackages_16; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; From 53af611dd20722f52302fc9efc298eb46684093c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 16:22:56 -0700 Subject: [PATCH 005/189] chromium: invoke ungoogled-chromium via buildPackages ungoogled-chromium is, contrary to its name, not a build of chromium. It is a patched copy of chromium's *source code*. Therefore, it needs to come from pkgsBuildBuild, because it contains python scripts which get /nix/store/.../bin/python3 patched into their shebangs. --- .../applications/networking/browsers/chromium/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index cb77883601cd..d39b52809ed2 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -17,6 +17,7 @@ , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" , pkgsBuildTarget +, pkgsBuildBuild }: let @@ -61,7 +62,12 @@ let inherit channel chromiumVersionAtLeast enableWideVine ungoogled; }; - ungoogled-chromium = callPackage ./ungoogled.nix {}; + # ungoogled-chromium is, contrary to its name, not a build of + # chromium. It is a patched copy of chromium's *source code*. + # Therefore, it needs to come from buildPackages, because it + # contains python scripts which get /nix/store/.../bin/python3 + # patched into their shebangs. + ungoogled-chromium = pkgsBuildBuild.callPackage ./ungoogled.nix {}; }; pkgSuffix = if channel == "dev" then "unstable" else From 5f3c644b1ad7b73de1888177cea86b44513fb670 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 23 Apr 2023 16:01:56 -0700 Subject: [PATCH 006/189] chromium: control llvmPackages version selection with a string Sometimes we access `llvmPackages` via `pkgs`, and other times via `pkgsFooBar`, so unfortunately a string (attrname) is the only way to have a single point of control over the LLVM version used for both buildPlatform and hostPlatform. --- .../networking/browsers/chromium/common.nix | 9 ++++++--- .../networking/browsers/chromium/default.nix | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4cd7eb485bcb..4be1512a6c22 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,7 @@ { stdenv, lib, fetchurl, fetchpatch +, buildPackages +, pkgsBuildBuild +, pkgsBuildTarget # Channel data: , channel, upstream-info # Helper functions: @@ -8,7 +11,7 @@ , ninja, pkg-config , python3, perl , which -, llvmPackages +, llvmPackages_attrName , rustc # postPatch: , pkgsBuildHost @@ -130,7 +133,7 @@ let ninja pkg-config python3WithPackages perl which - llvmPackages.bintools + buildPackages.${llvmPackages_attrName}.bintools bison gperf ]; @@ -308,7 +311,7 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; - clang_base_path = "${llvmPackages.stdenv.cc}"; + clang_base_path = "${pkgsBuildTarget.${llvmPackages_attrName}.stdenv.cc}"; use_qt = false; # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a): diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index d39b52809ed2..45327783f0b0 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -18,11 +18,15 @@ , commandLineArgs ? "" , pkgsBuildTarget , pkgsBuildBuild +, pkgs }: let - llvmPackages = pkgsBuildTarget.llvmPackages_16; - stdenv = llvmPackages.stdenv; + # Sometimes we access `llvmPackages` via `pkgs`, and other times + # via `pkgsFooBar`, so a string (attrname) is the only way to have + # a single point of control over the LLVM version used. + llvmPackages_attrName = "llvmPackages_16"; + stdenv = pkgs.${llvmPackages_attrName}.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -44,7 +48,7 @@ let callPackage = newScope chromium; chromium = rec { - inherit stdenv llvmPackages upstream-info; + inherit stdenv llvmPackages_attrName upstream-info; mkChromiumDerivation = callPackage ./common.nix ({ inherit channel chromiumVersionAtLeast versionRange; From 0a05fbb9a010337454b942011bfa92168b2efc17 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 16:18:16 -0700 Subject: [PATCH 007/189] chromium: cross compilation support This commit successfully cross-compiles chromium from buildPlatform=x86_64-linux to hostPlatform=aarch64-linux. Other PRs in this project (can be reviewed/merged independently of this one): - https://github.com/NixOS/nixpkgs/pull/227707 - https://github.com/NixOS/nixpkgs/pull/227708 - https://github.com/NixOS/nixpkgs/pull/227710 - https://github.com/NixOS/nixpkgs/pull/227719 - https://github.com/NixOS/nixpkgs/pull/227720 - https://github.com/NixOS/nixpkgs/pull/227722 - https://github.com/NixOS/nixpkgs/pull/227723 --- .../networking/browsers/chromium/browser.nix | 2 +- .../networking/browsers/chromium/common.nix | 74 ++++++++++++++++++- .../browsers/chromium/cross-compile.patch | 31 ++++++++ 3 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/cross-compile.patch diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 7678d87ccff5..826d29adeb03 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -6,7 +6,7 @@ mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; - buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; + buildTargets = [ "run_mksnapshot_default" "chrome_sandbox" "chrome" ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4be1512a6c22..13d96f1e2959 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,6 +13,8 @@ , which , llvmPackages_attrName , rustc +, libuuid +, overrideCC # postPatch: , pkgsBuildHost # configurePhase: @@ -119,6 +121,33 @@ let inherit (upstream-info.deps.ungoogled-patches) rev sha256; }; + # There currently isn't a (much) more concise way to get a stdenv + # that uses lld as its linker without bootstrapping pkgsLLVM; see + # https://github.com/NixOS/nixpkgs/issues/142901 + buildPlatformLlvmStdenv = + let + llvmPackages = pkgsBuildBuild.${llvmPackages_attrName}; + in + overrideCC llvmPackages.stdenv + (llvmPackages.stdenv.cc.override { + inherit (llvmPackages) bintools; + }); + + chromiumRosettaStone = { + cpu = platform: + let name = platform.parsed.cpu.name; + in ({ "x86_64" = "x64"; + "i686" = "x86"; + "arm" = "arm"; + "aarch64" = "arm64"; + }.${platform.parsed.cpu.name} + or (throw "no chromium Rosetta Stone entry for cpu: ${name}")); + os = platform: + if platform.isLinux + then "linux" + else throw "no chromium Rosetta Stone entry for os: ${platform.config}"; + }; + base = rec { pname = "${packageName}-unwrapped"; inherit (upstream-info) version; @@ -137,6 +166,22 @@ let bison gperf ]; + depsBuildBuild = [ + buildPlatformLlvmStdenv + buildPlatformLlvmStdenv.cc + pkg-config + libuuid + libpng # needed for "host/generate_colors_info" + ] + # When cross-compiling, chromium builds a huge proportion of its + # components for both the `buildPlatform` (which it calls + # `host`) as well as for the `hostPlatform` -- easily more than + # half of the dependencies are needed here. To avoid having to + # maintain a separate list of buildPlatform-dependencies, we + # simply throw in the kitchen sink. + ++ buildInputs + ; + buildInputs = [ (libpng.override { apngSupport = false; }) # https://bugs.chromium.org/p/chromium/issues/detail?id=752403 bzip2 flac speex opusWithCustomModes @@ -168,6 +213,7 @@ let ++ lib.optional pulseSupport libpulseaudio; patches = [ + ./cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: @@ -275,9 +321,27 @@ let # weaken or disable security measures like sandboxing or ASLR): is_official_build = true; disable_fieldtrial_testing_config = true; + + # note: chromium calls buildPlatform "host" and calls hostPlatform "target" + host_cpu = chromiumRosettaStone.cpu stdenv.buildPlatform; + host_os = chromiumRosettaStone.os stdenv.buildPlatform; + target_cpu = chromiumRosettaStone.cpu stdenv.hostPlatform; + v8_target_cpu = chromiumRosettaStone.cpu stdenv.hostPlatform; + target_os = chromiumRosettaStone.os stdenv.hostPlatform; + # Build Chromium using the system toolchain (for Linux distributions): + # + # What you would expect to be caled "target_toolchain" is + # actually called either "default_toolchain" or "custom_toolchain", + # depending on which part of the codebase you are in; see: + # https://github.com/chromium/chromium/blob/d36462cc9279464395aea5e65d0893d76444a296/build/config/BUILDCONFIG.gn#L17-L44 custom_toolchain = "//build/toolchain/linux/unbundle:default"; - host_toolchain = "//build/toolchain/linux/unbundle:default"; + host_toolchain = "//build/toolchain/linux/unbundle:host"; + v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host"; + + host_pkg_config = "${pkgsBuildBuild.pkg-config}/bin/pkg-config"; + pkg_config = "${pkgsBuildHost.pkg-config}/bin/${stdenv.cc.targetPrefix}pkg-config"; + # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; # Because we use a different toolchain / compiler version: @@ -321,6 +385,9 @@ let # We do intentionally not set rustc_version as nixpkgs will never do incremental # rebuilds, thus leaving this empty is fine. rust_sysroot_absolute = "${rustc}"; + } // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) { + # https://www.mail-archive.com/v8-users@googlegroups.com/msg14528.html + arm_control_flow_integrity = "none"; } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; @@ -350,6 +417,11 @@ let # our Clang is always older than Chromium's and the build logs have a size # of approx. 25 MB without this option (and this saves e.g. 66 %). env.NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + env.BUILD_CC = "$CC_FOR_BUILD"; + env.BUILD_CXX = "$CXX_FOR_BUILD"; + env.BUILD_AR = "$AR_FOR_BUILD"; + env.BUILD_NM = "$NM_FOR_BUILD"; + env.BUILD_READELF = "$READELF_FOR_BUILD"; buildPhase = let buildCommand = target: '' diff --git a/pkgs/applications/networking/browsers/chromium/cross-compile.patch b/pkgs/applications/networking/browsers/chromium/cross-compile.patch new file mode 100644 index 000000000000..7df73299bc43 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/cross-compile.patch @@ -0,0 +1,31 @@ +diff --git a/build/toolchain/linux/unbundle/BUILD.gn b/build/toolchain/linux/unbundle/BUILD.gn +index a091491236bb1..d36fd4e652fbf 100644 +--- a/build/toolchain/linux/unbundle/BUILD.gn ++++ b/build/toolchain/linux/unbundle/BUILD.gn +@@ -9,6 +9,7 @@ gcc_toolchain("default") { + cxx = getenv("CXX") + ar = getenv("AR") + nm = getenv("NM") ++ readelf = getenv("READELF") + ld = cxx + + extra_cflags = getenv("CFLAGS") +@@ -27,6 +28,7 @@ gcc_toolchain("host") { + cxx = getenv("BUILD_CXX") + ar = getenv("BUILD_AR") + nm = getenv("BUILD_NM") ++ readelf = getenv("BUILD_READELF") + ld = cxx + + extra_cflags = getenv("BUILD_CFLAGS") +@@ -35,7 +37,8 @@ gcc_toolchain("host") { + extra_ldflags = getenv("BUILD_LDFLAGS") + + toolchain_args = { +- current_cpu = current_cpu +- current_os = current_os ++ current_cpu = host_cpu ++ current_os = host_os ++ v8_current_cpu = target_cpu + } + } From 0eabede44b064fb3da5026d4dc5f01fa4c1fd3cf Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sat, 1 Jul 2023 22:37:14 +0200 Subject: [PATCH 008/189] nixos/apparmor: make abstractions/ssl_certs more go friendly By default golang's crypto/x509 implementation wants to read /etc/pki/tls/certs/ when loading system certificates. This patch adds the path to reduce audit log noise. Relevant code: - https://github.com/golang/go/blob/go1.20.5/src/crypto/x509/root_unix.go#L32-L82 - https://github.com/golang/go/blob/go1.20.5/src/crypto/x509/root_linux.go#L17-L22 --- nixos/modules/security/apparmor/includes.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix index adfca04426ca..7711f1fdb7e7 100644 --- a/nixos/modules/security/apparmor/includes.nix +++ b/nixos/modules/security/apparmor/includes.nix @@ -279,6 +279,8 @@ config.security.apparmor.includes = { r /var/lib/acme/*/chain.pem, r /var/lib/acme/*/fullchain.pem, + r /etc/pki/tls/certs/, + '' + lib.concatMapStringsSep "\n" etcRule [ "ssl/certs/ca-certificates.crt" "ssl/certs/ca-bundle.crt" From 9145e6df84b171a96ff3b3e2ba5d6d5083b25834 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 2 Jul 2023 02:35:27 +0200 Subject: [PATCH 009/189] nixos/apparmor: add missing abstraction/nss-systemd The abstraction/nameservice profile from apparmor-profiles package includes abstractions/nss-systemd. Without "reexporting" it, the include fails and we get some errors. --- nixos/modules/security/apparmor/includes.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix index 7711f1fdb7e7..8e9706eef973 100644 --- a/nixos/modules/security/apparmor/includes.nix +++ b/nixos/modules/security/apparmor/includes.nix @@ -211,6 +211,9 @@ config.security.apparmor.includes = { "abstractions/nis" = '' include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nis" ''; + "abstractions/nss-systemd" = '' + include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nss-systemd" + ''; "abstractions/nvidia" = '' include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/nvidia" ${etcRule "vdpau_wrapper.cfg"} From ad7ffe3a7c270a82e06caea439963278bbc70348 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 2 Jul 2023 14:23:59 +0200 Subject: [PATCH 010/189] nixos/apparmor: fix syntax in abstractions/bash --- nixos/modules/security/apparmor/includes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix index 8e9706eef973..d05a1d1b0d1d 100644 --- a/nixos/modules/security/apparmor/includes.nix +++ b/nixos/modules/security/apparmor/includes.nix @@ -72,7 +72,7 @@ config.security.apparmor.includes = { # bash inspects filesystems at startup # and /etc/mtab is linked to /proc/mounts - @{PROC}/mounts + r @{PROC}/mounts, # system-wide bash configuration '' + lib.concatMapStringsSep "\n" etcRule [ From 0f474b4c6cd6202d346bc7b7220b88f3c281e478 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 9 Jul 2023 15:48:59 +0200 Subject: [PATCH 011/189] nixos/apparmor: support custom i18n glibc locales The i18n nixos module creates a customized glibcLocales package. Use the system specific glibcLocale instead of the vanilla one. --- nixos/modules/security/apparmor/includes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix index d05a1d1b0d1d..88051de484c5 100644 --- a/nixos/modules/security/apparmor/includes.nix +++ b/nixos/modules/security/apparmor/includes.nix @@ -62,7 +62,7 @@ config.security.apparmor.includes = { include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base" r ${pkgs.stdenv.cc.libc}/share/locale/**, r ${pkgs.stdenv.cc.libc}/share/locale.alias, - ${lib.optionalString (pkgs.glibcLocales != null) "r ${pkgs.glibcLocales}/lib/locale/locale-archive,"} + r ${config.i18n.glibcLocales}/lib/locale/locale-archive, ${etcRule "localtime"} r ${pkgs.tzdata}/share/zoneinfo/**, r ${pkgs.stdenv.cc.libc}/share/i18n/**, From 125617826334fbf6be4f4f0e312f40b137bcb932 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sat, 1 Jul 2023 16:45:18 +0200 Subject: [PATCH 012/189] apparmor: fix python import issues With buildPythonApplication the PYTHONPATH is now populated properly, which should address the ModuleNotFoundError issue. I also moved some of the substitutions from postInstall to prePatch, so they don't conflict with the wrapped executables. Because upstream does not seem to hardcode binary paths in the utils anymore, some of the old substituteInPlace rules could be removed. Partial fix for nixpkgs#169056 --- pkgs/os-specific/linux/apparmor/default.nix | 31 +++++++++++---------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index f579c00eb5c9..7c3503d16a65 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -128,9 +128,10 @@ let meta = apparmor-meta "library"; }; - apparmor-utils = stdenv.mkDerivation { + apparmor-utils = python.pkgs.buildPythonApplication { pname = "apparmor-utils"; version = apparmor-version; + format = "other"; src = apparmor-sources; @@ -146,14 +147,25 @@ let libapparmor.python ]; + propagatedBuildInputs = [ + libapparmor.python + + # Used by aa-notify + python.pkgs.notify2 + python.pkgs.psutil + ]; + prePatch = prePatchCommon + # Do not build vim file lib.optionalString stdenv.hostPlatform.isMusl '' sed -i ./utils/Makefile -e "/\/d" '' + '' - for file in utils/apparmor/easyprof.py utils/apparmor/aa.py utils/logprof.conf; do - substituteInPlace $file --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" - done + sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' ./utils/Makefile + + sed -i utils/aa-unconfined -e "/my_env\['PATH'\]/d" + + substituteInPlace utils/aa-remove-unknown \ + --replace "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" ''; inherit patches; postPatch = "cd ./utils"; @@ -161,17 +173,6 @@ let installFlags = [ "DESTDIR=$(out)" "BINDIR=$(out)/bin" "VIM_INSTALL_PATH=$(out)/share" "PYPREFIX=" ]; postInstall = '' - sed -i $out/bin/aa-unconfined -e "/my_env\['PATH'\]/d" - for prog in aa-audit aa-autodep aa-cleanprof aa-complain aa-disable aa-enforce aa-genprof aa-logprof aa-mergeprof aa-unconfined ; do - wrapProgram $out/bin/$prog --prefix PYTHONPATH : "$out/lib/${python.sitePackages}:$PYTHONPATH" - done - - substituteInPlace $out/bin/aa-notify \ - --replace /usr/bin/notify-send ${libnotify}/bin/notify-send \ - --replace /usr/bin/perl "${perl}/bin/perl -I ${libapparmor}/${perl.libPrefix}" - - substituteInPlace $out/bin/aa-remove-unknown \ - --replace "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" wrapProgram $out/bin/aa-remove-unknown \ --prefix PATH : ${lib.makeBinPath [ gawk ]} From ced170c030a409f8e21a7c1e20bced6a9397c1d2 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sat, 8 Jul 2023 02:18:34 +0200 Subject: [PATCH 013/189] nixos/miniflux: add apparmor policy This change also extends the test to ensure that normal operations aren't denied. --- nixos/modules/services/web-apps/miniflux.nix | 12 ++++++++++++ nixos/tests/miniflux.nix | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 7cc8ce10ffe0..3374c746ad3d 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -130,5 +130,17 @@ in environment = cfg.config; }; environment.systemPackages = [ cfg.package ]; + + security.apparmor.policies."bin.miniflux".profile = '' + include + ${cfg.package}/bin/miniflux { + include + include + include + include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}" + r ${cfg.package}/bin/miniflux, + r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size, + } + ''; }; } diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index be3e7abb6abd..a3af53db0e7a 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -25,6 +25,7 @@ in default = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; inherit adminCredentialsFile; @@ -34,6 +35,7 @@ in withoutSudo = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; inherit adminCredentialsFile; @@ -44,6 +46,7 @@ in customized = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; config = { @@ -63,6 +66,7 @@ in default.succeed( "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) + default.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') withoutSudo.wait_for_unit("miniflux.service") withoutSudo.wait_for_open_port(${toString defaultPort}) @@ -70,6 +74,7 @@ in withoutSudo.succeed( "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) + withoutSudo.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') customized.wait_for_unit("miniflux.service") customized.wait_for_open_port(${toString port}) @@ -77,5 +82,6 @@ in customized.succeed( "curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) + customized.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') ''; }) From 30ad9053abddb3128e90c023faf64e0bdd4fce1a Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 9 Jul 2023 01:01:03 +0200 Subject: [PATCH 014/189] nixos/murmur: add apparmor policy --- nixos/modules/services/networking/murmur.nix | 32 ++++++++++++++++++++ nixos/tests/mumble.nix | 4 +++ 2 files changed, 36 insertions(+) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index ebade7aa8e40..fe3eb3787e91 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -355,5 +355,37 @@ in ''; destination = "/share/dbus-1/system.d/murmur.conf"; })]; + + security.apparmor.policies."bin.mumble-server".profile = '' + include + + ${cfg.package}/bin/{mumble-server,.mumble-server-wrapped} { + include + include + include + include "${pkgs.apparmorRulesFromClosure { name = "mumble-server"; } cfg.package}" + pix ${cfg.package}/bin/.mumble-server-wrapped, + + r ${config.environment.etc."os-release".source}, + r ${config.environment.etc."lsb-release".source}, + owner rwk /var/lib/murmur/murmur.sqlite, + owner rw /var/lib/murmur/murmur.sqlite-journal, + owner r /var/lib/murmur/, + r /run/murmur/murmurd.pid, + r /run/murmur/murmurd.ini, + r ${configFile}, + '' + optionalString (cfg.logFile != null) '' + rw ${cfg.logFile}, + '' + optionalString (cfg.sslCert != "") '' + r ${cfg.sslCert}, + '' + optionalString (cfg.sslKey != "") '' + r ${cfg.sslKey}, + '' + optionalString (cfg.sslCa != "") '' + r ${cfg.sslCa}, + '' + optionalString (cfg.dbus != null) '' + dbus bus=${cfg.dbus} + '' + '' + } + ''; }; } diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 2b5cc20163bc..8eee454721a1 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -20,6 +20,7 @@ in nodes = { server = { config, ... }: { + security.apparmor.enable = true; services.murmur.enable = true; services.murmur.registerName = "NixOS tests"; services.murmur.password = "$MURMURD_PASSWORD"; @@ -81,5 +82,8 @@ in server.sleep(5) # wait to get screenshot client1.screenshot("screen1") client2.screenshot("screen2") + + # check if apparmor denied anything + server.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') ''; }) From 642dac2e5e01ee1213f846eb6f203b5f31eb548d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Jul 2023 10:25:14 -0700 Subject: [PATCH 015/189] python310Packages.ypy-websocket: 0.9.0 -> 0.12.1 Diff: https://github.com/y-crdt/ypy-websocket/compare/refs/tags/v0.9.0...v0.12.1 Changelog: https://github.com/y-crdt/ypy-websocket/blob/refs/tags/v0.12.1/CHANGELOG.md --- pkgs/development/python-modules/ypy-websocket/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ypy-websocket/default.nix b/pkgs/development/python-modules/ypy-websocket/default.nix index 11b0b3b00707..796118abc25c 100644 --- a/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/pkgs/development/python-modules/ypy-websocket/default.nix @@ -9,12 +9,13 @@ , pytest-asyncio , pytestCheckHook , pythonRelaxDepsHook +, uvicorn , websockets }: buildPythonPackage rec { pname = "ypy-websocket"; - version = "0.9.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "y-crdt"; repo = "ypy-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-dHcXJavzR1BDAM9Xjm144gfNMSDEkenumI3POBfCjvQ="; + hash = "sha256-JsSOh7CSHUnGJmNAP87fMMsRgdj6nNna1XVe15MYqoA="; }; pythonRelaxDeps = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook + uvicorn websockets ]; From 3eea344be3afdea61111702fe0e6b6c27568e60e Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Mon, 17 Jul 2023 14:36:50 -0400 Subject: [PATCH 016/189] crystal_1_9: 1.9.0 -> 1.9.2 --- pkgs/development/compilers/crystal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 8fe6748c08f6..48dd456bcb2f 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -279,8 +279,8 @@ rec { }; crystal_1_9 = generic { - version = "1.9.0"; - sha256 = "sha256-FFpAL1U8WtfwDCLaUP+axSnJlGaKp/jzBs54rit9T2A="; + version = "1.9.2"; + sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; binary = binaryCrystal_1_2; }; From c2089256f954b4d73b23542141125943ffe4eb3e Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 24 Jul 2023 13:44:53 +0200 Subject: [PATCH 017/189] qpwgraph: 0.4.5 -> 0.5.1 Signed-off-by: Sefa Eyeoglu --- pkgs/applications/audio/qpwgraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 0c36a8b3ecca..c4955e15e894 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.4.5"; + version = "0.5.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-VMTVaJJHMgx5mJT4ZRL5CDOJp7UPOkZOjqulCFSd7xo="; + sha256 = "sha256-HVeuqgqYf/gO1KdteXV4dWd13Q58GqHUz8CAYpruc18="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -29,6 +29,6 @@ mkDerivation rec { homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ kanashimia exi ]; + maintainers = with maintainers; [ kanashimia exi Scrumplex ]; }; } From 4e14f5fee6a68ee5fb56d07e70e86fcfcebdc7d3 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Mon, 10 Jul 2023 21:16:25 +0200 Subject: [PATCH 018/189] lib.path.subpath.components: init Co-authored-by: Robert Hensing --- lib/path/default.nix | 31 +++++++++++++++++++++++++++++++ lib/path/tests/unit.nix | 13 +++++++++++++ 2 files changed, 44 insertions(+) diff --git a/lib/path/default.nix b/lib/path/default.nix index 936e9b030253..181124c179a9 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -336,6 +336,37 @@ in /* No rec! Add dependencies on this file at the top. */ { ${subpathInvalidReason path}'' ) 0 subpaths; + /* + Split [a subpath](#function-library-lib.path.subpath.isValid) into its path component strings. + Throw an error if the subpath isn't valid. + Note that the returned path components are also valid subpath strings, though they are intentionally not [normalised](#function-library-lib.path.subpath.normalise). + + Laws: + + - Splitting a subpath into components and [joining](#function-library-lib.path.subpath.join) the components gives the same subpath but [normalised](#function-library-lib.path.subpath.normalise): + + subpath.join (subpath.components s) == subpath.normalise s + + Type: + subpath.components :: String -> [ String ] + + Example: + subpath.components "." + => [ ] + + subpath.components "./foo//bar/./baz/" + => [ "foo" "bar" "baz" ] + + subpath.components "/foo" + => + */ + subpath.components = + subpath: + assert assertMsg (isValid subpath) '' + lib.path.subpath.components: Argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; + splitRelPath subpath; + /* Normalise a subpath. Throw an error if the subpath isn't valid, see `lib.path.subpath.isValid` diff --git a/lib/path/tests/unit.nix b/lib/path/tests/unit.nix index 9c5b752cf64a..fc5a84493adb 100644 --- a/lib/path/tests/unit.nix +++ b/lib/path/tests/unit.nix @@ -204,6 +204,19 @@ let expr = (builtins.tryEval (subpath.normalise "..")).success; expected = false; }; + + testSubpathComponentsExample1 = { + expr = subpath.components "."; + expected = [ ]; + }; + testSubpathComponentsExample2 = { + expr = subpath.components "./foo//bar/./baz/"; + expected = [ "foo" "bar" "baz" ]; + }; + testSubpathComponentsExample3 = { + expr = (builtins.tryEval (subpath.components "/foo")).success; + expected = false; + }; }; in if cases == [] then "Unit tests successful" From 407db583c54245136fe8e73976abadb7eb9fad80 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 20 Jul 2023 22:31:57 +0200 Subject: [PATCH 019/189] lib/path/README.md: Justify returning subpaths Co-authored-by: Valentin Gagarin --- lib/path/README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/path/README.md b/lib/path/README.md index 87e552d120d7..89eec18b1130 100644 --- a/lib/path/README.md +++ b/lib/path/README.md @@ -187,6 +187,27 @@ Decision: All functions remove trailing slashes in their results. +### Prefer returning subpaths over components +[subpath-preference]: #prefer-returning-subpaths-over-components + +Observing: Functions could return subpaths or lists of path component strings. + +Considering: Subpaths are used as inputs for some functions. Using them for outputs, too, makes the library more consistent and composable. + +Decision: Subpaths should be preferred over list of path component strings. + +
+Arguments + +- (+) It is consistent with functions accepting subpaths, making the library more composable +- (-) It is less efficient when the components are needed, because after creating the normalised subpath string, it will have to be parsed into components again + - (+) If necessary, we can still make it faster by adding builtins to Nix + - (+) Alternatively if necessary, versions of these functions that return components could later still be introduced. +- (+) It makes the path library simpler because there's only two types (paths and subpaths). Only `lib.path.subpath.components` can be used to get a list of components. + And once we have a list of component strings, `lib.lists` and `lib.strings` can be used to operate on them. + For completeness, `lib.path.subpath.join` allows converting the list of components back to a subpath. +
+ ## Other implementations and references - [Rust](https://doc.rust-lang.org/std/path/struct.Path.html) From dc617c662350c026fade3b0561e43314f0a56da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 29 Jul 2023 14:03:56 +0200 Subject: [PATCH 020/189] vdrPlugins.softhddevice: 1.10.3 -> 1.11.1 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index b0ea1b04c258..1be01e63fc58 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.10.3"; + version = "1.11.1"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-iuQ6ZHPrtIQzEqHYrLibZ8uOOwNqMbWYCD5plDQcBZg="; + sha256 = "sha256-+itSxkyst/KJzyT8ALJkCKumrHHKiWfnvikonwexgnc="; rev = "v${version}"; }; From 5cd25a3eced3a9585ddd861d98dfaccd1db0549d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 29 Jul 2023 14:08:23 +0200 Subject: [PATCH 021/189] vdrPlugins.markad: 3.1.1 -> 3.3.3 --- .../applications/video/vdr/markad/default.nix | 59 +++++++++++++++++++ pkgs/applications/video/vdr/plugins.nix | 52 ++-------------- 2 files changed, 63 insertions(+), 48 deletions(-) create mode 100644 pkgs/applications/video/vdr/markad/default.nix diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix new file mode 100644 index 000000000000..d924398b6389 --- /dev/null +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, vdr +, fetchFromGitHub +, graphicsmagick +, pcre +, xorgserver +, ffmpeg +, libiconv +, boost +, libgcrypt +, perl +, util-linux +, groff +, libva +, xorg +, ncurses +, callPackage +}: +stdenv.mkDerivation rec { + pname = "vdr-markad"; + version = "3.3.3"; + + src = fetchFromGitHub { + repo = "vdr-plugin-markad"; + owner = "kfb77"; + sha256 = "sha256-wU8hfNss0Lxvf9CqFhDAPOxIVaG/9vNR620xpEJkxWI="; + rev = "V${version}"; + }; + + buildInputs = [ vdr ffmpeg ]; + + postPatch = '' + substituteInPlace command/Makefile --replace '/usr' "" + + substituteInPlace plugin/markad.cpp \ + --replace "/usr/bin" "$out/bin" \ + --replace "/var/lib/markad" "$out/var/lib/markad" + + substituteInPlace command/markad-standalone.cpp \ + --replace "/var/lib/markad" "$out/var/lib/markad" + ''; + + buildFlags = [ + "DESTDIR=$(out)" + "VDRDIR=${vdr.dev}/lib/pkgconfig" + ]; + + installFlags = buildFlags; + + meta = with lib; { + inherit (src.meta) homepage; + description = "MarkAd marks advertisements in VDR recordings."; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + inherit (vdr.meta) platforms; + }; + +} diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 404af2ec83b3..ba24cefb4d94 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -1,6 +1,6 @@ { lib, stdenv, vdr, fetchFromGitHub -, graphicsmagick, pcre, xorgserver, ffmpeg -, libiconv, boost, libgcrypt, perl, util-linux, groff, libva, xorg, ncurses +, graphicsmagick, pcre +, boost, libgcrypt, perl, util-linux, groff, ncurses , callPackage }: let mkPlugin = name: stdenv.mkDerivation { @@ -12,6 +12,8 @@ }; in { + markad = callPackage ./markad {}; + softhddevice = callPackage ./softhddevice {}; streamdev = callPackage ./streamdev {}; @@ -53,52 +55,6 @@ in { }; - markad = stdenv.mkDerivation rec { - pname = "vdr-markad"; - version = "3.1.1"; - - src = fetchFromGitHub { - repo = "vdr-plugin-markad"; - owner = "kfb77"; - sha256 = "sha256-h2a400T6mHzZRWAVFXF5Wzhu4Zp1D3btEKlxnCtB13M="; - rev = "V${version}"; - }; - - buildInputs = [ vdr ffmpeg ]; - - postPatch = '' - substituteInPlace command/Makefile --replace '/usr' "" - - substituteInPlace plugin/markad.cpp \ - --replace "/usr/bin" "$out/bin" \ - --replace "/var/lib/markad" "$out/var/lib/markad" - - substituteInPlace command/markad-standalone.cpp \ - --replace "/var/lib/markad" "$out/var/lib/markad" - ''; - - buildFlags = [ - "DESTDIR=$(out)" - "LIBDIR=/lib/vdr" - "BINDIR=/bin" - "MANDIR=/share/man" - "APIVERSION=${vdr.version}" - "VDRDIR=${vdr.dev}/include/vdr" - "LOCDIR=/share/locale" - ]; - - installFlags = buildFlags; - - meta = with lib; { - inherit (src.meta) homepage; - description = "MarkAd marks advertisements in VDR recordings."; - maintainers = [ maintainers.ck3d ]; - license = licenses.gpl2; - inherit (vdr.meta) platforms; - }; - - }; - epgsearch = stdenv.mkDerivation rec { pname = "vdr-epgsearch"; version = "2.4.2"; From 686484946d52a08b2c9419bc508cbda321a018c8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 30 Jul 2023 10:59:01 +0800 Subject: [PATCH 022/189] python3Packages.sagemaker: 2.135.0 -> 2.173.0 --- .../python-modules/sagemaker/default.nix | 63 ++++++++++++------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 6bee251ff3dd..c45a72916467 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -1,65 +1,84 @@ { lib , buildPythonPackage -, fetchPypi +, pythonOlder +, fetchFromGitHub , pythonRelaxDepsHook , attrs , boto3 +, cloudpickle , google-pasta -, importlib-metadata , numpy , protobuf -, protobuf3-to-dict , smdebug-rulesconfig +, importlib-metadata +, packaging , pandas , pathos -, packaging -, pythonOlder +, schema +, pyyaml +, jsonschema +, platformdirs +, tblib +, urllib3 +, docker +, scipy }: buildPythonPackage rec { pname = "sagemaker"; - version = "2.135.0"; + version = "2.173.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ypdcqEYLxHbfnq1ycq3hVLThhIIs3pq29Fv33Ly2hbE="; + src = fetchFromGitHub { + owner = "aws"; + repo = "sagemaker-python-sdk"; + rev = "refs/tags/v${version}"; + hash = "sha256-Fzkw37bRBbCD7VBIsN4Qkk6dI0Qh4Gvt5TJbnoUuPCs="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ - # FIXME: Remove when >= 2.111.0 "attrs" - "protobuf" + "boto3" ]; propagatedBuildInputs = [ attrs boto3 + cloudpickle google-pasta - importlib-metadata numpy - packaging - pathos protobuf - protobuf3-to-dict smdebug-rulesconfig + importlib-metadata + packaging pandas + pathos + schema + pyyaml + jsonschema + platformdirs + tblib ]; - postFixup = '' - [ "$($out/bin/sagemaker-upgrade-v2 --help 2>&1 | grep -cim1 'pandas failed to import')" -eq "0" ] - ''; - - doCheck = false; + doCheck = false; # many test dependencies are not available in nixpkgs pythonImportsCheck = [ "sagemaker" "sagemaker.lineage.visualizer" ]; + passthru.optional-dependencies = { + local = [ urllib3 docker pyyaml ]; + scipy = [ scipy ]; + # feature-processor = [ pyspark sagemaker-feature-store-pyspark ]; # not available in nixpkgs + }; + meta = with lib; { description = "Library for training and deploying machine learning models on Amazon SageMaker"; homepage = "https://github.com/aws/sagemaker-python-sdk/"; From 9d1f56beda73ca75f9353e2daf110a17fcf7d127 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 30 Jul 2023 04:20:00 +0000 Subject: [PATCH 023/189] barman: 3.4.0 -> 3.7.0 Diff: https://github.com/EnterpriseDB/barman/compare/release/3.4.0...release/3.7.0 Changelog: https://github.com/EnterpriseDB/barman/blob/release/3.7.0/NEWS --- pkgs/tools/misc/barman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index bed377663328..f310b99f811f 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.4.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - hash = "sha256-K5y5C+K/fMhgOcSsCMaIgY6ce9UUPszoyumsfNHKjBo="; + hash = "sha256-5mecCg5c+fu6WUgmNEL4BR+JCild02YAuYgLwO1MGnI="; }; patches = [ From b980f26d34d6950d35d99373446c113e280521bf Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 30 Jul 2023 04:20:00 +0000 Subject: [PATCH 024/189] git-lfs: install completions --- pkgs/applications/version-management/git-lfs/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index a45f184881d4..ed36f2092716 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -39,6 +39,10 @@ buildGoModule rec { postInstall = '' installManPage man/man*/* + installShellCompletion --cmd git-lfs \ + --bash <($out/bin/git-lfs completion bash) \ + --fish <($out/bin/git-lfs completion fish) \ + --zsh <($out/bin/git-lfs completion zsh) ''; passthru.tests.version = testers.testVersion { From 14cc800e2151a14b12190a47a3fd994921527576 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Aug 2023 07:22:57 +0000 Subject: [PATCH 025/189] vaultwarden: 1.29.0 -> 1.29.1 --- pkgs/tools/security/vaultwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 9321537539e0..cfe65eb332c1 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -9,13 +9,13 @@ in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.29.0"; + version = "1.29.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - hash = "sha256-dF27b29n4JUHdXG68UfQwlacZE1SXqk0h854cMR8Ii8="; + hash = "sha256-uASoPZRBQ9IKJHtMGeeZzmr0fCYDWl56EzaJVj6LwMk="; }; cargoLock = { From e31b7df1b85516222cbd64eb4251347c6afb4d3e Mon Sep 17 00:00:00 2001 From: Guilherme Ramos Costa Paixao Date: Tue, 1 Aug 2023 09:27:39 -0300 Subject: [PATCH 026/189] zettlr-beta: init at 3.0.0-beta.7 --- pkgs/applications/misc/zettlr/default.nix | 45 ++++------------------- pkgs/applications/misc/zettlr/generic.nix | 42 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 pkgs/applications/misc/zettlr/generic.nix diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 586d9f95f1f7..79d386e349c0 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -1,41 +1,12 @@ -{ appimageTools -, lib -, fetchurl -, texlive -, pandoc -}: +{ callPackage, texlive }: -# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. -let - pname = "zettlr"; - version = "2.3.0"; - name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk="; +builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texlive; })) { + zettlr = { + version = "2.3.0"; + hash = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk="; }; - appimageContents = appimageTools.extractType2 { - inherit name src; - }; -in -appimageTools.wrapType2 rec { - inherit name src; - - multiArch = false; # no 32bit needed - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; - extraInstallCommands = '' - mv $out/bin/{${name},${pname}} - install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop - install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png - substituteInPlace $out/share/applications/Zettlr.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "A markdown editor for writing academic texts and taking notes"; - homepage = "https://www.zettlr.com"; - platforms = [ "x86_64-linux" ]; - license = licenses.gpl3; - maintainers = with maintainers; [ tfmoraes ]; + zettlr-beta = { + version = "3.0.0-beta.7"; + hash = "sha256-zIZaINE27bcjbs8yCGQ3UKAwStFdvhHD3Q1F93LrG4U="; }; } diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix new file mode 100644 index 000000000000..4a8bcbd8549e --- /dev/null +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -0,0 +1,42 @@ +{ pname +, version +, hash +, appimageTools +, lib +, fetchurl +, texlive +, pandoc +}: + +# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. +let + name = "${pname}-${version}"; + src = fetchurl { + url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; + inherit hash; + }; + appimageContents = appimageTools.extractType2 { + inherit name src; + }; +in +appimageTools.wrapType2 rec { + inherit name src; + + multiArch = false; # no 32bit needed + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop + install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png + substituteInPlace $out/share/applications/Zettlr.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "A markdown editor for writing academic texts and taking notes"; + homepage = "https://www.zettlr.com"; + platforms = [ "x86_64-linux" ]; + license = licenses.gpl3; + maintainers = with maintainers; [ tfmoraes ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6ce25e7274f..4c94b7481a85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -41503,9 +41503,9 @@ with pkgs; zalgo = callPackage ../tools/misc/zalgo { }; - zettlr = callPackage ../applications/misc/zettlr { + inherit (callPackage ../applications/misc/zettlr { texlive = texlive.combined.scheme-medium; - }; + }) zettlr zettlr-beta; unpoller = callPackage ../servers/monitoring/unpoller { }; From 5a4e5d7b1209fd393624478e0397a5dd0b33ae7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Aug 2023 02:10:08 +0000 Subject: [PATCH 027/189] python310Packages.commandparse: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/commandparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix index 68da870f4e2d..7ac68dd973ef 100644 --- a/pkgs/development/python-modules/commandparse/default.nix +++ b/pkgs/development/python-modules/commandparse/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "commandparse"; - version = "1.1.1"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "06mcxc0vs5qdcywalgyx5zm18z4xcsrg5g0wsqqv5qawkrvmvl53"; + sha256 = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; }; # tests only distributed upstream source, not PyPi From 13e2cb64cfc4236c6b0f11076636b471d97ac0b0 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 2 Aug 2023 04:03:53 +0100 Subject: [PATCH 028/189] cdrdao: use `finalAttrs` --- pkgs/tools/cd-dvd/cdrdao/default.nix | 33 ++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 527d70e7a90d..a58754c0370d 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -1,18 +1,33 @@ -{lib, stdenv, fetchurl, libvorbis, libmad, pkg-config, libao}: +{ + lib, + stdenv, + fetchurl, + pkg-config, + libvorbis, + libmad, + libao, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cdrdao"; version = "1.2.5"; src = fetchurl { - url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2"; + url = "mirror://sourceforge/cdrdao/cdrdao-${finalAttrs.version}.tar.bz2"; hash = "sha256-0ZtnyFPF26JAavqrbNeI53817r5jTKxGeVKEd8e+AbY="; }; makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libvorbis libmad libao ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libvorbis + libmad + libao + ]; hardeningDisable = [ "format" ]; @@ -25,10 +40,10 @@ stdenv.mkDerivation rec { # Needed on gcc >= 6. env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; - meta = with lib; { + meta = { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = "https://cdrdao.sourceforge.net/"; - platforms = platforms.linux; - license = licenses.gpl2; + platforms = lib.platforms.linux; + license = lib.licenses.gpl2; }; -} +}) From 58dff2378fec180a2d273bccfe10a6423fafcba5 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 2 Aug 2023 04:04:42 +0100 Subject: [PATCH 029/189] {cdrdao,whipper}: support Darwin --- pkgs/applications/audio/whipper/default.nix | 2 +- pkgs/tools/cd-dvd/cdrdao/default.nix | 19 ++++++++++++++++++- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index e92b2f13187e..eb179bfa5496 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -95,6 +95,6 @@ in python3.pkgs.buildPythonApplication rec { description = "A CD ripper aiming for accuracy over speed"; maintainers = with maintainers; [ emily ]; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index a58754c0370d..8d557993f9dc 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -2,10 +2,14 @@ lib, stdenv, fetchurl, + fetchpatch, pkg-config, + libiconv, libvorbis, libmad, libao, + CoreServices, + IOKit, }: stdenv.mkDerivation (finalAttrs: { @@ -24,13 +28,26 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libiconv libvorbis libmad libao + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + IOKit ]; hardeningDisable = [ "format" ]; + patches = [ + # Fix build on macOS SDK < 12 + # https://github.com/cdrdao/cdrdao/pull/19 + (fetchpatch { + url = "https://github.com/cdrdao/cdrdao/commit/105d72a61f510e3c47626476f9bbc9516f824ede.patch"; + hash = "sha256-NVIw59CSrc/HcslhfbYQNK/qSmD4QbfuV8hWYhWelX4="; + }) + ]; + # we have glibc/include/linux as a symlink to the kernel headers, # and the magic '..' points to kernelheaders, and not back to the glibc/include postPatch = '' @@ -43,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; homepage = "https://cdrdao.sourceforge.net/"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; license = lib.licenses.gpl2; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a9362c02dcf..1ec575b69bf5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6547,7 +6547,9 @@ with pkgs; cdpr = callPackage ../tools/networking/cdpr { }; - cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { + inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; + }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; From 8d08ce1f93bfec78965195851b874abf904f8cc9 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 2 Aug 2023 04:05:21 +0100 Subject: [PATCH 030/189] cdrdao: add patch to fix uninitialized variable --- pkgs/tools/cd-dvd/cdrdao/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 8d557993f9dc..959899d3b3f3 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -46,6 +46,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/cdrdao/cdrdao/commit/105d72a61f510e3c47626476f9bbc9516f824ede.patch"; hash = "sha256-NVIw59CSrc/HcslhfbYQNK/qSmD4QbfuV8hWYhWelX4="; }) + + # Fix undefined behaviour caused by uninitialized variable + # https://github.com/cdrdao/cdrdao/pull/21 + (fetchpatch { + url = "https://github.com/cdrdao/cdrdao/commit/251a40ab42305c412674c7c2d391374d91e91c95.patch"; + hash = "sha256-+nGlWw5rgc5Ns2l+6fQ4Hp2LbhO4R/I95h9WGIh/Ebw="; + }) ]; # we have glibc/include/linux as a symlink to the kernel headers, From d02af47fad91b0dd05ef83486c1802139296ce8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 31 Jul 2023 09:09:12 -0700 Subject: [PATCH 031/189] reveal-md: use buildNpmPackage --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 309 ------------------ pkgs/development/node-packages/overrides.nix | 13 - pkgs/tools/text/reveal-md/default.nix | 41 +++ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 43 insertions(+), 324 deletions(-) create mode 100644 pkgs/tools/text/reveal-md/default.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 05d996865fbf..31c43333f889 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -49,6 +49,7 @@ mapAliases { gtop = pkgs.gtop; # added 2023-07-31 manta = pkgs.node-manta; # Added 2023-05-06 readability-cli = pkgs.readability-cli; # Added 2023-06-12 + reveal-md = pkgs.reveal-md; # added 2023-07-31 thelounge = pkgs.thelounge; # Added 2023-05-22 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index da2f95ab848c..e1a1b862f156 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -272,7 +272,6 @@ , "redoc-cli" , "remod-cli" , "reveal.js" -, "reveal-md" , "rimraf" , "rollup" , {"rust-analyzer-build-deps": "../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"} diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index a05307fcc569..e8e9d7c20dd6 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -133651,315 +133651,6 @@ in bypassCache = true; reconstructLock = true; }; - reveal-md = nodeEnv.buildNodePackage { - name = "reveal-md"; - packageName = "reveal-md"; - version = "5.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.5.1.tgz"; - sha512 = "6M2jSP4HHEWKRmaeB7Sc7oyUffUL98NVeg9Z8mquJFBZqjBXdL39Du8RCrKgN31XwI8oiLaFs5jRiUzJnQiaTA=="; - }; - dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."accepts-1.3.8" - sources."agent-base-4.3.0" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."argparse-1.0.10" - sources."array-flatten-1.1.1" - sources."async-limiter-1.0.1" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."boxen-5.1.2" - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.7" - sources."bytes-3.1.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."call-bind-1.0.2" - sources."camelcase-6.3.0" - sources."chalk-4.1.2" - sources."chokidar-3.5.3" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."clone-response-1.0.3" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-6.2.1" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."configstore-5.0.1" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."cookie-0.5.0" - sources."cookie-signature-1.0.6" - sources."core-util-is-1.0.3" - sources."crypto-random-string-2.0.0" - sources."debug-4.3.4" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."define-lazy-prop-2.0.0" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.5" - sources."ee-first-1.1.1" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" - sources."escape-goat-2.1.1" - sources."escape-html-1.0.3" - sources."esprima-4.0.1" - sources."etag-1.8.1" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - (sources."extract-zip-1.7.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."fd-slicer-1.1.0" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-extra-11.1.1" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."get-stream-4.1.0" - sources."glob-8.1.0" - sources."glob-parent-5.1.2" - sources."global-dirs-3.0.1" - sources."got-9.6.0" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-flag-4.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-yarn-2.1.0" - sources."highlight.js-11.8.0" - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - (sources."https-proxy-agent-2.2.4" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."iconv-lite-0.4.24" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - sources."ipaddr.js-1.9.1" - sources."is-binary-path-2.1.0" - sources."is-ci-2.0.0" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-npm-5.0.0" - sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-typedarray-1.0.0" - sources."is-wsl-2.2.0" - sources."is-yarn-global-0.3.0" - sources."isarray-1.0.0" - sources."js-yaml-3.14.1" - sources."json-buffer-3.0.0" - sources."jsonfile-6.1.0" - sources."keyv-3.1.0" - sources."latest-version-5.1.0" - sources."livereload-0.9.3" - sources."livereload-js-3.4.1" - sources."lodash-4.17.21" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" - sources."minimatch-5.1.6" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.2" - sources."mustache-4.2.0" - sources."negotiator-0.6.3" - sources."node-gyp-build-4.6.0" - sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" - sources."object-inspect-1.12.3" - sources."on-finished-2.4.1" - sources."once-1.4.0" - sources."open-8.4.2" - sources."opts-2.0.2" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" - sources."path-to-regexp-0.1.7" - sources."pend-1.2.0" - sources."picomatch-2.3.1" - sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" - sources."proxy-addr-2.0.7" - sources."proxy-from-env-1.1.0" - sources."pump-3.0.0" - sources."pupa-2.1.1" - (sources."puppeteer-1.20.0" // { - dependencies = [ - sources."mime-2.6.0" - sources."ws-6.2.2" - ]; - }) - sources."qs-6.11.0" - sources."range-parser-1.2.1" - sources."raw-body-2.5.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."readdirp-3.6.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."responselike-1.0.2" - sources."reveal.js-4.5.0" - (sources."rimraf-2.7.1" // { - dependencies = [ - sources."brace-expansion-1.1.11" - sources."glob-7.2.3" - sources."minimatch-3.1.2" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - (sources."serve-favicon-2.5.0" // { - dependencies = [ - sources."ms-2.1.1" - sources."safe-buffer-5.1.1" - ]; - }) - sources."serve-static-1.15.0" - sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."sprintf-js-1.0.3" - sources."statuses-2.0.1" - sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" - sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."try-require-1.2.1" - sources."type-fest-0.20.2" - sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" - sources."unique-string-2.0.0" - sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."update-notifier-5.1.0" - sources."url-parse-lax-3.0.0" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."vary-1.1.2" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-7.5.9" - sources."xdg-basedir-4.0.0" - sources."yallist-4.0.0" - sources."yaml-front-matter-4.1.1" - sources."yargs-parser-21.1.1" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "reveal.js on steroids! Get beautiful reveal.js presentations from your Markdown files."; - homepage = "https://github.com/webpro/reveal-md#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 863fb6e46674..e0cbf39b3f6a 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -420,19 +420,6 @@ final: prev: { ''; }; - reveal-md = prev.reveal-md.override ( - lib.optionalAttrs (!stdenv.isDarwin) { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - prePatch = '' - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 - ''; - postInstall = '' - wrapProgram $out/bin/reveal-md \ - --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium - ''; - } - ); - rush = prev."@microsoft/rush".override { name = "rush"; }; diff --git a/pkgs/tools/text/reveal-md/default.nix b/pkgs/tools/text/reveal-md/default.nix new file mode 100644 index 000000000000..0ae05e59025d --- /dev/null +++ b/pkgs/tools/text/reveal-md/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "reveal-md"; + version = "5.5.1"; + + src = fetchFromGitHub { + owner = "webpro"; + repo = "reveal-md"; + rev = version; + hash = "sha256-BlUZsETMdOmnz+OFGQhQ9aLHxIIAZ12X1ipy3u59zxo="; + }; + + npmDepsHash = "sha256-xaDBB16egGi8zThHRrhcN8TVf6Nqkx8fkbxWqvJwJb4="; + + env = { + PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true; + }; + + dontNpmBuild = true; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + npm run test + + runHook postCheck + ''; + + meta = { + description = "Get beautiful reveal.js presentations from your Markdown files"; + homepage = "https://github.com/webpro/reveal-md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sagikazarmark ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc48e816f647..07d50619f2c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12407,7 +12407,7 @@ with pkgs; reuse = callPackage ../tools/package-management/reuse { }; - inherit (nodePackages) reveal-md; + reveal-md = callPackage ../tools/text/reveal-md { }; rewritefs = callPackage ../os-specific/linux/rewritefs { }; From 4c41208f29db52ea91992327e5460e07a47fc405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sat, 29 Jul 2023 15:35:32 +0200 Subject: [PATCH 032/189] eza: init at 0.10.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit eza: init at unstable-2023-07-29 Changelog (general): - Merged pr-1177: add hyperlink support - Merged pr-855: add selinux context outputs - Merged pr-797: git repo status, current branch - Merged pr-1219: fish inode completions - Merged pr-1164: -o shortcut for --octal-permissions - Merged pr-1099: typo - Merged pr-69: fix cargo.toml, completions, man pages - Merged pr-981: use stdout for timezone errors Changelog (security): - Bumped openssl-src: SM2 Decryption Buffer Overflow (Critical) - Bumped openssl-src: openssl-src contains Double free after calling `PEM_read_bio_ex` (High) - Bumped openssl-src: AES OCB fails to encrypt some bytes (High) - Bumped openssl-src: openssl-src's infinite loop in `BN_mod_sqrt()` reachable when parsing certificates (High) - Bumped openssl-src: Read buffer overruns processing ASN.1 strings (High) - Bumped openssl-src: openssl-src vulnerable to Use-after-free following `BIO_new_NDEF` (High) - Bumped openssl-src: Vulnerable OpenSSL included in cryptography wheels (High) - Bumped openssl-src: openssl-src subject to Timing Oracle in RSA Decryption (Moderate) - Bumped git2-rs: git2-rs fails to verify SSH keys by default (Moderate) - Bumped git2-rs: git2-rs fails to verify SSH keys by default (Moderate) Signed-off-by: Christina Sørensen eza: unstable-2023-07-29 -> unstable-2023-07-30 Signed-off-by: Christina Sørensen eza: unstable-2023-07-30 -> 0.10.2 Signed-off-by: Christina Sørensen eza: 0.10.2 -> 0.10.3 Signed-off-by: Christina Sørensen eza: 0.10.3 -> 0.10.4 Changelog: Bug Fixes - Dereferencing linksfile size. - Dereferencing links users. - Dereferencing links groups. - Dereferencing links permissions. - Dereferencing links timestamps. - Syntax error Documentation - Add -X/--dereference flag Features - Add symlink dereferencing flag - Add -X/--dereference completions - Add -X/--dereference completions - Added ".out" files for latex - Add changelog generation Signed-off-by: Christina Sørensen --- pkgs/tools/misc/eza/default.nix | 61 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 65 insertions(+) create mode 100644 pkgs/tools/misc/eza/default.nix diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix new file mode 100644 index 000000000000..f3b2fa0e52b8 --- /dev/null +++ b/pkgs/tools/misc/eza/default.nix @@ -0,0 +1,61 @@ +{ lib +, gitSupport ? true +, stdenv +, fetchFromGitHub +, rustPlatform +, cmake +, pandoc +, pkg-config +, zlib +, Security +, libiconv +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "eza"; + version = "0.10.4"; + + src = fetchFromGitHub { + owner = "cafkafk"; + repo = "eza"; + rev = "v${version}"; + hash = "sha256-9Pw7DQ/QTRHNsCPen+Nn5HdvjX1ju08q+KyitPF9+xQ="; + }; + + cargoHash = "sha256-KveRmlgyree77ZDOB4hQA35F/u/ARKiAHRgHpjCXOow="; + + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; + buildInputs = [ zlib ] + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + + buildNoDefaultFeatures = true; + buildFeatures = lib.optional gitSupport "git"; + + outputs = [ "out" "man" ]; + + postInstall = '' + pandoc --standalone -f markdown -t man man/eza.1.md > man/eza.1 + pandoc --standalone -f markdown -t man man/eza_colors.5.md > man/eza_colors.5 + installManPage man/eza.1 man/eza_colors.5 + installShellCompletion \ + --bash completions/bash/eza \ + --fish completions/fish/eza.fish \ + --zsh completions/zsh/_eza + ''; + + meta = with lib; { + description = "A modern, maintained replacement for ls"; + longDescription = '' + eza is a modern replacement for ls. It uses colours for information by + default, helping you distinguish between many types of files, such as + whether you are the owner, or in the owning group. It also has extra + features not present in the original ls, such as viewing the Git status + for a directory, or recursing into directories with a tree view. eza is + written in Rust, so it’s small, fast, and portable. + ''; + homepage = "https://github.com/cafkafk/eza"; + license = licenses.mit; + maintainers = with maintainers; [ cafkafk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f521fbcb14cd..01b859e561dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7789,6 +7789,10 @@ with pkgs; expliot = callPackage ../tools/security/expliot { }; + eza = callPackage ../tools/misc/eza { + inherit (darwin.apple_sdk.frameworks) Security; + }; + f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; Fabric = with python3Packages; toPythonApplication fabric; From 29a0a9e29acab168023a5528cf63f5043b48f6c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Aug 2023 22:03:03 +0000 Subject: [PATCH 033/189] picard-tools: 3.0.0 -> 3.1.0 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 8bd1af4b11d7..e0555055c1a4 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-DV4oqzAfrTsCAw0BkjiIEpuoLF9yKsXMstQYq3asVJk="; + sha256 = "sha256-6nnKYnml6BjLb6aKNHbd55nH6gP/5Somo8poxx7yhVk="; }; nativeBuildInputs = [ makeWrapper ]; From b6910512a0789390af9db312ee8f08665bd662ab Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Mon, 15 May 2023 12:36:46 -0500 Subject: [PATCH 034/189] wasm-bindgen-cli: 0.2.84 -> 0.2.87 Also allow overriding the version --- .../tools/wasm-bindgen-cli/default.nix | 15 +++++++-------- pkgs/servers/ldap/lldap/default.nix | 8 +++++++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index ec336d422ab1..d7b6aba2a2a3 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -7,28 +7,27 @@ , stdenv , curl , Security -, runCommand +, version ? "0.2.87" +, hash ? "sha256-0u9bl+FkXEK2b54n7/l9JOCtKo+pb42GF9E1EnAUQa0=" +, cargoHash ? "sha256-AsZBtE2qHJqQtuCt/wCAgOoxYMfvDh8IzBPAOkYSYko=" }: rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.84"; + inherit version hash cargoHash; src = fetchCrate { - inherit pname version; - sha256 = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; + inherit pname version hash; }; - cargoSha256 = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; nativeCheckInputs = [ nodejs ]; - # other tests require it to be ran in the wasm-bindgen monorepo - cargoTestFlags = [ "--test=interface-types" ]; + # tests require it to be ran in the wasm-bindgen monorepo + doCheck = false; meta = with lib; { homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index 1948ca015dda..93bf09add849 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -32,6 +32,12 @@ let configureFlags = attrs.configureFlags ++ ["--set=build.docs=false"]; }); + wasm-bindgen-84 = wasm-bindgen-cli.override { + version = "0.2.84"; + hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; + cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; + }; + commonDerivationAttrs = rec { pname = "lldap"; version = "0.4.3"; @@ -65,7 +71,7 @@ let pname = commonDerivationAttrs.pname + "-frontend"; nativeBuildInputs = [ - wasm-pack wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld + wasm-pack wasm-bindgen-84 binaryen which rustc-wasm rustc-wasm.llvmPackages.lld ]; buildPhase = '' From 5478b1ce34f42ce495ee30502df7aabc4499772c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Aug 2023 22:57:20 +0000 Subject: [PATCH 035/189] movit: 1.7.0 -> 1.7.1 --- pkgs/development/libraries/movit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 9507d3fce6d6..4601e04f03c9 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "movit"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://movit.sesse.net/${pname}-${version}.tar.gz"; - sha256 = "sha256-I1l7k+pTdi1E33Y+zCtwIwj3b8Fzggmek4UiAIHOZhA="; + sha256 = "sha256-szBztwXwzLasSULPURUVFUB7QLtOmi3QIowcLLH7wRo="; }; outputs = [ "out" "dev" ]; From 8245a4c8f2d6a9fc12aaa309f036abacdf437e85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Aug 2023 23:10:04 +0000 Subject: [PATCH 036/189] unpackerr: 0.11.2 -> 0.12.0 --- pkgs/servers/unpackerr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 269faed8961b..140f4ddfa793 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "sha256-Jxg1gaMTJ/BbL8TQfPcyt1hYnT/LcL4j+m+jSeh5QyA="; + sha256 = "sha256-yMmn733j6k9r8I/lvVOZNL6o35eSPJZ5G8jw9xaJZRg="; }; - vendorHash = "sha256-yXFIBWOF72nXmT8+OSvF1aKBhCMBloLmGTfvNbV9ir4="; + vendorHash = "sha256-1VMeRB34JS9EwyGhPxFsRIgKaY6NyIMsa132PQKoPYY="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; From 970082f20b773eb3b0eccee738d3bf79653dab3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Aug 2023 23:32:08 +0000 Subject: [PATCH 037/189] ckan: 1.32.0 -> 1.33.2 --- pkgs/games/ckan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 4a6f8d0c8ef2..960798cde222 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ckan"; - version = "1.32.0"; + version = "1.33.2"; src = fetchurl { url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; - sha256 = "sha256-cD8S5UcS5tBJoW1IExrmtoYn8k/P7RjCRAx7BEhAWGk="; + sha256 = "sha256-FIndxRyGDgXinP8ZX0o6LEJgGNNw84tCPw5FdVAU3TI="; }; dontUnpack = true; From 66d5ed8be9b8448504fdd77a1d07bb1bbe1c3ff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Aug 2023 23:59:40 +0000 Subject: [PATCH 038/189] victoriametrics: 1.91.3 -> 1.92.1 --- pkgs/servers/nosql/victoriametrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 2ff96b760f16..a1344969de6c 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.91.3"; + version = "1.92.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-xW31Lm+WiJ1quMaIDa7tbZuKhILTMdUviIDTRJT1Cqg="; + hash = "sha256-s4OxOyOfPd98ZTdn/VYr9Z12zrQM5ZCsoJBx6nwz1Ww="; }; vendorHash = null; From b1f8c101bbb2af1f945f85380b1ea882b901cca0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Aug 2023 00:43:11 +0000 Subject: [PATCH 039/189] mediamtx: 0.23.7 -> 0.23.8 --- pkgs/servers/mediamtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index b573de68eac8..c51c2775c55f 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mediamtx"; - version = "0.23.7"; + version = "0.23.8"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-kkB4OuBBz9kdymUmXSkr3alE62O1T0woK5BNAwRBN4o="; + hash = "sha256-ICH102Z18dbabXVYgxCX4JTQ75v0A9wx2pIsZHIXDFg="; }; - vendorHash = "sha256-LCdMSyCbndus+VviT4Zp3mZ4ZzpF0F+ONroJsayb5lo="; + vendorHash = "sha256-uqcv05AHwwPxrix+FWSWpV8vKFqKQsMn8qEgD71zgo8="; # Tests need docker doCheck = false; From 5eeeb2c26f7ba9703f431d5a0b23e41d606acb14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Aug 2023 01:56:30 +0000 Subject: [PATCH 040/189] fluidd: 1.24.1 -> 1.24.2 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 00e53d3a82e3..4faa7a7eac2d 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-iTh8vU6NrJZLyUdeY1wegUue0NIHQtpCEr9pJnC2Wx4="; + sha256 = "sha256-w0IqcvVbeYG9Ly8QzJIxgWIMeYQBf4Ogwi+eRLfD8kk="; }; nativeBuildInputs = [ unzip ]; From f6adcdce4a046163504d5d27ebd4cc705cd67c2a Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 2 Aug 2023 22:45:34 -0400 Subject: [PATCH 041/189] gtk-layer-shell: 0.8.0 -> 0.8.1 --- .../libraries/gtk-layer-shell/default.nix | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 92fc02bfa2c9..4fbf6f3a6e39 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -15,9 +14,9 @@ , vala }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.8.0"; + version = "0.8.1"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -25,25 +24,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; - rev = "v${version}"; - sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; + rev = "v${finalAttrs.version}"; + hash = "sha256-WW5sdOAJUKbSLWUpI9BK7O63/Uli+Tu9Tj9ccCOREPM="; }; - patches = [ - # https://github.com/wmww/gtk-layer-shell/pull/146 - # Mark wayland-scanner as a build-time dependency - (fetchpatch { - url = "https://github.com/wmww/gtk-layer-shell/commit/6fd16352e5b35fefc91aa44e73671addaaa95dfc.patch"; - hash = "sha256-U/mxmcRcZnsF0fvWW0axo6ajqW40NuOzNIAzoLCboRM="; - }) - # https://github.com/wmww/gtk-layer-shell/pull/147 - # Remove redundant dependency check for gtk-doc - (fetchpatch { - url = "https://github.com/wmww/gtk-layer-shell/commit/124ccc2772d5ecbb40b54872c22e594c74bd39bc.patch"; - hash = "sha256-WfrWe9UJCp1RvVJhURAxGw4jzqPjoaP6182jVdoEAQs="; - }) - ]; - strictDeps = true; depsBuildBuild = [ @@ -74,8 +58,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; + homepage = "https://github.com/wmww/gtk-layer-shell"; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ eonpatapon ]; + maintainers = with maintainers; [ eonpatapon donovanglover ]; platforms = platforms.linux; }; -} +}) From c775b3024d5f1e4dcc6d1b7e969b3dce7c2983a0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Aug 2023 04:20:00 +0000 Subject: [PATCH 042/189] arti: 1.1.6 -> 1.1.7 Diff: https://gitlab.torproject.org/tpo/core/arti/-/compare/arti-v1.1.6...arti-v1.1.7 Changelog: https://gitlab.torproject.org/tpo/core/arti/-/raw/arti-v1.1.7/CHANGELOG.md --- pkgs/tools/security/arti/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index e0b553a8e441..c746bb8557c3 100644 --- a/pkgs/tools/security/arti/default.nix +++ b/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-6VmpBt1KxWRdZJLVPNeqETQnZITGoX+rz29eIiOnHnU="; + sha256 = "sha256-RUBSF6zG+LpBopnCo/mj+Sr+iFz95Ce0p0/RNIOuRCg="; }; - cargoHash = "sha256-Q/1zgfF1v3D5Mg+JhS0K9mF4BN9xHV2tf7AtsBHZGh0="; + cargoHash = "sha256-ngIrAaQY3aWPridH67ZKACbFRkP8BeZ1W1wji6IPBAA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 65e49fdb5df497b655b8d80d3b525954e4ccd4ca Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 3 Aug 2023 04:20:00 +0000 Subject: [PATCH 043/189] millet: 0.12.8 -> 0.12.9 Diff: https://github.com/azdavis/millet/compare/v0.12.8...v0.12.9 Changelog: https://github.com/azdavis/millet/blob/v0.12.9/docs/CHANGELOG.md --- .../tools/language-servers/millet/Cargo.lock | 72 +++++++++---------- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 96f0e67abb30..e9208f2e315b 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.12.8" +version = "0.12.9" dependencies = [ "config", "diagnostic", @@ -115,7 +115,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "str-util", @@ -128,7 +128,7 @@ source = "git+https://github.com/azdavis/language-util.git#f2c149459f0544fb6a8e1 [[package]] name = "cm-syntax" -version = "0.12.8" +version = "0.12.9" dependencies = [ "lex-util", "paths", @@ -157,7 +157,7 @@ dependencies = [ [[package]] name = "config" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "serde", @@ -185,7 +185,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "once_cell", @@ -412,7 +412,7 @@ dependencies = [ [[package]] name = "input" -version = "0.12.8" +version = "0.12.9" dependencies = [ "cm-syntax", "config", @@ -460,7 +460,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.12.8" +version = "0.12.9" dependencies = [ "analysis", "anyhow", @@ -488,7 +488,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.12.8" +version = "0.12.9" [[package]] name = "libc" @@ -560,7 +560,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.12.8" +version = "0.12.9" dependencies = [ "analysis", "codespan-reporting", @@ -578,7 +578,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.12.8" +version = "0.12.9" dependencies = [ "anyhow", "env_logger", @@ -598,7 +598,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "paths", @@ -609,7 +609,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.12.8" +version = "0.12.9" dependencies = [ "config", "diagnostic", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.12.8" +version = "0.12.9" dependencies = [ "lex-util", "paths", @@ -696,7 +696,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.12.8" +version = "0.12.9" dependencies = [ "better-panic", ] @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "str-util", @@ -907,14 +907,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.12.8" +version = "0.12.9" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "fmt-util", @@ -925,7 +925,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.12.8" +version = "0.12.9" dependencies = [ "config", "pretty_assertions", @@ -941,7 +941,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.12.8" +version = "0.12.9" dependencies = [ "config", "elapsed", @@ -955,7 +955,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "once_cell", @@ -964,7 +964,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.12.8" +version = "0.12.9" dependencies = [ "la-arena", "sml-lab", @@ -975,7 +975,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.12.8" +version = "0.12.9" dependencies = [ "config", "cov-mark", @@ -990,14 +990,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.12.8" +version = "0.12.9" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.12.8" +version = "0.12.9" dependencies = [ "cov-mark", "diagnostic", @@ -1012,7 +1012,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "sml-comment", @@ -1021,11 +1021,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.12.8" +version = "0.12.9" [[package]] name = "sml-parse" -version = "0.12.8" +version = "0.12.9" dependencies = [ "diagnostic", "event-parse", @@ -1037,14 +1037,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.12.8" +version = "0.12.9" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.12.8" +version = "0.12.9" dependencies = [ "num-bigint", "num-traits", @@ -1053,7 +1053,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.12.8" +version = "0.12.9" dependencies = [ "chain-map", "config", @@ -1076,7 +1076,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.12.8" +version = "0.12.9" dependencies = [ "chain-map", "code-h2-md-map", @@ -1095,7 +1095,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.12.8" +version = "0.12.9" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1103,7 +1103,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.12.8" +version = "0.12.9" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1114,7 +1114,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.12.8" +version = "0.12.9" dependencies = [ "fast-hash", "sml-hir", @@ -1172,7 +1172,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.12.8" +version = "0.12.9" dependencies = [ "analysis", "cm-syntax", @@ -1516,7 +1516,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.12.8" +version = "0.12.9" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index d28677fc3a8f..8b1fc8c47745 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.12.8"; + version = "0.12.9"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-H44aQGrLv/A1yo44DaR9FJ0ReXiHU4SQ3zLoEkxF9M8="; + hash = "sha256-PGB5sgYxiXYTj6O9SY/druDpNCf4O8HsivT8zhJM62M="; }; cargoLock = { From cc98fec6b570cb4f34e966a3f0f3773899228bf7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 3 Aug 2023 19:37:02 +0900 Subject: [PATCH 044/189] python310Packages.dask-awkward: 2023.8.0 -> 2023.8.1 Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2023.8.0...2023.8.1 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2023.8.1 --- pkgs/development/python-modules/dask-awkward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index fc29437b7c42..d7ef1204bc3e 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2023.8.0"; + version = "2023.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2nF2G6bpwHeMlB0+/DRW4I7W6mK3wfXkuqCSRQusJu4="; + hash = "sha256-sSsd35Psf3VEydkNxtd9mSBzV23S7fRM/jhbC9T62kY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From a7d630d216e1e5f244b1ce3606a1769810d6b9bf Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 2 Aug 2023 18:03:41 +0200 Subject: [PATCH 045/189] nzbget: 21.1 -> 21.4-rc2 About 9 months ago the NzbGet development officially stopped and there were an announcement on reddit: https://www.reddit.com/r/usenet/comments/z62skp/nzbget_development_officially_abandoned/ The official github repository has been archived to be marked readonly: https://github.com/nzbget/nzbget However, there's a fork and they are responsive to issues and makes new commits: https://github.com/nzbget-ng/nzbget This fixes #244142 --- pkgs/tools/networking/nzbget/default.nix | 41 ++++++++++++------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 9141a2932bbb..4e67e81a7de8 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,11 +1,12 @@ { lib , stdenv -, fetchurl -, fetchpatch +, fetchFromGitHub +, autoreconfHook , pkg-config , gnutls , libgcrypt , libpar2 +, libcap , libsigcxx , libxml2 , ncurses @@ -14,31 +15,24 @@ , nixosTests }: -stdenv.mkDerivation rec { - pname = "nzbget"; - version = "21.1"; +stdenv.mkDerivation (finalAttrs: { + pname = "nzbget-ng"; + version = "21.4-rc2"; - src = fetchurl { - url = "https://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - hash = "sha256-To/BvrgNwq8tajajOjP0Te3d1EhgAsZE9MR5MEMHICU="; + src = fetchFromGitHub { + owner = "nzbget-ng"; + repo = "nzbget"; + rev = "v${finalAttrs.version}"; + hash = "sha256-JJML5mtAog5xC7DkthCtoyn5QeC2Z+fdzSuEa/Te0Ew="; }; - patches = [ - # openssl 3 compatibility - # https://github.com/nzbget/nzbget/pull/793 - (fetchpatch { - name = "daemon-connect-dont-use-fips-mode-set-with-openssl-3.patch"; - url = "https://github.com/nzbget/nzbget/commit/f76e8555504e3af4cf8dd4a8c8e374b3ca025099.patch"; - hash = "sha256-39lvnhBK4126TYsRbJOUxsV9s9Hjuviw7CH/wWn/VkM="; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ gnutls libgcrypt libpar2 + libcap libsigcxx libxml2 ncurses @@ -46,15 +40,20 @@ stdenv.mkDerivation rec { zlib ]; + prePatch = '' + sed -i 's/AC_INIT.*/AC_INIT( nzbget, m4_esyscmd_s( echo ${finalAttrs.version} ) )/' configure.ac + ''; + enableParallelBuilding = true; passthru.tests = { inherit (nixosTests) nzbget; }; meta = with lib; { - homepage = "https://nzbget.net"; + homepage = "https://nzbget-ng.github.io/"; + changelog = "https://github.com/nzbget-ng/nzbget/releases/tag/v${finalAttrs.version}"; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; }; -} +}) From 9a2ced3739a1a71cd7e9259edd3f3170ba5fe8df Mon Sep 17 00:00:00 2001 From: QJoly Date: Thu, 3 Aug 2023 14:36:53 +0200 Subject: [PATCH 046/189] kubefirst: 2.2.5 -> 2.2.7 --- pkgs/applications/networking/cluster/kubefirst/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 554d0126ef72..6eae71afe124 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.2.5"; + version = "2.2.7"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-WlY9CdMY5fgEkXc/d/aUxr5c93oKd3vWQkUlX1jWaZo="; + hash = "sha256-sIX+B08JNwWr4QsWWi4kpqaY9uZbIeiM2sVvMCvSb0I="; }; - vendorHash = "sha256-vIIaiHciA7ZPW0GWJNL/wx0siiNfXK16jYjMkMDfywE="; + vendorHash = "sha256-F+kzj2lBSFawfc8OyPf6V2XVB1418uhv+cv3CHpXUk0="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; From 16d97686137505ef613bcf225937c0e7f3b27df7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 2 Aug 2023 23:41:06 -0500 Subject: [PATCH 047/189] sketchybar-app-font: init at 1.0.13 --- .../fonts/sketchybar-app-font/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/data/fonts/sketchybar-app-font/default.nix diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix new file mode 100644 index 000000000000..77b352e33d9a --- /dev/null +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchurl +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "sketchybar-app-font"; + version = "1.0.13"; + + src = fetchurl { + url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; + hash = "sha256-vlvSrN6yxabKnzPmqI9VNkOdR3yLa1QUieZjOOW6w3c="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/sketchybar-app-font.ttf + + runHook postInstall + ''; + + meta = { + description = "A ligature-based symbol font and a mapping function for sketchybar"; + longDescription = '' + A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons. + ''; + homepage = "https://github.com/kvndrsslr/sketchybar-app-font"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ khaneliman ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3f848921ae8..ad76ca69d29a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12893,6 +12893,8 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) Carbon Cocoa CoreWLAN DisplayServices MediaRemote SkyLight; }; + sketchybar-app-font = callPackage ../data/fonts/sketchybar-app-font { }; + skippy-xd = callPackage ../tools/X11/skippy-xd { }; sks = callPackage ../servers/sks { From e2c1f63ac60d3a4518666a4f6e760efafb5562e8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 3 Aug 2023 10:03:04 -0400 Subject: [PATCH 048/189] star-history: 1.0.12 -> 1.0.13 Diff: https://diff.rs/star-history/1.0.12/1.0.13 --- pkgs/tools/misc/star-history/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 789f38a7dff3..6c6ed54eec7e 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.12"; + version = "1.0.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-znISDhxmAEw38TWAtA3xCZrplYs1pQ+DvfCucGDJZSU="; + sha256 = "sha256-WOdiBN/qyszAI4GNFB/RuZd9EV0uj9l5yUnryZ6cqSE="; }; - cargoSha256 = "sha256-GBms5Ha7agwG5u2U+perN8Uo5ihL4QFRZh2wxlV+Wxo="; + cargoSha256 = "sha256-sET5Gf4vLJAvgdslT+bov9vzCKuTKCEJ0/+JR2GfhmY="; nativeBuildInputs = [ pkg-config ]; From 301ffaff5aaaf0a73c51cde631551ddb2d1827af Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Wed, 5 Jul 2023 14:32:39 +0200 Subject: [PATCH 049/189] autorandr: add fish completion Version 1.14 also added fish completion, but was not added to the package in the update commit --- pkgs/tools/misc/autorandr/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index 53bc534e11e0..40a22836f77f 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -41,7 +41,10 @@ python3.pkgs.buildPythonApplication rec { # see https://github.com/phillipberndt/autorandr/issues/197 installShellCompletion --cmd autorandr \ --bash contrib/bash_completion/autorandr \ - --zsh contrib/zsh_completion/_autorandr + --zsh contrib/zsh_completion/_autorandr \ + --fish contrib/fish_copletion/autorandr.fish + # In the line above there's a typo that needs to be fixed in the next + # release make install TARGETS='autostart_config' PREFIX=$out DESTDIR=$out From eacf49d19ecfd2e121d523f83bf449ba368e3c33 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Thu, 3 Aug 2023 17:34:32 +0200 Subject: [PATCH 050/189] openmolcas: enable dmrg and nevpt2 support --- .../science/chemistry/openmolcas/default.nix | 74 ++++++++++++++++--- .../chemistry/openmolcas/qcmaquis.patch | 46 ++++++++++++ 2 files changed, 108 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index c99c5da06f37..695d5502b5eb 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,19 +1,47 @@ -{ lib, stdenv, fetchFromGitLab, cmake, gfortran, perl -, blas-ilp64, hdf5-cpp, python3, texlive -, armadillo, libxc, makeWrapper -# Note that the CASPT2 module is broken with MPI -# See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 +{ lib +, stdenv +, fetchFromGitLab +, fetchFromGitHub +, cmake +, gfortran +, perl +, blas-ilp64 +, hdf5-cpp +, python3 +, texlive +, armadillo +, libxc +, makeWrapper +, gsl +, boost175 +, autoPatchelfHook + # Note that the CASPT2 module is broken with MPI + # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 , enableMpi ? false -, mpi, globalarrays -} : +, mpi +, globalarrays +}: assert blas-ilp64.isILP64; assert lib.elem blas-ilp64.passthru.implementation [ "openblas" "mkl" ]; let - python = python3.withPackages (ps : with ps; [ six pyparsing numpy h5py ]); + python = python3.withPackages (ps: with ps; [ six pyparsing numpy h5py ]); + qcmaquisSrc = fetchFromGitHub { + owner = "qcscine"; + repo = "qcmaquis"; + rev = "release-3.1.1"; # Must match tag in cmake/custom/qcmaquis.cmake + hash = "sha256-diLDWj/Om6EHrVp+Hd24jsN6R9vV2vRl0y9gqyRWhkI="; + }; + nevtp2Src = fetchFromGitHub { + owner = "qcscine"; + repo = "nevpt2"; + rev = "e1484fd"; # Must match tag in cmake/custom/nevpt2.cmake + hash = "sha256-Vl+FhwhJBbD/7U2CwsYE9BClSQYLJ8DKXV9EXxQUmz0="; + }; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "openmolcas"; version = "23.06"; @@ -28,12 +56,22 @@ in stdenv.mkDerivation { patches = [ # Required to handle openblas multiple outputs ./openblasPath.patch + + # Required for a local QCMaquis build + ./qcmaquis.patch ]; postPatch = '' # Using env fails in the sandbox substituteInPlace Tools/pymolcas/export.py --replace \ "/usr/bin/env','python3" "python3" + + # Pointing CMake to local QCMaquis and NEVPT2 archives + substituteInPlace cmake/custom/qcmaquis.cmake \ + --subst-var-by "qcmaquis_src_url" "file://${qcmaquisSrc}" + + substituteInPlace cmake/custom/nevpt2.cmake \ + --subst-var-by "nevpt2_src_url" "file://${nevtp2Src}" ''; nativeBuildInputs = [ @@ -42,6 +80,7 @@ in stdenv.mkDerivation { cmake texlive.combined.scheme-minimal makeWrapper + autoPatchelfHook ]; buildInputs = [ @@ -50,6 +89,8 @@ in stdenv.mkDerivation { python armadillo libxc + gsl.dev + boost175 ] ++ lib.optionals enableMpi [ mpi globalarrays @@ -64,10 +105,15 @@ in stdenv.mkDerivation { "-DHDF5=ON" "-DFDE=ON" "-DEXTERNAL_LIBXC=${libxc}" + "-DDMRG=ON" + "-DNEVPT2=ON" + "-DCMAKE_SKIP_BUILD_RPATH=ON" ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [ - "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" "-DLINALG=OpenBLAS" + "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}" + "-DLINALG=OpenBLAS" ] ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [ - "-DMKLROOT=${blas-ilp64.passthru.provider}" "-DLINALG=MKL" + "-DMKLROOT=${blas-ilp64.passthru.provider}" + "-DLINALG=MKL" ] ++ lib.optionals enableMpi [ "-DGA=ON" "-DMPI=ON" @@ -89,6 +135,10 @@ in stdenv.mkDerivation { rm -r $out/Tools ''; + # DMRG executables contain references to /build, however, they are properly + # removed by autopatchelf + noAuditTmpdir = true; + postFixup = '' # Wrong store path in shebang (no Python pkgs), force re-patching sed -i "1s:/.*:/usr/bin/env python:" $out/bin/pymolcas @@ -101,7 +151,7 @@ in stdenv.mkDerivation { description = "Advanced quantum chemistry software package"; homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; - license = licenses.lgpl21Only; + license = with licenses; [ lgpl21Only bsd3 ]; platforms = [ "x86_64-linux" ]; mainProgram = "pymolcas"; }; diff --git a/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch b/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch new file mode 100644 index 000000000000..ca276bb3fb58 --- /dev/null +++ b/pkgs/applications/science/chemistry/openmolcas/qcmaquis.patch @@ -0,0 +1,46 @@ +diff --git a/cmake/custom/nevpt2.cmake b/cmake/custom/nevpt2.cmake +index 789739ec8..6c86a7b8c 100644 +--- a/cmake/custom/nevpt2.cmake ++++ b/cmake/custom/nevpt2.cmake +@@ -67,6 +67,7 @@ list(APPEND NEVPT2CMakeArgs + "-DMOLCAS_BUILD_DIR=${PROJECT_BINARY_DIR}" + "-DCMAKE_Fortran_MODULE_DIRECTORY=${mod_dir}" + "-DDMRG_INCLUDE=${HDF5_QCM_INCLUDE}" ++ "-DCMAKE_SKIP_BUILD_RPATH=ON" + ) + + if(HDF5_ROOT) +@@ -118,9 +119,7 @@ endif () + + ExternalProject_Add(${EP_PROJECT} + PREFIX ${CUSTOM_NEVPT2_LOCATION} +- GIT_REPOSITORY ${reference_git_repo} +- GIT_TAG ${reference_git_commit} +- UPDATE_DISCONNECTED ${EP_SkipUpdate} ++ URL @nevpt2_src_url@ + CMAKE_ARGS "${NEVPT2CMakeArgs}" + INSTALL_DIR "${PROJECT_BINARY_DIR}/qcmaquis" + ) +diff --git a/cmake/custom/qcmaquis.cmake b/cmake/custom/qcmaquis.cmake +index 176d02761..e160b7bc8 100644 +--- a/cmake/custom/qcmaquis.cmake ++++ b/cmake/custom/qcmaquis.cmake +@@ -78,6 +78,7 @@ list(APPEND QCMaquisCMakeArgs + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_CXX_FLAGS=${QCM_CMake_CXX_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= ++ -DCMAKE_SKIP_BUILD_RPATH=ON + ) + if(HDF5_ROOT) + list(APPEND QCMaquisCMakeArgs +@@ -278,9 +279,7 @@ set (CMAKE_DISABLE_SOURCE_CHANGES OFF) + + ExternalProject_Add(${EP_PROJECT} + PREFIX ${extprojpath} +- GIT_REPOSITORY ${reference_git_repo} +- GIT_TAG ${reference_git_commit} +- UPDATE_DISCONNECTED ${EP_SkipUpdate} ++ URL @qcmaquis_src_url@ + + SOURCE_SUBDIR dmrg + CMAKE_ARGS ${EP_CMAKE_ARGS} From 1b417659caf1e55d1653d5ee3aea7d038bb850c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 18:13:44 +0200 Subject: [PATCH 051/189] python311Packages.aiooss2: 0.2.6 -> 0.2.7 Diff: https://github.com/karajan1001/aiooss2/compare/refs/tags/0.2.6...0.2.7 Changelog: https://github.com/karajan1001/aiooss2/blob/0.2.7/CHANGES.txt --- pkgs/development/python-modules/aiooss2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index 03aa8543ffbe..85561d6472b1 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiooss2"; - version = "0.2.6"; + version = "0.2.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "karajan1001"; repo = "aiooss2"; rev = "refs/tags/${version}"; - hash = "sha256-VVfDH9QWF9gBhd2pOjKH5+VdNSvl1q0iauAbo88wNaM="; + hash = "sha256-eMmJpX7bjX5r6GW9N5KmLQpo5V8i6F95TfInct34a2g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1b667a69a99f1fa753f429f122b1d80f5c48845c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 18:17:00 +0200 Subject: [PATCH 052/189] python311Packages.dsmr-parser: 1.2.4 -> 1.3.0 Diff: https://github.com/ndokter/dsmr_parser/compare/refs/tags/v1.2.4...v1.3.0 Changelog: https://github.com/ndokter/dsmr_parser/releases/tag/v1.3.0 --- pkgs/development/python-modules/dsmr-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dsmr-parser/default.nix b/pkgs/development/python-modules/dsmr-parser/default.nix index 21e24275c448..4f63c677e676 100644 --- a/pkgs/development/python-modules/dsmr-parser/default.nix +++ b/pkgs/development/python-modules/dsmr-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dsmr-parser"; - version = "1.2.4"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ndokter"; repo = "dsmr_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-R/4k6yZS96yAkjhO/Ay9MJ2KUlq9TFQvsUoqpjvZcKI="; + hash = "sha256-nPhXJgky9/CgqBnyqbF2+BASHRSpwKd0ePIRFMq29Vc="; }; propagatedBuildInputs = [ From dd4e3f0ceeb1de85311665e52ada48d9e36b1c80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 18:17:42 +0200 Subject: [PATCH 053/189] python311Packages.dvc-data: 2.6.0 -> 2.9.1 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/2.6.0...2.9.1 Changelog: https://github.com/iterative/dvc-data/releases/tag/2.9.1 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index f65b3eb16cd7..9dd9a154a8b3 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.6.0"; + version = "2.9.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Tqo2dhTes/HHhWqBZkJ9qW8i6FGWRx1Uk+0Q3pwsD+M="; + hash = "sha256-NJAemtzqpqgWRmsXfcw9gj7T10jARemUMehIxTI7+fQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d0b1f362a663e61479b6f19dde01dd975a37cb24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 18:22:06 +0200 Subject: [PATCH 054/189] python311Packages.adafruit-platformdetect: 3.48.0 -> 3.49.0 Changelog: https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/3.49.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index d0755af53ee1..d9fe80fcba4f 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.48.0"; + version = "3.49.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-wc8TC1IoeeeANlQILFeXUx9jJqpn1Mr3KNhJC6ZJAhU="; + hash = "sha256-bLwPnKLOdk8scKF4hQgkBXRoz0Ph6/pcRLlJdN+cDoA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 52d6cbc56d1075e495069ec5a141e2593ecb09d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 18:25:51 +0200 Subject: [PATCH 055/189] python311Packages.commandparse: disable on unsupported Python releases --- pkgs/development/python-modules/commandparse/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix index 7ac68dd973ef..e146649604f0 100644 --- a/pkgs/development/python-modules/commandparse/default.nix +++ b/pkgs/development/python-modules/commandparse/default.nix @@ -1,11 +1,15 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "commandparse"; version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -14,7 +18,10 @@ buildPythonPackage rec { # tests only distributed upstream source, not PyPi doCheck = false; - pythonImportsCheck = [ "commandparse" ]; + + pythonImportsCheck = [ + "commandparse" + ]; meta = with lib; { description = "Python module to parse command based CLI application"; From 2fc62549a69f46ed27868d2d9abe4e9dd800fe6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 18:34:00 +0200 Subject: [PATCH 056/189] python311Packages.gehomesdk: 0.5.13 -> 0.5.20 Changelog: https://github.com/simbaja/gehome/blob/master/CHANGELOG.md --- pkgs/development/python-modules/gehomesdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gehomesdk/default.nix b/pkgs/development/python-modules/gehomesdk/default.nix index 0c1aa9fbf2d1..81a8e3678272 100644 --- a/pkgs/development/python-modules/gehomesdk/default.nix +++ b/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.13"; + version = "0.5.20"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gkHAIrsk6LKNjieTiSU0ZH6WI2+wJB68edNqJ7n86tY="; + hash = "sha256-5nu7pewkxCZ/F6m7xOwvMwuhFsanQKHtdwGqNto3/zk="; }; propagatedBuildInputs = [ From c615797d32f937a1870a9f45b019a04fffa94cd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 18:46:55 +0200 Subject: [PATCH 057/189] python311Packages.python-roborock: 0.30.3 -> 0.31.1 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v0.30.3...v0.31.1 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v0.31.1/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index aa675053d820..f7aa10c9b2b7 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.30.3"; + version = "0.31.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-EHHyuiG/yRGY7/Z5TAq/83rIkyehg37eTFxSOWrVhR0="; + hash = "sha256-t5UYdoaKqUrEIgRQy1URtNhFmlkB2sgGwsLrclqH6Tg="; }; pythonRelaxDeps = [ From 7ed803a136055bee137f2b7a1f29c1c2d91bbcb3 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 20 Jul 2023 20:21:57 -0400 Subject: [PATCH 058/189] prismlauncher: add support for darwin --- pkgs/games/prismlauncher/default.nix | 65 ++++++++++++++++++++++------ pkgs/games/prismlauncher/wrapper.nix | 8 ++-- pkgs/top-level/all-packages.nix | 8 +++- 3 files changed, 61 insertions(+), 20 deletions(-) diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 9df1182e1ab7..0f28a6edd4a1 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmark +, Cocoa , ninja , jdk17 , zlib @@ -13,7 +15,8 @@ , ghc_filesystem , gamemode , msaClientID ? null -, gamemodeSupport ? true +, gamemodeSupport ? stdenv.isLinux +, }: let libnbtplusplus = fetchFromGitHub { @@ -23,7 +26,11 @@ let sha256 = "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4="; }; in -stdenv.mkDerivation rec { + +assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is only available on Linux"; + +stdenv.mkDerivation +rec { pname = "prismlauncher-unwrapped"; version = "7.2"; @@ -34,23 +41,53 @@ stdenv.mkDerivation rec { sha256 = "sha256-RArg60S91YKp1Mt97a5JNfBEOf2cmuX4pK3VAx2WfqM="; }; - nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ]; - buildInputs = [ - qtbase - zlib - quazip - ghc_filesystem - tomlplusplus - cmark - ] ++ lib.optional gamemodeSupport gamemode; + patches = lib.optionals stdenv.isDarwin [ + # https://github.com/PrismLauncher/PrismLauncher/pull/1452 + # These patches allow us to disable the Sparkle updater and cmake bundling + # TODO: remove these when updating to 8.0 + (fetchpatch { + name = "disable-sparkle-when-url-is-empty.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/48e50401968a72846350c6fbd76cc957b64a6b5a.patch"; + hash = "sha256-IFxp6Sj87ogQcMooV4Ql5/4B+C7oTzEk+4tlMud2OLo="; + }) + (fetchpatch { + name = "make-install_bundle-cached.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/a8498b0dab94d0ab6c9e5cf395e5003db541b749.patch"; + hash = "sha256-ji5GGUnzVut9xFXkynqf9aVR9FO/zsqIbt3P9dexJ2I="; + }) + (fetchpatch { + name = "dont-include-sparkle-when-not-enabled.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/51bfda937d47837ed426150ed6f43a60b4ca0ce1.patch"; + hash = "sha256-7hMgANOg4zRIf3F2AfLXGR3dAEBqVmKm/J5SH0G5oCk="; + }) + (fetchpatch { + name = "introduce-internal-updater-variable.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/b1aa9e584624a0732dd55fc6c459524a8abfe6ba.patch"; + hash = "sha256-mm++EfnBxz7NVtKLMb889mMq8F/OdQmzob8OmlvNlRA="; + }) + ]; - hardeningEnable = [ "pie" ]; + nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ]; + buildInputs = + [ + qtbase + zlib + quazip + ghc_filesystem + tomlplusplus + cmark + ] + ++ lib.optional gamemodeSupport gamemode + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + + hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ]; cmakeFlags = [ # downstream branding "-DLauncher_BUILD_PLATFORM=nixpkgs" ] ++ lib.optionals (msaClientID != null) [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] - ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ]; + ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ] + ++ lib.optionals stdenv.isDarwin [ "-DINSTALL_BUNDLE=nodeps" "-DMACOSX_SPARKLE_UPDATE_FEED_URL=''" ]; postUnpack = '' rm -rf source/libraries/libnbtplusplus @@ -67,7 +104,7 @@ stdenv.mkDerivation rec { their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface. ''; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ minion3665 Scrumplex getchoo ]; diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 57d85f4800d3..63604ea1ff5a 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -16,7 +16,7 @@ , gamemode , msaClientID ? null -, gamemodeSupport ? true +, gamemodeSupport ? stdenv.isLinux , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] }: @@ -38,7 +38,7 @@ symlinkJoin { qtbase qtsvg ] - ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; + ++ lib.optional (lib.versionAtLeast qtbase.version "6" && stdenv.isLinux) qtwayland; postBuild = '' wrapQtAppsHook @@ -64,9 +64,9 @@ symlinkJoin { ++ additionalLibs; in - [ + [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ] + ++ lib.optionals stdenv.isLinux [ "--set LD_LIBRARY_PATH /run/opengl-driver/lib:${lib.makeLibraryPath libs}" - "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 "--prefix PATH : ${lib.makeBinPath [xorg.xrandr]}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0109d702efac..8c792eed907b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37747,11 +37747,15 @@ with pkgs; principia = callPackage ../games/principia { }; - prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher { }; + prismlauncher-qt5-unwrapped = libsForQt5.callPackage ../games/prismlauncher { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; prismlauncher-qt5 = libsForQt5.callPackage ../games/prismlauncher/wrapper.nix { prismlauncher-unwrapped = prismlauncher-qt5-unwrapped; }; - prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher { }; + prismlauncher-unwrapped = qt6Packages.callPackage ../games/prismlauncher { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; prismlauncher = qt6Packages.callPackage ../games/prismlauncher/wrapper.nix { }; From 0bc21d64e1e5013e38680bbe0531c829bbe47541 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 19:09:03 +0200 Subject: [PATCH 059/189] python311Packages.pyspcwebgw: 0.6.0 -> 0.7.0 Diff: https://github.com/mbrrg/pyspcwebgw/compare/refs/tags/v0.6.0...v0.7.0 Changelog: https://github.com/pyspcwebgw/pyspcwebgw/releases/tag/v0.7.0 --- .../python-modules/pyspcwebgw/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyspcwebgw/default.nix b/pkgs/development/python-modules/pyspcwebgw/default.nix index 5aff4d2ccd2e..8ac514d7fa5c 100644 --- a/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -4,6 +4,7 @@ , asynccmd , buildPythonPackage , fetchFromGitHub +, poetry-core , pytest-asyncio , pytestCheckHook , pythonOlder @@ -11,18 +12,22 @@ buildPythonPackage rec { pname = "pyspcwebgw"; - version = "0.6.0"; - format = "setuptools"; + version = "0.7.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mbrrg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Pjv8AxXuwi48Z8U+LSZZ+OhXrE3KlX7jlmnXTBLxXOs="; + hash = "sha256-gdIrbr25GXaX26B1f7u0NKbqqnAC2tmMFZspzW6I4HI="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ asynccmd aiohttp @@ -43,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for the SPC Web Gateway REST API"; homepage = "https://github.com/mbrrg/pyspcwebgw"; + changelog = "https://github.com/pyspcwebgw/pyspcwebgw/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 2f5a4245025e7281a2a20ee0187fadfa4b1231d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 Jul 2023 17:54:44 +0200 Subject: [PATCH 060/189] python311Packages.publicsuffixlist: 0.10.0.20230711 -> 0.10.0.20230719 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 12a0326fb4e3..49497adbf155 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230711"; + version = "0.10.0.20230719"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yFShirput7wpYLQoDauxW5xxc6o2ptWFAYSAEqDmzBA="; + hash = "sha256-m1P9/gbgfm2l5lddq+EGmM64IQUFfbzdmIZe4eX+Cm0="; }; passthru.optional-dependencies = { From 61915f750c99365f63e839aa414875e4df53dac0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 19:22:54 +0200 Subject: [PATCH 061/189] python311Packages.publicsuffixlist: 0.10.0.20230719 -> 0.10.0.20230730 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 49497adbf155..c671d929a143 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230719"; + version = "0.10.0.20230730"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m1P9/gbgfm2l5lddq+EGmM64IQUFfbzdmIZe4eX+Cm0="; + hash = "sha256-HNOEfsHrwCBpcVYwlYrWe9/rfn+fNfaZ0w/EEpjO7aw="; }; passthru.optional-dependencies = { From 99816f6e98c1efd6704cd536e100ce0f48b2bf00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 19:23:35 +0200 Subject: [PATCH 062/189] python311Packages.neo4j: 5.10.0 -> 5.11.0 Diff: https://github.com/neo4j/neo4j-python-driver/compare/refs/tags/5.10.0...5.11.0 Changelog: https://github.com/neo4j/neo4j-python-driver/releases/tag/5.11.0 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 22f817b7ebcf..1447ceb9bcf1 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.10.0"; + version = "5.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-UD7y/OVoYyEL+68CW+kc8m8poATqRRSwoP6XQyUbGC0="; + hash = "sha256-xPMO1Db1+TwOT+JsBGJcTc7BL2B8Eb1K3kqKMGnsUmE="; }; propagatedBuildInputs = [ From 45f3ca2abc94111311d4287a4820d18fc7e5334e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 19:24:28 +0200 Subject: [PATCH 063/189] python311Packages.mypy-boto3-builder: 7.16.1 -> 7.17.1 Diff: https://github.com/youtype/mypy_boto3_builder/compare/refs/tags/7.16.1...7.17.1 Changelog: https://github.com/youtype/mypy_boto3_builder/releases/tag/7.17.1 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index bc9193ec5102..4f46289634bc 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.16.1"; + version = "7.17.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-zqiJqjsE54mzN1/NScKeXtRa3Tt3IzSdtnmOxP4meEE="; + hash = "sha256-QzofWNnYTAlxoeJm8HRaGBOV5rqkhjHHOEwYNrXTh/I="; }; nativeBuildInputs = [ From 457e04db138489f3a514c1cc75eaac8a69cb1567 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 19:24:58 +0200 Subject: [PATCH 064/189] python311Packages.mypy-boto3-s3: 1.28.15.post1 -> 1.28.16 Changelog: https://github.com/youtype/mypy_boto3_builder/releases/tag/1.28.16 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 4b3ed66afb0f..2dadaefe38cf 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.28.15.post1"; + version = "1.28.16"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZVAr6CV4n9FuTKzxCuzWQIVUtgrl0mG+YP1GvuadhZI="; + hash = "sha256-TlX9rXKbbm9FIR41S9Ggp0WlZf6dHkYnN/d1wohJz7U="; }; propagatedBuildInputs = [ From 73cdac096d6550676d07d9f86813f7347425d1c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 19:25:40 +0200 Subject: [PATCH 065/189] python311Packages.meilisearch: 0.28.1 -> 0.28.2 Diff: https://github.com/meilisearch/meilisearch-python/compare/refs/tags/v0.28.1...v0.28.2 Changelog: https://github.com/meilisearch/meilisearch-python/releases/tag/v0.28.2 --- pkgs/development/python-modules/meilisearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index a338309ec6ab..88ca28f4896b 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.28.1"; + version = "0.28.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-iaho3a6Agk5Utl7px+E3afUJfoWbhoYSCe2WqYzDF1w="; + hash = "sha256-S1ZBSkWqCU6EpFqLpxCN1ZNswJroF86+26WeyYPD0S0="; }; nativeBuildInputs = [ From 06e3b76b81b81d27916124b32bf7dfe36bf6829d Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Thu, 3 Aug 2023 20:06:32 +0200 Subject: [PATCH 066/189] foomatic-db: unstable 2023-06-30 -> 2023-08-02 Just switches the driver of the `NRG` printer `IM C2510`. --- pkgs/misc/cups/drivers/foomatic-db/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/drivers/foomatic-db/default.nix b/pkgs/misc/cups/drivers/foomatic-db/default.nix index 71c3fce9054f..de98f607d011 100644 --- a/pkgs/misc/cups/drivers/foomatic-db/default.nix +++ b/pkgs/misc/cups/drivers/foomatic-db/default.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { pname = "foomatic-db"; - version = "unstable-2023-06-30"; + version = "unstable-2023-08-02"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, # but it gets deleted quickly and would provoke 404 errors owner = "OpenPrinting"; repo = "foomatic-db"; - rev = "5b916154bcc37d9881f71110b3d5a7e624a67c95"; - hash = "sha256-mbIVtrmLT8saZga6rIMY55xCQWadV9BSlZR4669wNCs="; + rev = "a6e32fa657f3598dc87c650a9fa9cfa38dda6a60"; + hash = "sha256-lEnog9Klxny6oEm/l2HDlI0DY5aIdPjHhWCBex2vp9Y="; }; buildInputs = [ cups cups-filters ghostscript gnused perl ]; From c720055b91ca8122bba49057f8fbe8fba09ed405 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 3 Aug 2023 15:42:46 -0400 Subject: [PATCH 067/189] dysk: 2.7.1 -> 2.7.2 Diff: https://github.com/Canop/dysk/compare/v2.7.1...v2.7.2 Changelog: https://github.com/Canop/dysk/blob/v2.7.2/CHANGELOG.md --- pkgs/tools/filesystems/dysk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/dysk/default.nix b/pkgs/tools/filesystems/dysk/default.nix index c1e7f5b2332d..fe4e61014a63 100644 --- a/pkgs/tools/filesystems/dysk/default.nix +++ b/pkgs/tools/filesystems/dysk/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-5KUTb2mSYQdkT3K5BrBCQqq45q0MzFYG1UmE+5eBnuc="; + hash = "sha256-3uukeuxB1GjmJ59bkgDEzgG9RMZhmB5TSv3uiXV8GNg="; }; - cargoHash = "sha256-YmA1Qx3oKHXlXs3FWoLMRAnFdIQaFdLJaNwj/FxIS5Q="; + cargoHash = "sha256-td4B9/DAmASqLGO3PVLLWeO3GeDbLHI7wNcOT1qk20k="; nativeBuildInputs = [ installShellFiles From a882b4a3f7516542c001c78445f46f68fb47e7ce Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 3 Aug 2023 21:58:08 +1000 Subject: [PATCH 068/189] mailspring: 1.10.8 -> 1.11.0 --- .../networking/mailreaders/mailspring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 6e694d01b466..9b5adb3a9772 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.8"; + version = "1.11.0"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-aXpPn6tpSOwWL/34qlpJ+on/H+X7303J1jwvwcVOTNs="; + hash = "sha256-aAqkltVxIlGwRVGM+1QkrVgfnitl+D3Xb0qi0o8ow+Q="; }; nativeBuildInputs = [ From a13c86515a340c564eab98c4c175f0f510dd311b Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Fri, 4 Aug 2023 06:46:13 +1000 Subject: [PATCH 069/189] maintainers: add ludovicopiero --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c4247443f566..c3dac5d13841 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9926,6 +9926,15 @@ githubId = 1168435; name = "Ludovic Courtès"; }; + ludovicopiero = { + email = "ludovicopiero@pm.me"; + github = "ludovicopiero"; + githubId = 44255157; + name = "Ludovico Piero"; + keys = [{ + fingerprint = "72CA 4F61 46C6 0DAB 6193 4D35 3911 DD27 6CFE 779C"; + }]; + }; lufia = { email = "lufia@lufia.org"; github = "lufia"; From 4d87592bf55afcbcd74d15616950013b2291ad9f Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 3 Aug 2023 17:02:04 -0400 Subject: [PATCH 070/189] brave: 1.56.9 -> 1.56.20 https://community.brave.com/t/release-channel-1-56-20/499712/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index bc6dd075ad2d..5d9e4c838ddb 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -91,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.56.9"; + version = "1.56.20"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-cw41xUewYB/M6xHZhhL9nX1J9vnNGA9TFJWI/Qwdu/k="; + sha256 = "sha256-ub44AI0Fu3V8SRhiBrQueJZaSdl4/cI6DQ3QYJfGseo="; }; dontConfigure = true; From 0c2cc0eeb972d1fbd49dbb78950700db6df2d947 Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Wed, 2 Aug 2023 19:59:02 -0500 Subject: [PATCH 071/189] vimPlugins.telescope-sg: init at 2023-08-02 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 2d5a4754af76..0402a7dacd54 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9376,6 +9376,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; + telescope-sg = buildVimPluginFrom2Nix { + pname = "telescope-sg"; + version = "2023-08-02"; + src = fetchFromGitHub { + owner = "Marskey"; + repo = "telescope-sg"; + rev = "df40e78ed1c1ba3cb3591a799c8e4292c88e1ff0"; + sha256 = "0mqqh15jl7y4i1ycb5lpw9fvad4qm03vw5x7paxw8h2yzi39qp0p"; + }; + meta.homepage = "https://github.com/Marskey/telescope-sg/"; + }; + telescope-symbols-nvim = buildVimPluginFrom2Nix { pname = "telescope-symbols.nvim"; version = "2023-02-19"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index aca91df2c53e..c44c338e82cd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -787,6 +787,7 @@ https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,, https://github.com/MrcJkb/telescope-manix/,HEAD, https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD, https://github.com/nvim-telescope/telescope-project.nvim/,, +https://github.com/Marskey/telescope-sg/,HEAD, https://github.com/nvim-telescope/telescope-symbols.nvim/,, https://github.com/nvim-telescope/telescope-ui-select.nvim/,, https://github.com/fhill2/telescope-ultisnips.nvim/,, From 1ef3e3ec59c5cb558ba34a1bf37b832d1ab23dac Mon Sep 17 00:00:00 2001 From: kashw2 Date: Fri, 4 Aug 2023 08:34:59 +1000 Subject: [PATCH 072/189] expressvpn: 3.25.0.13 -> 3.52.0.2 --- pkgs/applications/networking/expressvpn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/expressvpn/default.nix b/pkgs/applications/networking/expressvpn/default.nix index fa88705ad2e2..5334fc01ffc4 100644 --- a/pkgs/applications/networking/expressvpn/default.nix +++ b/pkgs/applications/networking/expressvpn/default.nix @@ -11,8 +11,8 @@ let pname = "expressvpn"; - clientVersion = "3.25.0"; - clientBuild = "13"; + clientVersion = "3.52.0"; + clientBuild = "2"; version = lib.strings.concatStringsSep "." [ clientVersion clientBuild ]; expressvpnBase = stdenvNoCC.mkDerivation { @@ -20,7 +20,7 @@ let src = fetchurl { url = "https://www.expressvpn.works/clients/linux/expressvpn_${version}-1_amd64.deb"; - hash = "sha256-lyDjG346FrgT7SZbsWET+Hexl9Un6mzMukfO2PwlInA="; + hash = "sha256-cDZ9R+MA3FXEto518bH4/c1X4W9XxgTvXns7zisylew="; }; nativeBuildInputs = [ dpkg autoPatchelfHook ]; From d44cf611fb7e67eab2c07edf738e0da0e3834c61 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 4 Aug 2023 02:28:11 +0300 Subject: [PATCH 073/189] gitignore: Add symlinks produced by `:bl` in repl --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b1018d44b833..b23460ec9198 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ outputs/ result-* result +repl-result-* !pkgs/development/python-modules/result /doc/NEWS.html /doc/NEWS.txt From 540ff38c9cb4cd26ea7e6d1c358906caa487cd2a Mon Sep 17 00:00:00 2001 From: Colin Date: Sat, 29 Jul 2023 23:14:34 +0000 Subject: [PATCH 074/189] python310Packages.gssapi: support cross compilation `GSSAPI_SUPPORT_DETECT` defaults to true and instructs setup.py to perform a sanity check before enabling each gss extension. that sanity check is to `dlopen` the dependency, which fails for cross compilation. setting `GSSAPI_SUPPORT_DETECT=false` enables all extensions, it simply bypasses the `dlopen` check. --- pkgs/development/python-modules/gssapi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 9b41e272b90a..30619532a4a5 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { --replace 'get_output(f"{kc} gssapi --prefix")' '"${lib.getDev krb5}"' ''; + env = lib.optionalAttrs (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) { + GSSAPI_SUPPORT_DETECT = "false"; + }; + nativeBuildInputs = [ cython krb5 From 577b523196858ecb6e152820e373afa00a42671f Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Fri, 4 Aug 2023 00:29:16 +0000 Subject: [PATCH 075/189] plexamp: 4.8.1 -> 4.8.2 --- pkgs/applications/audio/plexamp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 6729e05ce6e0..d39b0217dc83 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "iPCiBbb6alQspEPccxn1XHik0GbksZoe5jb0u8VuUdybO+xVb6sIxTNi6sxTG32uSRH6o16EHNUhLKeb6OcEtA=="; + sha512 = "7NQmH42yzItReQ5WPdcbNPr/xed74H4UyDNlX5PGmoJRBpV1RdeuW1KRweIWfYNhw0KeqULVTjr/aCggoWp4WA=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/51"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/52"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; From 51606bc8c11c96cdbc2cfd1e85031a5b7357dd47 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 3 Aug 2023 17:43:39 +0800 Subject: [PATCH 076/189] lemmy: 0.18.2 -> 0.18.3 --- pkgs/servers/web-apps/lemmy/package.json | 5 ++--- pkgs/servers/web-apps/lemmy/pin.json | 10 +++++----- pkgs/servers/web-apps/lemmy/update.py | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 9ec97ece37f0..8f0b48b50d39 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,6 +1,6 @@ { "name": "lemmy-ui", - "version": "0.18.2", + "version": "0.18.3", "description": "An isomorphic UI for lemmy", "repository": "https://github.com/LemmyNet/lemmy-ui", "license": "AGPL-3.0", @@ -8,7 +8,7 @@ "scripts": { "analyze": "webpack --mode=none", "prebuild:dev": "yarn clean && node generate_translations.js", - "build:dev": "webpack --env LEMMY_UI_DISABLE_CSP=true --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", + "build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", "prebuild:prod": "yarn clean && node generate_translations.js", "build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production", "clean": "yarn run rimraf dist", @@ -69,7 +69,6 @@ "jwt-decode": "^3.1.2", "lemmy-js-client": "0.18.1", "lodash.isequal": "^4.5.0", - "lodash.merge": "^4.6.2", "markdown-it": "^13.0.1", "markdown-it-container": "^3.0.0", "markdown-it-emoji": "^2.0.2", diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 0fbf8af7ce49..e9250c01347c 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.18.2", - "uiVersion": "0.18.2", - "serverHash": "sha256-T08CjsRREgGJb1vXJrYihYaCin8NNHtsG+2PUHoI4Ho=", - "serverCargoHash": "sha256-nTZcLOpsbdeGzpz3PzgXZEGZHMbvSDA5rB2A3S9tMF8=", - "uiHash": "sha256-qFFnmdCONjfPyfp8v0VonPQP8G5b2DVpxEUAQT731Z0=", + "serverVersion": "0.18.3", + "uiVersion": "0.18.3", + "serverHash": "sha256-1feDR3WX4hwaAPEGkM3syb+CsYS3zkzQb2q8be/4UC4=", + "serverCargoHash": "sha256-CVZyOwM0BAeIVy74tj4NNE6occ6yo8eWpMhMb1DnoJY=", + "uiHash": "sha256-asmn5KQ4hhy1yGoeUrQJZLWXPelnb16utQWYplDqIOg=", "uiYarnDepsHash": "sha256-fRJpA9WstNNNOePoqotJKYmlikkcjc34iM0WO8+a/3Q=" } diff --git a/pkgs/servers/web-apps/lemmy/update.py b/pkgs/servers/web-apps/lemmy/update.py index 4e867553b790..939008253132 100755 --- a/pkgs/servers/web-apps/lemmy/update.py +++ b/pkgs/servers/web-apps/lemmy/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github +#! nix shell -i python3 -p python3 python3.pkgs.semver nix-prefetch-github from urllib.request import Request, urlopen import dataclasses import subprocess From 5377971c39b5389932a05e8e02dfe6b42847d47a Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 4 Aug 2023 10:12:50 +0800 Subject: [PATCH 077/189] qtcreator: 11.0.0 -> 11.0.1 --- pkgs/development/tools/qtcreator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 61413e554397..2617de16586d 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "qtcreator"; - version = "11.0.0"; + version = "11.0.1"; src = fetchurl { url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - hash = "sha256-2/RPVfsDg00nC+3v9pWsT8Aq862oRfW575graxWaFDA="; + hash = "sha256-T55ZOFPPO/gGxlc6u2/EF2dhQWAj2X3e0H4ZxFbW23M="; }; nativeBuildInputs = [ From 8a4f0c286ed074a0848541a5ff0a08d7e35819a7 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 4 Aug 2023 10:36:38 +0800 Subject: [PATCH 078/189] netease-cloud-music-gtk: 2.0.3 -> 2.2.0 --- .../audio/netease-cloud-music-gtk/Cargo.lock | 1217 +++++++++-------- .../audio/netease-cloud-music-gtk/default.nix | 10 +- 2 files changed, 621 insertions(+), 606 deletions(-) diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock b/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock index 50af298c2a0c..0fd4e15861db 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock +++ b/pkgs/applications/audio/netease-cloud-music-gtk/Cargo.lock @@ -10,24 +10,39 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] [[package]] -name = "anyhow" -version = "1.0.66" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "async-channel" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -36,9 +51,9 @@ dependencies = [ [[package]] name = "atomic_refcell" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b5e5f48b927f04e952dedc932f31995a65a0bf65ec971c74436e51bf6e970d" +checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" [[package]] name = "atty" @@ -59,15 +74,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -83,15 +92,15 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytemuck" -version = "1.12.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -101,25 +110,19 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-rs" -version = "0.16.1" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9ee4a4ca9239c9a839453dce04b7ddee2f859ec4cd7acd1f5703b68db549c" +checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" dependencies = [ "bitflags", "cairo-sys-rs", - "glib 0.16.2", + "glib 0.16.9", "libc", "once_cell", "thiserror", @@ -127,11 +130,11 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5119ea655ec777b523f0b57279e70f8a4542f61b0e98a48f892b4ef043fd4c5d" +checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", "system-deps", ] @@ -144,17 +147,21 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0" +dependencies = [ + "libc", +] [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -163,6 +170,21 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "time 0.1.45", + "wasm-bindgen", + "winapi", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -171,13 +193,47 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ - "cache-padded", + "crossbeam-utils", ] +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time 0.3.25", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5a18f35792056f8c7c2de9c002e7e4fe44c7b5f66e7d99f46468dbb730a7ea7" +dependencies = [ + "cookie", + "idna 0.3.0", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time 0.3.25", + "url", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + [[package]] name = "crc32fast" version = "1.3.2" @@ -187,55 +243,15 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "curl" version = "0.4.44" @@ -253,9 +269,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.58+curl-7.86.0" +version = "0.4.65+curl-8.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430e2ecf0c5f4445334472cf8f9611a6eea404b4135ca5500f38a97a128c913e" +checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" dependencies = [ "cc", "libc", @@ -278,25 +294,25 @@ dependencies = [ ] [[package]] -name = "either" -version = "1.8.0" +name = "deranged" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] [[package]] name = "env_logger" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -305,27 +321,18 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "event-listener" version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "exr" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb5f255b5980bb0c8cf676b675d1a99be40f316881444f44e0462eaf5df5ded" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.6.2", - "smallvec", - "threadpool", -] - [[package]] name = "fastrand" version = "1.8.0" @@ -336,10 +343,19 @@ dependencies = [ ] [[package]] -name = "field-offset" -version = "0.3.4" +name = "fdeflate" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", "rustc_version", @@ -347,25 +363,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.5.4", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin", + "miniz_oxide", ] [[package]] @@ -391,39 +394,33 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -432,15 +429,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ "fastrand", "futures-core", @@ -453,32 +450,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] -[[package]] -name = "futures-sink" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" - [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-macro", @@ -490,57 +481,57 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.16.0" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fb526c8c3a075eda15f961820edf3e15fe18576ac4fbabbb324e4cc6c421e6" +checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" dependencies = [ "bitflags", "gdk-pixbuf-sys", "gio", - "glib 0.16.2", + "glib 0.16.9", "libc", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df12d15c10c3c5a84d9fb4ba0e27659f6a2bdee4f27f8b17126da15d5ddd3f2" +checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" dependencies = [ "gio-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "system-deps", ] [[package]] name = "gdk4" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fe07f362c977c4684d1136a29f097208b3ccb2013ab6f441a3c60a046fd358" +checksum = "bb2181330ebf9d091f8ea7fed6877f7adc92114128592e1fdaeb1da28e0d01e9" dependencies = [ "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", "gio", - "glib 0.16.2", + "glib 0.16.9", "libc", "pango", ] [[package]] name = "gdk4-sys" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcf9e3ab5f237bb641e7f2fccc4b26d5b86f111f0d62e27d452dc24964541c2" +checksum = "de55cb49432901fe2b3534177fa06844665b9b0911d85d8601a8d8b88b7791db" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "pango-sys", "pkg-config", @@ -549,15 +540,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", - "js-sys", "libc", - "wasi", - "wasm-bindgen", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -580,21 +569,11 @@ dependencies = [ "temp-dir", ] -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gio" -version = "0.16.2" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1debf8d0315d69be0153aa76249db3c858ef69b7778ad3cc669e6d370c485" +checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" dependencies = [ "bitflags", "futures-channel", @@ -602,7 +581,7 @@ dependencies = [ "futures-io", "futures-util", "gio-sys", - "glib 0.16.2", + "glib 0.16.9", "libc", "once_cell", "pin-project-lite", @@ -612,12 +591,12 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6da1bba9d3f2ab13a6e9932c40f240dc99ebc9f0bdc35cfb130d1a3df36f374c" +checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "system-deps", "winapi", @@ -634,7 +613,7 @@ dependencies = [ "futures-core", "futures-executor", "futures-task", - "glib-macros 0.15.11", + "glib-macros 0.15.13", "glib-sys 0.15.10", "gobject-sys 0.15.10", "libc", @@ -645,9 +624,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.2" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5abffa711471e015eb93d65d6ea20e7e9f6f7951fc0a1042280439319b2de06" +checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba" dependencies = [ "bitflags", "futures-channel", @@ -656,9 +635,9 @@ dependencies = [ "futures-task", "futures-util", "gio-sys", - "glib-macros 0.16.0", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-macros 0.16.8", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "once_cell", "smallvec", @@ -667,9 +646,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.15.11" +version = "0.15.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" dependencies = [ "anyhow", "heck", @@ -677,14 +656,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "glib-macros" -version = "0.16.0" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e195c1311fa6b04d7b896ea39385f6bd60ef5d25bf74a7c11c8c3f94f6c1a572" +checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" dependencies = [ "anyhow", "heck", @@ -692,7 +671,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -707,9 +686,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b33357bb421a77bd849f6a0bfcaf3b4b256a2577802971bb5dd522d530f27021" +checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" dependencies = [ "libc", "system-deps", @@ -728,33 +707,33 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ca11a57400f3d4fda594e002844be47900c9fb8b29e2155c6e37a1f24e51b3" +checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", "system-deps", ] [[package]] name = "graphene-rs" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a8de4506a64776d90fedf9c28fdca5a7127f8cc9c78976e8184ac6f42685d8" +checksum = "95ecb4d347e6d09820df3bdfd89a74a8eec07753a06bb92a3aac3ad31d04447b" dependencies = [ - "glib 0.16.2", + "glib 0.16.9", "graphene-sys", "libc", ] [[package]] name = "graphene-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c952f764f02f8546fcc5d014bc78aa704c6d453c828c8b429121f704349163" +checksum = "b9aa82337d3972b4eafdea71e607c23f47be6f27f749aab613f1ad8ddbe6dcd6" dependencies = [ - "glib-sys 0.16.0", + "glib-sys 0.16.3", "libc", "pkg-config", "system-deps", @@ -762,14 +741,14 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc2b86c751a7fe9aad0fdba85937a6aace3a8453e0e2a08d2a31ce4bb8ae55" +checksum = "591239f5c52ca803b222124ac9c47f230cd180cee9b114c4d672e4a94b74f491" dependencies = [ "bitflags", "cairo-rs", "gdk4", - "glib 0.16.2", + "glib 0.16.9", "graphene-rs", "gsk4-sys", "libc", @@ -778,14 +757,14 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb53e25cbbe3fa8e3e9db7c06d65085086fadbec4cd0aa567b2e2a4917db83d" +checksum = "195a63f0be42529f98c3eb3bae0decfd0428ba2cc683b3e20ced88f340904ec5" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "graphene-sys", "libc", "pango-sys", @@ -794,16 +773,16 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.19.1" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e428081934c617115320750b7827f8f13131d9c3ae90b647c14a5d6019f47b4" +checksum = "85fc926d081923c840403ec5ec3b2157a7cd236a2587c3031a4f0206f13ed500" dependencies = [ "bitflags", "cfg-if", "futures-channel", "futures-core", "futures-util", - "glib 0.16.2", + "glib 0.16.9", "gstreamer-sys", "libc", "muldiv", @@ -818,14 +797,14 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.19.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "326674197c010e91a98d0f55a032abe22b1fd932456dbcdc3415450b4b653817" +checksum = "a61a299f9ea2ca892b43e2e428b86c679875e95ba23f8ae06fd730308df630f0" dependencies = [ "atomic_refcell", "bitflags", "cfg-if", - "glib 0.16.2", + "glib 0.16.9", "gstreamer", "gstreamer-base-sys", "libc", @@ -833,40 +812,40 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.19.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd55d3858fa65a99286c1cbe8db001f4ce5cff6a038f1c1253f5d99f840970de" +checksum = "dbc3c4476e1503ae245c89fbe20060c30ec6ade5f44620bcc402cbc70a3911a1" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-sys", "libc", "system-deps", ] [[package]] -name = "gstreamer-player" -version = "0.19.0" +name = "gstreamer-play" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796e053b45803544c37a150ae6cbedc8019bc5f410dff78aa6041e7a1a969f2b" +checksum = "7788ccf29b0311c272c7144e425bff8f15af38bcaca44b7e2229f4d36a266093" dependencies = [ "bitflags", - "glib 0.16.2", + "glib 0.16.9", "gstreamer", - "gstreamer-player-sys", + "gstreamer-play-sys", "gstreamer-video", "libc", "once_cell", ] [[package]] -name = "gstreamer-player-sys" -version = "0.19.0" +name = "gstreamer-play-sys" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7930b84f995cf393906ee8499d7bf643aba1899ace61e20fee0ea416ad532f32" +checksum = "a347e1ef8b62364451312f440c233a55ddaec94539d058553335677fa4bb151c" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-sys", "gstreamer-video-sys", "libc", @@ -875,26 +854,26 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.19.0" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaafc66df32b334d4aa28025fd5d83cadc971e1910205e140ea070f4ac4834f" +checksum = "545f52ad8a480732cc4290fd65dfe42952c8ae374fe581831ba15981fedf18a4" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "system-deps", ] [[package]] name = "gstreamer-video" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b96daff8a3d853588e61207afac81a4879f3972430f6609721601ab757d7fd" +checksum = "eb19dcbdd5436483e764318bef157070f192acc5b1199e85878723a9ce33d4e3" dependencies = [ "bitflags", "cfg-if", "futures-channel", - "glib 0.16.2", + "glib 0.16.9", "gstreamer", "gstreamer-base", "gstreamer-video-sys", @@ -904,12 +883,12 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066ee44cd8d84f19a18c646128c1890878c034d3fb9f34d8d5f07311bbd9f41f" +checksum = "7546bc798c898f2083330d81a7efff48f65a31b03873f410538032d26ec0cdc7" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gstreamer-base-sys", "gstreamer-sys", "libc", @@ -918,9 +897,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.5.1" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47223ddb27033731b71ea841d1b878bd87a275a865f1df60b41505f9e4933d64" +checksum = "fd89dba65def483a233dc4fdd3f3dab01576e3d83f80f6c9303ebe421661855e" dependencies = [ "bitflags", "cairo-rs", @@ -929,7 +908,7 @@ dependencies = [ "gdk-pixbuf", "gdk4", "gio", - "glib 0.16.2", + "glib 0.16.9", "graphene-rs", "gsk4", "gtk4-macros", @@ -941,30 +920,30 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.5.0" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5eb86364b216ee8c497b1121831168fb25130d3378495a135f8e5c1972db7b" +checksum = "42829d621396a69b352d80b952dfcb4ecb4272506b2e10a65457013af1b395a4" dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "gtk4-sys" -version = "0.5.0" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f04bd0b63d999a36ae53a916ee4b20ea64a3ef4732ca8a98b1fde4a22c1476c" +checksum = "e370564e3fdacff7cffc99f7366b6a4689feb44e819d3ccee598a9a215b71605" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", "gio-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "graphene-sys", "gsk4-sys", "libc", @@ -973,19 +952,16 @@ dependencies = [ ] [[package]] -name = "half" -version = "2.1.0" +name = "hashbrown" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554" -dependencies = [ - "crunchy", -] +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1004,18 +980,18 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "html-escape" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e7479fa1ef38eb49fb6a42c426be515df2d063f06cb8efd3e50af073dbc26c" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" dependencies = [ "utf8-width", ] [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1034,6 +1010,29 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "idna" version = "0.3.0" @@ -1045,22 +1044,37 @@ dependencies = [ ] [[package]] -name = "image" -version = "0.24.4" +name = "idna" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "image" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder", "num-rational", "num-traits", "png", - "scoped_threadpool", - "tiff", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", ] [[package]] @@ -1102,24 +1116,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "jpeg-decoder" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9478aa10f73e7528198d75109c8be5cd7d15fb530238040148d5f9a22d4c5b3b" -dependencies = [ - "rayon", -] +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1130,24 +1135,18 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - [[package]] name = "libadwaita" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed92f031cf7f3d501b84f41e4d05aed6ebfd8eed59a8fc0cccbf51359e92c8e3" +checksum = "9dfa0722d4f1724f661cbf668c273c5926296ca411ed3814e206f8fd082b6c48" dependencies = [ "bitflags", "futures-channel", "gdk-pixbuf", "gdk4", "gio", - "glib 0.16.2", + "glib 0.16.9", "gtk4", "libadwaita-sys", "libc", @@ -1157,14 +1156,14 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec4243e86fb53d06df2461d543529a640c9a0fba2d4cc850b70e11a85f9d952" +checksum = "de902982372b454a0081d7fd9dd567b37b73ae29c8f6da1820374d345fd95d5b" dependencies = [ "gdk4-sys", "gio-sys", - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "gtk4-sys", "libc", "pango-sys", @@ -1173,15 +1172,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.137" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libdbus-sys" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ "pkg-config", ] @@ -1198,9 +1197,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1221,24 +1220,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "malloc_buf" @@ -1257,35 +1243,27 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -1300,23 +1278,14 @@ dependencies = [ [[package]] name = "muldiv" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5136edda114182728ccdedb9f5eda882781f35fa6e80cc360af12a8932507f3" - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "netease-cloud-music-api" -version = "1.0.2" -source = "git+https://github.com/gmg137/netease-cloud-music-api.git#08e08044a0726bcd2e0d01035b972cb7f7b56ae8" +version = "1.2.0" +source = "git+https://github.com/gmg137/netease-cloud-music-api.git?tag=1.2.0#519ab225a64a57e7a21b1060390d3bd6c651d1a8" dependencies = [ "anyhow", "base64", @@ -1333,15 +1302,16 @@ dependencies = [ [[package]] name = "netease-cloud-music-gtk4" -version = "2.0.3" +version = "2.2.0" dependencies = [ "anyhow", + "chrono", + "cookie_store", "env_logger", "fastrand", - "fragile", "gettext-rs", "gstreamer", - "gstreamer-player", + "gstreamer-play", "gtk4", "libadwaita", "log", @@ -1375,23 +1345,13 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "objc" version = "0.2.7" @@ -1423,15 +1383,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" -version = "0.10.42" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags", "cfg-if", @@ -1444,13 +1404,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -1461,11 +1421,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.77" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1483,13 +1442,13 @@ dependencies = [ [[package]] name = "pango" -version = "0.16.0" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7208c60f224cf6e44c551df5ee2ef38f9da0fd29d7c5a0402000b8ab0520e798" +checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" dependencies = [ "bitflags", "gio", - "glib 0.16.2", + "glib 0.16.9", "libc", "once_cell", "pango-sys", @@ -1497,69 +1456,59 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922441c228366ed98d3534b87bc7c987c50564094c3abbc3513717786419252d" +checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" dependencies = [ - "glib-sys 0.16.0", - "gobject-sys 0.16.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "system-deps", ] [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "paste" -version = "1.0.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" -dependencies = [ - "thiserror", - "ucd-trie", -] +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1569,41 +1518,44 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.6" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" dependencies = [ "bitflags", "crc32fast", + "fdeflate", "flate2", - "miniz_oxide 0.5.4", + "miniz_oxide", ] [[package]] name = "polling" -version = "2.4.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", + "bitflags", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite", + "windows-sys", ] [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" @@ -1613,13 +1565,12 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -1631,7 +1582,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1648,18 +1599,34 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] -name = "qrcode-generator" -version = "4.1.6" +name = "psl-types" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501c33c9127afb867693646b38817bf63a9a756d4b66aefbc5c0d7e5e8c3125a" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "qrcode-generator" +version = "4.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76" dependencies = [ "html-escape", "image", @@ -1674,9 +1641,9 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1711,35 +1678,11 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rayon" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - [[package]] name = "regex" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -1748,90 +1691,65 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "rustc_version" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ "semver", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", "windows-sys", ] -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - [[package]] name = "semver" -version = "0.11.0" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.87" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -1839,10 +1757,25 @@ dependencies = [ ] [[package]] -name = "slab" -version = "0.4.7" +name = "serde_spanned" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -1860,34 +1793,36 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] [[package]] -name = "spin" -version = "0.9.4" +name = "syn" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "lock_api", + "proc-macro2", + "quote", + "unicode-ident", ] [[package]] name = "syn" -version = "1.0.103" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -1896,9 +1831,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.3" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck", @@ -1907,6 +1842,12 @@ dependencies = [ "version-compare", ] +[[package]] +name = "target-lexicon" +version = "0.12.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" + [[package]] name = "temp-dir" version = "0.1.11" @@ -1915,51 +1856,70 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] -name = "threadpool" -version = "1.8.1" +name = "time" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ - "num_cpus", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", ] [[package]] -name = "tiff" -version = "0.7.3" +name = "time" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259662e32d1e219321eb309d5f9d898b779769d81b76e762c07c8e5d38fcb65" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +dependencies = [ + "time-core", ] [[package]] @@ -1973,17 +1933,42 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.5.9" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -2001,20 +1986,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", ] @@ -2029,23 +2014,17 @@ dependencies = [ "tracing", ] -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2058,12 +2037,12 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna", + "idna 0.4.0", "percent-encoding", ] @@ -2087,9 +2066,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] name = "version_check" @@ -2103,6 +2082,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2111,9 +2096,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2121,24 +2106,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.28", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2146,37 +2131,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "winapi" @@ -2210,44 +2180,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", + "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows_aarch64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807" +dependencies = [ + "memchr", +] diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index 8a83da7ff529..edf1b9a9ddb4 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -23,22 +23,26 @@ stdenv.mkDerivation rec { pname = "netease-cloud-music-gtk"; - version = "2.0.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gmg137"; repo = pname; rev = version; - hash = "sha256-A3mvf6TZ3+aiWA6rg9G5NMaDKvO0VQzwIM1t0MaTpTc="; + hash = "sha256-9qUzRmm3WQEVjzhzHMT1vNw3r3ymWGlBWXnnPsYGSnk="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "netease-cloud-music-api-1.0.2" = "sha256-7Yp2ZBg5wHnDPtdPLwZQnqcSlVuGCrXpV5M/dp/IaOE="; + "netease-cloud-music-api-1.2.0" = "sha256-MR1yVPrNzhZC65mQen88t7NbLfRcoWvT6DMSLGCMeTY="; }; }; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + nativeBuildInputs = [ meson ninja From 3ea80c9c2c26ff0740fd29b30f04766dbca179de Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 3 Aug 2023 20:29:24 -0500 Subject: [PATCH 079/189] srt-to-vtt-cl: fix macOS builds The upstream Makefile is using logic to build into different dirs depending on uname output. Trivial to get macOS builds working if we just don't do that. I've also stripped out a use of substituteAll that was having no effect (the variables it replaced were removed during review of the initial PR.) --- pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix | 11 +++---- .../srt-to-vtt-cl/simplify-macOS-builds.patch | 31 +++++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 70fcedde858a..80e456d072ce 100644 --- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "srt-to-vtt-cl"; @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./fix-validation.patch; - }) + ./fix-validation.patch + ./simplify-macOS-builds.patch ]; installPhase = '' mkdir -p $out/bin - cp bin/$(uname -s)/$(uname -m)/srt-vtt $out/bin + cp bin/srt-vtt $out/bin ''; meta = with lib; { @@ -27,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ ericdallo ]; homepage = "https://github.com/nwoltman/srt-to-vtt-cl"; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch b/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch new file mode 100644 index 000000000000..71497f23beef --- /dev/null +++ b/pkgs/tools/cd-dvd/srt-to-vtt-cl/simplify-macOS-builds.patch @@ -0,0 +1,31 @@ +From be08356f421825d3d2dd7ab687f86d9981a31f9a Mon Sep 17 00:00:00 2001 +From: "Travis A. Everett" +Date: Thu, 3 Aug 2023 20:15:40 -0500 +Subject: [PATCH] simplify macOS builds + +--- + Makefile | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 6dfd829..19c3ae3 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,13 +8,7 @@ CXXFLAGS = -std=c++11 -O2 -MMD -I ./deps + OBJECTS := src/text_encoding_detect.o src/Utils.o src/Converter.o src/main.o + DEPENDS := $(OBJECTS:.o=.d) + EXEC = srt-vtt +-UNAME_S := $(shell uname -s) +-ifeq ($(UNAME_S), Darwin) +- BIN_DIR = bin/Mac-OSX +-else +- UNAME_M := $(shell uname -m) +- BIN_DIR = bin/$(UNAME_S)/$(UNAME_M) +-endif ++BIN_DIR = bin + EXEC_PATH = $(BIN_DIR)/$(EXEC) + + .PHONY: test +-- +2.39.0 + From c074b2497f55e4e318ccf79df8699e2431ab3b24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 03:23:00 +0000 Subject: [PATCH 080/189] terraform-providers.azurerm: 3.67.0 -> 3.68.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eb45738d5acf..da0d341a1bd5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-Ff+9TpObtwCGn/xkb9YIQeXdKeX9c/jfps/XgvHk/Go=", + "hash": "sha256-7ekMsiMvyJuwp+/fzKJcvp7RirunsGykTH62Z8Znz4Q=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.67.0", + "rev": "v3.68.0", "spdx": "MPL-2.0", "vendorHash": null }, From ce02f7520be63e1391068ee74005c6b351631ed4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 03:25:14 +0000 Subject: [PATCH 081/189] terraform-providers.checkly: 1.6.7 -> 1.6.8 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index da0d341a1bd5..3a32ad54a4ac 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -191,13 +191,13 @@ "vendorHash": "sha256-oVXrSI+DU6NgmVIPcS4He4mHVrkA2tMxFUpxMnv0bu4=" }, "checkly": { - "hash": "sha256-UXIni594P85sgS8XVLoJ0+UTBeUS0XC+oj98KJUfghg=", + "hash": "sha256-69oRZpJNRFJCwAZNcmVfYTNKmtBgFocvEUZpr4jbJQg=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.6.7", + "rev": "v1.6.8", "spdx": null, - "vendorHash": "sha256-ATj1tGTS7FnEQDa6KuDQITGuVimP0A4sdlUNJ6RNIqI=" + "vendorHash": "sha256-cnvXf0zJrJvpRbQMm2pF7f2cuazxDR4193JCbyGuL2Y=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", From 960412394309829b73a93b7b6f8d44704f9b5e55 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 03:30:18 +0000 Subject: [PATCH 082/189] terraform-providers.launchdarkly: 2.13.3 -> 2.13.4 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3a32ad54a4ac..4c8bd8623529 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -664,11 +664,11 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-I4d/REcXlyFX+LztvpkWjXjlWZD2JL//mewvgNdw2Rc=", + "hash": "sha256-dK7JxmC/GRjsMpiJb2e8EyFl+V/KcxKlw8/5IbyFlXY=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.13.3", + "rev": "v2.13.4", "spdx": "MPL-2.0", "vendorHash": "sha256-jggXSnERsraNqkQKFpUtlglSOi02n4eAp4graJ6K+ZA=" }, From 4eddf22d9ecf33af68ebe8da3f1b160f2fb2cf5b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 03:31:02 +0000 Subject: [PATCH 083/189] terraform-providers.aws: 5.10.0 -> 5.11.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4c8bd8623529..58dc411629d6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-IIbSrtCm3GKJqfHstdczkptPLKHkNthtgzo0zORRPMQ=", + "hash": "sha256-y4KAw4hX+Hl+laVzOoNVxUXo4AkjWEKYSf87ffpSh2w=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.10.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UeXYx3AfUrWJB6o1qSrYqmnk6obJXnToyF0dHLhRfVQ=" + "vendorHash": "sha256-lf/bx9Uwf2jkOKfgYc2JPJ9Rt0PKHpIHzHW5Dfmt5rM=" }, "azuread": { "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=", From 9f57ea05a1b3f121cd06edbee273a90560100f22 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 03:34:33 +0000 Subject: [PATCH 084/189] terraform-providers.rancher2: 3.1.0 -> 3.1.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 58dc411629d6..d2744906bdfa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -944,11 +944,11 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-/BAaOZM9SZA0crEEB0+UlCzDo2d4RfNdDQe04pCTCdE=", + "hash": "sha256-thojEtfA8vn5fMTBuOClAKt3rlKs2XK7/RRMYSHAoMM=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v3.1.0", + "rev": "v3.1.1", "spdx": "MPL-2.0", "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc=" }, From f05e7e02a34dab4b5c162f07c4d3469aa07db896 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 4 Aug 2023 13:24:12 +0800 Subject: [PATCH 085/189] python310Packages.edk2-pytool-library: 0.15.3 -> 0.15.4 Diff: https://github.com/tianocore/edk2-pytool-library/compare/v0.15.3...v0.15.4 --- .../python-modules/edk2-pytool-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index d3349549bc5c..70b11a9f23f3 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.15.3"; + version = "0.15.4"; format = "pyproject"; src = fetchFromGitHub { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-PWjevYUts0dQMBmABpU8neuTqDlglTCCQmuvnVndfto="; + hash = "sha256-jGZa1qfI/OybwgG2L4N1hICHpWZTufgElpl31EhU+O4="; }; nativeBuildInputs = [ From 2ff8d8b24fee303b6b9888d7b4f91d42053a592b Mon Sep 17 00:00:00 2001 From: meppu Date: Fri, 4 Aug 2023 08:27:29 +0300 Subject: [PATCH 086/189] gleam: add nix-update-script --- pkgs/development/compilers/gleam/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index c7e6669dd14e..d0e4f9994c87 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, git, pkg-config, openssl, Security, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, git +, pkg-config +, openssl +, Security +, libiconv +, nix-update-script +}: rustPlatform.buildRustPackage rec { pname = "gleam"; @@ -18,6 +28,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-K7MrrnupH1BS8KEIgVdlnGF91J5ND5umgdeLVCg7DbQ="; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A statically typed language for the Erlang VM"; homepage = "https://gleam.run/"; From a546cb6b3e2626cb3c6ea6462dce3af6ab3923e0 Mon Sep 17 00:00:00 2001 From: meppu Date: Fri, 4 Aug 2023 08:39:28 +0300 Subject: [PATCH 087/189] gleam: 0.30.2 -> 0.30.5 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index d0e4f9994c87..ea82d72a481a 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.30.2"; + version = "0.30.5"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XrXN+HZlCPzywFo10/vLHbz/zjglSZnNQKfYvLvx35I="; + hash = "sha256-DOQhuSNIyP6K+M9a/uM8Cn6gyzpaH23+n4fux8otPWQ="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoHash = "sha256-K7MrrnupH1BS8KEIgVdlnGF91J5ND5umgdeLVCg7DbQ="; + cargoHash = "sha256-CkMUconCw94Jvy7FhrOZvBbA8DAi91Ae5GFxGFBcEew="; passthru.updateScript = nix-update-script { }; From cf086d9ae6960e376d3370343cde8fa3ad3a2617 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 4 Aug 2023 08:49:16 +0200 Subject: [PATCH 088/189] safeeyes: Add passthru.tests.version --- pkgs/applications/misc/safeeyes/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index f5cd73e03137..4b845737e7c8 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -7,6 +7,8 @@ , libnotify , wlrctl , gtk3 +, safeeyes +, testers , xprintidle , xprop , wrapGAppsHook @@ -61,6 +63,8 @@ buildPythonApplication rec { doCheck = false; # no tests + passthru.tests.version = testers.testVersion { package = safeeyes; }; + meta = with lib; { homepage = "http://slgobinath.github.io/SafeEyes"; description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo"; From 0c66bba4554ce3e1943716f3943a55fd5ea880a3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 4 Aug 2023 08:53:02 +0200 Subject: [PATCH 089/189] php81: 8.1.21 -> 8.1.22 Security release Changelog: https://www.php.net/ChangeLog-8.php#8.1.22 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 1be51b03f1f6..c05ac442ced6 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.21"; - hash = "sha256-bqSegzXWMhd/VrUHFgqhUcewIBhXianBSFn85dSgd20="; + version = "8.1.22"; + hash = "sha256-mSNU44LGxhjQHtS+Br7qjewxeLFBU99k08jEi4Xp+8I="; }); in From 3ebfba5f605d0ebe6d5962e7530524c3c23aa790 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 4 Aug 2023 14:54:01 +0800 Subject: [PATCH 090/189] zoxide: 0.9.1 -> 0.9.2 --- pkgs/tools/misc/zoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 8d311223be75..cba030c8a653 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-qmT/gTkizZpyYN/YdobBq2vunGM5SpNpCHIFmg8nPhk="; + sha256 = "sha256-h/T3McaKKASwQt+0SBBxFXMnYyt+0Xl+5i8IulUAdnU="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-1sW6bvRJJp+qT5A9+l8wN3TQuzFDiBoeLyY5JvAA7dQ="; + cargoSha256 = "sha256-uu7zi6prnfbi4EQ0+0QcTEo/t5CIwNEQgJkIgxSk5u4="; postInstall = '' installManPage man/man*/* From 140b6662aac0fb52c7f71b05d4cee997a292e844 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 4 Aug 2023 08:54:36 +0200 Subject: [PATCH 091/189] php83: 8.3.0beta2 -> 8.3.0beta3 --- pkgs/development/interpreters/php/8.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 1b025afd95b7..a12feb9c4e14 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0beta1"; + version = "8.3.0beta2"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~eric/php-8.3.0beta1.tar.xz"; - hash = "sha256-eZjhwqkP1RkyzpV5uMUxUWkXiPERBgGtmaX65WhDdl8="; + url = "https://downloads.php.net/~jakub/php-8.3.0beta2.tar.xz"; + hash = "sha256-ND1OlmSMtBxTE/0qfgy3Cz/gF08eIzydU2W/eKg58wQ="; }; }); in From 95cd1bb632c498436e713bfa1f021bd9d006e21b Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Fri, 4 Aug 2023 11:20:06 +0200 Subject: [PATCH 092/189] tor-browser-bundle-bin: 12.5.1 -> 12.5.2 https://blog.torproject.org/new-release-tor-browser-1252/ --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 3ed322797fc2..ee31f79a5752 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -89,7 +89,7 @@ let fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.5.1"; + version = "12.5.2"; lang = "ALL"; @@ -101,7 +101,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - hash = "sha256-Kuq7ZNhaDl2nBcokWKm/XTIjJ8h4czEvwvsF2z3DzJ4="; + hash = "sha256-Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es="; }; i686-linux = fetchurl { @@ -111,7 +111,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - hash = "sha256-WNIlwDNVUJyO5l33QxLwTn1knADXDzPvgG279QeRXl8="; + hash = "sha256-mouxVi/Y5duIQXHYd8WcIzLZEXs5FZAt20dFq4vHzso="; }; }; From 74e9b9cd498824105d65c08faf084a157fad9817 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 3 Aug 2023 15:36:23 +0800 Subject: [PATCH 093/189] openvi: 7.3.22 -> 7.4.23 --- pkgs/applications/editors/openvi/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/openvi/default.nix b/pkgs/applications/editors/openvi/default.nix index e104c4dd7591..19da3daf78fc 100644 --- a/pkgs/applications/editors/openvi/default.nix +++ b/pkgs/applications/editors/openvi/default.nix @@ -1,30 +1,22 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , ncurses +, perl }: stdenv.mkDerivation rec { pname = "openvi"; - version = "7.3.22"; + version = "7.4.23"; src = fetchFromGitHub { owner = "johnsonjh"; repo = "OpenVi"; rev = version; - hash = "sha256-yXYiH2FCT7ffRPmb28V54+KO1RLs8L9KHk3remkMWmA="; + hash = "sha256-DwecSnByRkjBFqy3gWJ0+1srF2YsNACqKrAITn6wXJw="; }; - patches = [ - # do not attempt to install to /var/tmp/vi.recover - (fetchpatch { - url = "https://github.com/johnsonjh/OpenVi/commit/5205f0234369963c443e83ca5028ca63feaaac91.patch"; - hash = "sha256-hoKzQLnpdRbc48wffWbzFtivr20VqEPs4WRPXuDa/88="; - }) - ]; - - buildInputs = [ ncurses ]; + buildInputs = [ ncurses perl ]; makeFlags = [ "PREFIX=$(out)" From d59d36a24b5eb274fa4e5e4d6cd50640e5b18ff3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:58:35 +0200 Subject: [PATCH 094/189] autogen: pin guile_2_2 --- pkgs/development/tools/misc/autogen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index 61df38f68ce9..4e776b34ded3 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile, libxml2 }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, autoreconfHook, which, pkg-config, perl, guile_2_2, libxml2 }: stdenv.mkDerivation rec { pname = "autogen"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { buildPackages.buildPackages.autogen buildPackages.texinfo ]; buildInputs = [ - guile libxml2 + guile_2_2 libxml2 ]; preConfigure = '' From 56376d412bd1da83d366a0937137a041c29ef4db Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 20:11:55 +0200 Subject: [PATCH 095/189] junkie: pin guile_2_2 --- pkgs/tools/networking/junkie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix index 9f7b4350f1b1..87c0fc6ae2a7 100644 --- a/pkgs/tools/networking/junkie/default.nix +++ b/pkgs/tools/networking/junkie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile_2_2, openssl }: stdenv.mkDerivation rec { pname = "junkie"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h ''; - buildInputs = [ libpcap guile openssl ]; + buildInputs = [ libpcap guile_2_2 openssl ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "GUILELIBDIR=\${out}/share/guile/site" From 6eccbaa3b1efc1c72fc2fabf2fcab6f162731668 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:59:23 +0200 Subject: [PATCH 096/189] lilypond: pin guile_2_2 --- pkgs/misc/lilypond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index ef861068fa49..b9f59934efea 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile +{ stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile_2_2 , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff , freefont_ttf, makeFontsConf @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex makeWrapper pkg-config ]; buildInputs = - [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm + [ ghostscript texinfo imagemagick texi2html guile_2_2 dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango fontforge help2man groff t1utils boehmgc rsync ]; From 977c397643daea45ebfb34d1e8394994bcf67c18 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 20:04:51 +0200 Subject: [PATCH 097/189] mailutils: pin guile_2_2 --- pkgs/tools/networking/mailutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 6ed8b2fc4b5b..2fa7f78f4937 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -12,7 +12,7 @@ , gdbm , gnutls , gss -, guile +, guile_2_2 , libmysqlclient , mailcap , nettools @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libxcrypt ] ++ lib.optionals stdenv.isLinux [ nettools ] ++ lib.optionals pythonSupport [ python3 ] - ++ lib.optionals guileSupport [ guile ]; + ++ lib.optionals guileSupport [ guile_2_2 ]; patches = [ ./fix-build-mb-len-max.patch From e4b9770b1ad369effd531cbe802d2200a0d4558c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 20:10:36 +0200 Subject: [PATCH 098/189] xbindkeys: pin guile_2_2 --- pkgs/tools/X11/xbindkeys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 17e0ca66e3f3..ed9e5ba43c99 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, guile }: +{ lib, stdenv, fetchurl, pkg-config, libX11, guile_2_2 }: stdenv.mkDerivation rec { pname = "xbindkeys"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 guile ]; + buildInputs = [ libX11 guile_2_2 ]; meta = { homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html"; From 1a25a201039bd0ee388f29b32525fbbeece69c57 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 19:58:10 +0200 Subject: [PATCH 099/189] guile: default to guile_3_0 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9482b47820f6..614509a14a71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18032,7 +18032,7 @@ with pkgs; guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { }; - guile = guile_2_2; + guile = guile_3_0; guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; From 98edae65c0cd947649b64788192b693028498c77 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 20:25:27 +0200 Subject: [PATCH 100/189] guile-commonmark: 0.1.2 -> unstable-2020-04-30 --- .../guile-modules/guile-commonmark/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/development/guile-modules/guile-commonmark/default.nix index 113fad13600c..c103635d37af 100644 --- a/pkgs/development/guile-modules/guile-commonmark/default.nix +++ b/pkgs/development/guile-modules/guile-commonmark/default.nix @@ -4,22 +4,24 @@ , autoreconfHook , guile , pkg-config +, texinfo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "guile-commonmark"; - version = "0.1.2"; + version = "unstable-2020-04-30"; src = fetchFromGitHub { owner = "OrangeShark"; - repo = pname; - rev = "v${version}"; - hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo="; + repo = "guile-commonmark"; + rev = "538ffea25ca69d9f3ee17033534ba03cc27ba468"; + hash = "sha256-9cA7iQ/GGEx+HwsdAxKC3IssqkT/Yg8ZxaiIprS5VuI="; }; nativeBuildInputs = [ autoreconfHook pkg-config + texinfo # for makeinfo ]; buildInputs = [ guile From 4f5308922f99987cabb1821b675da86948af00b4 Mon Sep 17 00:00:00 2001 From: zendo Date: Fri, 4 Aug 2023 08:13:11 +0800 Subject: [PATCH 101/189] treewide: add meta.mainProgram Related PR: https://github.com/NixOS/nixpkgs/pull/246386 --- pkgs/applications/networking/nload/default.nix | 1 + pkgs/shells/any-nix-shell/default.nix | 1 + pkgs/shells/zsh/default.nix | 1 + pkgs/tools/admin/procs/default.nix | 1 + pkgs/tools/misc/exa/default.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index 8b97bbf4635a..e46a95d71e49 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.devhell ]; + mainProgram = "nload"; }; } diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix index 095347a3ca99..fd4807e6d675 100644 --- a/pkgs/shells/any-nix-shell/default.nix +++ b/pkgs/shells/any-nix-shell/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://github.com/haslersn/any-nix-shell"; maintainers = with maintainers; [ haslersn ]; + mainProgram = "any-nix-shell"; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 1297e622269f..d2bdd5d34d22 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -131,6 +131,7 @@ EOF homepage = "https://www.zsh.org/"; maintainers = with lib.maintainers; [ pSub artturin ]; platforms = lib.platforms.unix; + mainProgram = "zsh"; }; passthru = { diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 03d26fd64988..b9c2a463909b 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/dalance/procs/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne sciencentistguy ]; + mainProgram = "procs"; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 91d0b1c49d09..d22303e150c9 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -58,5 +58,6 @@ rustPlatform.buildRustPackage { homepage = "https://the.exa.website"; license = licenses.mit; maintainers = with maintainers; [ ehegnes lilyball globin fortuneteller2k ]; + mainProgram = "exa"; }; } From 2385e73cca73dbf0f853080e959834526aef7a8a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jul 2023 21:11:30 +0100 Subject: [PATCH 102/189] flood: repackage using buildNpmPackage Related issue: #229475 Co-authored-by: Winter --- .../networking/p2p/flood/default.nix | 27 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------- pkgs/development/node-packages/overrides.nix | 4 --- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 pkgs/applications/networking/p2p/flood/default.nix diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix new file mode 100644 index 000000000000..f4b8a7636014 --- /dev/null +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "flood"; + version = "4.7.0"; + + src = fetchFromGitHub { + owner = "jesec"; + repo = pname; + rev = "v${version}"; + hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; + }; + + npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; + + NODE_OPTIONS = "--openssl-legacy-provider"; + + meta = with lib; { + description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; + homepage = "https://flood.js.org"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ thiagokokada winter ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 05d996865fbf..7222a6f7d4cc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -46,6 +46,7 @@ mapAliases { bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30 bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25 eslint_d = pkgs.eslint_d; # Added 2023-05-26 + flood = pkgs.flood; # Added 2023-07-25 gtop = pkgs.gtop; # added 2023-07-31 manta = pkgs.node-manta; # Added 2023-05-06 readability-cli = pkgs.readability-cli; # Added 2023-06-12 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index da2f95ab848c..5b8d43dab820 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -140,7 +140,6 @@ , "fixjson" , "fkill-cli" , "fleek-cli" -, "flood" , "forever" , "fx" , "ganache" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 982bc9cb1445..8560786e3c14 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -107221,24 +107221,6 @@ in bypassCache = true; reconstructLock = true; }; - flood = nodeEnv.buildNodePackage { - name = "flood"; - packageName = "flood"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flood/-/flood-4.7.0.tgz"; - sha512 = "MAm4Yok64VPa49DM+0TxBBP0mScW5ILGCsY/HJLbATjHEkJFnwD1mkPndruZxO1vXBaFdPzoLl+gYThAUxWQjA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "A modern Web UI for various torrent clients with multi-user and multi-client support"; - homepage = "https://github.com/jesec/flood#readme"; - license = "GPL-3.0-only"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 863fb6e46674..f462cb90986c 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -162,10 +162,6 @@ final: prev: { nativeBuildInputs = lib.optionals stdenv.isDarwin [ pkgs.xcbuild ]; }; - flood = prev.flood.override { - buildInputs = [ final.node-pre-gyp ]; - }; - git-ssb = prev.git-ssb.override (oldAttrs: { buildInputs = [ final.node-gyp-build ]; meta = oldAttrs.meta // { broken = since "10"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9482b47820f6..e4021f171317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3652,7 +3652,7 @@ with pkgs; readline = readline63; }; - flood = nodePackages.flood; + flood = callPackage ../applications/networking/p2p/flood { }; font-config-info = callPackage ../tools/misc/font-config-info { }; From 207166a65d5af1dccae4b9b60c0195ab2d06d729 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 26 Jul 2023 22:47:00 +0100 Subject: [PATCH 103/189] flood: 4.7.0 -> unstable-2023-06-03 Bumping to current development version to fix some deprecation warns in Node and also issues with newer versions of qBittorrent. --- pkgs/applications/networking/p2p/flood/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix index f4b8a7636014..3f577289502a 100644 --- a/pkgs/applications/networking/p2p/flood/default.nix +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -5,18 +5,16 @@ buildNpmPackage rec { pname = "flood"; - version = "4.7.0"; + version = "unstable-2023-06-03"; src = fetchFromGitHub { owner = "jesec"; repo = pname; - rev = "v${version}"; - hash = "sha256-BR+ZGkBBfd0dSQqAvujsbgsEPFYw/ThrylxUbOksYxM="; + rev = "2b652f8148dab7134eeeb201b9d81dd6b8bda074"; + hash = "sha256-wI6URPGUZUbydSgNaHN2C5IA2x/HHjBWIRT6H6iZU/0="; }; - npmDepsHash = "sha256-tuEfyePwlOy2/mOPdXbqJskO6IowvAP4DWg8xSZwbJw="; - - NODE_OPTIONS = "--openssl-legacy-provider"; + npmDepsHash = "sha256-XmDnvq+ni5TOf3UQFc4JvGI3LiGpjbrLAocRvrW8qgk="; meta = with lib; { description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; From a07806b9dce8e190c540fd3897d5d112c45b42cd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 12:10:38 +0200 Subject: [PATCH 104/189] guile-ncurses: 1.7 -> 3.1 --- .../guile-modules/guile-ncurses/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index abfa144ee57c..f982ff600b8b 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "guile-ncurses"; - version = "1.7"; + version = "3.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q="; + hash = "sha256-7onozq/Kud0O8/wazJsQ9NIbpLJW0ynYQtYYPmP41zM="; }; nativeBuildInputs = [ @@ -25,19 +25,20 @@ stdenv.mkDerivation rec { ncurses ]; - preConfigure = '' - configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" - ''; + configureFlags = [ + "--with-gnu-filesystem-hierarchy" + ]; - postFixup = '' - for f in $out/share/guile/site/ncurses/**.scm; do \ - substituteInPlace $f \ - --replace "libguile-ncurses" "$out/lib/libguile-ncurses"; \ - done - ''; - - # Undefined symbols for architecture arm64: "_u32_conv_from_encoding" - env.NIX_LDFLAGS = "-lunistring"; + postFixup = + let + guileVersion = lib.versions.majorMinor guile.version; + in + '' + for f in $out/share/guile/site/ncurses/**.scm; do \ + substituteInPlace $f \ + --replace "libguile-ncurses" "$out/lib/guile/${guileVersion}/libguile-ncurses"; \ + done + ''; # XXX: 1 of 65 tests failed. doCheck = false; From baa886b5f97acb2c0b73d5fc3c5ea645288fdf92 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Aug 2023 20:26:03 +0200 Subject: [PATCH 105/189] guile-sdl: pin guile_2_2 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 614509a14a71..57768dd4ef0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18058,7 +18058,9 @@ with pkgs; guile-reader = callPackage ../development/guile-modules/guile-reader { }; - guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; + guile-sdl = callPackage ../development/guile-modules/guile-sdl { + guile = guile_2_2; + }; guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; From fb73087890e4214861c95ba64e0f511961497ff8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 11:15:57 +0200 Subject: [PATCH 106/189] guile-git: skip check on darwin --- pkgs/development/guile-modules/guile-git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index b106b8ad1c94..84d53b66e19b 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgit2 scheme-bytestructures ]; - doCheck = true; + doCheck = !stdenv.isDarwin; makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; enableParallelBuilding = true; From a5c7cb94a52c5657c463867e819c1da14ba29032 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 11:58:22 +0200 Subject: [PATCH 107/189] guile-lib: skip check on darwin --- pkgs/development/guile-modules/guile-lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 6d6a88808e38..2678bcb2c058 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; - doCheck = true; + doCheck = !stdenv.isDarwin; preCheck = '' # Make `libgcc_s.so' visible for `pthread_cancel'. From 9672b13a43c8c060fab7563fc9bc9bd44702401e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 28 Jun 2023 21:54:24 +0200 Subject: [PATCH 108/189] mya: init at 1.0.0 Co-authored-by: Emily --- pkgs/applications/misc/mya/argp.patch | 26 ++++++++++ pkgs/applications/misc/mya/default.nix | 67 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 95 insertions(+) create mode 100644 pkgs/applications/misc/mya/argp.patch create mode 100644 pkgs/applications/misc/mya/default.nix diff --git a/pkgs/applications/misc/mya/argp.patch b/pkgs/applications/misc/mya/argp.patch new file mode 100644 index 000000000000..352f8a077adc --- /dev/null +++ b/pkgs/applications/misc/mya/argp.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 273968c..236e5fb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,10 +3,6 @@ project(mya) + set(CMAKE_C_STANDARD 11 ) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall") + +-if(UNIX) +- set(LINUX TRUE) +-endif() +- + set(SRC_DIR src) + set(INC_DIR include) + +@@ -17,7 +13,8 @@ set_target_properties(mya PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DI + target_include_directories(mya PRIVATE ${INC_DIR}) + + set(LIBS curl json-c bsd) +-if(LINUX) +- list(APPEND LIBS) ++find_library(ARGP argp) ++if(ARGP) ++ list(APPEND LIBS argp) + endif() + target_link_libraries(mya ${LIBS}) diff --git a/pkgs/applications/misc/mya/default.nix b/pkgs/applications/misc/mya/default.nix new file mode 100644 index 000000000000..d33e6aecdf29 --- /dev/null +++ b/pkgs/applications/misc/mya/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, curl +, json_c +, libbsd +, argp-standalone +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mya"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "jmakhack"; + repo = "myanimelist-cli"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-EmdkPpYEUIk9hr6rbnixjvznKSEnTCSMZz/17BfHGCk="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + curl + json_c + libbsd + ] ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ + argp-standalone + ]; + + patches = [ + ./argp.patch + ]; + + installPhase = '' + runHook preInstall + + # Based on the upstream PKGBUILD + mkdir -p $out/share/doc/${finalAttrs.pname} + cp -a bin $out + cp $cmakeDir/README.md $out/share/doc/${finalAttrs.pname} + + runHook postInstall + ''; + + meta = with lib; { + description = "Minimalistic command line interface for fetching user anime data from MyAnimeList"; + longDescription = '' + Minimalistic command line interface for fetching user anime data from MyAnimeList. + + You have to run this with the MYANIMELIST_CLIENT_ID environ variable set. + Where to get one: . + Select the type `other`. + ''; + homepage = "https://github.com/jmakhack/myanimelist-cli"; + changelog = "https://github.com/jmakhack/myanimelist-cli/releases/tag/v${finalAttrs.version}"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + mainProgram = "mya"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b87dde10d79c..cec482f9542f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -951,6 +951,8 @@ with pkgs; mongosh = callPackage ../development/tools/mongosh { }; + mya = callPackage ../applications/misc/mya { }; + mysql-shell = callPackage ../development/tools/mysql-shell { inherit (darwin) cctools developer_cmds DarwinTools; inherit (darwin.apple_sdk.frameworks) CoreServices; From feac9edf6a4fc5f95f87fb88012e78e91ca55460 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 4 Aug 2023 10:32:10 +0000 Subject: [PATCH 109/189] treewide: add meta.mainProgram Related PR: NixOS#246386 --- pkgs/applications/misc/rofi-rbw/default.nix | 1 + pkgs/development/node-packages/main-programs.nix | 1 + .../tools/continuous-integration/drone-runner-docker/default.nix | 1 + .../tools/continuous-integration/drone-runner-exec/default.nix | 1 + .../tools/continuous-integration/drone-runner-ssh/default.nix | 1 + pkgs/development/tools/continuous-integration/woodpecker/cli.nix | 1 + pkgs/games/steam/steam.nix | 1 + pkgs/servers/nginx-sso/default.nix | 1 + pkgs/tools/security/rage/default.nix | 1 + pkgs/tools/text/gawk/default.nix | 1 + 10 files changed, 10 insertions(+) diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 02bae9322907..0aac8045023c 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -31,5 +31,6 @@ buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ equirosa dit7ya ]; platforms = platforms.linux; + mainProgram = "rofi-rbw"; }; } diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 132024e58e68..c327b3b9a5bb 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -47,6 +47,7 @@ firebase-tools = "firebase"; fkill-cli = "fkill"; fleek-cli = "fleek"; + flood = "flood"; git-run = "gr"; gitmoji-cli = "gitmoji"; graphql-cli = "graphql"; diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index f71068188049..974cd8f464cb 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; + mainProgram = "drone-runner-docker"; }; } diff --git a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix index 373c6183725d..c40d94645d1e 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-exec/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { # https://polyformproject.org/licenses/small-business/1.0.0/ license = licenses.unfree; maintainers = with maintainers; [ mic92 ]; + mainProgram = "drone-runner-exec"; }; } diff --git a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix index 1d15cdc60479..92a015f8e95a 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/drone-runners/drone-runner-ssh"; license = licenses.unfreeRedistributable; maintainers = teams.c3d2.members; + mainProgram = "drone-runner-ssh"; }; } diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index efe6d5facb39..d1f1da881681 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -12,5 +12,6 @@ buildGoModule { meta = common.meta // { description = "Command line client for the Woodpecker Continuous Integration server"; + mainProgram = "woodpecker-cli"; }; } diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 13d63117b7f8..2687ee7febdd 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -49,5 +49,6 @@ in stdenv.mkDerivation { homepage = "https://store.steampowered.com/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga jonringer ]; + mainProgram = "steam"; }; } diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 8928234f9672..3b3dd52be6ef 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; maintainers = with maintainers; [ delroth ]; + mainProgram = "nginx-sso"; }; } diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index ea8e304099c0..44b67e96a1e0 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -46,5 +46,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/str4d/rage/raw/v${version}/rage/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; # either at your option maintainers = with maintainers; [ marsam ryantm ]; + mainProgram = "rage"; }; } diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 8fe044a9e218..d85880e82e15 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix ++ platforms.windows; maintainers = [ ]; + mainProgram = "gawk"; }; } From 21d348b2eb1c135a487480c8ea4165e0ce9e8c53 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 12:52:46 +0200 Subject: [PATCH 110/189] skribilo: disable pie charts on darwin --- pkgs/tools/typesetting/skribilo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 24b579c49a33..264eeea52e38 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -10,9 +10,9 @@ , imagemagick , makeWrapper , pkg-config -, ploticus , enableEmacs ? false, emacs -, enableLout ? true, lout +, enableLout ? stdenv.isLinux, lout +, enablePloticus ? stdenv.isLinux, ploticus , enableTex ? true, tex }: @@ -40,10 +40,10 @@ in stdenv.mkDerivation (finalAttrs: { guile-lib guile-reader imagemagick - ploticus ] ++ optional enableEmacs emacs ++ optional enableLout lout + ++ optional enablePloticus ploticus ++ optional enableTex tex; postInstall = From 47bed4fe00ce4cf753dc5fc053ada62ce49e0804 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 12:54:46 +0200 Subject: [PATCH 111/189] netease-cloud-music-gtk: restrict platforms --- pkgs/applications/audio/netease-cloud-music-gtk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index edf1b9a9ddb4..9a9d9ee8cc93 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -79,5 +79,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ diffumist ]; mainProgram = "netease-cloud-music-gtk4"; + platforms = platforms.linux; }; } From 4ce78b49b9f8a8604da54d545a847e938ad58ff4 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Fri, 4 Aug 2023 14:29:44 +0300 Subject: [PATCH 112/189] prettierd: set meta.mainProgram --- pkgs/development/tools/prettierd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/prettierd/default.nix b/pkgs/development/tools/prettierd/default.nix index a95a0c1b7f16..b3ba24db42c8 100644 --- a/pkgs/development/tools/prettierd/default.nix +++ b/pkgs/development/tools/prettierd/default.nix @@ -41,6 +41,7 @@ mkYarnPackage rec { doDist = false; meta = with lib; { + mainProgram = "prettierd"; description = "Prettier, as a daemon, for improved formatting speed"; homepage = "https://github.com/fsouza/prettierd"; license = licenses.isc; From 799a69971efd215e611b0e6c70b2575fef2f9dd2 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 4 Aug 2023 12:59:22 +0200 Subject: [PATCH 113/189] nixos/tests/networking: dhcpd -> kea forgotten in 413d9d3864e58ae59c77210e8591968a3121496f --- nixos/tests/networking.nix | 76 +++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 05fed0f4b473..45cc688492b5 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -29,23 +29,49 @@ let ipv6.addresses = [ { address = "fd00:1234:5678:${toString n}::1"; prefixLength = 64; } ]; }))); }; - services.dhcpd4 = { - enable = true; - interfaces = map (n: "eth${toString n}") vlanIfs; - extraConfig = flip concatMapStrings vlanIfs (n: '' - subnet 192.168.${toString n}.0 netmask 255.255.255.0 { - option routers 192.168.${toString n}.1; - range 192.168.${toString n}.3 192.168.${toString n}.254; - } - '') - ; - machines = flip map vlanIfs (vlan: - { - hostName = "client${toString vlan}"; - ethernetAddress = qemu-common.qemuNicMac vlan 1; - ipAddress = "192.168.${toString vlan}.2"; - } - ); + services.kea = { + dhcp4 = { + enable = true; + settings = { + interfaces-config = { + interfaces = map (n: "eth${toString n}") vlanIfs; + dhcp-socket-type = "raw"; + service-sockets-require-all = true; + service-sockets-max-retries = 5; + service-sockets-retry-wait-time = 2500; + }; + subnet4 = map (n: { + id = n; + subnet = "192.168.${toString n}.0/24"; + pools = [{ pool = "192.168.${toString n}.3 - 192.168.${toString n}.254"; }]; + option-data = [{ name = "routers"; data = "192.168.${toString n}.1"; }]; + + reservations = [{ + hw-address = qemu-common.qemuNicMac n 1; + hostname = "client${toString n}"; + ip-address = "192.168.${toString n}.2"; + }]; + }) vlanIfs; + }; + }; + dhcp6 = { + enable = true; + settings = { + interfaces-config = { + interfaces = map (n: "eth${toString n}") vlanIfs; + service-sockets-require-all = true; + service-sockets-max-retries = 5; + service-sockets-retry-wait-time = 2500; + }; + + subnet6 = map (n: { + id = n; + subnet = "fd00:1234:5678:${toString n}::/64"; + interface = "eth${toString n}"; + pools = [{ pool = "fd00:1234:5678:${toString n}::2-fd00:1234:5678:${toString n}::2"; }]; + }) vlanIfs; + }; + }; }; services.radvd = { enable = true; @@ -61,17 +87,6 @@ let }; ''); }; - services.dhcpd6 = { - enable = true; - interfaces = map (n: "eth${toString n}") vlanIfs; - extraConfig = '' - authoritative; - '' + flip concatMapStrings vlanIfs (n: '' - subnet6 fd00:1234:5678:${toString n}::/64 { - range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2; - } - ''); - }; }; testCases = { @@ -117,8 +132,9 @@ let client.wait_for_unit("network.target") router.wait_for_unit("network-online.target") - with subtest("Make sure dhcpcd is not started"): - client.fail("systemctl status dhcpcd.service") + with subtest("Make sure DHCP server is not started"): + client.fail("systemctl status kea-dhcp4-server.service") + client.fail("systemctl status kea-dhcp6-server.service") with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") From 1690adc424829313c5c4323770a313466f5d6ee5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 4 Aug 2023 14:38:08 +0200 Subject: [PATCH 114/189] nixos/tests/networking/caseSensitiveRenaming: fix bash syntax was introduced broken in 93502aa3b18db32649814fbb8341ea59ba40df5c --- nixos/tests/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 45cc688492b5..46fc715d0891 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -1051,7 +1051,7 @@ let testScript = '' machine.succeed("udevadm settle") print(machine.succeed("ip link show dev enCustom")) - machine.wait_until_succeeds("ip link show dev enCustom | grep -q '52:54:00:12:0b:01") + machine.wait_until_succeeds("ip link show dev enCustom | grep -q 52:54:00:12:0b:01") ''; }; }; From b9599a594424b141243745acfda7db971d92f2e2 Mon Sep 17 00:00:00 2001 From: n3oney Date: Fri, 4 Aug 2023 14:33:31 +0200 Subject: [PATCH 115/189] caprine-bin: 2.55.5 -> 2.58.0 --- .../networking/instant-messengers/caprine-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index c6e020cdc252..5e49faf61c7a 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, stdenvNoCC }: let pname = "caprine"; - version = "2.55.5"; + version = "2.58.0"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,11 +10,11 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "MMbyiLBrdMGENRq493XzkcsDoXr3Aq3rXAni1egkPbo="; + sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "1txuSQk6tH0xsjPk5cWUVnaAw4XBOr1+Fel06NLKFfk="; + sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { From 5bd8a5ef2db5f2fe02cdfca2259a29bdc195896d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 4 Aug 2023 14:43:24 +0200 Subject: [PATCH 116/189] kea: add more tests to passthru --- pkgs/tools/networking/kea/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 9ee9a3df0f75..2c5b064a165f 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { kea = nixosTests.kea; prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation; prometheus-exporter = nixosTests.prometheus-exporters.kea; + networking-scripted = lib.recurseIntoAttrs { inherit (nixosTests.networking.scripted) dhcpDefault dhcpSimple dhcpOneIf; }; + networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; }; }; meta = with lib; { From e60ea01959e2386723a4784abd04fe9747100377 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 4 Aug 2023 14:52:10 +0200 Subject: [PATCH 117/189] jq: set mainProgram Signed-off-by: Sefa Eyeoglu --- pkgs/development/tools/jq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 9c3d3c09ea5f..3c6d85e8ddcc 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin globin artturin ]; platforms = platforms.unix; downloadPage = "https://stedolan.github.io/jq/download/"; + mainProgram = "jq"; }; } From 48912917aa1d2d8f2c5586656b39af28d27eb5a1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 4 Aug 2023 14:54:53 +0200 Subject: [PATCH 118/189] mpc-cli: set mainProgram Signed-off-by: Sefa Eyeoglu --- pkgs/applications/audio/mpc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index cebf08f19084..9f7d8a06e206 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + mainProgram = "mpc"; }; } From 112c8c3b11b318d3ee666567bb25c784b1197cf9 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 4 Aug 2023 14:55:12 +0200 Subject: [PATCH 119/189] brightnessctl: set mainProgram Signed-off-by: Sefa Eyeoglu --- pkgs/misc/brightnessctl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/brightnessctl/default.nix b/pkgs/misc/brightnessctl/default.nix index 2fab8b4bd676..43a37ad764ee 100644 --- a/pkgs/misc/brightnessctl/default.nix +++ b/pkgs/misc/brightnessctl/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ megheaiulian ]; platforms = platforms.linux; + mainProgram = "brightnessctl"; }; } From afc9a33ec8150b5b0fa2a505b1c2e8a09ad28ea1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 4 Aug 2023 14:55:24 +0200 Subject: [PATCH 120/189] gtklock: set mainProgram Signed-off-by: Sefa Eyeoglu --- pkgs/tools/wayland/gtklock/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/wayland/gtklock/default.nix b/pkgs/tools/wayland/gtklock/default.nix index 3d74344a4e76..c5146532e442 100644 --- a/pkgs/tools/wayland/gtklock/default.nix +++ b/pkgs/tools/wayland/gtklock/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ dit7ya ]; platforms = platforms.linux; + mainProgram = "gtklock"; }; } From c0c91c26094361385df0ad57daa388ddba8fb0fc Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 4 Aug 2023 14:55:50 +0200 Subject: [PATCH 121/189] wlogout: set mainProgram Signed-off-by: Sefa Eyeoglu --- pkgs/tools/wayland/wlogout/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/tools/wayland/wlogout/default.nix index de150c3af309..2be33bee6ac0 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/tools/wayland/wlogout/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; + mainProgram = "wlogout"; }; } # TODO: shell completions From 94f0f914c65a4b01329e4c31cc12206922d8e0d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 14:57:40 +0200 Subject: [PATCH 122/189] python311Packages.dbus-fast: 1.88.0 -> 1.90.1 https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v1.90.1 --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 42e10168f3db..ec01d5ab3327 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.88.0"; + version = "1.90.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sx2q/we7f8IfoqdsTiDo1QqMY6TSVMW//vKTtkqcrY8="; + hash = "sha256-B+NW7ORKIBtjxeR0W0tX7V1MgBtNoyGFX35TXUl7rVE="; }; nativeBuildInputs = [ From c84f5d49e885d99b6361246e56aee14c014a99bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 14:58:03 +0200 Subject: [PATCH 123/189] python311Packages.python-roborock: 0.31.1 -> 0.32.0 https://github.com/humbertogontijo/python-roborock/blob/v0.32.0/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index f7aa10c9b2b7..ade8f0cfd76b 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.31.1"; + version = "0.32.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-t5UYdoaKqUrEIgRQy1URtNhFmlkB2sgGwsLrclqH6Tg="; + hash = "sha256-DojIfAmYW/asvpAkcBj/pN1rdCPFD4nwkEqpGVBkMoE="; }; pythonRelaxDeps = [ From ccd89a89bafd1c08ce5bde18b5c88358f331aa66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 14:59:46 +0200 Subject: [PATCH 124/189] home-assistant.intents: 2023.7.25 -> 2023.8.2 https://github.com/home-assistant/intents-package/compare/refs/tags/2023.7.25...2023.8.2 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 282662ccded1..0255d97da6b6 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.7.25"; + version = "2023.8.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-/9+d22CqlEi+ukjIZRsyCuPPeTCD+XZp8+5iUM3Nc3o="; + hash = "sha256-pNLH3GGfY8upKi7uYGZ466cIQkpdA16tR1tjwuiQ3JI="; fetchSubmodules = true; }; From c0b216333a0d300e2d6d9dde2e3ef5f28cdc4918 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 15:02:38 +0200 Subject: [PATCH 125/189] python311Packages.zeroconf: 0.72.0 -> 0.74.0 https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.74.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 5265b9ae7a39..6cd8253cfc32 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.72.0"; + version = "0.74.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-Km7qZEXp0Srzt7XAq9D/U8WI/7go81Lvgx3Xck24XDc="; + hash = "sha256-0QmAq1+dRfRkomZgh4Q0YF20omQBDUTgGt8cP1L6cx0="; }; nativeBuildInputs = [ From cf49c29935855481150594cf629b65ecde1a15ba Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 4 Aug 2023 08:12:00 -0400 Subject: [PATCH 126/189] swww: add shell completions and man pages --- pkgs/tools/wayland/swww/default.nix | 41 ++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 3555af7c0424..d97c8ea28df8 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,4 +1,13 @@ -{ lib, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, lz4 +, libxkbcommon +, installShellFiles +, scdoc +}: + rustPlatform.buildRustPackage rec { pname = "swww"; version = "0.8.1"; @@ -11,15 +20,39 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "sha256-AE9bQtW5r1cjIsXA7YEP8TR94wBjaM7emOroVFq9ldE="; - buildInputs = [ lz4 libxkbcommon ]; + + buildInputs = [ + lz4 + libxkbcommon + ]; + doCheck = false; # Integration tests do not work in sandbox environment - nativeBuildInputs = [ pkg-config ]; + + nativeBuildInputs = [ + pkg-config + installShellFiles + scdoc + ]; + + postInstall = '' + for f in doc/*.scd; do + local page="doc/$(basename "$f" .scd)" + scdoc < "$f" > "$page" + installManPage "$page" + done + + installShellCompletion --cmd swww \ + --bash <(cat completions/swww.bash) \ + --fish <(cat completions/swww.fish) \ + --zsh <(cat completions/_swww) + ''; meta = with lib; { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/Horus645/swww"; license = licenses.gpl3; - maintainers = with maintainers; [ mateodd25 ]; + maintainers = with maintainers; [ mateodd25 donovanglover ]; platforms = platforms.linux; + mainProgram = "swww"; }; } From 286679f3022e0585d1b832940796732d640e0f6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 19:21:39 +0200 Subject: [PATCH 127/189] python311Packages.pyatv: 0.13.2 -> 0.13.3 Diff: https://github.com/postlund/pyatv/compare/refs/tags/v0.13.2...v0.13.3 Changelog: https://github.com/postlund/pyatv/blob/v0.13.3/CHANGES.md --- pkgs/development/python-modules/pyatv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 4c1374373964..0851dc7034ff 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.13.2"; + version = "0.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7jXxnZLruwNzYVOn3c+YlF2olwezwjpwXInDem44/vE="; + hash = "sha256-lg7gsCB8zn+q+ZTkIoGkIls10xS7bp8Svd749a10bWA="; }; postPatch = '' From 99b8966c8dcaf704dae48747e1edd5812ac4ada0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 15:04:39 +0200 Subject: [PATCH 128/189] python311Packages.opower: 0.0.18 -> 0.0.20 https://github.com/tronikos/opower/compare/refs/tags/v0.0.18...v0.0.20 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index f0e07dc09bf1..299de618087f 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.18"; + version = "0.0.20"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-IlM4BPwZ42Bequs3edzP+iclOsHRf6bsDaaZOg+ynx4="; + hash = "sha256-hb+TVnCAAnsoKPk9N1bDXj463CErp7nn2cteOumKhLs="; }; pythonRemoveDeps = [ From 0c0249dfeedf29449da2e856f509b948a460283a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 15:06:29 +0200 Subject: [PATCH 129/189] python311Packages.zigpy: 0.56.2 -> 0.56.4 https://github.com/zigpy/zigpy/releases/tag/0.56.4 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index e852746d7b69..fb08f30623e2 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.56.2"; + version = "0.56.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-VUnt2rk1nQZqmoS8ytBCX2q3E4zxSz2A0Hg7AUXmtJo="; + hash = "sha256-PxvTg/z7WmJaH/iwHoJu2bQDLR4G5nkMS5fSP46C3mQ="; }; postPatch = '' From cc32deeb91b124c356a6700cb4e14c2bc771b943 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 15:08:40 +0200 Subject: [PATCH 130/189] python311Packages.pyatv: disable failing test on darwin --- pkgs/development/python-modules/pyatv/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 0851dc7034ff..5cddd154aa3f 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -19,6 +19,7 @@ , pythonOlder , requests , srptools +, stdenv , zeroconf }: @@ -87,6 +88,11 @@ buildPythonPackage rec { "--asyncio-mode=legacy" ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # tests/protocols/raop/test_raop_functional.py::test_stream_retransmission[raop_properties2-2-True] - assert False + "test_stream_retransmission" + ]; + disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" From d6a8f303ef33f10d469ae5f4c2168b3e2e64dc0f Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 23 Jul 2023 09:55:00 -0500 Subject: [PATCH 131/189] python3Packages.moderngl-window: 2.4.2 -> 2.4.4 Includes a fix for moderngl 5.8.x currently in nixpkgs. Enables import testing. Rename to use - instead of _ in accordance with nixpkgs guidelines. Corrects use of platform attribute and correctly sets meta.broken. --- .../python-modules/moderngl_window/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index 36294fab76fe..e2d498bc4215 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , isPy3k @@ -11,14 +12,14 @@ }: buildPythonPackage rec { - pname = "moderngl_window"; - version = "2.4.2"; + pname = "moderngl-window"; + version = "2.4.4"; src = fetchFromGitHub { owner = "moderngl"; - repo = pname; + repo = "moderngl_window"; rev = "refs/tags/${version}"; - hash = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; + hash = "sha256-mg3j5ZoMwdk39L5xjcoEJo9buqssM1VLJtndSFsuCB0="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; @@ -28,11 +29,14 @@ buildPythonPackage rec { # Tests need a display to run. doCheck = false; + pythonImportsCheck = [ "moderngl_window" ]; + meta = with lib; { homepage = "https://github.com/moderngl/moderngl_window"; description = "Cross platform helper library for ModernGL making window creation and resource loading simple"; license = licenses.mit; - platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. + broken = stdenv.isDarwin; # darwin build breaks + platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ c0deaddict ]; }; } From a323ed3d15a0542dfa7e240da3dbb5f38ed83855 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 4 Aug 2023 14:49:34 +0000 Subject: [PATCH 132/189] =?UTF-8?q?gnome.gnome-software:=2044.3=20?= =?UTF-8?q?=E2=86=92=2044.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/44.3...44.4 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index bee1f9e86db5..99ab7e4d5ca2 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "44.3"; + version = "44.4"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Mlq7ciyrILaqZ/FY6i/y6omYMMoKiD4kWU2d74X9FiI="; + sha256 = "i1N2fvbMVKLbWI7xxZJoOLDWe42bIRc95ROc0PvSgJU="; }; patches = [ From bcef1ed4d41b59019ea39087bff3ddfde33ea608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 4 Aug 2023 16:50:14 +0200 Subject: [PATCH 133/189] viceroy: 0.6.0 -> 0.6.1 --- pkgs/development/tools/viceroy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index f51e63d757e2..0b2f219014a0 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-lFDhiBgJFCXE7/BzCuNFPmP8PYHCqu6jYqRNa+M4J8Q="; + hash = "sha256-+vvlj8gGCHKQ2T245fwaZxCiglRnrDFwupQIh3I47Ys="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-HJXCNjWjO1GWIP46kqvq8mZVlYVvlG9ahxScpG3rfTA="; + cargoHash = "sha256-0Qr40hMA59WaHinkUkebF0CwPy3aublgfzSz1er7Uws="; cargoTestFlags = [ "--package viceroy-lib" From ff2026987f5e57ddfb6e449f88abc901c939789a Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Thu, 3 Aug 2023 11:30:43 -0700 Subject: [PATCH 134/189] craftos-pc: 2.7.4 -> 2.7.5 Changelog: https://github.com/MCJack123/craftos2/releases/tag/v2.7.5 This commit includes a hotfix of the craftos2-rom submodule with the version number '2.7.5.1', which fixes a critical bug (see https://github.com/MCJack123/craftos2-rom/commit/9881064c28c6de4433a53a32c084e9e566df2310 for more information.) --- pkgs/applications/emulators/craftos-pc/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 67950e0ed8a4..b147af8d02b7 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , callPackage , patchelf , unzip @@ -15,18 +16,18 @@ }: let - version = "2.7.4"; + version = "2.7.5"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - sha256 = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; + hash = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v${version}"; - sha256 = "sha256-BXTsBMlsymQHABWQCiv22Ia5jm2xv1jNy7Unwymtyp0="; + rev = "v${version}.1"; # Author released a hotfix; remove trailing '.1' on next update + hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k="; }; in @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "sha256-9XMc7zmtPxlt3WgS93lUJNMFtUJ/llG9SFGtgdFqZEA="; + hash = "sha256-t2yhSuNPFCF2NaQFWuN9Nos5ZPinAvecV6EZNO0Cy9I="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; From eca1f7bd56ed4a3760288d5aaf5c1aa54b38a53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 29 Jul 2023 14:10:41 +0200 Subject: [PATCH 135/189] vdrPlugins.nopacity: initial 1.1.14 --- .../applications/video/vdr/markad/default.nix | 2 +- .../video/vdr/nopacity/default.nix | 24 +++++++++++++++++++ pkgs/applications/video/vdr/plugins.nix | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/video/vdr/nopacity/default.nix diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index d924398b6389..3ced362b946d 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit (src.meta) homepage; - description = "MarkAd marks advertisements in VDR recordings."; + description = "Plugin for VDR that marks advertisements"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; inherit (vdr.meta) platforms; diff --git a/pkgs/applications/video/vdr/nopacity/default.nix b/pkgs/applications/video/vdr/nopacity/default.nix new file mode 100644 index 000000000000..b46723fbf848 --- /dev/null +++ b/pkgs/applications/video/vdr/nopacity/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitLab, vdr, graphicsmagick }: +stdenv.mkDerivation rec { + pname = "vdr-skin-nopacity"; + version = "1.1.14"; + + src = fetchFromGitLab { + repo = "SkinNopacity"; + owner = "kamel5"; + sha256 = "sha256-zSAnjBkFR8m+LXeoYO163VkNtVpfQZR5fI5CEzUABdQ="; + rev = version; + }; + + buildInputs = [ vdr graphicsmagick ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "Highly customizable native true color skin for the Video Disc Recorder"; + maintainers = [ maintainers.ck3d ]; + license = licenses.gpl2; + inherit (vdr.meta) platforms; + }; +} diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index ba24cefb4d94..92d9128543f0 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -14,6 +14,8 @@ in { markad = callPackage ./markad {}; + nopacity = callPackage ./nopacity {}; + softhddevice = callPackage ./softhddevice {}; streamdev = callPackage ./streamdev {}; From 0f06670c7720a7f7898bae80143dc6eaebb9b624 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 4 Aug 2023 17:57:08 +0300 Subject: [PATCH 136/189] nerdfonts: Add missing fonts Close #247090. --- pkgs/data/fonts/nerdfonts/shas.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix index 9e393f8e399c..11084b9025af 100644 --- a/pkgs/data/fonts/nerdfonts/shas.nix +++ b/pkgs/data/fonts/nerdfonts/shas.nix @@ -13,6 +13,7 @@ "DaddyTimeMono" = "1w5n170l63hfxh1xclw3jpf8amj60br6py4yx12yhqanp2zg0shj"; "DejaVuSansMono" = "1j22f5jnpmyli686r67c4c07g07ac78aq9wg8hy1vwblxfzdvq9f"; "DroidSansMono" = "13r1sglgwf05swnbn0mha2gpdqammzlg0p6h7c33af1vr7n8cnca"; + "EnvyCodeR" = "1y03cb0kq548nm8qh4jh8yw2zpx6ahl0y8561c429p5f16707qxl"; "FantasqueSansMono" = "1k0p6gvas6mgwq0bbvpwbn3mm6yaaapgjqgk30fvpq9zvn4a26bf"; "FiraCode" = "14vbb3w6il32kd8my75vvv786azm7sxmdpba9np0qjx4rs8xdhbn"; "FiraMono" = "1iiz5cnhrb67793ww6pj5y5x9s1a5nlk9kqwbv92kxmbqakarlcb"; @@ -27,6 +28,7 @@ "Inconsolata" = "02rar6g3zbbpxxxz37v7d5qzafn59bhp04iv3wk16kqxy0havgx5"; "InconsolataGo" = "0nx6j3v2fvhdw3ygmz65zwlj6zwrkpmf59wfxirpzkcqqsdh4zwl"; "InconsolataLGC" = "00s2051fz3k6jnsfmnlqnd2cghr9sj2pddi5gpid1i5x006rig7a"; + "IntelOneMono" = "02cynzrpn93b1kmi21p60lhdai6rppmm3m1f872kvf08damc1660"; "Iosevka" = "1byrmfbsqi06fsy958364jy694dnm7a7pcjsv64w6mwfsi5vjn1r"; "IosevkaTerm" = "1k65jfa0c7c6pvns7vfcxcfc3i1qcr6wg16qafbp9zggabbvl7aa"; "JetBrainsMono" = "0mbzvfl36a6mgb2dnjf8n3kkm28sz0xhv7s5lww141wpgj5jb4a9"; From d26b1b2d4a5c0845f3aee6af86123a2c280c473a Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Aug 2023 10:10:24 -0500 Subject: [PATCH 137/189] treewide: add meta.mainProgram to instant-messengers --- .../networking/instant-messengers/armcord/default.nix | 1 + .../networking/instant-messengers/caprine-bin/default.nix | 1 + .../networking/instant-messengers/discord/default.nix | 1 + .../networking/instant-messengers/element/element-desktop.nix | 1 + .../networking/instant-messengers/slack-term/default.nix | 1 + .../applications/networking/instant-messengers/slack/default.nix | 1 + .../applications/networking/instant-messengers/teams/default.nix | 1 + .../instant-messengers/telegram/telegram-desktop/default.nix | 1 + 8 files changed, 8 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index f6fd6553c7f3..82da4dedc943 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -136,5 +136,6 @@ stdenv.mkDerivation rec { license = licenses.osl3; maintainers = with maintainers; [ wrmilling ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "armcord"; }; } diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index c6e020cdc252..dc32382113bd 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -21,5 +21,6 @@ in passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; }; meta = oldAttrs.meta // { platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms; + mainProgram = "caprine"; }; }) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e56a47a3ff4d..8bc1c7cb5984 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -61,6 +61,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "discord"; }; package = if stdenv.isLinux diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 3f2d5a99fe67..f3ec46f3641c 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -149,5 +149,6 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; + mainProgram = "element-desktop"; }; }) diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index e2135734bd7f..99b8b4563d23 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -17,5 +17,6 @@ buildGoModule rec { homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "slack-term"; }; } diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 44846df1c740..3a03a5fce847 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -85,6 +85,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ mmahut maxeaubrey ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; + mainProgram = "slack"; }; linux = stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 1f21891c799e..be4334438c33 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -39,6 +39,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "teams"; }; linux = stdenv.mkDerivation rec { diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 4de6ce1bce4c..7a7835ede42c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -209,5 +209,6 @@ stdenv.mkDerivation rec { homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; + mainProgram = "telegram-desktop"; }; } From e17f117a71b44fa272a75b6a3d77873b9b40ce80 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 17:29:26 +0200 Subject: [PATCH 138/189] denemo: pin guile_2_2 instead --- pkgs/applications/audio/denemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 7e27bf783705..80018ecc395b 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, libjack2, gettext, intltool, guile_2_0, lilypond +, libjack2, gettext, intltool, guile_2_2, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband , portaudio, portmidi, fftw, wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile + libjack2 guile_2_2 lilypond glib libxml2 librsvg libsndfile aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi ]; From 37f3ebe498315da84c50cfa6f5e64df46a9d0b87 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 17:30:09 +0200 Subject: [PATCH 139/189] freetalk: 4.1 -> 4.2 --- .../instant-messengers/freetalk/default.nix | 36 +++++++------------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ffe82e6708aa..fdfbbc5b275b 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,43 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchurl , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo -, automake, autoconf }: +, argp-standalone }: stdenv.mkDerivation rec { pname = "freetalk"; - version = "4.1"; + version = "4.2"; - src = fetchFromGitHub { - owner = "GNUFreetalk"; - repo = "freetalk"; - rev = "v${version}"; - sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; + src = fetchurl { + url = "mirror://gnu/freetalk/freetalk-${version}.tar.gz"; + hash = "sha256-u1tPKacGry+JGYeAIgDia3N7zs5EM4FyQZdV8e7htYA="; }; - patches = [ - # Pull pending patch for -fno-common tuulchain support: - # https://github.com/GNUFreetalk/freetalk/pull/39 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; - sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; - }) - ]; - - preConfigure = '' - ./autogen.sh - ''; - - nativeBuildInputs = [ pkg-config texinfo autoconf automake ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson + ] ++ lib.optionals stdenv.isDarwin [ + argp-standalone ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; + meta = with lib; { description = "Console XMPP client"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; downloadPage = "https://www.gnu.org/software/freetalk/"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 885b0d85b5a7..373b7c21fcff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8113,9 +8113,7 @@ with pkgs; freeipmi = callPackage ../tools/system/freeipmi { }; - freetalk = callPackage ../applications/networking/instant-messengers/freetalk { - guile = guile_2_0; - }; + freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; freetds = callPackage ../development/libraries/freetds { }; From 12c62ed61634f498cfce9074f9051b833a7f05f0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 4 Aug 2023 14:53:45 +0000 Subject: [PATCH 140/189] =?UTF-8?q?gupnp-tools:=200.12.0=20=E2=86=92=200.1?= =?UTF-8?q?2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp-tools/-/compare/gupnp-tools-0.12.0...gupnp-tools-0.12.1 --- pkgs/tools/networking/gupnp-tools/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 8341cf1e7e22..a54ea88b1ce9 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.12.0"; + version = "0.12.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "XqdgfuNlZCxVWSf+3FteH+COdPBh0MPrCL2QG16yAII="; + sha256 = "U8+TEj85fo+PC46eQ2TIanUCpTNPTAvi4FSoJEeL1bo="; }; nativeBuildInputs = [ @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { ]; # new libxml2 version + # TODO: can be dropped on next update NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; passthru = { From 0d6c907ba898701e06a7383f8b151a18c5936d30 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Aug 2023 10:36:02 -0500 Subject: [PATCH 141/189] treewide: add meta.mainProgram to graphics --- pkgs/applications/graphics/digikam/default.nix | 1 + pkgs/applications/graphics/feh/default.nix | 1 + pkgs/applications/graphics/inkscape/default.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 8a95d10203c4..2a7e0e9ac0fc 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -151,5 +151,6 @@ mkDerivation rec { license = licenses.gpl2; homepage = "https://www.digikam.org"; platforms = platforms.linux; + mainProgram = "digikam"; }; } diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 5ca19d5b41a1..4859fee52fd9 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.mit-feh; maintainers = with maintainers; [ viric willibutz globin ma27 ]; platforms = platforms.unix; + mainProgram = "feh"; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index ec0ab074625d..3e1e482bb39c 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -159,6 +159,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.jtojnar ]; platforms = platforms.all; + mainProgram = "inkscape"; longDescription = '' Inkscape is a feature-rich vector graphics editor that edits files in the W3C SVG (Scalable Vector Graphics) file format. From 37c34fa0ba4b0d86d32ee9fc5e93a8f4324276fb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 17:44:22 +0200 Subject: [PATCH 142/189] guile-xcb: 1.3 -> unstable-2017-05-29 --- pkgs/development/guile-modules/guile-xcb/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index d009901bbf2e..19a790db77a4 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, autoreconfHook , guile , pkg-config , texinfo @@ -8,16 +9,17 @@ stdenv.mkDerivation rec { pname = "guile-xcb"; - version = "1.3"; + version = "unstable-2017-05-29"; src = fetchFromGitHub { owner = "mwitmer"; repo = pname; - rev = version; - hash = "sha256-8iaYil2wiqnu9p7Gj93GE5akta1A0zqyApRwHct5RSs="; + rev = "db7d5a393cc37a56f66541b3f33938b40c6f35b3"; + hash = "sha256-zbIsEIPwNJ1YXMZTDw2DfzufC+IZWfcWgZHbuv7bhJs="; }; nativeBuildInputs = [ + autoreconfHook pkg-config ]; buildInputs = [ @@ -30,6 +32,10 @@ stdenv.mkDerivation rec { "--with-guile-site-ccache-dir=$out/share/guile/site" ]; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; + meta = with lib; { homepage = "https://github.com/mwitmer/guile-xcb"; description = "XCB bindings for Guile"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 373b7c21fcff..e6c37f1715c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18069,7 +18069,7 @@ with pkgs; guile-ssh = callPackage ../development/guile-modules/guile-ssh { }; guile-xcb = callPackage ../development/guile-modules/guile-xcb { - guile = guile_2_0; + guile = guile_2_2; }; inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { }; From 8419104ce96809c4bce7af58d5b8e0a653286df2 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 17:47:42 +0200 Subject: [PATCH 143/189] gwrap: pin guile_2_2 instead --- pkgs/development/tools/guile/g-wrap/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 6bb80306e68e..516076012423 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libffi ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + doCheck = true; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6c37f1715c2..61a7bbbc4f4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19180,7 +19180,7 @@ with pkgs; }; gwrap = callPackage ../development/tools/guile/g-wrap { - guile = guile_2_0; + guile = guile_2_2; }; hadolint = haskell.lib.compose.justStaticExecutables haskellPackages.hadolint; From ea1c770d877ba20700ea11921defa41a79163ccd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 4 Aug 2023 15:37:01 +0000 Subject: [PATCH 144/189] =?UTF-8?q?gnome.rygel:=200.42.3=20=E2=86=92=200.4?= =?UTF-8?q?2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rygel/-/compare/rygel-0.42.3...rygel-0.42.4 --- pkgs/desktops/gnome/core/rygel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix index 6fe843282614..059fcde8ea3c 100644 --- a/pkgs/desktops/gnome/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.42.3"; + version = "0.42.4"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "D97CEoU36LVcPFQNCoDcfCSaspFT9L4Bl6XzECWlpaA="; + sha256 = "YxDfqi0zK2YRm5sCD61qS9J9m8Yfr3gMpcoLYoEzA/c="; }; patches = [ From ef8105b8e158d79d42e9817e9ae4ac123ce1dad0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Aug 2023 10:54:47 -0500 Subject: [PATCH 145/189] treewide: add meta.mainProgram to audio --- pkgs/applications/audio/cadence/default.nix | 1 + pkgs/applications/audio/cava/default.nix | 1 + pkgs/applications/audio/easyeffects/default.nix | 1 + pkgs/applications/audio/helvum/default.nix | 1 + pkgs/applications/audio/lollypop/default.nix | 1 + pkgs/applications/audio/mpdevil/default.nix | 1 + pkgs/applications/audio/ncmpcpp/default.nix | 1 + pkgs/applications/audio/pavucontrol/default.nix | 1 + pkgs/applications/audio/spotify/default.nix | 1 + pkgs/applications/audio/strawberry/default.nix | 1 + pkgs/applications/audio/tageditor/default.nix | 1 + pkgs/applications/audio/youtube-music/default.nix | 1 + pkgs/applications/audio/ytmdesktop/default.nix | 1 + 13 files changed, 13 insertions(+) diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index ebf72588df0d..a5d1a783b412 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -107,5 +107,6 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; + mainProgram = "cadence"; }; } diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 752e1d2dfcfa..e898f17d9345 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ offline mirrexagon ]; platforms = platforms.linux; + mainProgram = "cava"; }; } diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index faffd14576ae..ac286d499f1a 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -107,5 +107,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "easyeffects"; }; } diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index c293c3384d57..76a1ce2d27ea 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; + mainProgram = "helvum"; }; } diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 005bef77d456..34dbf0318a71 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -106,5 +106,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; + mainProgram = "lollypop"; }; } diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index 35fe314958c7..92f66d375d3b 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -51,5 +51,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ apfelkuchen6 ]; + mainProgram = "mpdevil"; }; } diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index e97bb2c130e5..e88ce8c9e339 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; + mainProgram = "ncmpcpp"; }; } diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index d57c56a2adb7..5cec295d0a75 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ abbradar globin ]; platforms = platforms.linux; + mainProgram = "pavucontrol"; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 398d3a6ad970..df6d762c65ef 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -15,6 +15,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "spotify"; }; in if stdenv.isDarwin diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index ee9cf4ff3d31..25193d1b78e4 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; # upstream says darwin should work but they lack maintainers as of 0.6.6 platforms = platforms.linux; + mainProgram = "strawberry"; }; } diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index efac5170249e..4360defc18d4 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; + mainProgram = "tageditor"; }; } diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 802af13137fa..91cf74e65d0c 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -34,5 +34,6 @@ appimageTools.wrapType2 rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; maintainers = [ maintainers.aacebedo ]; + mainProgram = "youtube-music"; }; } diff --git a/pkgs/applications/audio/ytmdesktop/default.nix b/pkgs/applications/audio/ytmdesktop/default.nix index be2b85199b7b..534bee41a983 100644 --- a/pkgs/applications/audio/ytmdesktop/default.nix +++ b/pkgs/applications/audio/ytmdesktop/default.nix @@ -32,5 +32,6 @@ in appimageTools.wrapType2 rec { license = licenses.cc0; platforms = platforms.linux; maintainers = [ maintainers.lgcl ]; + mainProgram = "ytmdesktop"; }; } From bfcce8245b3f18f7b8f3f50a4d4574d34eecb116 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Fri, 4 Aug 2023 18:03:39 +0200 Subject: [PATCH 146/189] pgrok: 1.3.3 -> 1.3.4 https://github.com/pgrok/pgrok/releases/tag/v1.3.4 --- pkgs/tools/networking/pgrok/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/pgrok/default.nix b/pkgs/tools/networking/pgrok/default.nix index 8fafcccd0707..6074746e9749 100644 --- a/pkgs/tools/networking/pgrok/default.nix +++ b/pkgs/tools/networking/pgrok/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "pgrok"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "pgrok"; repo = "pgrok"; rev = "v${version}"; - hash = "sha256-0b7d3wyhRuTxZmpx9oJnZN88yYn+TsR82KrktPAx9P4="; + hash = "sha256-lhcaJVIqZK7GnC/Q/+RDxTVFmgTana3vugDHr/SStFE="; }; - vendorHash = "sha256-laSfyHFkJJkv4EPMIVcai7RXaGIpUp+0tOpt5vhcLkA="; + vendorHash = "sha256-UzNx361cg4IDSQGlX5N9AxYZ8cYA0zsF5JF4Fe7efqM="; outputs = [ "out" "server" ]; From e3d54e3ed1c3e6a8224754669bb4f1563f478e4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Aug 2023 18:45:31 +0200 Subject: [PATCH 147/189] trufflehog: 3.45.3 -> 3.46.3 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.45.3...v3.46.3 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.46.3 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 2067a358cfcc..6b6e970a38ca 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.45.3"; + version = "3.46.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-ZjoX1E9zusni8ZRaTiaj41wpVP+f7r5PcsgPAnzZF/s="; + hash = "sha256-IdLNDJYg86dTj+E2w7+sXmNf/MY7eqW9NMAmuhrzm10="; }; - vendorHash = "sha256-VaNNfdY2CXR0sJb9efxTwkm12l20SbO5Q3OvcBs4cKA="; + vendorHash = "sha256-ecEms2Zf4EckP2OLoL41S1ZTTnGJhpdMDhknq/mO7qI="; ldflags = [ "-s" From bd707a574d53cbecf8aec28971505bfe62f4b648 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 18:12:07 +0200 Subject: [PATCH 148/189] python311Packages.confection: 0.1.0 -> 0.1.1 Diff: https://github.com/explosion/confection/compare/refs/tags/v0.1.0...v0.1.1 Changelog: https://github.com/explosion/confection/releases/tag/v0.1.1 --- pkgs/development/python-modules/confection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/confection/default.nix b/pkgs/development/python-modules/confection/default.nix index 40e388b0659b..d4b3152c3b46 100644 --- a/pkgs/development/python-modules/confection/default.nix +++ b/pkgs/development/python-modules/confection/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "confection"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "explosion"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yF+rG0UblGk6BCrqFrWXkB8ET0NPCL7v+4IJTmkYoTY="; + hash = "sha256-OpUMx8hcTnBdaATzRXBICwF6eAGsdyA0jFvX4nVBiM4="; }; propagatedBuildInputs = [ From 96d623afd6f28bc2fed4f1527621189a924301d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 18:12:36 +0200 Subject: [PATCH 149/189] memray: 1.9.0 -> 1.9.1 Diff: https://github.com/bloomberg/memray/compare/refs/tags/v1.9.0...v1.9.1 Changelog: https://github.com/bloomberg/memray/releases/tag/v1.9.1 --- pkgs/development/tools/memray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 4ca4b6cb2771..600316e295b3 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "memray"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; src = fetchFromGitHub { owner = "bloomberg"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fXA98kw+2NlbWTLXWK875t1RBIXH2a0SgS+0OseODKI="; + hash = "sha256-DaJ1Hhg7q4ckA5feUx0twOsmy28v5aBBCTUAkn43xAo="; }; nativeBuildInputs = [ From c692da7f8376da5bf7560be21e443ca9c9c58d66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 18:13:32 +0200 Subject: [PATCH 150/189] python311Packages.gitignore-parser: 0.1.4 -> 0.1.5 Diff: https://github.com/mherrmann/gitignore_parser/compare/refs/tags/v0.1.4...v0.1.5 Changelog: https://github.com/mherrmann/gitignore_parser/releases/tag/v0.1.5 --- pkgs/development/python-modules/gitignore-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix index 3446f653d468..7003443f1736 100644 --- a/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/pkgs/development/python-modules/gitignore-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.4"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-kc1Y3kHcVVao9zqQMbUeMi/9s+W2aUAapCx3h8VyWRQ="; + hash = "sha256-Z2x09XwFDMf6sUoKXJ240abp7zctbVCN4dsoQmWVSn8="; }; nativeCheckInputs = [ From 2bb1eb77893627c3890800e12beca74cc1a246fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 18:15:29 +0200 Subject: [PATCH 151/189] python311Packages.qcs-api-client: 0.21.5 -> 0.21.6 Diff: https://github.com/rigetti/qcs-api-client-python/compare/refs/tags/v0.21.5...v0.21.6 Changelog: https://github.com/rigetti/qcs-api-client-python/releases/tag/v0.21.6 --- pkgs/development/python-modules/qcs-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 8de6ba9e6dc5..e140c949b631 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.5"; + version = "0.21.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-lw6jswIaqDFExz/hjIrpZf4BC757l83MeCfOyZaTbfg="; + hash = "sha256-1vXqwir3lAM+m/HGHWuXl20muAOasEWo1H0RjUCShTM="; }; patches = [ From 14651559b58066e572dbdc84fecb4a82dbd213bd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 1 Aug 2023 06:15:31 +0200 Subject: [PATCH 152/189] =?UTF-8?q?hol=5Flight:=202019-10-06=20=E2=86=92?= =?UTF-8?q?=202023-07-21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../science/logic/hol_light/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 9f379252fd52..5f4bc89db397 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, findlib, num, camlp5, camlp-streams }: let load_num = @@ -15,19 +15,23 @@ let exec ${ocaml}/bin/ocaml \ -I \`${camlp5}/bin/camlp5 -where\` \ ${load_num} \ + -I ${camlp-streams}/lib/ocaml/${ocaml.version}/site-lib/camlp-streams camlp_streams.cma -init make.ml ''; in +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "hol_light is not available for OCaml ${ocaml.version}" + stdenv.mkDerivation { pname = "hol_light"; - version = "unstable-2019-10-06"; + version = "unstable-2023-07-21"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; - sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; + rev = "29b3e114f5c166584f4fbcfd1e1f9b13a25b7349"; + hash = "sha256-Z5/4dCfLRwLMHBmth3xMdFW1M6NzUT/aPEEwSz1/S2E="; }; patches = [ @@ -39,8 +43,8 @@ stdenv.mkDerivation { strictDeps = true; - nativeBuildInputs = [ ocaml camlp5 ]; - propagatedBuildInputs = [ num ]; + nativeBuildInputs = [ ocaml findlib camlp5 ]; + propagatedBuildInputs = [ camlp-streams num ]; installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" From 491a3d732fa31b3ca38af680a00d2118ffa7a954 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 28 Jul 2023 07:29:16 +0200 Subject: [PATCH 153/189] ocamlPackages.{trace,trace-tef}: init at 0.2 --- .../ocaml-modules/trace/default.nix | 21 +++++++++++++++++++ pkgs/development/ocaml-modules/trace/tef.nix | 15 +++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/development/ocaml-modules/trace/default.nix create mode 100644 pkgs/development/ocaml-modules/trace/tef.nix diff --git a/pkgs/development/ocaml-modules/trace/default.nix b/pkgs/development/ocaml-modules/trace/default.nix new file mode 100644 index 000000000000..208a879b1d1c --- /dev/null +++ b/pkgs/development/ocaml-modules/trace/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "trace"; + version = "0.2"; + + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/c-cube/trace/releases/download/v${version}/trace-${version}.tbz"; + hash = "sha256-iScnZxjgzDqZFxbDDXB0K4TkdDJDcrMC03sK/ltbqJQ="; + }; + + meta = { + description = "Common interface for tracing/instrumentation libraries in OCaml"; + license = lib.licenses.mit; + homepage = "https://c-cube.github.io/trace/"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/trace/tef.nix b/pkgs/development/ocaml-modules/trace/tef.nix new file mode 100644 index 000000000000..c1a6f9251554 --- /dev/null +++ b/pkgs/development/ocaml-modules/trace/tef.nix @@ -0,0 +1,15 @@ +{ buildDunePackage, trace, mtime }: + +buildDunePackage { + pname = "trace-tef"; + inherit (trace) src version; + + propagatedBuildInputs = [ mtime trace ]; + + doCheck = true; + + meta = trace.meta // { + description = "A simple backend for trace, emitting Catapult JSON into a file"; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 02e659de3a99..de2acdd372da 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1643,6 +1643,10 @@ let inherit (pkgs.python3Packages) torch; }; + trace = callPackage ../development/ocaml-modules/trace { }; + + trace-tef = callPackage ../development/ocaml-modules/trace/tef.nix { }; + trie = callPackage ../development/ocaml-modules/trie { }; tsdl = callPackage ../development/ocaml-modules/tsdl { From f991c6ec4a2d5aabe43e9ec0acbe66ae19d4e61d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 18:15:59 +0200 Subject: [PATCH 154/189] libmatheval: unpin guile_2_0 --- .../libraries/libmatheval/default.nix | 39 +++++++++++-------- pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index b0fe1c35ef3a..fcf4167c1901 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -1,10 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, autoconf, flex, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, guile, flex, fetchpatch }: +let + guileVersion = lib.versions.majorMinor guile.version; +in stdenv.mkDerivation rec { version = "1.1.11"; pname = "libmatheval"; - nativeBuildInputs = [ pkg-config autoconf flex ]; + nativeBuildInputs = [ pkg-config flex ]; buildInputs = [ guile ]; src = fetchurl { @@ -14,19 +17,23 @@ stdenv.mkDerivation rec { # Patches coming from debian package # https://packages.debian.org/source/sid/libs/libmatheval - patches = [ (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/002-skip-docs.patch"; - sha256 = "1nnkk9aw4jj6nql46zhwq6vx74zrmr1xq5ix0xyvpawhabhgjg62"; - } ) - (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/003-guile2.0.patch"; - sha256 = "1xgfw4finfvr20kjbpr4yl2djxmyr4lmvfa11pxirfvhrdi602qj"; - } ) - (fetchpatch { - url = "https://salsa.debian.org/science-team/libmatheval/raw/debian/1.1.11+dfsg-3/debian/patches/disable_coth_test.patch"; - sha256 = "0bai8jrd5azfz5afmjixlvifk34liq58qb7p9kb45k6kc1fqqxzm"; - } ) - ]; + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/002-skip-docs.patch"; + hash = "sha256-wjz54FKQq7t9Bz0W3EOu+ZPTt8EcfkMotkZKwlWa09o="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/003-guile3.0.patch"; + hash = "sha256-H3E/2m4MfQAbjpXbVFyNhikVifi3spVThzaVU5srmjI="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/libm/libmatheval/1.1.11%2Bdfsg-5/debian/patches/disable_coth_test.patch"; + hash = "sha256-9XeMXWDTzELWTPcsjAqOlIzp4qY9yupU+e6r0rJEUS0="; + }) + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev guile}/include/guile/${guileVersion}"; + env.NIX_LDFLAGS = "-L${guile}/lib -lguile-${guileVersion}"; meta = { description = "A library to parse and evaluate symbolic expressions input as text"; @@ -40,7 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/libmatheval/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.bzizou ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61a7bbbc4f4d..09c7cdfba277 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22920,10 +22920,7 @@ with pkgs; libmatchbox = callPackage ../development/libraries/libmatchbox { }; - libmatheval = callPackage ../development/libraries/libmatheval { - autoconf = buildPackages.autoconf269; - guile = guile_2_0; - }; + libmatheval = callPackage ../development/libraries/libmatheval { }; libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 From 3debecb54690ff26e6c53ee1edf7af1598f03885 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 4 Aug 2023 18:18:43 +0200 Subject: [PATCH 155/189] flips: unstable-2021-10-28 -> unstable-2023-03-15 --- pkgs/tools/compression/flips/default.nix | 6 +++--- .../compression/flips/use-system-libdivsufsort.patch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index 024ff5fbe9f1..4ba618556a70 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "flips"; - version = "unstable-2021-10-28"; + version = "unstable-2023-03-15"; src = fetchFromGitHub { owner = "Alcaro"; repo = "Flips"; - rev = "3a8733e74c9bdbb6b89da2b45913a0be3d0e1866"; - sha256 = "1jik580mz2spik5mgh60h93ryaj5x8dffncnr1lwija0v803xld7"; + rev = "fdd5c6e34285beef5b9be759c9b91390df486c66"; + hash = "sha256-uuHgpt7aWqiMTUILm5tAEGGeZrls3g/DdylYQgsfpTw="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch b/pkgs/tools/compression/flips/use-system-libdivsufsort.patch index aa741decb019..d621fe3a9f40 100644 --- a/pkgs/tools/compression/flips/use-system-libdivsufsort.patch +++ b/pkgs/tools/compression/flips/use-system-libdivsufsort.patch @@ -1,12 +1,12 @@ diff --git a/Makefile b/Makefile -index c9d8b6d..9d66b0b 100644 +index b3d5aeb..a5acc08 100644 --- a/Makefile +++ b/Makefile -@@ -79,9 +79,7 @@ endif +@@ -83,9 +83,7 @@ endif + MOREFLAGS := $(CFLAGS_$(TARGET)) - --DIVSUF := libdivsufsort-2.0.1 +-DIVSUF := $(SRCDIR)/libdivsufsort-2.0.1 -SOURCES += $(DIVSUF)/lib/divsufsort.c $(DIVSUF)/lib/sssort.c $(DIVSUF)/lib/trsort.c -MOREFLAGS += -I$(DIVSUF)/include -DHAVE_CONFIG_H -D__STDC_FORMAT_MACROS +MOREFLAGS += -ldivsufsort From 58920127ca39e4b4218d73b4f38821bfdd6878b8 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Aug 2023 11:44:05 -0500 Subject: [PATCH 156/189] treewide: add meta.mainProgram to editors --- pkgs/applications/editors/emacs/sources.nix | 1 + pkgs/applications/editors/geany/default.nix | 1 + pkgs/applications/editors/gedit/default.nix | 1 + pkgs/applications/editors/micro/default.nix | 1 + pkgs/applications/editors/nano/default.nix | 1 + pkgs/applications/editors/vim/common.nix | 1 + 6 files changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 91a60d5145b0..440184d959e0 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -32,6 +32,7 @@ let matthewbauer ]; platforms = lib.platforms.all; + mainProgram = "emacs"; }; in { diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 4f2b3f1eb332..4ecc511b6540 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ frlan ]; platforms = platforms.all; + mainProgram = "geany"; }; } diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index f85bb9e5fdc1..4352b74f964d 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -96,5 +96,6 @@ stdenv.mkDerivation rec { maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "gedit"; }; } diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index 081b038e2307..d4dbb4d97cca 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -41,5 +41,6 @@ buildGoModule rec { description = "Modern and intuitive terminal-based text editor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "micro"; }; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index bd8049699514..5b51f9563c39 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -75,5 +75,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ joachifm nequissimus ]; platforms = platforms.all; + mainProgram = "nano"; }; } diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 728ab5eb54c9..24e9ea914b78 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -27,5 +27,6 @@ rec { license = licenses.vim; maintainers = with maintainers; [ das_j equirosa ]; platforms = platforms.unix; + mainProgram = "vim"; }; } From f4c5837306d0f7860679e30831ee2328eb500fc0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 18:49:38 +0200 Subject: [PATCH 157/189] python311Packages.publicsuffixlist: 0.10.0.20230730 -> 0.10.0.20230804 --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index c671d929a143..3a46c99691f9 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20230730"; + version = "0.10.0.20230804"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HNOEfsHrwCBpcVYwlYrWe9/rfn+fNfaZ0w/EEpjO7aw="; + hash = "sha256-J8yeq9CuzXGlqPjGf8hnV0IeI+Wg0Q5GS69/8z+FLp8="; }; passthru.optional-dependencies = { From 98bdc5f654ce2963f851c20d12adc7152c11a3e8 Mon Sep 17 00:00:00 2001 From: Alejandro Sanchez Medina Date: Fri, 4 Aug 2023 18:56:09 +0200 Subject: [PATCH 158/189] maintainers: add alejandrosame --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3dac5d13841..8a468301ea5d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -650,6 +650,13 @@ githubId = 82811; name = "Aldo Borrero"; }; + alejandrosame = { + email = "alejandrosanchzmedina@gmail.com"; + matrix = "@alejandrosame:matrix.org"; + github = "alejandrosame"; + githubId = 1078000; + name = "Alejandro Sánchez Medina"; + }; aleksana = { email = "me@aleksana.moe"; github = "Aleksanaa"; From c39c0479dd5f26660750af9bd4c22256aca7db0a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:10:54 +0200 Subject: [PATCH 159/189] geda: 1.8.2-20130925 -> 1.10.2 --- .../science/electronics/geda/default.nix | 28 ++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 6b77f75b11bb..775bae981339 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,32 +1,20 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, guile, gtk2, flex, gawk, perl }: +{ lib, stdenv, fetchurl, groff, pkg-config, python2, guile, gtk2, flex, gawk, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "geda"; - version = "1.8.2-20130925"; + version = "1.10.2"; src = fetchurl { - url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz"; - sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; + url = "http://ftp.geda-project.org/geda-gaf/stable/v${lib.versions.majorMinor version}/${version}/geda-gaf-${version}.tar.gz"; + hash = "sha256-6GKrJBUoU4+jvuJzkmH1aAERArYMXjmi8DWGY8BCyKQ="; }; - patches = [ - # Pull upstream patch for -fno-common toolchains - (fetchpatch { - name = "fno-common-p1.patch"; - url = "http://git.geda-project.org/geda-gaf/patch/?id=cb6bac898fe43c5a59b577123ba8698ec04deef6"; - sha256 = "0njlh20qjrlqf5m8p92vmkl0jsm747f4mbqwvldnf8nd2j608nkq"; - }) - (fetchpatch { - name = "fno-common-p2.patch"; - url = "http://git.geda-project.org/geda-gaf/patch/?id=7b9d523a3558290b4487c3ff9a4a5b43e8941158"; - sha256 = "1z9gzz5ngsbq6c9dw2dfz7kpsq97zhs1ma9saxm7hiybwadbj18k"; - }) - ]; - configureFlags = [ "--disable-update-xdg-database" + "--without-libfam" ]; - nativeBuildInputs = [ pkg-config ]; + + nativeBuildInputs = [ groff pkg-config python2 ]; buildInputs = [ guile gtk2 flex gawk perl ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09c7cdfba277..b9a742a25a1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39317,7 +39317,7 @@ with pkgs; fparser = callPackage ../applications/science/electronics/fparser { }; geda = callPackage ../applications/science/electronics/geda { - guile = guile_2_0; + guile = guile_2_2; }; gedit = callPackage ../applications/editors/gedit { }; From 23aeaac3d4fb5031a5b2badac4e01627fbc584f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 19:12:02 +0200 Subject: [PATCH 160/189] python311Packages.zeep: expose optionals and clean up Set format, prune disabled tests. --- .../python-modules/zeep/default.nix | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index dc37c5315ac4..ab5f7b8147c8 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -3,10 +3,8 @@ , aioresponses , attrs , buildPythonPackage -, cached-property , defusedxml , fetchFromGitHub -, fetchpatch , freezegun , httpx , isodate @@ -29,6 +27,7 @@ buildPythonPackage rec { pname = "zeep"; version = "4.2.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -41,9 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs - cached-property defusedxml - httpx isodate lxml platformdirs @@ -51,7 +48,19 @@ buildPythonPackage rec { requests requests-file requests-toolbelt - xmlsec + ]; + + passthru.optional-dependencies = { + async_require = [ + httpx + ]; + xmlsec_require = [ + xmlsec + ]; + }; + + pythonImportsCheck = [ + "zeep" ]; nativeCheckInputs = [ @@ -64,26 +73,15 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - ]; + ] + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = '' - export HOME=$(mktemp -d); + export HOME=$TMPDIR ''; - disabledTests = [ - # lxml.etree.XMLSyntaxError: Extra content at the end of the document, line 2, column 64 - "test_mime_content_serialize_text_xml" - # Tests are outdated - "test_load" - "test_load_cache" - "test_post" - ]; - - pythonImportsCheck = [ - "zeep" - ]; - meta = with lib; { + changelog = "https://github.com/mvantellingen/python-zeep/releases/tag/${version}"; description = "Python SOAP client"; homepage = "http://docs.python-zeep.org"; license = licenses.mit; From 0611984ad3eb2b9ead0f36388bb4a9c301c9764a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 19:13:51 +0200 Subject: [PATCH 161/189] python311Packages.faraday-agent-parameters-types: 1.3.0 -> 1.3.1 Changelog: https://github.com/infobyte/faraday_agent_parameters_types/blob/1.3.1/CHANGELOG.md --- .../python-modules/faraday-agent-parameters-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index cadde12cafd1..7e7624020d5f 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-XWuWg8PzXdLIuUTZ5dnpFmFmqEhOReqIEmBbCpzdzrg="; + hash = "sha256-yWDZPa9+DZh2Bj9IIeIVFpAt9nhQOk2tTZh02difsCs="; }; propagatedBuildInputs = [ From 61c0ecea5b98249bc234466bc0e0ae778af72a45 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 4 Aug 2023 18:36:08 +0300 Subject: [PATCH 162/189] treewide: update mainProgram docs --- doc/stdenv/meta.chapter.md | 2 +- lib/meta.nix | 5 ++--- pkgs/development/node-packages/main-programs.nix | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index e626e7942996..f6da0bb84be0 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -70,7 +70,7 @@ A list of the maintainers of this Nix expression. Maintainers are defined in [`n ### `mainProgram` {#var-meta-mainProgram} -The name of the main binary for the package. This affects the binary `nix run` executes and falls back to the name of the package. Example: `"rg"` +The name of the main binary for the package. This affects the binary `nix run` executes. Example: `"rg"` ### `priority` {#var-meta-priority} diff --git a/lib/meta.nix b/lib/meta.nix index d32a37fe61d7..21404b3a2bfa 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -132,10 +132,9 @@ rec { { shortName = licstr; } ); - /* Get the path to the main program of a derivation with either - meta.mainProgram or pname or name + /* Get the path to the main program of a package based on meta.mainProgram - Type: getExe :: derivation -> string + Type: getExe :: package -> string Example: getExe pkgs.hello diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index c327b3b9a5bb..2329de51149e 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -1,5 +1,4 @@ -# Use this file to add `meta.mainProgram` to packages in `nodePackages`, that don't provide an -# executable that matches that packages name, so that they'll work with `nix run`. +# Use this file to add `meta.mainProgram` to packages in `nodePackages`. { # Packages that provide multiple executables where one is clearly the `mainProgram`. "@antfu/ni" = "ni"; @@ -11,7 +10,7 @@ vue-cli = "vue"; "@withgraphite/graphite-cli" = "gt"; - # Packages that provide a single executable whose name differs from the package's `name`. + # Packages that provide a single executable. "@angular/cli" = "ng"; "@antora/cli" = "antora"; "@astrojs/language-server" = "astro-ls"; From d787798f1c69104b91f6dd8ebdaafa4be66adbda Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 4 Aug 2023 18:35:06 +0300 Subject: [PATCH 163/189] pass.withExtensions: add meta.mainProgram ``` nix-repl> lib.getExe (pass.withExtensions(_: [])) "/nix/store/rvc4ambjr8jsvm5n757icfl3j7gv1jxh-pass-env/bin/pass" ``` --- pkgs/tools/security/pass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 1b840999e6af..3437b19e3a30 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -29,8 +29,7 @@ let selected = [ pass ] ++ extensions passExtensions ++ lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { - # lib.getExe looks for name, so we keep it the same as mainProgram - name = "pass"; + name = "pass-env"; paths = selected; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.concatMap (x: x.buildInputs) selected; @@ -51,6 +50,7 @@ let wrapProgram $out/bin/pass \ --set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions" ''; + meta.mainProgram = "pass"; }; in From d4e52e45647f8d4e176856f62e04a3e8a69e1dcc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:48:22 +0200 Subject: [PATCH 164/189] beluga: fix hash --- pkgs/applications/science/logic/beluga/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index e44506cebcb2..3cb06c4e7b14 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -8,7 +8,7 @@ ocamlPackages.buildDunePackage rec { owner = "Beluga-lang"; repo = "Beluga"; rev = "refs/tags/v${version}"; - hash = "sha256-GN4ZOlhs8ktAcCu7iE4lh6HxhTu+KCJJbIvcI4MGcr0="; + hash = "sha256-0E7rmiLmQPfOAQ1qKiqxeLdqviVl+Thkl6KfOWkGZRc="; }; duneVersion = "3"; From 7666648eb014953ffbe8bcbd6ab628c489463bd3 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 5 Aug 2023 01:50:44 +0800 Subject: [PATCH 165/189] neocmakelsp: 0.5.18 -> 0.6.1 --- .../tools/language-servers/neocmakelsp/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index d900046701bb..fde707ec6641 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.5.18"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-3Bv1tRskxQ4Fk+gEGCYRq8WtkBHYP2VjirtTZ3SWJlQ="; + hash = "sha256-wwFek9668tC+j2F12b9YiYbYJWp5z4J4F09dlj+hlq0="; }; - cargoHash = "sha256-O8E5PmXYrNOB8fXFs5ar30c1X5flIQZ/lrRSl/3XH+o="; + cargoHash = "sha256-XmacBalkevCmYxWFcez/++1ng2yyURge466VX6QZC9M="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ rewine ]; + mainProgram = "neocmakelsp"; }; } From d2c1acdbfdb6b5c0832b026ab08432aa0c5abb5d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 20:08:11 +0200 Subject: [PATCH 166/189] python311Packages.mypy-boto3-builder: 7.17.1 -> 7.17.2 Diff: https://github.com/youtype/mypy_boto3_builder/compare/refs/tags/7.17.1...7.17.2 Changelog: https://github.com/youtype/mypy_boto3_builder/releases/tag/7.17.2 --- .../development/python-modules/mypy-boto3-builder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 4f46289634bc..239dccb7e2a0 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.17.1"; + version = "7.17.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-QzofWNnYTAlxoeJm8HRaGBOV5rqkhjHHOEwYNrXTh/I="; + hash = "sha256-YuHq3pfx3dNgi9M4dGSmIOC3iZaLe9lqrRL0q3ggCTs="; }; nativeBuildInputs = [ From 0ca93ef0e61a521ba7968b7560dd2ec4412644e3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 4 Aug 2023 09:03:27 +0100 Subject: [PATCH 167/189] rtorrent: 0.9.8+date=2021-08-07 -> 0.9.8+date=2022-06-20 Pull in _FORTIFY_SOURCE=3 stack smashing fix. Without the change on current `master` `rtorrent` crashes at start as: *** buffer overflow detected ***: terminated __pthread_kill_implementation (threadid=, signo=signo@entry=6, no_tid=no_tid@entry=0) at pthread_kill.c:44 44 pthread_kill.c: No such file or directory. (gdb) bt #0 __pthread_kill_implementation (threadid=, signo=signo@entry=6, no_tid=no_tid@entry=0) at pthread_kill.c:44 #1 0x00007ffff7880af3 in __pthread_kill_internal (signo=6, threadid=) at pthread_kill.c:78 #2 0x00007ffff7831c86 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26 #3 0x00007ffff781b8ba in __GI_abort () at abort.c:79 #4 0x00007ffff781c5f5 in __libc_message (fmt=fmt@entry=0x7ffff7992540 "*** %s ***: terminated\n") at ../sysdeps/posix/libc_fatal.c:150 #5 0x00007ffff7910679 in __GI___fortify_fail (msg=msg@entry=0x7ffff79924e6 "buffer overflow detected") at fortify_fail.c:24 #6 0x00007ffff790eea4 in __GI___chk_fail () at chk_fail.c:28 #7 0x00007ffff790ea85 in ___snprintf_chk (s=, maxlen=, flag=, slen=, format=) at snprintf_chk.c:29 #8 0x0000000000472acf in utils::Lockfile::try_lock() () #9 0x000000000044b524 in core::DownloadStore::enable(bool) () #10 0x00000000004b1f7b in Control::initialize() () #11 0x000000000043000b in main () --- .../networking/p2p/rakshasa-rtorrent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index a6f59374db88..c454c3ad2053 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "rakshasa-rtorrent"; - version = "0.9.8+date=2021-08-07"; + version = "0.9.8+date=2022-06-20"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "a6bc99bb821d86b3b0633552db3fbd0a22497657"; - hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; + rev = "92bec88d0904bfb31c808085c2fd0f22d0ec8db7"; + hash = "sha256-er7UdIb+flhq0ye76UmomgfHV2ZSBROpXmfrNDHwTWw="; }; passthru = { From 2b8a2792c05dd54f9f38bd26e494956be74fdd76 Mon Sep 17 00:00:00 2001 From: rewine Date: Sat, 5 Aug 2023 02:17:56 +0800 Subject: [PATCH 168/189] wayfire: use finalAttrs pattern and set meta.mainProgram --- .../window-managers/wayfire/default.nix | 20 +++++++++---------- .../window-managers/wayfire/wcm.nix | 19 +++++++++--------- .../window-managers/wayfire/wf-config.nix | 18 ++++++++--------- .../window-managers/wayfire/wf-shell.nix | 18 ++++++++--------- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index ab68bc58ee06..133b561be621 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -21,16 +21,16 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; version = "0.7.5"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wayfire"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; + hash = "sha256-Z+rR9pY244I3i/++XZ4ROIkq3vtzMgcxxHvJNxFD9is="; }; nativeBuildInputs = [ @@ -40,7 +40,6 @@ stdenv.mkDerivation rec { wayland-scanner ]; - buildInputs = [ wf-config libdrm @@ -78,11 +77,12 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "wayfire" ]; - meta = with lib; { + meta = { homepage = "https://wayfire.org/"; description = "3D Wayland compositor"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; + mainProgram = "wayfire"; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index a67702185521..48be049560b5 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -16,16 +16,16 @@ , libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wcm"; version = "0.7.5"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wcm"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; + hash = "sha256-LJR9JGl49o4O6LARofz3jOeAqseGcmzVhMnhk/aobUU="; }; nativeBuildInputs = [ @@ -51,11 +51,12 @@ stdenv.mkDerivation rec { "-Denable_wdisplays=false" ]; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wcm"; description = "Wayfire Config Manager"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; + mainProgram = "wcm"; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 19435a87395b..923c3930c9b8 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -11,15 +11,15 @@ , libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; version = "0.7.1"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; + repo = "wf-config"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ADUBvDJcPYEB9ZvaFIgTfemo1WYwiWgCWX/z2yrEPtA="; }; nativeBuildInputs = [ @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { doCheck = true; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wf-config"; description = "Library for managing configuration files, written for Wayfire"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 10e16a6573e1..7af794db7886 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -13,16 +13,16 @@ , pulseaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; version = "0.7.0"; src = fetchFromGitHub { owner = "WayfireWM"; - repo = pname; - rev = "v${version}"; + repo = "wf-shell"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; + hash = "sha256-iQUBuNjbZuf51A69RC6NsMHFZCFRv+d9XZ0HtP6OpOA="; }; nativeBuildInputs = [ @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { mesonFlags = [ "--sysconfdir /etc" ]; - meta = with lib; { + meta = { homepage = "https://github.com/WayfireWM/wf-shell"; description = "GTK3-based panel for Wayfire"; - license = licenses.mit; - maintainers = with maintainers; [ qyliss wucke13 rewine ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qyliss wucke13 rewine ]; + platforms = lib.platforms.unix; }; -} +}) From e5764e8204fe82ca992be5379627fb93ccc20064 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Aug 2023 13:23:13 -0500 Subject: [PATCH 169/189] treewide: add meta.mainProgram to emulators --- pkgs/applications/emulators/cemu/default.nix | 1 + pkgs/applications/emulators/dosbox/default.nix | 1 + pkgs/applications/emulators/emulationstation/default.nix | 1 + pkgs/applications/emulators/mame/default.nix | 1 + pkgs/applications/emulators/melonDS/default.nix | 1 + pkgs/applications/emulators/mgba/default.nix | 1 + pkgs/applications/emulators/mupen64plus/default.nix | 1 + pkgs/applications/emulators/nestopia/default.nix | 1 + pkgs/applications/emulators/pcsxr/default.nix | 1 + pkgs/applications/emulators/rpcs3/default.nix | 1 + pkgs/applications/emulators/snes9x/default.nix | 1 + pkgs/applications/emulators/xemu/default.nix | 1 + 12 files changed, 12 insertions(+) diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 49d9779c4095..d38865adc205 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -128,5 +128,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zhaofengli baduhai ]; + mainProgram = "cemu"; }; } diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index a8d4df2e5feb..4a6d229762b0 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.unix; + mainProgram = "dosbox"; }; } diff --git a/pkgs/applications/emulators/emulationstation/default.nix b/pkgs/applications/emulators/emulationstation/default.nix index aa8192d3ec1d..170a3c30e547 100644 --- a/pkgs/applications/emulators/emulationstation/default.nix +++ b/pkgs/applications/emulators/emulationstation/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.edwtjo ]; license = lib.licenses.mit; platforms = lib.platforms.linux; + mainProgram = "emulationstation"; }; } diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 3a7e06509197..6fe3e4455d9f 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -196,5 +196,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.unix; broken = stdenv.isDarwin; + mainProgram = "mame"; }; } diff --git a/pkgs/applications/emulators/melonDS/default.nix b/pkgs/applications/emulators/melonDS/default.nix index 06ef3d99088e..50389db2b45e 100644 --- a/pkgs/applications/emulators/melonDS/default.nix +++ b/pkgs/applications/emulators/melonDS/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ artemist benley shamilton xfix ]; platforms = platforms.linux; + mainProgram = "melonDS"; }; } diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 8537a0511286..a52ee7ca30ce 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mpl20; maintainers = with maintainers; [ MP2E AndersonTorres ]; platforms = platforms.linux; + mainProgram = "mgba"; }; }) diff --git a/pkgs/applications/emulators/mupen64plus/default.nix b/pkgs/applications/emulators/mupen64plus/default.nix index 82908a166d46..ba8c69cfb3e0 100644 --- a/pkgs/applications/emulators/mupen64plus/default.nix +++ b/pkgs/applications/emulators/mupen64plus/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://www.mupen64plus.org/"; maintainers = [ maintainers.sander ]; platforms = [ "x86_64-linux" ]; + mainProgram = "mupen64plus"; }; } diff --git a/pkgs/applications/emulators/nestopia/default.nix b/pkgs/applications/emulators/nestopia/default.nix index fa55c2e9635d..b42a5786394e 100644 --- a/pkgs/applications/emulators/nestopia/default.nix +++ b/pkgs/applications/emulators/nestopia/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ MP2E ]; + mainProgram = "nestopia"; }; } diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix index 101fb829c6e3..b80c32bd9eda 100644 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ b/pkgs/applications/emulators/pcsxr/default.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2Plus; platforms = platforms.all; + mainProgram = "pcsxr"; }; } diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index bea72c7ca44f..88b3ddbb1750 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -101,5 +101,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ abbradar neonfuz ilian zane ]; license = licenses.gpl2Only; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "rpcs3"; }; } diff --git a/pkgs/applications/emulators/snes9x/default.nix b/pkgs/applications/emulators/snes9x/default.nix index 82efe6b42af4..34c2f72c7dd4 100644 --- a/pkgs/applications/emulators/snes9x/default.nix +++ b/pkgs/applications/emulators/snes9x/default.nix @@ -123,5 +123,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ qknight xfix thiagokokada ]; platforms = platforms.unix; broken = (withGtk && stdenv.isDarwin); + mainProgram = "snes9x"; }; } diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 3e985f336a65..311935b84676 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -133,5 +133,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ AndersonTorres genericnerdyusername ]; platforms = lib.platforms.linux; + mainProgram = "xemu"; }; }) From 02969a2f59334bc2ebd07ece87aed95f93608e45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 20:30:04 +0200 Subject: [PATCH 170/189] sqlfluff: 2.1.2 -> 2.2.0 Diff: https://github.com/sqlfluff/sqlfluff/compare/refs/tags/2.1.2...2.2.0 Changelog: https://github.com/sqlfluff/sqlfluff/blob/2.2.0/CHANGELOG.md --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 338b1d22e053..3968a5de6018 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.1.2"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XxaQlXXxd0CpVK2iIt2aJ5PoGWvanFf7oeCdnjOTaeI="; + hash = "sha256-3NNig7zt6ZQUXuzONKlE5h/uOrY8/0/oVbw+BZ99mPk="; }; propagatedBuildInputs = with python3.pkgs; [ From 9d258bd17d8b4ec6d6e0b5b2dbc7cdb8db73e497 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:30:17 +0200 Subject: [PATCH 171/189] loudmouth: fix build on x86_64-darwin --- pkgs/development/libraries/loudmouth/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index fb5409a7e727..d1a8c4887249 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib }: +{ lib, stdenv, fetchurl, openssl, libidn, glib, pkg-config, zlib, darwin }: stdenv.mkDerivation rec { version = "1.5.3"; @@ -9,15 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; - patches = [ - ]; - configureFlags = [ "--with-ssl=openssl" ]; propagatedBuildInputs = [ openssl libidn glib zlib ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Foundation + ]; + meta = with lib; { description = "A lightweight C library for the Jabber protocol"; platforms = platforms.all; From 919f5e1376d56b8dc4b27b381c09230250fd30b6 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Aug 2023 13:37:35 -0500 Subject: [PATCH 172/189] treewide: add meta.mainProgram to file-managers --- pkgs/applications/file-managers/krusader/default.nix | 1 + pkgs/applications/file-managers/mc/default.nix | 1 + pkgs/applications/file-managers/nnn/default.nix | 1 + pkgs/applications/file-managers/pcmanfm/default.nix | 1 + pkgs/applications/file-managers/ranger/default.nix | 1 + 5 files changed, 5 insertions(+) diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix index 9895cc108ef6..a8635a416396 100644 --- a/pkgs/applications/file-managers/krusader/default.nix +++ b/pkgs/applications/file-managers/krusader/default.nix @@ -43,5 +43,6 @@ mkDerivation rec { description = "Norton/Total Commander clone for KDE"; license = licenses.gpl2Only; maintainers = with maintainers; [ sander turion ]; + mainProgram = "krusader"; }; } diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index a61b0980d851..65211bb54391 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -93,5 +93,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = with platforms; linux ++ darwin; + mainProgram = "mc"; }; } diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index 6386018348a0..eb3e943676e4 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -78,5 +78,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau Br1ght0ne ]; + mainProgram = "nnn"; }; }) diff --git a/pkgs/applications/file-managers/pcmanfm/default.nix b/pkgs/applications/file-managers/pcmanfm/default.nix index deb9a98a517c..bfbe68d885e6 100644 --- a/pkgs/applications/file-managers/pcmanfm/default.nix +++ b/pkgs/applications/file-managers/pcmanfm/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { description = "File manager with GTK interface"; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux; + mainProgram = "pcmanfm"; }; } diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index a192edb0b32a..96d43dc8f247 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -55,5 +55,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ toonn magnetophon ]; + mainProgram = "ranger"; }; } From cdb0daeff9c7ef93cf32ef69114a9088a5628e3c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Aug 2023 20:43:26 +0200 Subject: [PATCH 173/189] xbindkeys: unpin guile_2_2 --- pkgs/tools/X11/xbindkeys/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index ed9e5ba43c99..5b2f5c8a1968 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, guile_2_2 }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libX11, guile }: stdenv.mkDerivation rec { pname = "xbindkeys"; @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1wl2vc5alisiwyk8m07y1ryq8w3ll9ym83j27g4apm4ixjl8d6x2"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 guile_2_2 ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libX11 guile ]; meta = { homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html"; description = "Launch shell commands with your keyboard or your mouse under X Window"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; }; } From e1501b7cad5ecbdd43a88bf908f9dce24c5c46de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 21:02:51 +0200 Subject: [PATCH 174/189] python311Packages.sentry-sdk: 1.28.1 -> 1.29.2 Diff: https://github.com/getsentry/sentry-python/compare/refs/tags/1.28.1...1.29.2 Changelog: https://github.com/getsentry/sentry-python/blob/1.29.2/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index f5ec7a21b5a1..94cb5ab003cc 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.28.1"; + version = "1.29.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-toyZAOtAZl38UfLs8+DbAb/EqX+sl/ndKGb7/pFI10Q="; + hash = "sha256-etn7vkKgCN7a8Dxv4gDSVaG6mvCltVh6rTOLaKEyNRA="; }; propagatedBuildInputs = [ From fa28015dedbf6b3d5b60e41fde79f56a8a1e4ba4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 21:07:30 +0200 Subject: [PATCH 175/189] python311Packages.karton-core: 5.1.0 -> 5.2.0 Diff: https://github.com/CERT-Polska/karton/compare/refs/tags/v5.1.0...v5.2.0 Changelog: https://github.com/CERT-Polska/karton/releases/tag/v5.2.0 --- pkgs/development/python-modules/karton-core/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 43d65c4f0f75..8805636080cd 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -2,6 +2,7 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, orjson , unittestCheckHook , pythonOlder , redis @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.1.0"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,11 +19,12 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-IhxMei6KkPsDnUkV4+zxSMI7rgZgOvbHQFqJAC1b5iw="; + hash = "sha256-1Bv0e218cvLuv/go0L13C39fFAeo0FJeCoU+XFUBhzk="; }; propagatedBuildInputs = [ boto3 + orjson redis ]; From f16c0ae9d4a9cc89b42e1dbb4894246e77f4dfac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 21:08:12 +0200 Subject: [PATCH 176/189] python311Packages.karton-yaramatcher: 1.2.0 -> 1.3.0 Diff: https://github.com/CERT-Polska/karton-yaramatcher/compare/refs/tags/v1.2.0...v1.3.0 Changelog: https://github.com/CERT-Polska/karton-yaramatcher/releases/tag/v1.3.0 --- .../development/python-modules/karton-yaramatcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index f85c756b811e..2c6dc57d9966 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; + hash = "sha256-URGW8FyJZ3ktrwolls5ElSWn8FD6vWCA+Eu0aGtPh6U="; }; propagatedBuildInputs = [ From f61284a19f2b302f9a99ded9fb563ebf4e9b1aed Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Aug 2023 14:10:05 -0500 Subject: [PATCH 177/189] treewide: add meta.mainProgram to misc --- pkgs/applications/misc/1password-gui/default.nix | 1 + pkgs/applications/misc/authy/default.nix | 1 + pkgs/applications/misc/barrier/default.nix | 1 + pkgs/applications/misc/bleachbit/default.nix | 1 + pkgs/applications/misc/blender/default.nix | 1 + pkgs/applications/misc/bottles/default.nix | 1 + pkgs/applications/misc/dbeaver/default.nix | 1 + pkgs/applications/misc/dmenu/default.nix | 1 + pkgs/applications/misc/dunst/default.nix | 1 + pkgs/applications/misc/dupeguru/default.nix | 1 + pkgs/applications/misc/fontpreview/default.nix | 1 + pkgs/applications/misc/keepass/default.nix | 1 + pkgs/applications/misc/lutris/default.nix | 1 + pkgs/applications/misc/mediainfo-gui/default.nix | 1 + pkgs/applications/misc/mediainfo/default.nix | 1 + pkgs/applications/misc/mupdf/default.nix | 1 + pkgs/applications/misc/mysql-workbench/default.nix | 1 + pkgs/applications/misc/nwg-displays/default.nix | 1 + pkgs/applications/misc/openrgb/default.nix | 1 + pkgs/applications/misc/qdirstat/default.nix | 1 + pkgs/applications/misc/rofi/default.nix | 1 + pkgs/applications/misc/spicetify-cli/default.nix | 1 + pkgs/applications/misc/waybar/default.nix | 1 + pkgs/applications/misc/wofi/default.nix | 1 + pkgs/applications/misc/wttrbar/default.nix | 1 + 25 files changed, 25 insertions(+) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index cfcf1d7f891b..7dbae3e43b46 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -61,6 +61,7 @@ let license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; platforms = builtins.attrNames sources.${channel}; + mainProgram = "1password"; }; in if stdenv.isDarwin diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index dd5585c35b0a..199e89dc0ba5 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ iammrinal0 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "authy"; }; } diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 66ad4046d1fb..f068667948c2 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -49,5 +49,6 @@ mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.phryneas ]; platforms = lib.platforms.linux; + mainProgram = "barrier"; }; } diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 7a667b187566..c6e4adf8a560 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -65,5 +65,6 @@ python3Packages.buildPythonApplication rec { longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; maintainers = with maintainers; [ leonardoce mbprtpmnr ]; + mainProgram = "bleachbit"; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 58cdf9592cdc..448eb1477136 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -196,5 +196,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; broken = stdenv.isDarwin; maintainers = with maintainers; [ goibhniu veprbl ]; + mainProgram = "blender"; }; } diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 34f0f3236101..64f0df2e4a7f 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -109,5 +109,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl3Only; maintainers = with maintainers; [ psydvl shamilton ]; platforms = platforms.linux; + mainProgram = "bottles"; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 0e89c7b1b057..15dbb33118b8 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -135,5 +135,6 @@ mavenJdk17.buildMavenPackage rec { license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; maintainers = with maintainers; [ jojosch mkg20001 ]; + mainProgram = "dbeaver"; }; } diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 71fba4e51524..b53fab409b04 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ pSub globin ]; platforms = platforms.all; + mainProgram = "dmenu"; }; } diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index ec3024d48d1d..47dbaa62c3c1 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = platforms.linux; maintainers = with maintainers; [ domenkozar ]; + mainProgram = "dunst"; }; } diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index c485375137ea..36fa71b1d9c7 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -63,5 +63,6 @@ python3Packages.buildPythonApplication rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.novoxd ]; + mainProgram = "dupeguru"; }; } diff --git a/pkgs/applications/misc/fontpreview/default.nix b/pkgs/applications/misc/fontpreview/default.nix index 7fa2e4d89102..0f02eeed1769 100644 --- a/pkgs/applications/misc/fontpreview/default.nix +++ b/pkgs/applications/misc/fontpreview/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.erictapen ]; + mainProgram = "fontpreview"; }; } diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 022eba1fd6cb..bde5bd4b44ae 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -117,5 +117,6 @@ in buildDotnetPackage rec { maintainers = with lib.maintainers; [ amorsillo obadz ]; platforms = with lib.platforms; all; license = lib.licenses.gpl2; + mainProgram = "keepass"; }; } diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 2836b14cd716..730737a8bbb6 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -147,5 +147,6 @@ buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ Madouura ]; platforms = platforms.linux; + mainProgram = "lutris"; }; } diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 877572396be7..4aebb67ac981 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; + mainProgram = "mediainfo-gui"; }; } diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index ea2adeab95b7..ffa7f68378db 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; + mainProgram = "mediainfo"; }; } diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index c9523581b0a9..d00b9103d8f0 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -152,5 +152,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; + mainProgram = "mupdf"; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 866583d497c9..ff9fb7c6b2cb 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -196,5 +196,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "mysql-workbench"; }; } diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 56691d3ce14a..943861a3d71e 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -55,5 +55,6 @@ python310Packages.buildPythonApplication rec { license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = [ ]; + mainProgram = "nwg-displays"; }; } diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index bd1664e85ff5..41d855cd333f 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jonringer ]; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "openrgb"; }; } diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index 3b1bdca19533..92949ad4a893 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -53,5 +53,6 @@ mkDerivation { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "qdirstat"; }; } diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index a505ad13a1af..edd012034115 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ bew ]; platforms = with platforms; linux; + mainProgram = "rofi"; }; } diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index e9cacc00652e..3f77420a5634 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -38,5 +38,6 @@ buildGoModule rec { homepage = "https://github.com/spicetify/spicetify-cli/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonringer mdarocha ]; + mainProgram = "spicetify-cli"; }; } diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 3e082bf0811e..c4a764fec97b 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -142,5 +142,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ FlorianFranzen minijackson synthetica lovesegfault rodrgz ]; platforms = platforms.unix; homepage = "https://github.com/alexays/waybar"; + mainProgram = "waybar"; }; } diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 0b76fb278d98..e64426365ecc 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ ]; platforms = with platforms; linux; + mainProgram = "wofi"; }; } diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 90ec71e97575..4e4a84988115 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bjesus/wttrbar"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ khaneliman ]; + mainProgram = "wttrbar"; }; } From 9591244e00f3a164a96b60585e687d46c565876f Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 3 Aug 2023 14:41:10 +0200 Subject: [PATCH 178/189] safeeyes: 2.1.5 -> 2.1.6 --- pkgs/applications/misc/safeeyes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 4b845737e7c8..6c839f65d942 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -18,11 +18,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.5"; + version = "2.1.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IjFDhkqtMitdcQORerRqwty3ZMP8jamPtb9oMHdre4I="; + hash = "sha256-tvsBTf6+zKBzB5aL+LUcEvE4jmVHnnoY0L4xoKMJ0vM="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ buildPythonApplication rec { postInstall = '' mkdir -p $out/share/applications cp -r safeeyes/platform/icons $out/share/icons/ - cp safeeyes/platform/safeeyes.desktop $out/share/applications/safeeyes.desktop + cp safeeyes/platform/io.github.slgobinath.SafeEyes.desktop $out/share/applications/io.github.slgobinath.SafeEyes.desktop ''; preFixup = '' From 9565bdbcd411e40c3d1476b0f609eb6358c6895f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 21:11:54 +0200 Subject: [PATCH 179/189] python311Packages.bc-detect-secrets: 1.4.29 -> 1.4.30 Diff: https://github.com/bridgecrewio/detect-secrets/compare/refs/tags/1.4.29...1.4.30 --- pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 9d173187ef73..0b7d04c69e85 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.29"; + version = "1.4.30"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-oMJMiXS4/OU5/LWV2i2CcDQZL5yuusXGwgZG2OMMlaQ="; + hash = "sha256-wq+SKOiMcVO7OiK+RdRk4RNsjSAT7lBdAjLHfurSIRo="; }; propagatedBuildInputs = [ From 1998f9aa9b5e18df7d2de6b2754292b0297fa1e7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 4 Aug 2023 14:27:18 -0500 Subject: [PATCH 180/189] treewide: add meta.mainPRogram to networking --- pkgs/applications/networking/cloudflared/default.nix | 1 + pkgs/applications/networking/davmail/default.nix | 1 + pkgs/applications/networking/dropbox/default.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index eea7abd62e64..68dd94b5ca99 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -79,5 +79,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ]; + mainProgram = "cloudflared"; }; } diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 5f5283738c06..3f6c52a4d473 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; + mainProgram = "davmail"; }; } diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9a0b718293ab..cf2edf767316 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -86,5 +86,6 @@ buildFHSEnv { license = licenses.unfree; maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; + mainProgram = "dropbox"; }; } From 09a194a811317606c4bbba0be9c5dd250ac6042d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 21:40:22 +0200 Subject: [PATCH 181/189] python311Packages.aiounifi: 50 -> 51 Diff: https://github.com/Kane610/aiounifi/compare/refs/tags/v50...v51 Changelog: https://github.com/Kane610/aiounifi/releases/tag/v51 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 9798938070c3..d99ff10cfa8d 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "50"; + version = "51"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ydSKXydtOJaAI2PCPX+8jh4w9otX64Lj7QwbasTdWf0="; + hash = "sha256-XR/yZLxTHVHxm/QLCKrp9XFJ7yZybPjPxKEhf1SOzD0="; }; propagatedBuildInputs = [ From b8038b47eb8ff1977525ff52c770462c7a8a841a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 4 Aug 2023 12:40:26 -0700 Subject: [PATCH 182/189] python310Packages.mat2: 0.13.3 -> 0.13.4 Diff: https://0xacab.org/jvoisin/mat2/-/compare/0.13.3...0.13.4 Changelog: https://0xacab.org/jvoisin/mat2/-/blob/0.13.4/CHANGELOG.md --- pkgs/development/python-modules/mat2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 3737bea08243..0346ba1074b2 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.3"; + version = "0.13.4"; disabled = pythonOlder "3.5"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-x3vGltGuFjI435lEXZU3p4eQcgRm0Oodqd6pTWO7ZX8="; + hash = "sha256-SuN62JjSb5O8gInvBH+elqv/Oe7j+xjCo+dmPBU7jEY="; }; patches = [ From a63de787af79f8da1bebf81975495a3051e5bf0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 21:42:56 +0200 Subject: [PATCH 183/189] python311Packages.add-trailing-comma: 3.0.0 -> 3.0.1 Diff: https://github.com/asottile/add-trailing-comma/compare/v3.0.0...v3.0.1 --- .../development/python-modules/add-trailing-comma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index 37c0a26b3b00..b0af50573ad9 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "3.0.0"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-uknXi7fsCWK5ngCEyfpkjovCtvL5v6OwN5kVoBpNZsY="; + hash = "sha256-wCqCKomnkYgvxDWtjBwyqKb09sTPqPgWbYohgosUaHA="; }; propagatedBuildInputs = [ From afa51689b5ea45806ec75d93ed5ac2504f444730 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Aug 2023 21:53:02 +0200 Subject: [PATCH 184/189] python311Packages.google-cloud-securitycenter: 1.23.1 -> 1.23.2 Changelog: https://github.com/googleapis/python-securitycenter/blob/v1.23.2/CHANGELOG.md --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 2b985e96e728..4063ad21ae9c 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.23.1"; + version = "1.23.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GlFoeifExNS7pd+vDnYWsGWPNDkQ4SmnFFnTnsjTN6Q="; + hash = "sha256-3QdHomKKN8bSUtyFCZJliw/FxNixVj9pdkzMwJWT880="; }; propagatedBuildInputs = [ From 62c5f723fb36461a168ccd5f28ab73dea717b9a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 20:59:48 +0200 Subject: [PATCH 185/189] python311Packages.aiounifi: 50 -> 51 https://github.com/Kane610/aiounifi/releases/tag/v51 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 9798938070c3..d99ff10cfa8d 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "50"; + version = "51"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ydSKXydtOJaAI2PCPX+8jh4w9otX64Lj7QwbasTdWf0="; + hash = "sha256-XR/yZLxTHVHxm/QLCKrp9XFJ7yZybPjPxKEhf1SOzD0="; }; propagatedBuildInputs = [ From 6f82a3d2d6ee0e942c3a636fb236304209a585f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 21:06:30 +0200 Subject: [PATCH 186/189] python311Packages.zigpy-znp: 0.11.3 -> 0.11.4 https://github.com/zigpy/zigpy-znp/releases/tag/v0.11.4 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index 8faa6bafe2c8..6b5c0fd41a85 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.3"; + version = "0.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3pK6H926awUuQGmwyqirFKPnnz+XCGg2/ChuwvaHoDY="; + hash = "sha256-wt7ZsMXOh+CbhJCUMS7RhzozYlyINRs0xOF7ecwkNCU="; }; postPatch = '' From ffbd41175460f5d870fac5cfef58d73f770684c9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Aug 2023 22:06:39 +0200 Subject: [PATCH 187/189] home-assistant: 2023.8.0 -> 2023.8.1 https://github.com/home-assistant/core/releases/tag/2023.8.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index aed44fb5808e..521f73dbb72e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.8.0"; + version = "2023.8.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 07c4e2adaebf..9c074cf090cc 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -295,7 +295,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.8.0"; + hassVersion = "2023.8.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -311,7 +311,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-Nvh52oVovcmicqYuXJcQveTTjTd/ZHjrKTMh2rtQKdU="; + hash = "sha256-u20hEdVoxp2MzLo6OonQZnkoxqK+myt4LwqB+mz3ipE="; }; # Secondary source is git for tests @@ -319,7 +319,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-WGM7xo2iOS1q19eVzBIh4t8B8s1kw7E1gsFChR8SPc0="; + hash = "sha256-CrfVokUk3KnkavM+/ci70ela7aJ60TSNymoCzZdxaIY="; }; nativeBuildInputs = with python.pkgs; [ From 161bf188f699612cc1c0d45e250d7cad6cc74105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 4 Aug 2023 14:00:49 -0700 Subject: [PATCH 188/189] python310Packages.mat2: add meta.mainProgram --- pkgs/development/python-modules/mat2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 0346ba1074b2..97b9090cc250 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -97,6 +97,7 @@ buildPythonPackage rec { homepage = "https://0xacab.org/jvoisin/mat2"; changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md"; license = licenses.lgpl3Plus; + mainProgram = "mat2"; maintainers = with maintainers; [ dotlambda ]; }; } From 25bbc404a1c3ef99435ced65f949d4731621ad26 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 4 Aug 2023 22:20:48 +0100 Subject: [PATCH 189/189] flood: fix mainProgram merge issue The package was repackaged using `buildNpmPackage` ([1]). In parallel its `meta.mainProgram` was defined for the old `node-packages.nix` packaging format ([2]). Both branches were merged almost at the same time, breaking the build. [1]: https://github.com/NixOS/nixpkgs/pull/245435 [2]: https://github.com/NixOS/nixpkgs/pull/247095 --- pkgs/applications/networking/p2p/flood/default.nix | 1 + pkgs/development/node-packages/main-programs.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix index 3f577289502a..8ee94f17e50c 100644 --- a/pkgs/applications/networking/p2p/flood/default.nix +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -21,5 +21,6 @@ buildNpmPackage rec { homepage = "https://flood.js.org"; license = licenses.gpl3Only; maintainers = with maintainers; [ thiagokokada winter ]; + mainProgram = "flood"; }; } diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 2329de51149e..494a69e8a3c2 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -46,7 +46,6 @@ firebase-tools = "firebase"; fkill-cli = "fkill"; fleek-cli = "fleek"; - flood = "flood"; git-run = "gr"; gitmoji-cli = "gitmoji"; graphql-cli = "graphql";