From 11f45c83621f8169f1c0dba8462196903697b0f1 Mon Sep 17 00:00:00 2001 From: Leon Vack Date: Mon, 8 Apr 2024 11:00:14 +0200 Subject: [PATCH 01/99] nixos/alertmanager: add additional docs about envsubst Environment variables in the alertmanager config are substituted using envsubst. It is therefore necessary to escape $ as $$ in the config, if it should be preserved. --- .../modules/services/monitoring/prometheus/alertmanager.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index bb426d8b7beb..a96cc8d96be8 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -51,6 +51,9 @@ in { default = null; description = lib.mdDoc '' Alertmanager configuration as nix attribute set. + + The contents of the resulting config file are processed using envsubst. + `$` needs to be escaped as `$$` to be preserved. ''; }; @@ -62,6 +65,9 @@ in { defines the text that is written to alertmanager.yml. If null, the contents of alertmanager.yml is generated from the structured config options. + + The contents of the resulting config file are processed using envsubst. + `$` needs to be escaped as `$$` to be preserved. ''; }; From 31193fae957745e6537d30ddaad2b3449942317c Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Thu, 2 May 2024 12:43:59 +0200 Subject: [PATCH 02/99] maintainers: add lordmzte --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1e3ee0931840..b3ada9c038f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11637,6 +11637,16 @@ githubId = 5624721; name = "Ben Wolsieffer"; }; + lordmzte = { + name = "Moritz Thomae"; + email = "lord@mzte.de"; + matrix = "@lordmzte:mzte.de"; + github = "LordMZTE"; + githubId = 28735087; + keys = [{ + fingerprint = "AB47 3D70 53D2 74CA DC2C 230C B648 02DC 33A6 4FF6"; + }]; + }; lord-valen = { name = "Lord Valen"; matrix = "@lord-valen:matrix.org"; From 64204e1dbbf261c61278d674e434ec852eb06bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 20 Oct 2024 23:34:25 +0200 Subject: [PATCH 03/99] n8n: drop maintainer freezeboy --- pkgs/by-name/n8/n8n/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 00df6946c213..d07b86b0534b 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -98,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://n8n.io"; changelog = "https://github.com/n8n-io/n8n/releases/tag/${finalAttrs.src.rev}"; maintainers = with maintainers; [ - freezeboy gepbird ]; license = licenses.sustainableUse; From 4541db911cca35a4c617746aaaeebf9beee3b504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 20 Oct 2024 23:50:14 +0200 Subject: [PATCH 04/99] n8n: remove `with lib;` --- pkgs/by-name/n8/n8n/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index d07b86b0534b..aabf9f6adfba 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = true; - meta = with lib; { + meta = { description = "Free and source-available fair-code licensed workflow automation tool"; longDescription = '' Free and source-available fair-code licensed workflow automation tool. @@ -97,11 +97,11 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://n8n.io"; changelog = "https://github.com/n8n-io/n8n/releases/tag/${finalAttrs.src.rev}"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ gepbird ]; - license = licenses.sustainableUse; + license = lib.licenses.sustainableUse; mainProgram = "n8n"; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }) From fcb041dad95d41fa4ca0c0a204fda06f93666cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 20 Oct 2024 23:48:41 +0200 Subject: [PATCH 05/99] n8n: 1.61.0 -> 1.65.1 --- pkgs/by-name/n8/n8n/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index aabf9f6adfba..29dfa2a7f7f6 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.61.0"; + version = "1.65.1"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${finalAttrs.version}"; - hash = "sha256-9hIwpid/uly7wUcrBgLkSw+Aah8OQ66MgrMQbs/5v1Y="; + hash = "sha256-3fGsghGzqLb9B0qrqPuJV2pypd3kJVUrYohMe9quqG4="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-lZLWqlR6xq7DYpnydgJK8gL7WdfZcRU+8Autzh6e7kY="; + hash = "sha256-n+A7SGfjzvB9NOt8kqi7DswKSjCTef5SJItWtFzNpwA="; }; nativeBuildInputs = [ From f21d3a0f07057bceb2816312233d3626493c3960 Mon Sep 17 00:00:00 2001 From: Ughur Alakbarov Date: Mon, 11 Nov 2024 16:26:57 +0100 Subject: [PATCH 06/99] nixos/tabby: fix typo --- nixos/modules/services/misc/tabby.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/tabby.nix b/nixos/modules/services/misc/tabby.nix index d63a6b24ae3d..162089c892c1 100644 --- a/nixos/modules/services/misc/tabby.nix +++ b/nixos/modules/services/misc/tabby.nix @@ -34,7 +34,7 @@ in If you want to utilize an existing model that you've already downloaded you'll need to move it into tabby's state directory which lives in `/var/lib/tabby`. Because the tabby.service is configured to - use a DyanmicUser the service will need to have been started at least + use a DynamicUser the service will need to have been started at least once before you can move the locally existing model into `/var/lib/tabby`. You can set the model to 'none' and tabby will startup and fail to download a model, but will have created the From b861831405b0799cd74e8f74a61c91368a228477 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 12 Nov 2024 16:53:46 +0100 Subject: [PATCH 07/99] nixos/luksroot: make it harder to accidentially break cryptsetup --- nixos/modules/system/boot/luksroot.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 70b455871b4b..c1a5e9c3877d 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -1094,6 +1094,7 @@ in }; # We do this because we need the udev rules from the package + services.lvm.enable = true; boot.initrd.services.lvm.enable = true; boot.initrd.preFailCommands = mkIf (!config.boot.initrd.systemd.enable) postCommands; From 809beefe79653c50462de9737a5512e1d918daa3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:00:26 +0100 Subject: [PATCH 08/99] bottles: 51.13 -> 51.15 --- pkgs/applications/misc/bottles/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index bc9d3cb2e444..3bcd36fc6c3b 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -29,13 +29,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.13"; + version = "51.15"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; - rev = version; - hash = "sha256-ZcUevGY81H3ATTk390ojBp/4zBE2Lui7Qa+Qe8B0XL4="; + rev = "refs/tags/${version}"; + hash = "sha256-HjGAeIh9s7xWBy35Oj66tCtgKCd/DpHg1sMPsdjWKDs="; }; patches = [ ./vulkan_icd.patch ]; From e024ba7ba9fbb8259489785a14abaee2f177fcc8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:02:04 +0100 Subject: [PATCH 09/99] bottles: avoid with libs; --- pkgs/applications/misc/bottles/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 3bcd36fc6c3b..8525f99dfdec 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -104,16 +104,16 @@ python3Packages.buildPythonApplication rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ psydvl shamilton ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "bottles"; }; } From e87c4e37493bf4bff74545a6e8f70726205f9c17 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:03:06 +0100 Subject: [PATCH 10/99] bottles: add Gliczy as maintainer --- pkgs/applications/misc/bottles/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 8525f99dfdec..69dccd4ae7f9 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -112,6 +112,7 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ psydvl shamilton + Gliczy ]; platforms = lib.platforms.linux; mainProgram = "bottles"; From d2cfb56cafd2aa7803e793413dd6622e565a3113 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:05:07 +0100 Subject: [PATCH 11/99] bottles: use nix-update-script gitUpdater was picking up an older version of bottles. --- pkgs/applications/misc/bottles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 69dccd4ae7f9..c6aa927e1c02 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - gitUpdater, python3Packages, blueprint-compiler, meson, @@ -25,6 +24,7 @@ mangohud, vkbasalt-cli, vmtouch, + nix-update-script, }: python3Packages.buildPythonApplication rec { @@ -102,7 +102,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = nix-update-script { }; meta = { description = "Easy-to-use wineprefix manager"; From b1a9ea361136e9207ab31320cd43a4c039a13385 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:09:25 +0100 Subject: [PATCH 12/99] bottles: move to pkgs/by-name --- .../default.nix => by-name/bo/bottles-unwrapped/package.nix} | 0 .../bottles => by-name/bo/bottles-unwrapped}/vulkan_icd.patch | 0 .../bottles/fhsenv.nix => by-name/bo/bottles/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 4 deletions(-) rename pkgs/{applications/misc/bottles/default.nix => by-name/bo/bottles-unwrapped/package.nix} (100%) rename pkgs/{applications/misc/bottles => by-name/bo/bottles-unwrapped}/vulkan_icd.patch (100%) rename pkgs/{applications/misc/bottles/fhsenv.nix => by-name/bo/bottles/package.nix} (100%) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix similarity index 100% rename from pkgs/applications/misc/bottles/default.nix rename to pkgs/by-name/bo/bottles-unwrapped/package.nix diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/by-name/bo/bottles-unwrapped/vulkan_icd.patch similarity index 100% rename from pkgs/applications/misc/bottles/vulkan_icd.patch rename to pkgs/by-name/bo/bottles-unwrapped/vulkan_icd.patch diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/by-name/bo/bottles/package.nix similarity index 100% rename from pkgs/applications/misc/bottles/fhsenv.nix rename to pkgs/by-name/bo/bottles/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 930d24a9eb82..23429d8e6dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13603,10 +13603,6 @@ with pkgs; bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; - bottles = callPackage ../applications/misc/bottles/fhsenv.nix { }; - - bottles-unwrapped = callPackage ../applications/misc/bottles { }; - breezy = with python3Packages; toPythonApplication breezy; cage = callPackage ../applications/window-managers/cage { From b80d0435e49f3c5b7c15e978208fb77781ce7ad6 Mon Sep 17 00:00:00 2001 From: moni Date: Sat, 16 Nov 2024 09:46:30 +0800 Subject: [PATCH 13/99] nvtopPackages.apple: darwin support --- pkgs/tools/system/nvtop/build-nvtop.nix | 9 ++++++--- pkgs/tools/system/nvtop/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index f1f855b25383..55927ae56b35 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -8,6 +8,7 @@ , ncurses , testers , udev +, apple-sdk_12 , addDriverRunpath , amd ? false , intel ? false @@ -53,7 +54,9 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addDriverRunpath; - buildInputs = [ ncurses udev ] + buildInputs = [ ncurses ] + ++ lib.optional stdenv.isLinux udev + ++ lib.optional stdenv.isDarwin apple-sdk_12 ++ lib.optional nvidia cudatoolkit ++ lib.optional needDrm libdrm ; @@ -83,8 +86,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Syllo/nvtop"; changelog = "https://github.com/Syllo/nvtop/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ willibutz gbtb anthonyroussel ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ willibutz gbtb anthonyroussel moni ]; mainProgram = "nvtop"; }; }) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index f6e679b6ffef..02cb9b7531a1 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -2,10 +2,10 @@ let # this GPU families are supported "by-default" upstream (see https://github.com/Syllo/nvtop/blob/3a69c2d060298cd6f92cb09db944eded98be1c23/CMakeLists.txt#L81) # coincidentally, these families are also easy to build in nixpkgs at the moment - defaultGPUFamilies = [ "amd" "intel" "msm" "nvidia" "panfrost" "panthor" ]; + defaultGPUFamilies = [ "amd" "apple" "intel" "msm" "nvidia" "panfrost" "panthor" ]; # these GPU families are partially supported upstream, they are also tricky to build in nixpkgs # volunteers with specific hardware needed to build and test these package variants - additionalGPUFamilies = [ "apple" "ascend" ]; + additionalGPUFamilies = [ "ascend" ]; defaultSupport = builtins.listToAttrs (builtins.map (gpu: { name = gpu; value = true; }) defaultGPUFamilies); in { From cd813611a445b6c7a46d9f473b69958ebe3c3bb9 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 20 Oct 2024 22:55:34 -0400 Subject: [PATCH 14/99] firefox: enable darwin builds --- .../networking/browsers/firefox/common.nix | 120 ++++++++++++------ .../firefox/packages/firefox-beta.nix | 1 - .../firefox/packages/firefox-devedition.nix | 1 - .../firefox/packages/firefox-esr-128.nix | 1 - .../browsers/firefox/packages/firefox.nix | 1 - .../networking/browsers/firefox/wrapper.nix | 6 +- 6 files changed, 83 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index dc52606f24b7..6a46a8ec82d2 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -83,6 +83,11 @@ in , zlib , pkgsBuildBuild +# Darwin +, apple-sdk_14 +, cups +, rsync # used when preparing .app directory + # optionals ## addon signing/sideloading @@ -214,6 +219,8 @@ let pref("${key}", ${builtins.toJSON value.value}); '') defaultPrefs)); + toolkit = if stdenv.hostPlatform.isDarwin then "cairo-cocoa" else "cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"; + in buildStdenv.mkDerivation { @@ -263,7 +270,7 @@ buildStdenv.mkDerivation { + extraPostPatch; # Ignore trivial whitespace changes in patches, this fixes compatibility of - # ./env_var_for_system_dir.patch with Firefox >=65 without having to track + # ./env_var_for_system_dir-*.patch with Firefox >=65 without having to track # two patches. patchFlags = [ "-p1" "-l" ]; @@ -279,7 +286,6 @@ buildStdenv.mkDerivation { makeWrapper nodejs perl - pkg-config python3 rust-cbindgen rustPlatform.bindgenHook @@ -288,6 +294,8 @@ buildStdenv.mkDerivation { which wrapGAppsHook3 ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ] ++ lib.optionals crashreporterSupport [ dump_syms patchelf ] ++ lib.optionals pgoSupport [ xvfb-run ] ++ extraNativeBuildInputs; @@ -381,20 +389,9 @@ buildStdenv.mkDerivation { "--disable-tests" "--disable-updater" "--enable-application=${application}" - "--enable-default-toolkit=cairo-gtk3${lib.optionalString waylandSupport "-wayland"}" - "--enable-system-pixman" + "--enable-default-toolkit=${toolkit}" "--with-distribution-id=org.nixos" "--with-libclang-path=${lib.getLib llvmPackagesBuildBuild.libclang}/lib" - "--with-system-ffi" - "--with-system-icu" - "--with-system-jpeg" - "--with-system-libevent" - "--with-system-libvpx" - "--with-system-nspr" - "--with-system-nss" - "--with-system-png" # needs APNG support - "--with-system-webp" - "--with-system-zlib" "--with-wasi-sysroot=${wasiSysRoot}" # for firefox, host is buildPlatform, target is hostPlatform "--host=${buildStdenv.buildPlatform.config}" @@ -410,17 +407,34 @@ buildStdenv.mkDerivation { ++ lib.optional (ltoSupport && (buildStdenv.hostPlatform.isAarch32 || buildStdenv.hostPlatform.isi686 || buildStdenv.hostPlatform.isx86_64)) "--disable-elf-hack" ++ lib.optional (!drmSupport) "--disable-eme" ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" - ++ [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # MacOS builds use bundled versions of libraries: https://bugzilla.mozilla.org/show_bug.cgi?id=1776255 + "--enable-system-pixman" + "--with-system-ffi" + "--with-system-icu" + "--with-system-jpeg" + "--with-system-libevent" + "--with-system-libvpx" + "--with-system-nspr" + "--with-system-nss" + "--with-system-png" # needs APNG support + "--with-system-webp" + "--with-system-zlib" + + # These options are not available on MacOS, even --disable-* (enableFeature alsaSupport "alsa") + (enableFeature jackSupport "jack") + (enableFeature pulseaudioSupport "pulseaudio") + (enableFeature sndioSupport "sndio") + ] + ++ [ (enableFeature crashreporterSupport "crashreporter") (enableFeature ffmpegSupport "ffmpeg") (enableFeature geolocationSupport "necko-wifi") (enableFeature gssSupport "negotiateauth") - (enableFeature jackSupport "jack") (enableFeature jemallocSupport "jemalloc") - (enableFeature pulseaudioSupport "pulseaudio") - (enableFeature sndioSupport "sndio") (enableFeature webrtcSupport "webrtc") + (enableFeature debugBuild "debug") (if debugBuild then "--enable-profiling" else "--enable-optimize") # --enable-release adds -ffunction-sections & LTO that require a big amount @@ -435,26 +449,33 @@ buildStdenv.mkDerivation { buildInputs = [ bzip2 + file + libGL + libGLU + libstartup_notification + nasm + perl + zip + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_14 + cups + ] + ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) ([ dbus dbus-glib - file fontconfig freetype glib gtk3 libffi - libGL - libGLU libevent libjpeg libpng - libstartup_notification libvpx libwebp - nasm nspr pango - perl xorg.libX11 xorg.libXcursor xorg.libXdamage @@ -466,21 +487,20 @@ buildStdenv.mkDerivation { xorg.libXtst xorg.pixman xorg.xorgproto - zip zlib - ] + (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) + ] ++ lib.optional alsaSupport alsa-lib + ++ lib.optional jackSupport libjack2 + ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed + ++ lib.optional sndioSupport sndio + ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] + )) # icu73 changed how it follows symlinks which breaks in the firefox sandbox # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287 # icu74 fails to build on 127 and older # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601 ++ [ (if (lib.versionAtLeast version "115") then icu73 else icu72) ] - ++ [ (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional jackSupport libjack2 - ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed - ++ lib.optional sndioSupport sndio ++ lib.optional gssSupport libkrb5 - ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional jemallocSupport jemalloc ++ extraBuildInputs; @@ -536,27 +556,45 @@ buildStdenv.mkDerivation { cd objdir ''; - postInstall = '' - # Install distribution customizations - install -Dvm644 ${distributionIni} $out/lib/${binaryName}/distribution/distribution.ini - install -Dvm644 ${defaultPrefsFile} $out/lib/${binaryName}/browser/defaults/preferences/nixos-default-prefs.js + # The target will prepare .app bundle + installTargets = lib.optionalString stdenv.hostPlatform.isDarwin "stage-package"; - '' + lib.optionalString buildStdenv.hostPlatform.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + cp -r dist/${binaryName}/*.app $out/Applications + + appBundlePath=(dist/${binaryName}/*.app) + appBundle=''${appBundlePath[0]#dist/${binaryName}} + resourceDir=$out/Applications/$appBundle/Contents/Resources + + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/${binaryName}-devel-* # Needed to find Mozilla runtime gappsWrapperArgs+=(--argv0 "$out/bin/.${binaryName}-wrapped") + + resourceDir=$out/lib/${binaryName} + '' + '' + # Install distribution customizations + install -Dvm644 ${distributionIni} "$resourceDir/distribution/distribution.ini" + install -Dvm644 ${defaultPrefsFile} "$resourceDir/browser/defaults/preferences/nixos-default-prefs.js" + + cd .. ''; - postFixup = lib.optionalString crashreporterSupport '' + postFixup = lib.optionalString (crashreporterSupport && buildStdenv.hostPlatform.isLinux) '' patchelf --add-rpath "${lib.makeLibraryPath [ curl ]}" $out/lib/${binaryName}/crashreporter ''; + # Some basic testing doInstallCheck = true; - installCheckPhase = '' - # Some basic testing - "$out/bin/${binaryName}" --version + installCheckPhase = lib.optionalString buildStdenv.hostPlatform.isDarwin '' + bindir=$out/Applications/$appBundle/Contents/MacOS + '' + lib.optionalString (!buildStdenv.hostPlatform.isDarwin) '' + bindir=$out/bin + '' + '' + "$bindir/${binaryName}" --version ''; passthru = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index fdf8ac09f98d..fc4b697d9388 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -22,7 +22,6 @@ buildMozillaMach rec { homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index a8781e765841..bb2b934aef75 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -24,7 +24,6 @@ buildMozillaMach rec { homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ jopejoe1 ]; platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix index 2fec0fa28714..f6528930ff8f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix @@ -21,7 +21,6 @@ buildMozillaMach rec { homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ hexa ]; platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index b37e1737e779..dfd197b3ef24 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix @@ -24,7 +24,6 @@ buildMozillaMach rec { hexa ]; platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 73cdd9103de9..56314b66de49 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -87,7 +87,10 @@ let else []) ); - libs = lib.optionals stdenv.hostPlatform.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ] + libs = lib.optionals stdenv.hostPlatform.isLinux ( + [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils vulkan-loader ] + ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal + ) ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 @@ -99,7 +102,6 @@ let ++ lib.optional sndioSupport sndio ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc - ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal ++ pkcs11Modules ++ gtk_modules; gtk_modules = [ libcanberra-gtk3 ]; From d72d4fa107a04cd708a9a819a4863046bc52d785 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 23 Oct 2024 20:21:25 -0400 Subject: [PATCH 15/99] thunderbird: enable darwin builds --- .../applications/networking/mailreaders/thunderbird/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 25f78dbd3dcb..846efdb0542a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -38,7 +38,6 @@ let mainProgram = "thunderbird"; maintainers = with maintainers; [ lovesegfault pierron vcunat ]; platforms = platforms.unix; - badPlatforms = platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = licenses.mpl20; From 2ef548869dfbd9ea4b9acd6cb22a6e3a3a9e0d4b Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 24 Oct 2024 08:35:49 -0400 Subject: [PATCH 16/99] floorp: enable darwin builds --- pkgs/applications/networking/browsers/floorp/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 56dc4af350ab..5b6b6e9e61b1 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -50,7 +50,6 @@ homepage = "https://floorp.app/"; maintainers = with lib.maintainers; [ christoph-heiss ]; platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. From de7585dec87f2446b02642df347cd3c5c6208eeb Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 24 Oct 2024 08:35:59 -0400 Subject: [PATCH 17/99] librewolf: enable darwin builds --- pkgs/applications/networking/browsers/librewolf/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 76c6ee7a052c..9a1c9330ccde 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -19,7 +19,6 @@ in homepage = "https://librewolf.net/"; maintainers = with lib.maintainers; [ squalus ]; platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) From 4a42682ff80ec666e6b0757d9d792dc51202d0ca Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Sun, 17 Nov 2024 01:34:29 +0000 Subject: [PATCH 18/99] nixos/meilisearch: fix disabling analytics --- nixos/modules/services/search/meilisearch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/search/meilisearch.nix b/nixos/modules/services/search/meilisearch.nix index 39197c5e69e1..07c6a507074f 100644 --- a/nixos/modules/services/search/meilisearch.nix +++ b/nixos/modules/services/search/meilisearch.nix @@ -112,7 +112,7 @@ in environment = { MEILI_DB_PATH = "/var/lib/meilisearch"; MEILI_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.listenPort}"; - MEILI_NO_ANALYTICS = toString cfg.noAnalytics; + MEILI_NO_ANALYTICS = boolToString cfg.noAnalytics; MEILI_ENV = cfg.environment; MEILI_DUMP_DIR = "/var/lib/meilisearch/dumps"; MEILI_LOG_LEVEL = cfg.logLevel; From 6b4dfe719935f214eb1e6c2a1468e5f3daf0673a Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:55:11 +0800 Subject: [PATCH 19/99] jami: fix build with libgit2 1.8.4 --- .../networking/instant-messengers/jami/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index a3df5958beb6..b9f02397e3b5 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -188,6 +188,12 @@ stdenv.mkDerivation rec { inherit src version meta; sourceRoot = "${src.name}/daemon"; + # Fix for libgit2 breaking changes + postPatch = '' + substituteInPlace src/jamidht/conversationrepository.cpp \ + --replace-fail "git_commit* const" "const git_commit*" + ''; + nativeBuildInputs = [ autoreconfHook pkg-config From 13a26c516c2aa8535c88919ea80de1f99306c4cb Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sun, 17 Nov 2024 23:06:31 +0800 Subject: [PATCH 20/99] jami: 20240823 -> 20241031.0 --- .../networking/instant-messengers/jami/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index b9f02397e3b5..ba1c6d69c01c 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -24,7 +24,6 @@ libnatpmp, libpulseaudio, libupnp, - yaml-cpp, msgpack-cxx, openssl, restinio, @@ -32,6 +31,7 @@ speex, udev, webrtc-audio-processing, + yaml-cpp, zlib, # for dhtnet @@ -68,14 +68,14 @@ stdenv.mkDerivation rec { pname = "jami"; - version = "20240823.0"; + version = "20241031.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-7jGH54sFiS6qrdEiKSS64lJyJXL1FOJVbesxo/FFmyA="; + hash = "sha256-LKezdzM+ltUSgW4GmTXICyufx9mI1AVbdEcwSp6tmao="; fetchSubmodules = true; }; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "dhtnet"; - rev = "cfe512b0632eea046f683b22e42d01eeb943d751"; + rev = "8cd00200669fa5b7632faa447ba206c3847e2879"; hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME="; }; @@ -173,6 +173,8 @@ stdenv.mkDerivation rec { "-DBUILD_BENCHMARKS=Off" "-DBUILD_TOOLS=Off" "-DBUILD_TESTING=Off" + "-DBUILD_DEPENDENCIES=Off" + "-DBUILD_EXAMPLE=Off" ]; meta = with lib; { @@ -218,7 +220,6 @@ stdenv.mkDerivation rec { libnatpmp libpulseaudio libupnp - yaml-cpp msgpack-cxx opendht-jami openssl @@ -228,6 +229,7 @@ stdenv.mkDerivation rec { speex udev webrtc-audio-processing + yaml-cpp zlib ]; From 73b6567c4122aa1d8d4e9fb602e954ea3d0fae73 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 18 Nov 2024 13:07:49 +0100 Subject: [PATCH 21/99] doc: change allowInsecurePredicate example to a useful one --- doc/using/configuration.chapter.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/using/configuration.chapter.md b/doc/using/configuration.chapter.md index 05a8fa5517cc..d443cf1b8e54 100644 --- a/doc/using/configuration.chapter.md +++ b/doc/using/configuration.chapter.md @@ -154,11 +154,13 @@ There are several ways to tweak how Nix handles a package which has been marked The `allowInsecurePredicate` option is a function which accepts a package and returns a boolean, much like `allowUnfreePredicate`. - The following configuration example only allows insecure packages with very short names: + The following configuration example allows any version of the `ovftool` package: ```nix { - allowInsecurePredicate = pkg: builtins.stringLength (lib.getName pkg) <= 5; + allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ + "ovftool" + ]; } ``` From 216274522546630af9f24d220e77e9be4c03ef3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Nov 2024 13:33:09 +0100 Subject: [PATCH 22/99] yt-dlp: 2024.11.4 -> 2024.11.18 Changelog: https://github.com/yt-dlp/yt-dlp/blob/HEAD/Changelog.md --- pkgs/by-name/yt/yt-dlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index c3149189b538..884089079e1d 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.11.4"; + version = "2024.11.18"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-7SBMG2G8Vj4TREd2bRqzQxc1QHmeE+u5U+iHzn3PaGU="; + hash = "sha256-uKTCPTya/X5Ha824fzi2wOjhLjojnXmI8TrLQ0IA9U0="; }; build-system = with python3Packages; [ From df5830d01308ba2e9801009d9df1c01a6f3d9a6c Mon Sep 17 00:00:00 2001 From: Rahul Rameshbabu Date: Mon, 18 Nov 2024 23:52:42 -0800 Subject: [PATCH 23/99] gpauth: limit platforms to *-linux Since gpauth depends on webkitgtk, it cannot be trivially built on the darwin platform. Even though webkitgtk is explicitly marked as broken for darwin, this does not help with showing what platforms gpauth (and gpclient) is supported on when doing package searching. Signed-off-by: Rahul Rameshbabu --- pkgs/by-name/gp/gpauth/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index 102cfe3ddf58..a98459bbc0d1 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -49,5 +49,9 @@ rustPlatform.buildRustPackage rec { binary-eater m1dugh ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; } From 810fcd88f8c03a91384c72e562cbc1353e2daf7b Mon Sep 17 00:00:00 2001 From: Celio Grand Date: Tue, 19 Nov 2024 18:44:35 +0800 Subject: [PATCH 24/99] tuxguitar: fix start script --- pkgs/by-name/tu/tuxguitar/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index e8df3929fc6f..bbea8d4dea70 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -10,6 +10,8 @@ fluidsynth, libpulseaudio, lilv, + which, + wrapGAppsHook, nixosTests, }: @@ -22,8 +24,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FD1+7jV69E9AfTczjD6DOGD+pPlscg4o8A9ADBUM9B4="; }; + buildInputs = [ + which + ]; + nativeBuildInputs = [ makeWrapper + wrapGAppsHook ]; installPhase = '' @@ -36,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/share $out/bin/share wrapProgram $out/bin/tuxguitar \ - --set JAVA "${jre}/bin/java" \ + --set PATH "$PATH:${jre}/bin" \ --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt From 739e9ee35f978ec58de9258fb408be52b7ec4d22 Mon Sep 17 00:00:00 2001 From: Celio Grand Date: Tue, 19 Nov 2024 23:02:31 +0800 Subject: [PATCH 25/99] tuxguitar: apply suggestions --- pkgs/by-name/tu/tuxguitar/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index bbea8d4dea70..2a6fe2d955cc 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -11,7 +11,7 @@ libpulseaudio, lilv, which, - wrapGAppsHook, + wrapGAppsHook3, nixosTests, }: @@ -24,15 +24,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FD1+7jV69E9AfTczjD6DOGD+pPlscg4o8A9ADBUM9B4="; }; - buildInputs = [ - which - ]; - nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; + dontWrapGApps = true; + installPhase = '' mkdir -p $out/bin cp -r dist lib share $out/ @@ -41,9 +39,12 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/dist $out/bin/dist ln -s $out/lib $out/bin/lib ln -s $out/share $out/bin/share + ''; + postFixup = '' wrapProgram $out/bin/tuxguitar \ - --set PATH "$PATH:${jre}/bin" \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${lib.makeBinPath[ jre which ]} \ --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt From 9660fc3945d178b435a45d5efbd69e0b93df5794 Mon Sep 17 00:00:00 2001 From: Celio Grand Date: Wed, 20 Nov 2024 01:12:15 +0800 Subject: [PATCH 26/99] tuxguitar: format Co-authored-by: seth --- pkgs/by-name/tu/tuxguitar/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index 2a6fe2d955cc..abbc7dfd9662 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' wrapProgram $out/bin/tuxguitar \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath[ jre which ]} \ + --prefix PATH : ${lib.makeBinPath [ jre which ]} \ --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt From dffdc71078d244f22f33b8849e73bc28b94b5c1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 19 Nov 2024 17:55:40 +0000 Subject: [PATCH 27/99] python312Packages.language-data: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/language-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index da1a35456152..4c6f19d2ea88 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "language-data"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "georgkrause"; repo = "language_data"; rev = "refs/tags/v${version}"; - hash = "sha256-TVWyDEDI6NBioc8DqhXzpLS22EFKsZ/nan2vfgFsieQ="; + hash = "sha256-qHPie07GtVPKP/PFlP72XVVrl6j+5A8fIO729aPRsrc="; }; build-system = [ setuptools-scm ]; From 63b1496a2ce377644f1efbf2e462790d93bb225f Mon Sep 17 00:00:00 2001 From: Celio Grand Date: Wed, 20 Nov 2024 02:51:58 +0800 Subject: [PATCH 28/99] tuxguitar: nixfmt --- pkgs/by-name/tu/tuxguitar/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/tu/tuxguitar/package.nix b/pkgs/by-name/tu/tuxguitar/package.nix index abbc7dfd9662..a393c1a85d7c 100644 --- a/pkgs/by-name/tu/tuxguitar/package.nix +++ b/pkgs/by-name/tu/tuxguitar/package.nix @@ -44,7 +44,12 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' wrapProgram $out/bin/tuxguitar \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ jre which ]} \ + --prefix PATH : ${ + lib.makeBinPath [ + jre + which + ] + } \ --prefix LD_LIBRARY_PATH : "$out/lib/:${ lib.makeLibraryPath [ swt From 0a54d674cb3bd708b34c6b76ee6fed2f0dfb19af Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 19 Nov 2024 20:29:49 +0000 Subject: [PATCH 29/99] p4: fix darwin build --- pkgs/applications/version-management/p4/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index ec01f86a3af0..94bbd7cb0df9 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-sOSVER=1013" - "-sMACOSX_SDK=${emptyDirectory}" "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" ]; @@ -81,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: rec { (stdenv.cc.isClang || (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.cc.version "11.0.0")) [ "-include" "limits" "-include" "thread" ]; + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + export MACOSX_SDK=$SDKROOT + ''; + buildPhase = '' runHook preBuild jam $jamFlags -j$NIX_BUILD_CORES p4 From 2e32c0cb683b9b6d7f47273e55411c3619d79a76 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 19 Nov 2024 16:10:41 -0800 Subject: [PATCH 30/99] signalbackup-tools: 20241106-1 -> 20241119 Diff: https://github.com/bepaald/signalbackup-tools/compare/20241106-1...20241119 --- pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index b7aacf1b70ee..8541b9fd668a 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20241106-1"; + version = "20241119"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-klIkNt3AlT/msZl7pYPQaFMl/pdI7rcaeLDZekmTIzY="; + hash = "sha256-HZNjkOuJOoOSPmJHu6QTYzyxgS4dSC6lWB++xF4rRnI="; }; nativeBuildInputs = [ From 3e29e0560db624aedd01487b3c1beb04293f027a Mon Sep 17 00:00:00 2001 From: oddlama Date: Wed, 20 Nov 2024 01:40:06 +0100 Subject: [PATCH 31/99] nixos/kanidm: add provisioning secret directories to BindReadOnlyPaths --- nixos/modules/services/security/kanidm.nix | 23 +++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index a368b6eee2a6..042ca0bb3b36 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -31,6 +31,7 @@ let mkOption mkPackageOption optional + optionals optionalString splitString subtractLists @@ -45,10 +46,22 @@ let serverConfigFile = settingsFormat.generate "server.toml" (filterConfig cfg.serverSettings); clientConfigFile = settingsFormat.generate "kanidm-config.toml" (filterConfig cfg.clientSettings); unixConfigFile = settingsFormat.generate "kanidm-unixd.toml" (filterConfig cfg.unixSettings); - certPaths = builtins.map builtins.dirOf [ - cfg.serverSettings.tls_chain - cfg.serverSettings.tls_key - ]; + provisionSecretFiles = filter (x: x != null) ( + [ + cfg.provision.idmAdminPasswordFile + cfg.provision.adminPasswordFile + ] + ++ mapAttrsToList (_: x: x.basicSecretFile) cfg.provision.systems.oauth2 + ); + secretDirectories = unique ( + map builtins.dirOf ( + [ + cfg.serverSettings.tls_chain + cfg.serverSettings.tls_key + ] + ++ optionals cfg.provision.enable provisionSecretFiles + ) + ); # Merge bind mount paths and remove paths where a prefix is already mounted. # This makes sure that if e.g. the tls_chain is in the nix store and /nix/store is already in the mount @@ -817,7 +830,7 @@ in ( defaultServiceConfig // { - BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ certPaths); + BindReadOnlyPaths = mergePaths (defaultServiceConfig.BindReadOnlyPaths ++ secretDirectories); } ) { From 323260bb1bf1046453af3489072d921a691695a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Nov 2024 02:14:13 +0000 Subject: [PATCH 32/99] cargo-binstall: 1.10.7 -> 1.10.13 --- pkgs/by-name/ca/cargo-binstall/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index eb6d5bff0026..e4e644584774 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.7"; + version = "1.10.13"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-bQYKOo11zVIXNHdoD60oEdzSSYeLKppPJBen6wdrXq8="; + hash = "sha256-z18p25myXINtQpuNw+tHiyj1J1oDEmkQ+v4dj4GKYtg="; }; - cargoHash = "sha256-Tr++ui715adP1taqj+Sms2yO3hF5SZl7zCrAkPYlSdY="; + cargoHash = "sha256-cRTaGqArCbmlu6xthBMijtyyL7s+4mvxl1Yeuw5VS9A="; nativeBuildInputs = [ pkg-config From 2d4dfc04b44a5557436895bb8b4795dd7969ee32 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 20 Nov 2024 16:06:55 +0900 Subject: [PATCH 33/99] doc/stdenv: fix a typo --- doc/stdenv/platform-notes.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md index 7e06a9bab30f..63511e7e8b21 100644 --- a/doc/stdenv/platform-notes.chapter.md +++ b/doc/stdenv/platform-notes.chapter.md @@ -165,7 +165,7 @@ These paths will need to be replaced with relative paths and the xcbuild package stdenv.mkDerivation { name = "libfoo-1.2.3"; postPatch = '' - subsituteInPlace Makefile \ + substituteInPlace Makefile \ --replace-fail '/usr/bin/xcodebuild' 'xcodebuild' \ --replace-fail '/usr/bin/xcrun' 'xcrun' \ --replace-fail '/usr/bin/PListBuddy' 'PListBuddy' From 304d33e04d2a3871f4372c3c143d1523220fc5e5 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 20 Nov 2024 08:26:28 +0100 Subject: [PATCH 34/99] opensc: fix darwin build Closes #357432 --- pkgs/by-name/op/opensc/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opensc/package.nix b/pkgs/by-name/op/opensc/package.nix index 0f0e5b50757d..82b371875ce4 100644 --- a/pkgs/by-name/op/opensc/package.nix +++ b/pkgs/by-name/op/opensc/package.nix @@ -73,7 +73,12 @@ stdenv.mkDerivation rec { ) "XSLTPROC=${buildPackages.libxslt}/bin/xsltproc") ]; - PCSC_CFLAGS = lib.optionalString withApplePCSC "-I${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/Headers"; + PCSC_CFLAGS = lib.concatStringsSep " " ( + lib.optionals withApplePCSC [ + "-I${darwin.apple_sdk.frameworks.PCSC}/Library/Frameworks/PCSC.framework/Headers" + "-I${lib.getDev pcsclite}/include/PCSC" + ] + ); installFlags = [ "sysconfdir=$(out)/etc" From ef02dff02c577393d09c8c00c13733267d40aeba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= Date: Wed, 20 Nov 2024 10:01:29 +0100 Subject: [PATCH 35/99] searxng: 0-unstable-2024-10-05 -> 0-unstable-2024-11-17 --- pkgs/by-name/se/searxng/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index ebb545933a1d..39857dd8d7e6 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -8,13 +8,13 @@ python3.pkgs.toPythonModule ( python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "0-unstable-2024-10-05"; + version = "0-unstable-2024-11-17"; src = fetchFromGitHub { owner = "searxng"; repo = "searxng"; - rev = "e7a4d7d7c3d688b69737f2b1ecd23571f5e3a0b9"; - hash = "sha256-JfcB19Tfk5e7DyArzz9TNjidOZjkSxTLEU3ZhE105qs="; + rev = "10d3af84b833ab2f2d1095efa3a7ba240ffb32fc"; + hash = "sha256-dXALuiPCzK0Az64Fj9ygsNFoPKf0oJ2LyZDeg00Bfyo="; }; postPatch = '' @@ -52,10 +52,11 @@ python3.pkgs.toPythonModule ( brotli jinja2 lxml + msgspec pygments - pytomlpp pyyaml redis + typer uvloop setproctitle httpx From ab58dc04c31544b159691cc9c1146f6e5a389b2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Nov 2024 13:15:16 +0000 Subject: [PATCH 36/99] galer: 0.1.0 -> 0.2.0 --- pkgs/by-name/ga/galer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/galer/package.nix b/pkgs/by-name/ga/galer/package.nix index b2a9311a0b46..5f2e90fe8c10 100644 --- a/pkgs/by-name/ga/galer/package.nix +++ b/pkgs/by-name/ga/galer/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "galer"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dwisiswant0"; repo = "galer"; rev = "refs/tags/v${version}"; - hash = "sha256-/VvN6LjK+V8E9XYarRUI/TPGitMM0a3g1lfdYhV1yP8="; + hash = "sha256-otyvEXBiPBhWvyoJEG6Ho5HA63Lg78odMR4mc0n+xXo="; }; - vendorHash = "sha256-WDOwUjU6AP/8QvqiKTEY6wsMBZQFWn/LGWr8nfqDF+8="; + vendorHash = "sha256-BS7ZUq8/swZpTaYGjiF5OuZXQpoosZ3mdF9v1euijxo="; meta = with lib; { description = "Tool to fetch URLs from HTML attributes"; From 25dcc03d56450eeef8ccc68904f021012848477f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Nov 2024 14:02:00 +0000 Subject: [PATCH 37/99] exfatprogs: 1.2.5 -> 1.2.6 --- pkgs/by-name/ex/exfatprogs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exfatprogs/package.nix b/pkgs/by-name/ex/exfatprogs/package.nix index 66505d82b7ec..aef76521b9f5 100644 --- a/pkgs/by-name/ex/exfatprogs/package.nix +++ b/pkgs/by-name/ex/exfatprogs/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exfatprogs"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-EqSzveqLb0Ms7D5Pczoh0BuKD1sILzAbJMnDLacokl4="; + sha256 = "sha256-VUvVPABgQ7EUQu90DbWU7a+YThrWhusTk/YreKSqU/M="; }; nativeBuildInputs = [ pkg-config autoreconfHook file ]; From 84e9fd9db5a9da04bde71b08e4553e96ea5c067d Mon Sep 17 00:00:00 2001 From: moni Date: Sat, 16 Nov 2024 10:05:14 +0800 Subject: [PATCH 38/99] nvtopPackages.full: mutually exclude gpus for darwin and linux --- pkgs/tools/system/nvtop/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 02cb9b7531a1..648f0f25482b 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,4 +1,4 @@ -{ callPackage }: +{ callPackage, stdenv }: let # this GPU families are supported "by-default" upstream (see https://github.com/Syllo/nvtop/blob/3a69c2d060298cd6f92cb09db944eded98be1c23/CMakeLists.txt#L81) # coincidentally, these families are also easy to build in nixpkgs at the moment @@ -6,13 +6,14 @@ let # these GPU families are partially supported upstream, they are also tricky to build in nixpkgs # volunteers with specific hardware needed to build and test these package variants additionalGPUFamilies = [ "ascend" ]; - defaultSupport = builtins.listToAttrs (builtins.map (gpu: { name = gpu; value = true; }) defaultGPUFamilies); + defaultSupport = builtins.listToAttrs ( + # apple can only build on darwin, and it can't build everything else, and vice versa + builtins.map (gpu: { name = gpu; value = (gpu == "apple" && stdenv.buildPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) || (gpu != "apple" && stdenv.buildPlatform.isLinux); + }) defaultGPUFamilies + ); in { full = callPackage ./build-nvtop.nix defaultSupport; #this package supports all default GPU families } # additional packages with only one specific GPU family support // builtins.listToAttrs (builtins.map (gpu: { name = gpu; value = (callPackage ./build-nvtop.nix { "${gpu}" = true; }); }) defaultGPUFamilies) - - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index beb25b36d18a..9771864e750e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10541,7 +10541,7 @@ with pkgs; nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { }; - nvtopPackages = recurseIntoAttrs (import ../tools/system/nvtop { inherit callPackage; }); + nvtopPackages = recurseIntoAttrs (import ../tools/system/nvtop { inherit callPackage stdenv; }); inherit (callPackages ../development/libraries/ogre { }) ogre_13 ogre_14; From 37cf6e3ee61db025a21da52aa9121a1249b3153c Mon Sep 17 00:00:00 2001 From: moni Date: Sat, 16 Nov 2024 10:09:33 +0800 Subject: [PATCH 39/99] nvtopPackages: format --- pkgs/tools/system/nvtop/build-nvtop.nix | 71 +++++++++++++++---------- pkgs/tools/system/nvtop/default.nix | 25 +++++++-- 2 files changed, 65 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 55927ae56b35..7d5e2cd79949 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -1,30 +1,37 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtest -, cudatoolkit -, libdrm -, ncurses -, testers -, udev -, apple-sdk_12 -, addDriverRunpath -, amd ? false -, intel ? false -, msm ? false -, nvidia ? false -, apple ? false -, panfrost ? false -, panthor ? false -, ascend ? false +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gtest, + cudatoolkit, + libdrm, + ncurses, + testers, + udev, + apple-sdk_12, + addDriverRunpath, + amd ? false, + intel ? false, + msm ? false, + nvidia ? false, + apple ? false, + panfrost ? false, + panthor ? false, + ascend ? false, }: let drm-postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${lib.makeLibraryPath [ libdrm ncurses udev ]}" \ + --set-rpath "${ + lib.makeLibraryPath [ + libdrm + ncurses + udev + ] + }" \ $out/bin/nvtop ''; needDrm = (amd || msm || panfrost || panthor); @@ -52,20 +59,25 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "PANTHOR_SUPPORT" panthor) (cmakeBool "ASCEND_SUPPORT" ascend) ]; - nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addDriverRunpath; + nativeBuildInputs = [ + cmake + gtest + ] ++ lib.optional nvidia addDriverRunpath; - buildInputs = [ ncurses ] + buildInputs = + [ ncurses ] ++ lib.optional stdenv.isLinux udev ++ lib.optional stdenv.isDarwin apple-sdk_12 ++ lib.optional nvidia cudatoolkit - ++ lib.optional needDrm libdrm - ; + ++ lib.optional needDrm libdrm; # this helps cmake to find env.NIX_CFLAGS_COMPILE = lib.optionalString needDrm "-isystem ${lib.getDev libdrm}/include/libdrm"; # ordering of fixups is important - postFixup = (lib.optionalString needDrm drm-postFixup) + (lib.optionalString nvidia "addDriverRunpath $out/bin/nvtop"); + postFixup = + (lib.optionalString needDrm drm-postFixup) + + (lib.optionalString nvidia "addDriverRunpath $out/bin/nvtop"); doCheck = true; @@ -87,7 +99,12 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/Syllo/nvtop/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Only; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ willibutz gbtb anthonyroussel moni ]; + maintainers = with maintainers; [ + willibutz + gbtb + anthonyroussel + moni + ]; mainProgram = "nvtop"; }; }) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 648f0f25482b..7e9653102bef 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -2,18 +2,35 @@ let # this GPU families are supported "by-default" upstream (see https://github.com/Syllo/nvtop/blob/3a69c2d060298cd6f92cb09db944eded98be1c23/CMakeLists.txt#L81) # coincidentally, these families are also easy to build in nixpkgs at the moment - defaultGPUFamilies = [ "amd" "apple" "intel" "msm" "nvidia" "panfrost" "panthor" ]; + defaultGPUFamilies = [ + "amd" + "apple" + "intel" + "msm" + "nvidia" + "panfrost" + "panthor" + ]; # these GPU families are partially supported upstream, they are also tricky to build in nixpkgs # volunteers with specific hardware needed to build and test these package variants additionalGPUFamilies = [ "ascend" ]; defaultSupport = builtins.listToAttrs ( # apple can only build on darwin, and it can't build everything else, and vice versa - builtins.map (gpu: { name = gpu; value = (gpu == "apple" && stdenv.buildPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) || (gpu != "apple" && stdenv.buildPlatform.isLinux); + builtins.map (gpu: { + name = gpu; + value = + (gpu == "apple" && stdenv.buildPlatform.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) + || (gpu != "apple" && stdenv.buildPlatform.isLinux); }) defaultGPUFamilies ); in { - full = callPackage ./build-nvtop.nix defaultSupport; #this package supports all default GPU families + full = callPackage ./build-nvtop.nix defaultSupport; # this package supports all default GPU families } # additional packages with only one specific GPU family support -// builtins.listToAttrs (builtins.map (gpu: { name = gpu; value = (callPackage ./build-nvtop.nix { "${gpu}" = true; }); }) defaultGPUFamilies) +// builtins.listToAttrs ( + builtins.map (gpu: { + name = gpu; + value = (callPackage ./build-nvtop.nix { "${gpu}" = true; }); + }) defaultGPUFamilies +) From 088ac6b39eae37775b5b6c34516017949ec8e756 Mon Sep 17 00:00:00 2001 From: moni Date: Thu, 21 Nov 2024 00:12:37 +0800 Subject: [PATCH 40/99] nvtopPackages: set platform accordingly --- pkgs/tools/system/nvtop/build-nvtop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix index 7d5e2cd79949..953565150765 100644 --- a/pkgs/tools/system/nvtop/build-nvtop.nix +++ b/pkgs/tools/system/nvtop/build-nvtop.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Syllo/nvtop"; changelog = "https://github.com/Syllo/nvtop/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Only; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.optional (!apple) platforms.linux ++ lib.optional apple platforms.darwin; maintainers = with maintainers; [ willibutz gbtb From c0921fd9f119dd53b046a1bc0f0544490484ac09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Nov 2024 16:29:34 +0000 Subject: [PATCH 41/99] payload-dumper-go: 1.2.2 -> 1.3.0 --- pkgs/by-name/pa/payload-dumper-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/payload-dumper-go/package.nix b/pkgs/by-name/pa/payload-dumper-go/package.nix index e10b41cbef99..e09322a0138c 100644 --- a/pkgs/by-name/pa/payload-dumper-go/package.nix +++ b/pkgs/by-name/pa/payload-dumper-go/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "payload-dumper-go"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ssut"; repo = "payload-dumper-go"; rev = "refs/tags/${version}"; - hash = "sha256-P20/Nd2YOW9A9/OkpavVRBAi/ueYp812zZvVLnwX67Y="; + hash = "sha256-TFnBWylOoyleuBx3yYfHl1kWO6jVBiqsi8AMYLMuuk0="; }; - vendorHash = "sha256-CqIZFMDN/kK9bT7b/32yQ9NJAQnkI8gZUMKa6MJCaec="; + vendorHash = "sha256-XeD47PsFjDT9777SNE8f2LbKZ1cnL5HNPr3Eg7UIpJ0="; buildInputs = [ xz ]; From 66644c73b68734e3a7e5df748e6fd97a4624aa54 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 20 Nov 2024 09:09:08 -0800 Subject: [PATCH 42/99] zoom-us: 6.2.5.* -> 6.2.10.* --- pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index 798f7302ea66..3e30acbd820f 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -49,23 +49,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.2.5.41699"; - versions.x86_64-darwin = "6.2.5.41699"; - versions.x86_64-linux = "6.2.5.2440"; + versions.aarch64-darwin = "6.2.10.43047"; + versions.x86_64-darwin = "6.2.10.43047"; + versions.x86_64-linux = "6.2.10.4983"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-GD3WS4O8Xg2EKYS+CirXWHVjNkn3tQ6Ee5u15x218yA="; + hash = "sha256-i6ZO6Gp0PL200oklp7NJ56jGKF/nvuo54EazyfBU0Eo="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-8yEkB7hpvat33VCxuScsLD+zPKvqeTfK4Wx0vjyA9yY="; + hash = "sha256-lqmRjIre20VG9gkd7ISosABwYdLaHQDnSPYFKJZKh4Q="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-h+kt+Im0xv1zoLTvE+Ac9sfw1VyoAnvqFThf5/MwjHU="; + hash = "sha256-lPUKxkXI3yB/fCY05kQSJhTGSsU6v+t8nq5H6FLwhrk="; }; }; From e43293f0c99d2678a0964e3ffeefbe16ddd1c8ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Nov 2024 17:12:22 +0000 Subject: [PATCH 43/99] python312Packages.aioairq: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/aioairq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 274b25202a3a..99fddd49b095 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioairq"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "CorantGmbH"; repo = "aioairq"; rev = "refs/tags/v${version}"; - hash = "sha256-ppjhGBAoA5iV+ZfUKkUCNJRYN82JtclRe36pbe85i5w="; + hash = "sha256-Bgzwu/9Eu3Miw0eFb0b9jbD8yuPcBlJFnVyom+CsZBE="; }; build-system = [ setuptools ]; From f1bf4d74ef99397b15d17167656886d5a416586c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 20 Nov 2024 18:40:58 +0100 Subject: [PATCH 44/99] webdav: 5.4.2 -> 5.4.3 Diff: https://github.com/hacdias/webdav/compare/v5.4.2...v5.4.3 --- pkgs/by-name/we/webdav/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 312ae182466c..ebd4bffa33fa 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -2,13 +2,13 @@ buildGo123Module rec { pname = "webdav"; - version = "5.4.2"; + version = "5.4.3"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "sha256-a1XAlmEW8gNTgVZiJ200CP/wvbwvyv4Lc3L6KP/4Mik="; + sha256 = "sha256-ASc+ioVBpCFESEryI0EwKYZln1JzPCOKLJJWmh7L8oA="; }; vendorHash = "sha256-d8WauJ1i429dr79iHgrbFRZCmx+W6OobSINy8aNGG6w="; From 995a25b404f92227a97c8368d1c948c4dbed83e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Nov 2024 17:49:21 +0000 Subject: [PATCH 45/99] python312Packages.django-filer: 3.2.3 -> 3.3.0 --- pkgs/development/python-modules/django-filer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-filer/default.nix b/pkgs/development/python-modules/django-filer/default.nix index e87125cd9514..5d4b7395906f 100644 --- a/pkgs/development/python-modules/django-filer/default.nix +++ b/pkgs/development/python-modules/django-filer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-filer"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "django-cms"; repo = "django-filer"; rev = "refs/tags/${version}"; - hash = "sha256-PoUBnfNymighCsGoJE+iu31lxA9wqVXimFPCytQtPLg="; + hash = "sha256-qtvPd0TlFNoxNgzXiRWOOmViouDq0vtVBFGWK4XrIFE="; }; build-system = [ setuptools ]; From d9f8532ec2f953c8ec724cf2ff3d6cd9d63fc292 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Nov 2024 20:22:57 +0000 Subject: [PATCH 46/99] memtier-benchmark: 2.1.1 -> 2.1.2 --- pkgs/by-name/me/memtier-benchmark/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix index c63adb0772b0..f0b0d41aa6ff 100644 --- a/pkgs/by-name/me/memtier-benchmark/package.nix +++ b/pkgs/by-name/me/memtier-benchmark/package.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "memtier-benchmark"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "redislabs"; repo = "memtier_benchmark"; rev = "refs/tags/${version}"; - sha256 = "sha256-mYqbtyXVx21rMJmZubFuAVV3qEmk0G3H3fjL6WnUzzM="; + sha256 = "sha256-8xo4CbpjAl9+SArUwqSJiTcKCLhPF/rIPernDoPIi3I="; }; patchPhase = '' From 88700dd2611c1f3f13e22a15072fba6365845c6b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 21 Nov 2024 00:51:48 +0100 Subject: [PATCH 47/99] openvino: 2024.4.1 -> 2024.5.0 https://github.com/openvinotoolkit/openvino/releases/tag/2024.5.0 --- pkgs/by-name/op/openvino/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvino/package.nix b/pkgs/by-name/op/openvino/package.nix index 21372f8aea4c..7641287ebfff 100644 --- a/pkgs/by-name/op/openvino/package.nix +++ b/pkgs/by-name/op/openvino/package.nix @@ -60,14 +60,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2024.4.1"; + version = "2024.5.0"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-v0PPGFUHCGNWdlTff40Ol2NvaYglb/+L/zZAQujk6lk="; + hash = "sha256-qRa6vTwTEWiSH57HThT2oGhJqhHwFLIqNsU1eCSLwLs="; }; outputs = [ @@ -124,6 +124,7 @@ stdenv.mkDerivation rec { (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) (cmakeBool "ENABLE_OPENCV" true) + (cmakeBool "ENABLE_OV_JAX_FRONTEND" false) # auto-patchelf could not satisfy dependency libopenvino_jax_frontend.so.2450 (cmakeBool "ENABLE_PYTHON" true) # system libs @@ -139,6 +140,9 @@ stdenv.mkDerivation rec { "libngraph_backend.so" ]; + # src/graph/src/plugins/intel_gpu/src/graph/include/reorder_inst.h:24:8: error: type 'struct typed_program_node' violates the C++ One Definition Rule [-Werror=odr] + env.NIX_CFLAGS_COMPILE = "-Wno-odr"; + buildInputs = [ flatbuffers gflags From b19fcb8e4bd2246502b0bb6d73b90471c5b5038b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 01:26:24 +0000 Subject: [PATCH 48/99] tideways-daemon: 1.9.18 -> 1.9.22 --- pkgs/by-name/ti/tideways-daemon/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix index 0a76c2dba528..a0d240b8c92f 100644 --- a/pkgs/by-name/ti/tideways-daemon/package.nix +++ b/pkgs/by-name/ti/tideways-daemon/package.nix @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-daemon"; - version = "1.9.18"; + version = "1.9.22"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz"; - hash = "sha256-CFVHD2CfY1yOP621PzkflvapCrIuqY0rtTgm20xW41E="; + hash = "sha256-qB8R6BwL2dxLiNhR9/ZwMMXKQpKeF7ZtAiVHyyXU+5s="; }; "aarch64-linux" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz"; - hash = "sha256-59quxF5rClfw8xd8mT2jU1/DVatrZyJw7Rj6pikKXF0="; + hash = "sha256-VXZmpX/60WqxwXrkJXMfQ/14X2hOXvSgG9qQBXBJkRo="; }; "aarch64-darwin" = fetchurl { url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz"; - hash = "sha256-4h7Vn9s8Y63M1BnzwjcxSV8ydRqhNeJnFvG9Cs1Cq8Q="; + hash = "sha256-3KaARUt8VnnVxf9fDgt7AcGxIgG78MkR9EEW5mJWxCE="; }; }; updateScript = "${ From 0414b4c9dcf3522ab69120556fb3f5d11dd54609 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 01:30:00 +0000 Subject: [PATCH 49/99] php81Extensions.tideways: 5.13.0 -> 5.14.0 --- pkgs/development/php-packages/tideways/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/tideways/default.nix b/pkgs/development/php-packages/tideways/default.nix index 6649d0194710..41f764062555 100644 --- a/pkgs/development/php-packages/tideways/default.nix +++ b/pkgs/development/php-packages/tideways/default.nix @@ -23,7 +23,7 @@ in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tideways-php"; extensionName = "tideways"; - version = "5.13.0"; + version = "5.14.0"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} @@ -43,15 +43,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { sources = { "x86_64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-x86_64.tar.gz"; - hash = "sha256-HiH7EjAOqHIYaIRlp/cemhU+QX9Q66ZX8RpX1qcctZ0="; + hash = "sha256-jhTlHkdBqnI+HmEPbawpI0z3tIHUJdTwutLsmA5uBsw="; }; "aarch64-linux" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-arm64.tar.gz"; - hash = "sha256-kntNr8KMrOBK2ZZT/EMTR7MCuRt3rJAqhpt5B0m5qVM="; + hash = "sha256-HkYyie3FUIvRwFZ2H/0BuHB+tqrSWSGZYTIAa5HtO6s="; }; "aarch64-darwin" = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/tideways/extension/${finalAttrs.version}/tideways-php-${finalAttrs.version}-macos-arm.tar.gz"; - hash = "sha256-zNVBTXKwCRLKmDlEUUUpP7feB/n2fMevEuKZrgdyAkw="; + hash = "sha256-qspHSImQHRVPjcSjeARFBdNgYPD3mOoqktA08X8jGqg="; }; }; From 8880ce30ec267830c6c3c6d73b1ade474f107167 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 02:49:51 +0000 Subject: [PATCH 50/99] noseyparker: 0.20.0 -> 0.21.0 --- pkgs/by-name/no/noseyparker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/noseyparker/package.nix b/pkgs/by-name/no/noseyparker/package.nix index 8e71720b617c..21d213802370 100644 --- a/pkgs/by-name/no/noseyparker/package.nix +++ b/pkgs/by-name/no/noseyparker/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "noseyparker"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "noseyparker"; rev = "v${version}"; - hash = "sha256-pFAtyvnqCLTY3l7c47rpN1jHjQon0fTPT3KaV9mcs3Q="; + hash = "sha256-mRGlJto2b/oPLsvktQuBUsIO0kao9i4GjbmgztdAwiQ="; }; - cargoHash = "sha256-t4tZDww6aySlTBq1BB4OGhi9w6fGY2gi7mPM1SR2mt8="; + cargoHash = "sha256-NibALhXquX/izimso8BBSWDCwDIykvbr7yN610nnOS4="; nativeCheckInputs = [ git From 28f4f47f48579930c81f3d63506e0ceab3f99ffa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 03:11:23 +0000 Subject: [PATCH 51/99] mlkit: 4.7.12 -> 4.7.13 --- pkgs/by-name/ml/mlkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix index 633f126a3561..38babac5b65f 100644 --- a/pkgs/by-name/ml/mlkit/package.nix +++ b/pkgs/by-name/ml/mlkit/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.12"; + version = "4.7.13"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-9a2CbIOHdN+kTtm2Z001qOEO/nXuSLrzq0ovgHU1hTQ="; + sha256 = "sha256-sh6IaSrVOULGixQFpm1ada4Kzly/TVCgsZwEzV+7lzc="; }; nativeBuildInputs = [ autoreconfHook mlton ]; From 56bb92bd957656d01dec3894784d9e096b80d265 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 03:39:13 +0000 Subject: [PATCH 52/99] python312Packages.django-tastypie: 0.14.7 -> 0.15.0 --- pkgs/development/python-modules/django-tastypie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-tastypie/default.nix b/pkgs/development/python-modules/django-tastypie/default.nix index 1ed2dbc4fe6b..d422a683f81b 100644 --- a/pkgs/development/python-modules/django-tastypie/default.nix +++ b/pkgs/development/python-modules/django-tastypie/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-tastypie"; - version = "0.14.7"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "django-tastypie"; repo = "django-tastypie"; rev = "refs/tags/v${version}"; - hash = "sha256-bQBq5Wk5P9c+/a5B+LnxG8aCrVK1A3jLsLFK69/UYjo="; + hash = "sha256-StXWqwGVILXtK53fa2vSNXSIf7UGfdn7iJyOIzdnth4="; }; build-system = [ setuptools ]; From 969cf45ee407e031bda25a7879d17a96970690c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 05:04:55 +0000 Subject: [PATCH 53/99] python312Packages.coffea: 2024.10.0 -> 2024.11.0 --- pkgs/development/python-modules/coffea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index 9f148a4beabe..d3dcee1b16e4 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.10.0"; + version = "2024.11.0"; pyproject = true; src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-n17L/IuJGjDdYhVxW7Q0Qgeg+Y+pz9GphUxpLY4vXDM="; + hash = "sha256-QE+la7CB2xrbbIOUL/HtKRHUOGu19IyfDvjL6oucn7g="; }; build-system = [ From 2faac2e37a8c2b5a1834bcf561a25704741ae1be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 05:56:26 +0000 Subject: [PATCH 54/99] seilfahrt: 2.0.0 -> 2.1.0 --- pkgs/by-name/se/seilfahrt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seilfahrt/package.nix b/pkgs/by-name/se/seilfahrt/package.nix index be33fe3bf74b..6dd2002b2ad9 100644 --- a/pkgs/by-name/se/seilfahrt/package.nix +++ b/pkgs/by-name/se/seilfahrt/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "seilfahrt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Nerdbergev"; repo = "seilfahrt"; rev = "v${version}"; - hash = "sha256-eQcRS3xyqdtjRki+EPnHIaqUJufniFJCh5qU2Za9kyg="; + hash = "sha256-w3r/mNb4en32huHjJbYghqDi/VsPGXinwUAfSMcuc+0="; }; - vendorHash = "sha256-JU77EFk8SWgZkN4DEtkKS2MsBH16my4j9X/NJC/r6mI="; + vendorHash = "sha256-wYxQHr8AVi5KGMqRJcb2rTtbnJbi5som29YSILlO6Po="; buildInputs = [ pandoc ]; From b5847c2c30fb66b6100ea25bc13cdbbeeb0cd84d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:16:18 +0100 Subject: [PATCH 55/99] python312Packages.thinqconnect: 1.0.0 -> 1.0.1 Diff: https://github.com/thinq-connect/pythinqconnect/compare/refs/tags/1.0.0...1.0.1 --- pkgs/development/python-modules/thinqconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix index 657eac221a47..e47ca0287792 100644 --- a/pkgs/development/python-modules/thinqconnect/default.nix +++ b/pkgs/development/python-modules/thinqconnect/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thinqconnect"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "thinq-connect"; repo = "pythinqconnect"; rev = "refs/tags/${version}"; - hash = "sha256-8TDpoV2FNWzcHwXaEDyt5mRCbmFdtfuIYJK7OqXAgvg="; + hash = "sha256-kKmC2RMxJpNIX8bhHlPnFwP+0l7+MC+mWlCRjACy4cg="; }; build-system = [ setuptools ]; From 0380ef514f56c05f4fc8ff74402d00f24f3e407a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Thu, 21 Nov 2024 08:16:43 +0100 Subject: [PATCH 56/99] eza: 0.20.8 -> 0.20.9 changelog: https://github.com/eza-community/eza/releases/tag/v0.20.9 --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 9a39ca1dc516..9452224d8390 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.20.8"; + version = "0.20.9"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-/YoSBjaKlubOqyOKtaykkh20beDHkwCAWarRlyitoOc="; + hash = "sha256-iWANQD5+cn/vUYdy6MXBYIEl5BOiG6WPuYYsOyWzUuM="; }; - cargoHash = "sha256-5vlVrrgJKObsAd/4Kspu7G3CPfOt6QpbZHgTTKrpuBs="; + cargoHash = "sha256-gagCf81TT+6LsxypHoMZXHU0ux4f8wytwDMGyaDbXyg="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From 3cc7596e5657afd4153245a17cae3d4b640eb088 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:17:12 +0100 Subject: [PATCH 57/99] python312Packages.aioairq: 0.4.2 -> 0.4.3 Diff: https://github.com/CorantGmbH/aioairq/compare/refs/tags/v0.4.2...v0.4.3 --- pkgs/development/python-modules/aioairq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 274b25202a3a..99fddd49b095 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioairq"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "CorantGmbH"; repo = "aioairq"; rev = "refs/tags/v${version}"; - hash = "sha256-ppjhGBAoA5iV+ZfUKkUCNJRYN82JtclRe36pbe85i5w="; + hash = "sha256-Bgzwu/9Eu3Miw0eFb0b9jbD8yuPcBlJFnVyom+CsZBE="; }; build-system = [ setuptools ]; From 4b15fd5225fa4d3e336e091aae9f712b44bfcc6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:18:07 +0100 Subject: [PATCH 58/99] python312Packages.pyswitchbot: 0.51.0 -> 0.53.2 Diff: https://github.com/Danielhiversen/pySwitchbot/compare/refs/tags/0.51.0...0.53.2 Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.53.2 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index e960018bd61a..67e7c4ed5978 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.51.0"; + version = "0.53.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-Ti+3f6UGn/A9MdLJVUT9hnAiS8Ce6D8FrSryrGxMV6s="; + hash = "sha256-V0oTx2uRz58t5IN2atXVlyLvMg1zavzSbd+2NNEQ6V0="; }; build-system = [ setuptools ]; From ce4ef48fe91de9e79bd6f6d4b4d93822d8a8500c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:21:19 +0100 Subject: [PATCH 59/99] python312Packages.aioairzone: 0.9.5 -> 0.9.7 Diff: https://github.com/Noltari/aioairzone/compare/refs/tags/0.9.5...0.9.7 Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.9.7 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 21d831c9e24e..6614f076706e 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.5"; + version = "0.9.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-LFMHueSz0ddZNYUL0uuC91dw1ppYcdE/EjKX0ikc+J0="; + hash = "sha256-ZD/lJwYiggE7fUVGjimgGQ+H8zCtOZrZRElc0crrKhw="; }; build-system = [ setuptools ]; From e633b6a3c90c92113b83b7c5114b562ce8f928d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 07:25:16 +0000 Subject: [PATCH 60/99] tabiew: 0.6.2 -> 0.7.1 --- pkgs/by-name/ta/tabiew/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tabiew/package.nix b/pkgs/by-name/ta/tabiew/package.nix index 043a2675159e..caa6be91040b 100644 --- a/pkgs/by-name/ta/tabiew/package.nix +++ b/pkgs/by-name/ta/tabiew/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tabiew"; - version = "0.6.2"; + version = "0.7.1"; src = fetchFromGitHub { owner = "shshemi"; repo = "tabiew"; rev = "v${version}"; - hash = "sha256-3f+l1gmJYl/7aTkZGxmCur9khDNSoUNjDGAHhe6T13U="; + hash = "sha256-c7Oo0sr/9uvOYwtNRTyYNWYVaBUWJXwJmMXaivv4RTg="; }; - cargoHash = "sha256-FT98jzx/NQ1AWtGGLY63izKzGyjHnJNMuuQREqw+qnw="; + cargoHash = "sha256-uGxqVA7LrO0bzYVCDaPt4yECxWEzV4PQxxvk+17IX4w="; nativeBuildInputs = [ installShellFiles ]; From 3ee6aa3e8913c9a77b3c2f382eed519e6e5af46c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:25:39 +0100 Subject: [PATCH 61/99] python312Packages.pytouchlinesl: 0.1.8 -> 0.2.0 Diff: https://github.com/jnsgruk/pytouchlinesl/compare/refs/tags/0.1.8...0.2.0 Changelog: https://github.com/jnsgruk/pytouchlinesl/releases/tag/0.2.0 --- pkgs/development/python-modules/pytouchlinesl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytouchlinesl/default.nix b/pkgs/development/python-modules/pytouchlinesl/default.nix index 845b734fc59c..7ff2a0da211a 100644 --- a/pkgs/development/python-modules/pytouchlinesl/default.nix +++ b/pkgs/development/python-modules/pytouchlinesl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytouchlinesl"; - version = "0.1.8"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jnsgruk"; repo = "pytouchlinesl"; rev = "refs/tags/${version}"; - hash = "sha256-BSffzy/MKmpPdvk55Ff76i+p4/cY0OHjS/NOc9tEGwo="; + hash = "sha256-j/DEzYFopS/wolcycYP70hETT+8Pg/+9vDPYmLcd740="; }; build-system = [ setuptools ]; From 5dcbf2c8ec93b53d7c315837be599f992a854dab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:32:50 +0100 Subject: [PATCH 62/99] python312Packages.asdf-astropy: 0.6.1 -> 0.7.0 Diff: https://github.com/astropy/asdf-astropy/compare/refs/tags/0.6.1...0.7.0 Changelog: https://github.com/astropy/asdf-astropy/blob/0.7.0/CHANGES.rst --- pkgs/development/python-modules/asdf-astropy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asdf-astropy/default.nix b/pkgs/development/python-modules/asdf-astropy/default.nix index a883fc87af81..adf443d35961 100644 --- a/pkgs/development/python-modules/asdf-astropy/default.nix +++ b/pkgs/development/python-modules/asdf-astropy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "asdf-astropy"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "astropy"; repo = "asdf-astropy"; rev = "refs/tags/${version}"; - hash = "sha256-dOd9QdBOu7QotRiHkXJoIqaHG6U9odTlRmy22/nvvuw="; + hash = "sha256-xtDpKlAExMTYNopS9cAhLU2ZnHhtHHaV3KjWCq0yapE="; }; nativeBuildInputs = [ From cf5cb77b14dc3682e67add2dd5edb9980914a57c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:34:51 +0100 Subject: [PATCH 63/99] python312Packages.cyclopts: 3.0.0 -> 3.0.1 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.0.0...v3.0.1 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.0.1 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 703a139ed7ff..39ac0c9ec165 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-aTFas+3+veky+pyz2T1SytMNGwxlF9dAc3E03PKqvrM="; + hash = "sha256-oMsskBM0SV1OBxy3/6di1rKcOoV0qGisDyjKHNv72Go="; }; build-system = [ From 6fa2bef83566271903786634622cba69eb6b2636 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:35:27 +0100 Subject: [PATCH 64/99] python312Packages.django-tastypie: 0.14.7 -> 0.15.0 Diff: https://github.com/django-tastypie/django-tastypie/compare/refs/tags/v0.14.7...v0.15.0 Changelog: https://github.com/django-tastypie/django-tastypie/releases/tag/v0.15.0 --- pkgs/development/python-modules/django-tastypie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-tastypie/default.nix b/pkgs/development/python-modules/django-tastypie/default.nix index 1ed2dbc4fe6b..d422a683f81b 100644 --- a/pkgs/development/python-modules/django-tastypie/default.nix +++ b/pkgs/development/python-modules/django-tastypie/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-tastypie"; - version = "0.14.7"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "django-tastypie"; repo = "django-tastypie"; rev = "refs/tags/v${version}"; - hash = "sha256-bQBq5Wk5P9c+/a5B+LnxG8aCrVK1A3jLsLFK69/UYjo="; + hash = "sha256-StXWqwGVILXtK53fa2vSNXSIf7UGfdn7iJyOIzdnth4="; }; build-system = [ setuptools ]; From 878b7c8622cea78b7e8062b9d911e16ceb3c77a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:35:58 +0100 Subject: [PATCH 65/99] python312Packages.dnfile: 0.15.0 -> 0.15.1 Diff: https://github.com/malwarefrank/dnfile/compare/refs/tags/v0.15.0...v0.15.1 Changelog: https://github.com/malwarefrank/dnfile/blob/v0.15.1/HISTORY.rst --- pkgs/development/python-modules/dnfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnfile/default.nix b/pkgs/development/python-modules/dnfile/default.nix index e9bff0525de3..1802b005437f 100644 --- a/pkgs/development/python-modules/dnfile/default.nix +++ b/pkgs/development/python-modules/dnfile/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dnfile"; - version = "0.15.0"; + version = "0.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "malwarefrank"; repo = "dnfile"; rev = "refs/tags/v${version}"; - hash = "sha256-HzlMJ4utBHyLLhO+u0uiTfqtk8jX80pEyO75QvpJ3yg="; + hash = "sha256-AdGXcdoBNWZ4f8NBP50Fp3in1FTVPFDifGhjeAfp46M="; fetchSubmodules = true; }; From 8ef7600d5932bad66c6e6724e0e18f7b1f985210 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 08:37:56 +0100 Subject: [PATCH 66/99] python312Packages.environs: 11.1.0 -> 11.2.1 Diff: https://github.com/sloria/environs/compare/refs/tags/11.1.0...11.2.1 Changelog: https://github.com/sloria/environs/blob/11.2.1/CHANGELOG.md --- pkgs/development/python-modules/environs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index acbf0dc39467..aa325cb8e0b6 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "environs"; - version = "11.1.0"; + version = "11.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; rev = "refs/tags/${version}"; - hash = "sha256-LL1lNNIJBd4MaU41xKYUu/I8dOd3lpmFmnv8/7lJAu4="; + hash = "sha256-BU2D9NGNoUu3F1kx9t4j1VW0HarLVqiXTZEW67pMPV8="; }; nativeBuildInputs = [ flit-core ]; From 0708559fe75a16194df7bf1fd46b8571ef05fed6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 07:42:03 +0000 Subject: [PATCH 67/99] troubadix: 24.10.0 -> 24.10.2 --- pkgs/by-name/tr/troubadix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix index d15f21ed772b..4fbfd93db9af 100644 --- a/pkgs/by-name/tr/troubadix/package.nix +++ b/pkgs/by-name/tr/troubadix/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "troubadix"; - version = "24.10.0"; + version = "24.10.2"; pyproject = true; src = fetchFromGitHub { owner = "greenbone"; repo = "troubadix"; rev = "refs/tags/v${version}"; - hash = "sha256-UOjR23VfOc65584JQtO+LF2Pp1JER8nIOA64hRnd5UA="; + hash = "sha256-s67701Wk+UDRoSCQWC58k54eF/dcCcqn41SijOz6cbQ="; }; pythonRelaxDeps = [ "validators" ]; From 6a4405a5e5e314e096c806e82e9317ad6d7c1fb6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:00:48 +0100 Subject: [PATCH 68/99] python312Packages.tololib: 1.1.0 -> 1.2.0 Diff: https://gitlab.com/MatthiasLohr/tololib/-/compare/refs/tags/v1.1.0...v1.2.0 Changelog: https://gitlab.com/MatthiasLohr/tololib/-/blob/v1.2.0/CHANGELOG.md --- pkgs/development/python-modules/tololib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 9548f2d77657..9344f14dd0e8 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tololib"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "MatthiasLohr"; repo = "tololib"; rev = "refs/tags/v${version}"; - hash = "sha256-TxWKV2nrnCxZmj6+wBDMSdJRvKV+MsPFbOyIlUJYJ3Q="; + hash = "sha256-CVibq5dgjjXW4Fxs3doBmUyXMMbtGfN9fLgNtuTqqiA="; }; build-system = [ setuptools-scm ]; From 7569b855d3ec12e8cb89d8449d2b3072142a282d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:01:29 +0100 Subject: [PATCH 69/99] python312Packages.types-deprecated: 1.2.9.20240311 -> 1.2.15.20241117 --- pkgs/development/python-modules/types-deprecated/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix index 13b371b4e3fe..3d26a47ee404 100644 --- a/pkgs/development/python-modules/types-deprecated/default.nix +++ b/pkgs/development/python-modules/types-deprecated/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-deprecated"; - version = "1.2.9.20240311"; + version = "1.2.15.20241117"; pyproject = true; src = fetchPypi { pname = "types-Deprecated"; inherit version; - hash = "sha256-BoDomYmoFCcH3oED8V0YJEWlM8EEf9m36MVFkQHpuQo="; + hash = "sha256-kkACyLf93sUbpJSXiKcCQRouNjbNmyozq9juEZcB134="; }; nativeBuildInputs = [ setuptools ]; From 3ee89c589cb01a99588295995d0437350766627b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:03:48 +0100 Subject: [PATCH 70/99] python312Packages.types-docopt: 0.6.11.4 -> 0.6.11.20241107 --- pkgs/development/python-modules/types-docopt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-docopt/default.nix b/pkgs/development/python-modules/types-docopt/default.nix index 284fa0ea0fcc..3825b907c0cc 100644 --- a/pkgs/development/python-modules/types-docopt/default.nix +++ b/pkgs/development/python-modules/types-docopt/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docopt"; - version = "0.6.11.4"; + version = "0.6.11.20241107"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-mRpkwVaTEMIkCuc0/SwQYnq7ikr6875axvTv+aYB8xo="; + hash = "sha256-YcRNA6xIlbW+jUC6XMgM5Spj09dnd60UZp6Utent96c="; }; # Module has no tests From dedec25f2f501d2186761020d052ca66112f2a9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:13:41 +0100 Subject: [PATCH 71/99] cnspec: 11.30.0 -> 11.31.1 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.30.0...v11.31.1 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.31.1 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 8e5a0cff74a9..d0a3624b46bb 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.30.0"; + version = "11.31.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-1d04jYnVrbtxVYOJiUYZzNCwJJXZ2O1Bendxj692Sc8="; + hash = "sha256-xdnyW9nZSQrTSA6B2dFcKanNVJRcZXgpxLJHsLsL6LQ="; }; proxyVendor = true; - vendorHash = "sha256-Sd3uN+rny3J0Z/SIMKR0HEsq21B5ZqcjxrUgqS95FaU="; + vendorHash = "sha256-9/N76JWnzR6/k2yeLR49hpxNfKHgrV7lXVb9pnV/tn8="; subPackages = [ "apps/cnspec" ]; From df778095e05d638f87946c6456aab210dcad453a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:20:09 +0100 Subject: [PATCH 72/99] python312Packages.tencentcloud-sdk-python: 3.0.1267 -> 3.0.1268 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1267...3.0.1268 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1268/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index ee82c16220db..b894bd1c1bf9 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1267"; + version = "3.0.1268"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-aX9ulyCodTPf/6YhhL0Gf77PbqJEenEyKu/0zhNWgf0="; + hash = "sha256-668fJLHnxle3eOQf62D1lbVJnP/ukoBSiENrkxQB9oU="; }; build-system = [ setuptools ]; From e2264471522f5ab2ca2942e8b4410e2ce0b749fd Mon Sep 17 00:00:00 2001 From: Nicholas Hassan Date: Thu, 21 Nov 2024 13:13:16 +1030 Subject: [PATCH 73/99] duti: add maintainer n-hass --- maintainers/maintainer-list.nix | 7 +++++++ pkgs/os-specific/darwin/duti/default.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e4ce300f7cda..95236b95ad91 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15592,6 +15592,13 @@ githubId = 399535; name = "Niklas Hambüchen"; }; + n-hass = { + email = "nick@hassan.host"; + github = "n-hass"; + githubId = 72363381; + name = "n-hass"; + keys = [ { fingerprint = "FDEE 6116 DBA7 8840 7323 4466 A371 5973 2728 A6A6"; } ]; + }; nhnn = { matrix = "@nhnn:nhnn.dev"; github = "thenhnn"; diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 033591c1fec3..87af500e98e4 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { a Microsoft Word document has a UTI of com.microsoft.word.doc. Using duti, the user can change which application acts as the default handler for a given UTI. ''; - maintainers = with maintainers; [matthewbauer]; + maintainers = with maintainers; [matthewbauer n-hass]; platforms = platforms.darwin; license = licenses.publicDomain; homepage = "https://github.com/moretension/duti/"; From c47912b4a19c0719215d73396b8e8788dc5a8b2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:21:46 +0100 Subject: [PATCH 74/99] python312Packages.ufmt: 2.7.3 -> 2.8.0 Diff: https://github.com/omnilib/ufmt/compare/refs/tags/v2.7.3...v2.8.0 Changelog: https://github.com/omnilib/ufmt/blob/2.8.0/CHANGELOG.md --- pkgs/development/python-modules/ufmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index e18b8062f1ff..97e4106c804b 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "ufmt"; - version = "2.7.3"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "omnilib"; repo = "ufmt"; rev = "refs/tags/v${version}"; - hash = "sha256-hXCOsetw5o3V9NCR0TOfYSFyfBnuOOZDMiUd/6ER9WU="; + hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw="; }; build-system = [ flit-core ]; From f512ddbb3abaeaa8c1d8395bceb2c4187c6c1bd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:42:22 +0100 Subject: [PATCH 75/99] galer: add changelog to meta --- pkgs/by-name/ga/galer/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ga/galer/package.nix b/pkgs/by-name/ga/galer/package.nix index 5f2e90fe8c10..69012a2519a4 100644 --- a/pkgs/by-name/ga/galer/package.nix +++ b/pkgs/by-name/ga/galer/package.nix @@ -19,6 +19,7 @@ buildGoModule rec { meta = with lib; { description = "Tool to fetch URLs from HTML attributes"; homepage = "https://github.com/dwisiswant0/galer"; + changelog = "https://github.com/dwisiswant0/galer/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "galer"; From 4edaf66e64724515be35a79d7eb0f97bc98f981c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:44:18 +0100 Subject: [PATCH 76/99] python312Packages.language-data: update disabled --- pkgs/development/python-modules/language-data/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/language-data/default.nix b/pkgs/development/python-modules/language-data/default.nix index 4c6f19d2ea88..b83ba0168248 100644 --- a/pkgs/development/python-modules/language-data/default.nix +++ b/pkgs/development/python-modules/language-data/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "georgkrause"; From 89c722b5e1530f77b7e667be5745f4ee485d58c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 09:52:58 +0100 Subject: [PATCH 77/99] python312Packages.ibm-cloud-sdk-core: 3.21.0 -> 3.22.0 Diff: https://github.com/IBM/python-sdk-core/compare/refs/tags/v3.21.0...v3.22.0 Changelog: https://github.com/IBM/python-sdk-core/blob/v3.22.0/CHANGELOG.md --- .../python-modules/ibm-cloud-sdk-core/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index f301901ef5f7..66d5f8f3fa2c 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pyjwt, pytestCheckHook, python-dateutil, @@ -14,15 +14,16 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.21.0"; + version = "3.22.0"; pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "ibm_cloud_sdk_core"; - inherit version; - hash = "sha256-G3LvZ13f/aJbCMQ7hLi25U0rXiGvHhvT6FB6LSVxpUQ="; + src = fetchFromGitHub { + owner = "IBM"; + repo = "python-sdk-core"; + rev = "refs/tags/v${version}"; + hash = "sha256-gNEd79kOtDlFJg3Ji9kO6VGGsy/VGxd6GzC/cuen9M0="; }; pythonRelaxDeps = [ "requests" ]; @@ -56,6 +57,8 @@ buildPythonPackage rec { "test_retry_config_external" # assertion error due to requests brotli support "test_http_client" + # Tests require network access + "test_tls_v1_2" ] ++ lib.optionals (pythonAtLeast "3.12") [ # Tests are blocking or failing From 943fe516578906d2027857b684733b8bf5b06f57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 10:33:06 +0100 Subject: [PATCH 78/99] python312Packages.elmax-api: 0.0.5 -> 0.0.6.1 Diff: https://github.com/albertogeniola/elmax-api/compare/refs/tags/v0.0.5...v0.0.6.1 Changelog: https://github.com/albertogeniola/elmax-api/releases/tag/v0.0.6.1 --- pkgs/development/python-modules/elmax-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix index 27b168986339..8d86b44706c4 100644 --- a/pkgs/development/python-modules/elmax-api/default.nix +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax-api"; - version = "0.0.5"; + version = "0.0.6.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-57pmmH7f893H71CMhdnahvbN/5F2yfrVZ6MFpYQ4+mQ="; + hash = "sha256-KMszoyeAIUyHCAuSUuCgbMos7SrQXncz38WqyPblJuE="; }; build-system = [ setuptools ]; From 77e1fdf5629c3b4b11ed5901aee92aa07a85b4d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 11:12:50 +0100 Subject: [PATCH 79/99] python312Packages.aio-pika: 9.4.3 -> 9.5.0 Changelog: https://github.com/mosquito/aio-pika/blob/9.5.0/CHANGELOG.md --- pkgs/development/python-modules/aio-pika/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 0b00a8130dae..95759d541fb8 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -4,6 +4,7 @@ aiormq, buildPythonPackage, docker, + exceptiongroup, fetchFromGitHub, pamqp, poetry-core, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.4.3"; + version = "9.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,13 +27,14 @@ buildPythonPackage rec { owner = "mosquito"; repo = "aio-pika"; rev = "refs/tags/${version}"; - hash = "sha256-lzBBcfWzhdT2v9RX5C+VWWSxsBCB7EOeCjm6wUrXGtA="; + hash = "sha256-4MweCuZbo/XDur9iwM3MT/P75HjEQvMlPI82bDxuol8="; }; build-system = [ poetry-core ]; dependencies = [ aiormq + exceptiongroup yarl ]; From 0b40beb7cdff8d4fdad7537e46d1aa2eba717253 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 11:14:18 +0100 Subject: [PATCH 80/99] python312Packages.aiogram: 3.14.0 -> 3.15.0 Diff: https://github.com/aiogram/aiogram/compare/refs/tags/v3.14.0...v3.15.0 Changelog: https://github.com/aiogram/aiogram/releases/tag/v3.15.0 --- pkgs/development/python-modules/aiogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index afd1bcd6258f..c7de615170bb 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.14.0"; + version = "3.15.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-SEq88e5MLNqssJhxPPwI2ZdpNdTCBomNpI0xmbmz3Pw="; + hash = "sha256-heCebvYP1rrExuD7tAMwSsBsds0cbsPvzHLUtBjNwW0="; }; build-system = [ hatchling ]; From aa0e7f56b102aba9fd6b55a2c6c856631a4a57d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 11:15:21 +0100 Subject: [PATCH 81/99] python312Packages.aiostream: 0.6.3 -> 0.6.4 Diff: https://github.com/vxgmichel/aiostream/compare/refs/tags/v0.6.3...v0.6.4 Changelog: https://github.com/vxgmichel/aiostream/releases/tag/v0.6.4 --- pkgs/development/python-modules/aiostream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix index 701278b299c8..184f889bd209 100644 --- a/pkgs/development/python-modules/aiostream/default.nix +++ b/pkgs/development/python-modules/aiostream/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aiostream"; rev = "refs/tags/v${version}"; - hash = "sha256-MssA4gDo79mlHjVwQAxhX6DZPHB4Quo6V05Nye91oJg="; + hash = "sha256-hRbPK1JsB/JQuSjj81YMUAI8eDUyXCOFhdW22ZJ47xU="; }; build-system = [ setuptools ]; From 436199731ca33fc7c401fa9b0d496d0f3dc4cebe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 21 Nov 2024 11:16:24 +0100 Subject: [PATCH 82/99] python312Packages.aiovlc: 0.6.1 -> 0.6.2 Diff: https://github.com/MartinHjelmare/aiovlc/compare/refs/tags/v0.6.1...v0.6.2 Changelog: https://github.com/MartinHjelmare/aiovlc/blob/v0.6.2/CHANGELOG.md --- pkgs/development/python-modules/aiovlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index 126661bc1e17..eae29bbcf565 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-NnctcSgEHWEJUB0yDrSYMochh20CfT5jgtcALKmDjdo="; + hash = "sha256-tvMd7kydL4fx9JLTFQgCskBQCV0Zs/swDpPBxtSEvyM="; }; build-system = [ poetry-core ]; From b9d0d70b1529f6350d73e19e26933f4e4c8d09c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 12:35:07 +0000 Subject: [PATCH 83/99] nmap-formatter: 3.0.1 -> 3.0.2 --- pkgs/by-name/nm/nmap-formatter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nm/nmap-formatter/package.nix b/pkgs/by-name/nm/nmap-formatter/package.nix index 12b73a585b11..173514c7fd0b 100644 --- a/pkgs/by-name/nm/nmap-formatter/package.nix +++ b/pkgs/by-name/nm/nmap-formatter/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "nmap-formatter"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "vdjagilev"; repo = pname; rev = "v${version}"; - hash = "sha256-2XbqpvtlNAYrgtaMnFklYRoHCj3nkltEZlwbZzvfdFU="; + hash = "sha256-tB3FPb0k7jJ8RECsT3eLGjVpHqNclOvlh1MgoV6bbwo="; }; vendorHash = "sha256-PKoe4rpwPy3omfRRhN70iEJJ/sHliIwxPUHGxRJqrf4="; From 47914834c3bf97a4dff5b42b987b125b87d5f7b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 12:49:14 +0000 Subject: [PATCH 84/99] walker: 0.8.12 -> 0.9.0 --- pkgs/by-name/wa/walker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index 484de327b45e..c6a416788e50 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "walker"; - version = "0.8.12"; + version = "0.9.0"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-K65bzaUcTBqsqngxbxwEEsTVZA2s8lX6+HEhu03Nywk="; + hash = "sha256-nYC6KoLsmMf6uJ74Y2zvDU5wdgeOU9aZb/4zGlnWOJM="; }; vendorHash = "sha256-nc/WKBhUxhs1aNUg/GM7vhrKd7FrUdl2uKp7MX2VCdE="; From aadaa13a0ec05f1f571e59edb208d9af5d94a36c Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Thu, 2 May 2024 14:35:18 +0200 Subject: [PATCH 85/99] lyra-cursors: init at 0-unstable-2021-12-04 --- maintainers/maintainer-list.nix | 4 +- pkgs/by-name/ly/lyra-cursors/package.nix | 82 ++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/ly/lyra-cursors/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b3ada9c038f5..9be9b3565de7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11643,9 +11643,7 @@ matrix = "@lordmzte:mzte.de"; github = "LordMZTE"; githubId = 28735087; - keys = [{ - fingerprint = "AB47 3D70 53D2 74CA DC2C 230C B648 02DC 33A6 4FF6"; - }]; + keys = [ { fingerprint = "AB47 3D70 53D2 74CA DC2C 230C B648 02DC 33A6 4FF6"; } ]; }; lord-valen = { name = "Lord Valen"; diff --git a/pkgs/by-name/ly/lyra-cursors/package.nix b/pkgs/by-name/ly/lyra-cursors/package.nix new file mode 100644 index 000000000000..b1ce03d965fb --- /dev/null +++ b/pkgs/by-name/ly/lyra-cursors/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenvNoCC, + inkscape, + xcursorgen, + fetchFromGitHub, + fetchpatch2, +}: +let + styles = [ + "LyraB" + "LyraF" + "LyraG" + "LyraP" + "LyraQ" + "LyraR" + "LyraS" + "LyraX" + "LyraY" + ]; + + # This is a patch from a fork of the upstream repository which addresses several issues with the + # build script such as the fact that the style to build isn't hardcoded. We don't simply use this + # fork as source, as the upstream repository is what we want to track. + buildScriptPatch = fetchpatch2 { + name = "use-more-flexible-build-script.patch"; + url = "https://github.com/KiranWells/Lyra-Cursors/commit/2735acb37a51792388497c666cc28370660217cb.patch?full_index=1"; + hash = "sha256-KCT4zNdep1TB7Oa4qrPw374ahT30o9/QrNTEgobp8zM="; + }; +in +stdenvNoCC.mkDerivation { + pname = "lyra-cursors"; + version = "0-unstable-2021-12-04"; + + src = fetchFromGitHub { + owner = "yeyushengfan258"; + repo = "Lyra-Cursors"; + rev = "c096c54034f95bd35699b3226250e5c5ec015d9a"; + hash = "sha256-lfaX8ouE0JaQwVBpAGsrLIExQZ2rCSFKPs3cch17eYg="; + }; + + nativeBuildInputs = [ + inkscape + xcursorgen + ]; + + patches = [ buildScriptPatch ]; + + dontConfigure = true; + + postPatch = '' + patchShebangs build.sh + ''; + + buildPhase = '' + runHook preBuild + + rm -r dist + for THEME in ${lib.escapeShellArgs styles}; do + ./build.sh "$THEME" + done + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + mv dist/*-cursors $out/share/icons + + runHook postInstall + ''; + + meta = { + description = "A cursor theme inspired by macOS and based on capitaine-cursors"; + homepage = "https://github.com/yeyushengfan258/Lyra-Cursors"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ lordmzte ]; + }; +} From 7c2fe325787c0f1dd44c7618ab2f0ab8f8c8e7de Mon Sep 17 00:00:00 2001 From: birdee Date: Thu, 21 Nov 2024 05:14:20 -0800 Subject: [PATCH 86/99] neovim: fix ruby provider warning Fixing this warning from checkhealth provider.ruby: require("provider.ruby.health").check() Ruby provider (optional) ~ - Ruby: ruby 3.3.5 (2024-09-03 revision ef084cc8f4) [x86_64-linux] - Host: /nix/store/l354hgiahcjd81qazlc870104i26lm9b-neovim-0.10.2birdeevim/bin/birdeeVim-ruby - OK Latest "neovim" gem is installed: /home/birdee/.local/share/gem/ruby/3.3.0/gems/neovim-0.10.0/lib/neovim/connection.rb:1: warning: logger was loaded from the standard library, but will no longer be part of the default gems starting from Ruby 3.5.0. You can add logger to your Gemfile or gemspec to silence this warning. 0.10.0 steps taken: added `gem 'logger'` to Gemfile ran the following on the directory nix run --no-write-lock-file github:BirdeeHub/neovim_ruby_updater --- .../editors/neovim/ruby_provider/Gemfile | 1 + .../editors/neovim/ruby_provider/Gemfile.lock | 6 ++++-- .../editors/neovim/ruby_provider/gemset.nix | 14 ++++++++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile b/pkgs/applications/editors/neovim/ruby_provider/Gemfile index eebecf2906fb..e59d0636aacc 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile @@ -1,3 +1,4 @@ source 'https://rubygems.org' gem 'neovim' +gem 'logger' diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index dc0140032066..ad005030b00e 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,7 +1,8 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.7.2) + logger (1.6.1) + msgpack (1.7.5) multi_json (1.15.0) neovim (0.10.0) msgpack (~> 1.1) @@ -11,7 +12,8 @@ PLATFORMS ruby DEPENDENCIES + logger neovim BUNDLED WITH - 2.3.27 + 2.5.16 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index e2df8d535c47..75b461a908a3 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -1,13 +1,23 @@ { + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; msgpack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; + sha256 = "1a5fsgchkpcca4wf3pipbb2jbj523l7fbaq37j10cr0yymwlkc7z"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.5"; }; multi_json = { groups = ["default"]; From be3a3ad0dafa586ee21d504226a02a357f867d40 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 19 Nov 2024 19:50:15 +0100 Subject: [PATCH 87/99] opentelemetry-collector-builder: 0.112.0 -> 0.114.0 --- pkgs/by-name/op/opentelemetry-collector-builder/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix b/pkgs/by-name/op/opentelemetry-collector-builder/package.nix index caf5439ca6ee..84ddb318028d 100644 --- a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix +++ b/pkgs/by-name/op/opentelemetry-collector-builder/package.nix @@ -5,17 +5,17 @@ }: buildGoModule rec { pname = "ocb"; - version = "0.112.0"; + version = "0.114.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-0eL9J+PrURiNkL6CzUIlcvjyZor8iS9vKX8j0srLlZ8="; + hash = "sha256-zy+TWjh7janUhpxO9fOC8C9vz/tI0mbAyEsCo9zZ1j4="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-vZsGSLdzKa4sA/N3RG6Kwn8tMoIIhPJ6uAkM4pheitU="; + vendorHash = "sha256-dLNs9Vgn6f10hl5XuPzzE4eFNfvELWSKGsd7FbSiHkU="; CGO_ENABLED = 0; ldflags = [ From b7f57e3b18ececeebe66c0f0e51fd28b5d217ceb Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 19 Nov 2024 21:41:38 +0100 Subject: [PATCH 88/99] opentelemetry-collector-releases: init at 0.114.0 --- .../package.nix | 2 + .../misc/opentelemetry-collector/releases.nix | 172 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 175 insertions(+) create mode 100644 pkgs/tools/misc/opentelemetry-collector/releases.nix diff --git a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix b/pkgs/by-name/op/opentelemetry-collector-builder/package.nix index 84ddb318028d..1a9eb128bcf7 100644 --- a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix +++ b/pkgs/by-name/op/opentelemetry-collector-builder/package.nix @@ -5,6 +5,8 @@ }: buildGoModule rec { pname = "ocb"; + # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` + # whenever that version changes. version = "0.114.0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/opentelemetry-collector/releases.nix b/pkgs/tools/misc/opentelemetry-collector/releases.nix new file mode 100644 index 000000000000..508fe54693ed --- /dev/null +++ b/pkgs/tools/misc/opentelemetry-collector/releases.nix @@ -0,0 +1,172 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + testers, + nixosTests, + opentelemetry-collector-builder, + pkgs, + go, + git, + cacert, + stdenv, +}: +let + # This is the tool OTEL uses to build their distributions. + builder = "${opentelemetry-collector-builder}/bin/ocb"; + + # Keep the version in sync with the builder. + rev = opentelemetry-collector-builder.src.rev; + + version = lib.removePrefix "cmd/builder/v" rev; + + # This is a weird meta-repo where all the open-telemetry collectors are. + src = fetchFromGitHub { + owner = "open-telemetry"; + repo = "opentelemetry-collector-releases"; + rev = "v${version}"; + hash = "sha256-wHi3/rby/AA37x3BCbTXlLgRaN4DpATLSXpQb31Jr/o="; + }; + + # Then from this src, we use the tool to generate some go code, including + # the go.mod and go.sum files. + # + # The output depends on which release. + mkDistributionSource = + { + name, + hash, + }: + stdenv.mkDerivation { + inherit name; + + nativeBuildInputs = [ + cacert + git + go + ]; + + inherit src; + + outputHash = hash; + outputHashMode = "recursive"; + outputHashAlgo = if hash == "" then "sha256" else null; + + patchPhase = '' + patchShebangs . + ''; + + configurePhase = '' + export HOME=$NIX_BUILD_TOP/home + export GIT_SSL_CAINFO=$NIX_SSL_CERT_FILE + ''; + + buildPhase = '' + # Only generate the go code, skip compilation + ./scripts/build.sh -d ${name} -b ${builder} -s true + ''; + + installPhase = '' + mv ./distributions/${name}/_build $out + + # Make it reproducible + rm $out/build.log + ''; + }; + + # Then, finally, we build the project as a normal go module package. + mkDistribution = + { + name, + sourceHash, + vendorHash, + }: + let + package = buildGoModule { + pname = name; + inherit version; + + src = mkDistributionSource { + inherit name; + hash = sourceHash; + }; + + inherit vendorHash; + + nativeBuildInputs = [ installShellFiles ]; + + # upstream strongly recommends disabling CGO + # additionally dependencies have had issues when GCO was enabled that weren't caught upstream + # https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#using-cgo + CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + ]; + + postInstall = '' + # Fix binary name + mv $out/bin/* $out/bin/$pname + + installShellCompletion --cmd ${name} \ + --bash <($out/bin/${name} completion bash) \ + --fish <($out/bin/${name} completion fish) \ + --zsh <($out/bin/${name} completion zsh) + ''; + + passthru.tests = { + version = testers.testVersion { + inherit package version; + command = "${name} -v"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/open-telemetry/opentelemetry-collector-releases"; + description = "OpenTelemetry Collector Official Releases"; + longDescription = '' + The OpenTelemetry Collector offers a vendor-agnostic implementation on how + to receive, process and export telemetry data. In addition, it removes the + need to run, operate and maintain multiple agents/collectors in order to + support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) + sending to multiple open-source or commercial back-ends. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ + uri-canva + jk + zimbatm + ]; + mainProgram = name; + }; + }; + in + package; +in +lib.recurseIntoAttrs { + otelcol = mkDistribution { + name = "otelcol"; + sourceHash = "sha256-EGO5ns2Xi0g8PvPGdzMVxMJcPXvxaZDDi4YaJnIUAFc="; + vendorHash = "sha256-dCSOGT0n0I5Oxw30uNeg184Me7hwZUfDuvl1IOdVBeo="; + }; + + otelcol-contrib = mkDistribution { + name = "otelcol-contrib"; + sourceHash = "sha256-1TIzfR9F6iwSwoDc08SdOWYH378Y3qjwOcQ4IDbHTWE="; + vendorHash = "sha256-KObLO3bXqGL1WSTKbJjg+hYJ9sYU4rn9gC/o38U1XJI="; + }; + + otelcol-k8s = mkDistribution { + name = "otelcol-k8s"; + sourceHash = "sha256-WffBw41dZ/e5/d22ny6611pFReUVeO5lmtqqfaSdGLs="; + vendorHash = "sha256-3EVJxma9U7FTzt1jIxotavMespFpCpU/oAAKMC0ya2E="; + }; + + otelcol-otlp = mkDistribution { + name = "otelcol-otlp"; + sourceHash = "sha256-YQ9dIY9MdX0WtuOnFCZapDDWSl02S/dlTNce6RV48MM="; + vendorHash = "sha256-4wiIgYa9eHvGxDgLbqWPTus9zBznYJ4lpsIUvRjRYUQ="; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d3336e68e02..00fdf1b7eb86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4794,6 +4794,7 @@ with pkgs; update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentelemetry-collector-releases = callPackage ../tools/misc/opentelemetry-collector/releases.nix { }; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; }; From f89fdc3f6c38670cb26759745d2a87e146db37d2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 19 Nov 2024 22:02:51 +0100 Subject: [PATCH 89/99] opentelemetry-collector: alias to opentelemetry-collector-releases.otelcol --- .../misc/opentelemetry-collector/default.nix | 69 ------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/tools/misc/opentelemetry-collector/default.nix diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix deleted file mode 100644 index f437590936e2..000000000000 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles -, testers -, nixosTests -, opentelemetry-collector -}: - -buildGoModule rec { - pname = "opentelemetry-collector"; - version = "0.109.0"; - - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-collector"; - rev = "v${version}"; - hash = "sha256-ShVUBohSnIoeq2aTWJ9IMXKt0CeRv3CZjlqpYHR9DhY="; - }; - # there is a nested go.mod - sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-rXC4lm2ZvO3k6h1ZiYB+FskhW0c2uJyPLZg6n125MZE="; - - nativeBuildInputs = [ installShellFiles ]; - - # upstream strongly recommends disabling CGO - # additionally dependencies have had issues when GCO was enabled that weren't caught upstream - # https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#using-cgo - CGO_ENABLED = 0; - - preBuild = '' - # set the build version, can't be done via ldflags - sed -i -E 's/Version:(\s*)".*"/Version:\1"${version}"/' main.go - ''; - - ldflags = [ "-s" "-w" ]; - - postInstall = '' - installShellCompletion --cmd otelcorecol \ - --bash <($out/bin/otelcorecol completion bash) \ - --fish <($out/bin/otelcorecol completion fish) \ - --zsh <($out/bin/otelcorecol completion zsh) - ''; - - passthru.tests = { - version = testers.testVersion { - inherit version; - package = opentelemetry-collector; - command = "otelcorecol -v"; - }; - inherit (nixosTests) opentelemetry-collector; - }; - - meta = with lib; { - homepage = "https://github.com/open-telemetry/opentelemetry-collector"; - changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/v${version}/CHANGELOG.md"; - description = "Vendor-agnostic implementation on how to receive, process and export telemetry data"; - longDescription = '' - The OpenTelemetry Collector offers a vendor-agnostic implementation on how - to receive, process and export telemetry data. In addition, it removes the - need to run, operate and maintain multiple agents/collectors in order to - support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) - sending to multiple open-source or commercial back-ends. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ uri-canva jk ]; - mainProgram = "otelcorecol"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00fdf1b7eb86..b13a8ed50431 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4793,7 +4793,7 @@ with pkgs; update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; - opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentelemetry-collector = opentelemetry-collector-releases.otelcol; opentelemetry-collector-releases = callPackage ../tools/misc/opentelemetry-collector/releases.nix { }; opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; From 3b73cec2ccb5193e51601d5b1b786bb2e1c7c29d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Tue, 19 Nov 2024 22:03:08 +0100 Subject: [PATCH 90/99] opentelemetry-collector-contrib: alias to opentelemetry-collector-releases.otelcol-contrib --- .../misc/opentelemetry-collector/contrib.nix | 68 ------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 pkgs/tools/misc/opentelemetry-collector/contrib.nix diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix deleted file mode 100644 index 219f7b81c5f3..000000000000 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -, stdenv -, systemdMinimal -, withSystemd ? false -}: - -buildGoModule rec { - pname = "opentelemetry-collector-contrib"; - version = "0.110.0"; - - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-collector-contrib"; - rev = "v${version}"; - hash = "sha256-bDtP7EFKus0NJpLccbD+HlzEusc+KAbKWmS/KGthtwY="; - }; - - # proxy vendor to avoid hash mismatches between linux and macOS - proxyVendor = true; - vendorHash = "sha256-pDDEqtXu167b+J1+k7rC1BE5/ehxzG0ZAkhxqmJpHsg="; - - # there is a nested go.mod - sourceRoot = "${src.name}/cmd/otelcontribcol"; - - # upstream strongly recommends disabling CGO - # additionally dependencies have had issues when GCO was enabled that weren't caught upstream - # https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#using-cgo - CGO_ENABLED = 0; - - # journalctl is required in-$PATH for the journald receiver tests. - nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemdMinimal ]; - - # We don't inject the package into propagatedBuildInputs unless - # asked to avoid hard-requiring a large package. For the journald - # receiver to work, journalctl will need to be available in-$PATH, - # so expose this as an option for those who want more control over - # it instead of trusting the global $PATH. - propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ]; - - doCheck = false; - - ldflags = [ - "-s" - "-w" - "-X github.com/open-telemetry/opentelemetry-collector-contrib/internal/version.Version=v${version}" - ]; - - meta = with lib; { - description = "OpenTelemetry Collector superset with additional community collectors"; - longDescription = '' - The OpenTelemetry Collector offers a vendor-agnostic implementation on how - to receive, process and export telemetry data. In addition, it removes the - need to run, operate and maintain multiple agents/collectors in order to - support open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) - sending to multiple open-source or commercial back-ends. The Contrib - edition provides aditional vendor specific receivers/exporters and/or - components that are only useful to a relatively small number of users and - is multiple times larger as a result. - ''; - homepage = "https://github.com/open-telemetry/opentelemetry-collector-contrib"; - changelog = "https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ uri-canva jk ]; - mainProgram = "otelcontribcol"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b13a8ed50431..d9ea8c345f99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4795,7 +4795,7 @@ with pkgs; opentelemetry-collector = opentelemetry-collector-releases.otelcol; opentelemetry-collector-releases = callPackage ../tools/misc/opentelemetry-collector/releases.nix { }; - opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; + opentelemetry-collector-contrib = opentelemetry-collector-releases.otelcol-contrib; openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; }; From 1f62f5853591f4586e4edcabc9648bcde1f1525e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 21 Nov 2024 15:04:55 +0100 Subject: [PATCH 91/99] opentelemetry-collector-builder: move to the package set Since the package versions are best kept in sync, move it close to the other opentelemetry-collector packages. --- .../misc/opentelemetry-collector/builder.nix} | 0 pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/{by-name/op/opentelemetry-collector-builder/package.nix => tools/misc/opentelemetry-collector/builder.nix} (100%) diff --git a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix similarity index 100% rename from pkgs/by-name/op/opentelemetry-collector-builder/package.nix rename to pkgs/tools/misc/opentelemetry-collector/builder.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9ea8c345f99..ea4d3d6fd9b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4794,8 +4794,9 @@ with pkgs; update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; opentelemetry-collector = opentelemetry-collector-releases.otelcol; - opentelemetry-collector-releases = callPackage ../tools/misc/opentelemetry-collector/releases.nix { }; + opentelemetry-collector-builder = callPackage ../tools/misc/opentelemetry-collector/builder.nix { }; opentelemetry-collector-contrib = opentelemetry-collector-releases.otelcol-contrib; + opentelemetry-collector-releases = callPackage ../tools/misc/opentelemetry-collector/releases.nix { }; openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; }; From 121eeb599bc77d0a23d1cfa86b68089f385fb6b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 14:07:36 +0000 Subject: [PATCH 92/99] ghidra-extensions.lightkeeper: 1.1.1 -> 1.2.0 --- pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix index f31e89c9f4ef..7e7e15ebf3aa 100644 --- a/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix +++ b/pkgs/tools/security/ghidra/extensions/lightkeeper/default.nix @@ -5,13 +5,13 @@ }: buildGhidraExtension rec { pname = "lightkeeper"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "WorksButNotTested"; repo = "lightkeeper"; rev = version; - hash = "sha256-Emyo4GBrR725jDxRsStC6/4F9mYnRo3S3QY0GeB/BvI="; + hash = "sha256-4lj60OyVcam4JHyfIa+4auzITuEYqjz9wOQko/u+2dI="; }; preConfigure = '' cd lightkeeper From 3ee13e6dda9dd6019982e7a96a238d2cf3085bc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 14:14:22 +0000 Subject: [PATCH 93/99] iptraf-ng: 1.2.1 -> 1.2.2 --- pkgs/by-name/ip/iptraf-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ip/iptraf-ng/package.nix b/pkgs/by-name/ip/iptraf-ng/package.nix index 5b50bf3c5b01..33f9a83dcded 100644 --- a/pkgs/by-name/ip/iptraf-ng/package.nix +++ b/pkgs/by-name/ip/iptraf-ng/package.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.2"; pname = "iptraf-ng"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1f91w1bjaayr6ld95z2q55ny983bb0m05k1jrw2bcddvcihaiqb1"; + sha256 = "sha256-SM1cJYNnZlGl3eWaYd8DlPrV4AL9nck1tjdOn0CHVUw="; }; buildInputs = [ ncurses ]; From 519e0e44cfb5b94577cac42c96c44a25ee8bd4d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 15:26:36 +0000 Subject: [PATCH 94/99] python312Packages.aemet-opendata: 0.5.4 -> 0.5.5 --- pkgs/development/python-modules/aemet-opendata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index d356e78976a0..f720809863ab 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.5.4"; + version = "0.5.5"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-iy1ptkxc4dh/fwWSi/GgPX5KRulyG0zwWTbCNBirsCo="; + hash = "sha256-RX2FnXUALE4l5RG+L6KUBR57IlhRUSOxNc9JQMDDgvw="; }; build-system = [ setuptools ]; From 1ffc3bc18c9cbcc134db29d59c0cc5f386327c07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 15:33:46 +0000 Subject: [PATCH 95/99] oauth2c: 1.16.0 -> 1.17.0 --- pkgs/by-name/oa/oauth2c/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oa/oauth2c/package.nix b/pkgs/by-name/oa/oauth2c/package.nix index db7b3c00729b..5c01d5e10596 100644 --- a/pkgs/by-name/oa/oauth2c/package.nix +++ b/pkgs/by-name/oa/oauth2c/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "oauth2c"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "cloudentity"; repo = pname; rev = "v${version}"; - hash = "sha256-spD6BEyDwY2Nrk/XOWA+XJA1l7ixN4j6N5m9e8DLg88="; + hash = "sha256-2EfkNtTbHSa0UZGfYylz0HlyVxGdSJNIUj6682DICSg="; }; - vendorHash = "sha256-PdLh/J0HUvr1JjW/ew5PQe9TJNykI4tJhlRoVjRT/hg="; + vendorHash = "sha256-ZQFIETfiNKyeZuskwNfoTXBy3MSWmG0tDztz0Mm7xJY="; doCheck = false; # tests want to talk to oauth2c.us.authz.cloudentity.io From 717e0a53ec2394aabb45b2d3ec2dfc471007d331 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 6 Sep 2024 12:38:00 +0200 Subject: [PATCH 96/99] python3Packages.flask-allowed-hosts: init at 1.1.2 --- .../flask-allowed-hosts/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/flask-allowed-hosts/default.nix diff --git a/pkgs/development/python-modules/flask-allowed-hosts/default.nix b/pkgs/development/python-modules/flask-allowed-hosts/default.nix new file mode 100644 index 000000000000..0d50d9fda344 --- /dev/null +++ b/pkgs/development/python-modules/flask-allowed-hosts/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + flask, +}: + +buildPythonPackage rec { + pname = "flask-allowed-hosts"; + version = "1.1.2"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "flask_allowed_hosts"; + hash = "sha256-l25bZlJkOVI+S+HtAK22ZGULP95evx2NASA9ViIax7Q="; + }; + + build-system = [ setuptools ]; + + dependencies = [ flask ]; + + pythonImportsCheck = [ "flask_allowed_hosts" ]; + + meta = with lib; { + description = "Flask extension that helps you limit access to your API endpoints"; + homepage = "https://github.com/riad-azz/flask-allowedhosts"; + license = licenses.mit; + maintainers = with maintainers; [ erictapen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e898838e9c6..7cbaa4b090f1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4600,6 +4600,8 @@ self: super: with self; { flask-admin = callPackage ../development/python-modules/flask-admin { }; + flask-allowed-hosts = callPackage ../development/python-modules/flask-allowed-hosts { }; + flask-api = callPackage ../development/python-modules/flask-api { }; flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; From ad869c8f179b603ba093f5204804a106e86b5aec Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 16 Sep 2024 16:37:28 +0200 Subject: [PATCH 97/99] open-web-calendar: init at 1.41 --- pkgs/by-name/op/open-web-calendar/package.nix | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 pkgs/by-name/op/open-web-calendar/package.nix diff --git a/pkgs/by-name/op/open-web-calendar/package.nix b/pkgs/by-name/op/open-web-calendar/package.nix new file mode 100644 index 000000000000..1d1f0ace7145 --- /dev/null +++ b/pkgs/by-name/op/open-web-calendar/package.nix @@ -0,0 +1,90 @@ +{ + lib, + python3, + fetchPypi, + nixosTests, + + defaultSpecificationFile ? null, +}: + +let + python = python3; +in +python.pkgs.buildPythonApplication rec { + pname = "open-web-calendar"; + version = "1.41"; + pyproject = true; + + disabled = python.pythonOlder "3.9"; + + src = fetchPypi { + inherit version; + pname = "open_web_calendar"; + hash = "sha256-3D1bGAioKCD1XZQVwtMVXi67VzzdJQnRLS6RF+dJNL4="; + }; + + # The Pypi tarball doesn't contain open_web_calendars/features + postPatch = '' + ln -s $PWD/features open_web_calendar/features + ''; + + postInstall = lib.optionalString (defaultSpecificationFile != null) '' + install -D ${defaultSpecificationFile} $out/$defaultSpecificationPath + ''; + + build-system = with python.pkgs; [ + hatchling + hatch-vcs + ]; + + dependencies = + with python.pkgs; + [ + flask-caching + flask-allowed-hosts + flask + icalendar + requests + pyyaml + recurring-ical-events + gunicorn + lxml + beautifulsoup4 + lxml-html-clean + pytz + ] + ++ requests.optional-dependencies.socks; + + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; + + pytestFlagsArray = [ "open_web_calendar/test" ]; + + pythonImportsCheck = [ "open_web_calendar.app" ]; + + defaultSpecificationPath = "${python.sitePackages}/open_web_calendar/default_specification.yml"; + + passthru = { + inherit python; + tests = { + inherit (nixosTests) open-web-calendar; + }; + }; + + meta = with lib; { + description = "Highly customizable web calendar that can be embedded into websites using ICal source links"; + homepage = "https://open-web-calendar.quelltext.eu"; + changelog = + let + v = builtins.replaceStrings [ "." ] [ "" ] version; + in + "https://open-web-calendar.quelltext.eu/changelog/#v${v}"; + license = with licenses; [ + gpl2Only + cc-by-sa-40 + cc0 + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ erictapen ]; + mainProgram = "open-web-calendar"; + }; +} From 897954b8ae5c2cac7d61c9406aded112edc02750 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 16 Sep 2024 16:37:49 +0200 Subject: [PATCH 98/99] nixos/open-web-calendar: init module --- nixos/modules/module-list.nix | 1 + .../services/web-apps/open-web-calendar.nix | 162 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/web-apps/open-web-calendar.nix | 51 ++++++ 4 files changed, 215 insertions(+) create mode 100644 nixos/modules/services/web-apps/open-web-calendar.nix create mode 100644 nixos/tests/web-apps/open-web-calendar.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 362e4db45e23..88a6c24ce293 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1494,6 +1494,7 @@ ./services/web-apps/onlyoffice.nix ./services/web-apps/openvscode-server.nix ./services/web-apps/mediagoblin.nix + ./services/web-apps/open-web-calendar.nix ./services/web-apps/mobilizon.nix ./services/web-apps/openwebrx.nix ./services/web-apps/outline.nix diff --git a/nixos/modules/services/web-apps/open-web-calendar.nix b/nixos/modules/services/web-apps/open-web-calendar.nix new file mode 100644 index 000000000000..525c9eb8c28c --- /dev/null +++ b/nixos/modules/services/web-apps/open-web-calendar.nix @@ -0,0 +1,162 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + mkIf + mkOption + mkEnableOption + mkPackageOption + mkDefault + types + concatMapStringsSep + generators + ; + cfg = config.services.open-web-calendar; + + nixosSpec = calendarSettingsFormat.generate "nixos_specification.json" cfg.calendarSettings; + finalPackage = cfg.package.override { + # The calendarSettings need to be merged with the default_specification.yml + # in the source. This way we use upstreams default values but keep everything overridable. + defaultSpecificationFile = pkgs.runCommand "custom-default_specification.yml" { } '' + ${pkgs.yq}/bin/yq -s '.[0] * .[1]' ${cfg.package}/${cfg.package.defaultSpecificationPath} ${nixosSpec} > $out + ''; + }; + + inherit (finalPackage) python; + pythonEnv = python.buildEnv.override { + extraLibs = [ + (python.pkgs.toPythonModule finalPackage) + # Allows Gunicorn to set a meaningful process name + python.pkgs.gunicorn.optional-dependencies.setproctitle + ]; + }; + + settingsFormat = pkgs.formats.keyValue { }; + calendarSettingsFormat = pkgs.formats.json { }; +in +{ + options.services.open-web-calendar = { + + enable = mkEnableOption "OpenWebCalendar service"; + + package = mkPackageOption pkgs "open-web-calendar" { }; + + domain = mkOption { + type = types.str; + description = "The domain under which open-web-calendar is made available"; + example = "open-web-calendar.example.org"; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + options = { + ALLOWED_HOSTS = mkOption { + type = types.str; + readOnly = true; + description = '' + The hosts that the Open Web Calendar permits. This is required to + mitigate the Host Header Injection vulnerability. + + We always set this to the empty list, as Nginx already checks the Host header. + ''; + default = ""; + }; + }; + }; + default = { }; + description = '' + Configuration for the server. These are set as environment variables to the gunicorn/flask service. + + See the documentation options in . + ''; + }; + + calendarSettings = mkOption { + type = types.submodule { + freeformType = calendarSettingsFormat.type; + options = { }; + }; + default = { }; + description = '' + Configure the default calendar. + + See the documentation options in and . + + Individual calendar instances can be further configured outside this module, by specifying the `specification_url` parameter. + ''; + }; + + }; + + config = mkIf cfg.enable { + + assertions = [ + { + assertion = !cfg.settings ? "PORT"; + message = '' + services.open-web-calendar.settings.PORT can't be set, as the service uses a unix socket. + ''; + } + ]; + + systemd.sockets.open-web-calendar = { + before = [ "nginx.service" ]; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = "/run/open-web-calendar/socket"; + SocketUser = "open-web-calendar"; + SocketGroup = "open-web-calendar"; + SocketMode = "770"; + }; + }; + + systemd.services.open-web-calendar = { + description = "Open Web Calendar"; + after = [ "network.target" ]; + environment.PYTHONPATH = "${pythonEnv}/${python.sitePackages}/"; + serviceConfig = { + Type = "notify"; + NotifyAccess = "all"; + ExecStart = '' + ${pythonEnv.pkgs.gunicorn}/bin/gunicorn \ + --name=open-web-calendar \ + --bind='unix:///run/open-web-calendar/socket' \ + open_web_calendar.app:app + ''; + EnvironmentFile = settingsFormat.generate "open-web-calendar.env" cfg.settings; + ExecReload = "kill -s HUP $MAINPID"; + KillMode = "mixed"; + PrivateTmp = true; + RuntimeDirectory = "open-web-calendar"; + User = "open-web-calendar"; + Group = "open-web-calendar"; + }; + }; + + users.users.open-web-calendar = { + isSystemUser = true; + group = "open-web-calendar"; + }; + + services.nginx = { + enable = true; + virtualHosts."${cfg.domain}" = { + forceSSL = mkDefault true; + enableACME = mkDefault true; + locations."/".proxyPass = "http://unix:///run/open-web-calendar/socket"; + }; + }; + + users.groups.open-web-calendar.members = [ config.services.nginx.user ]; + + }; + + meta.maintainers = with lib.maintainers; [ erictapen ]; + +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d2ff01f9c7bb..b35d5fa7bf7d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -749,6 +749,7 @@ in { openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; opentelemetry-collector = handleTest ./opentelemetry-collector.nix {}; + open-web-calendar = handleTest ./web-apps/open-web-calendar.nix {}; ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix {}; owncast = handleTest ./owncast.nix {}; outline = handleTest ./outline.nix {}; diff --git a/nixos/tests/web-apps/open-web-calendar.nix b/nixos/tests/web-apps/open-web-calendar.nix new file mode 100644 index 000000000000..b5cd59c56abd --- /dev/null +++ b/nixos/tests/web-apps/open-web-calendar.nix @@ -0,0 +1,51 @@ +import ../make-test-python.nix ( + { pkgs, ... }: + + let + certs = import ../common/acme/server/snakeoil-certs.nix; + + serverDomain = certs.domain; + in + { + name = "open-web-calendar"; + meta.maintainers = with pkgs.lib.maintainers; [ erictapen ]; + + nodes.server = + { pkgs, lib, ... }: + { + services.open-web-calendar = { + enable = true; + domain = serverDomain; + calendarSettings.title = "My custom title"; + }; + + services.nginx.virtualHosts."${serverDomain}" = { + enableACME = lib.mkForce false; + sslCertificate = certs."${serverDomain}".cert; + sslCertificateKey = certs."${serverDomain}".key; + }; + + security.pki.certificateFiles = [ certs.ca.cert ]; + + networking.hosts."::1" = [ "${serverDomain}" ]; + networking.firewall.allowedTCPPorts = [ + 80 + 443 + ]; + }; + + nodes.client = + { pkgs, nodes, ... }: + { + networking.hosts."${nodes.server.networking.primaryIPAddress}" = [ "${serverDomain}" ]; + + security.pki.certificateFiles = [ certs.ca.cert ]; + }; + + testScript = '' + start_all() + server.wait_for_unit("open-web-calendar.socket") + server.wait_until_succeeds("curl -f https://${serverDomain}/ | grep 'My custom title'") + ''; + } +) From 6a24c125f8ca9ebd992cbde3e6016a4e6836dc25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Nov 2024 15:38:09 +0000 Subject: [PATCH 99/99] python312Packages.msgraph-core: 1.1.6 -> 1.1.7 --- pkgs/development/python-modules/msgraph-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix index 717c03e50ea6..5707a8906251 100644 --- a/pkgs/development/python-modules/msgraph-core/default.nix +++ b/pkgs/development/python-modules/msgraph-core/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "msgraph-core"; - version = "1.1.6"; + version = "1.1.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "microsoftgraph"; repo = "msgraph-sdk-python-core"; rev = "refs/tags/v${version}"; - hash = "sha256-W1tttt4jWGftW8zzklHV3SrAyugi6XZv0PYGs3T5gZ4="; + hash = "sha256-ADeUlxaDoekKMCE+CJL8biuhijdDqQn0s52yvGi3XCE="; }; build-system = [ setuptools ];