From 2a15702bc8761ae7e0cdbf30ed180f96a8607023 Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Wed, 2 Oct 2024 19:27:19 +0100 Subject: [PATCH 01/41] nixos/openvpn: don't fail to restart stopped units The current OpenVPN restart-after-sleep script will return a non-zero exit code if the system resumes from sleep and there are no active OpenVPN units, resulting in systemd reporting the system as degraded. Avoid that by only attempting to restart OpenVPN programs that are actually running at the time. This also means that any user-managed OpenVPN sessions won't be affected by NixOS's OpenVPN handling. --- nixos/modules/services/networking/openvpn.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index fba6d5e48f92..56b1f6f5ab8f 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -73,8 +73,9 @@ let openvpn-restart = { wantedBy = [ "sleep.target" ]; path = [ pkgs.procps ]; - script = "pkill --signal SIGHUP --exact openvpn"; - #SIGHUP makes openvpn process to self-exit and then it got restarted by systemd because of Restart=always + script = let + unitNames = map (n: "openvpn-${n}.service") (builtins.attrNames cfg.servers); + in "systemctl try-restart ${lib.escapeShellArgs unitNames}"; description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep"; }; }; From 823adf6a2eb8428593b3594bb7068ad6250ea968 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 5 Oct 2024 18:04:01 -0400 Subject: [PATCH 02/41] hof: 0.6.9-beta.1 -> 0.6.9 Diff: https://github.com/hofstadter-io/hof/compare/v0.6.9-beta.1...v0.6.9 --- pkgs/by-name/ho/hof/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/hof/package.nix b/pkgs/by-name/ho/hof/package.nix index d5ca54ea5beb..d82299492db1 100644 --- a/pkgs/by-name/ho/hof/package.nix +++ b/pkgs/by-name/ho/hof/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "hof"; - version = "0.6.9-beta.1"; + version = "0.6.9"; src = fetchFromGitHub { owner = "hofstadter-io"; repo = "hof"; rev = "v${version}"; - hash = "sha256-4yVP6DRHrsp52VxBhr7qppPhInYEsvPbIfxxQcRwHTw="; + hash = "sha256-okY+CkPnlndy5H4M1+T1CY21+63+KPBinHoa5+8kQ2M="; }; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-cDUcYwcxPn+9TEP5lhVJXofijCZX94Is+Qt41PqUgjI="; + vendorHash = "sha256-SmUEVWIyV6k5Lu5zeKGqpij3zUNRZQmIgtf8/Hf7UUs="; subPackages = [ "./cmd/hof/main.go" ]; From 408a0a97c02c2e019d83b8634aef80822ecff40a Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 18 Oct 2024 16:36:29 -0400 Subject: [PATCH 03/41] jellyfin-rpc: init at 1.3.0 --- pkgs/by-name/je/jellyfin-rpc/package.nix | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/je/jellyfin-rpc/package.nix diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix new file mode 100644 index 000000000000..e0120e9d6b98 --- /dev/null +++ b/pkgs/by-name/je/jellyfin-rpc/package.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, + versionCheckHook, +}: + +rustPlatform.buildRustPackage rec { + pname = "jellyfin-rpc"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "Radiicall"; + repo = "jellyfin-rpc"; + rev = "refs/tags/${version}"; + hash = "sha256-sr82lTOr6RUvYD0CVZMyyRAFjai1oLnRWIszuu7/jE0="; + }; + + cargoHash = "sha256-KHbYM7aWgch+DWF46DpFCCt7JoKR0sasuFO3xPOytWA="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Displays the content you're currently watching on Discord"; + homepage = "https://github.com/Radiicall/jellyfin-rpc"; + changelog = "https://github.com/Radiicall/jellyfin-rpc/releases/tag/${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "jellyfin-rpc"; + }; +} From ed71f1425175a41d9f474062b7d3468793f494ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= Date: Tue, 29 Oct 2024 09:07:51 +0100 Subject: [PATCH 04/41] nyxt: remove old workaround The issues this patch addressed are now fixed upstream --- pkgs/applications/networking/browsers/nyxt/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 0fb67d46bc09..6ff4976f00c8 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -39,14 +39,6 @@ stdenv.mkDerivation (finalAttrs: { stripRoot = false; }; - # for sbcl 2.4.3 - postPatch = '' - substituteInPlace _build/cl-gobject-introspection/src/init.lisp \ - --replace-warn sb-ext::set-floating-point-modes sb-int:set-floating-point-modes - substituteInPlace _build/fset/Code/port.lisp \ - --replace-warn sb-ext::once-only sb-int:once-only - ''; - nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ From fa62a40582a0344246a71967dddccec8020331f7 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Thu, 22 Aug 2024 11:53:02 +0200 Subject: [PATCH 05/41] gitopper: init at 0.0.16 --- pkgs/by-name/gi/gitopper/package.nix | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/gi/gitopper/package.nix diff --git a/pkgs/by-name/gi/gitopper/package.nix b/pkgs/by-name/gi/gitopper/package.nix new file mode 100644 index 000000000000..442a706ad7f9 --- /dev/null +++ b/pkgs/by-name/gi/gitopper/package.nix @@ -0,0 +1,54 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + git, + makeWrapper, +}: +let + pname = "gitopper"; + version = "0.0.16"; +in +buildGoModule { + inherit pname version; + + src = fetchFromGitHub { + owner = "miekg"; + repo = "gitopper"; + rev = "v${version}"; + hash = "sha256-EAOC54VtGx6axfty5m8JOebcayINTy4cP4NBo5+ioLk="; + }; + + ldflags = [ "-X main.Version=${version}" ]; + + vendorHash = "sha256-sxeN7nbNTGfD8ZgNQiEQdYl11rhOvPP8UrnYXs9Ljhc="; + + nativeCheckInputs = [ + makeWrapper + git + ]; + + checkFlags = + let + # Skip tests that does not works well inside an isolated environment + skippedTests = [ + "TestInitialGitCheckout" + "TestHash" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + postInstall = '' + wrapProgram $out/bin/gitopper \ + --suffix PATH : ${lib.makeBinPath [ git ]} + ''; + + meta = { + description = "Gitops for non-Kubernetes folks"; + homepage = "https://github.com/miekg/gitopper/"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "gitopper"; + }; +} From 0b63579b5384487d204b963f840f2a5a8514e074 Mon Sep 17 00:00:00 2001 From: Ilia Date: Fri, 4 Oct 2024 19:28:50 +0300 Subject: [PATCH 06/41] maintainers: add istudyatuni --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a04ff6ef63cd..43451ebea4b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9523,6 +9523,11 @@ github = "istoph"; githubId = 114227790; }; + istudyatuni = { + name = "Ilia"; + github = "istudyatuni"; + githubId = 43654815; + }; itepastra = { name = "Noa Aarts"; github = "itepastra"; From 4e0dbd3f396aba5f980aea5d13c2b4f45a11441e Mon Sep 17 00:00:00 2001 From: Ilia Date: Fri, 4 Oct 2024 19:28:50 +0300 Subject: [PATCH 07/41] gruvbox-kvantum: init at 1.1 --- pkgs/by-name/gr/gruvbox-kvantum/package.nix | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/gr/gruvbox-kvantum/package.nix diff --git a/pkgs/by-name/gr/gruvbox-kvantum/package.nix b/pkgs/by-name/gr/gruvbox-kvantum/package.nix new file mode 100644 index 000000000000..160166fd39ab --- /dev/null +++ b/pkgs/by-name/gr/gruvbox-kvantum/package.nix @@ -0,0 +1,47 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib, + variant ? "Gruvbox-Dark-Brown", +}: +let + pname = "gruvbox-kvantum"; +in +lib.checkListOfEnum "${pname}: variant" + [ + "Gruvbox-Dark-Blue" + "Gruvbox-Dark-Brown" + "Gruvbox-Dark-Green" + "Gruvbox_Light_Blue" + "Gruvbox_Light_Brown" + "Gruvbox_Light_Green" + ] + [ variant ] + + stdenvNoCC.mkDerivation + { + inherit pname; + version = "1.1"; + + src = fetchFromGitHub { + owner = "sachnr"; + repo = "gruvbox-kvantum-themes"; + rev = "f47670be407c1f07c64890ad53884ee9977a7db1"; + sha256 = "sha256-u2J4Zf9HuMjNCt3qVpgEffkytl/t277FzOvWL8Nm8os="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/Kvantum + cp -a "${variant}" $out/share/Kvantum + runHook postInstall + ''; + + meta = { + description = "Gruvbox themes for kvantum"; + homepage = "https://github.com/sachnr/gruvbox-kvantum-themes"; + license = lib.licenses.gpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ istudyatuni ]; + }; + } From 7a35c1a09d7ce09cc0a893c29757778fccc116f3 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Sat, 2 Nov 2024 16:33:47 +0900 Subject: [PATCH 08/41] circt: move to pkgs/by-name --- pkgs/{development/compilers => by-name/ci}/circt/circt-llvm.nix | 0 .../circt/default.nix => by-name/ci/circt/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/compilers => by-name/ci}/circt/circt-llvm.nix (100%) rename pkgs/{development/compilers/circt/default.nix => by-name/ci/circt/package.nix} (100%) diff --git a/pkgs/development/compilers/circt/circt-llvm.nix b/pkgs/by-name/ci/circt/circt-llvm.nix similarity index 100% rename from pkgs/development/compilers/circt/circt-llvm.nix rename to pkgs/by-name/ci/circt/circt-llvm.nix diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/by-name/ci/circt/package.nix similarity index 100% rename from pkgs/development/compilers/circt/default.nix rename to pkgs/by-name/ci/circt/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ae20f332ec2..5d5e239999ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -448,8 +448,6 @@ with pkgs; ciel = callPackage ../tools/package-management/ciel { }; - circt = callPackage ../development/compilers/circt { }; - clang-uml = callPackage ../by-name/cl/clang-uml/package.nix { stdenv = clangStdenv; }; From 28bd698b948953029100cd7bf33df44fb71dbe7b Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Sat, 12 Oct 2024 01:44:47 +0900 Subject: [PATCH 09/41] circt: format files --- pkgs/by-name/ci/circt/circt-llvm.nix | 30 ++++++++++++------- pkgs/by-name/ci/circt/package.nix | 45 ++++++++++++++++++---------- 2 files changed, 50 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ci/circt/circt-llvm.nix b/pkgs/by-name/ci/circt/circt-llvm.nix index 8375ccc22f8f..f5f7a685e2f4 100644 --- a/pkgs/by-name/ci/circt/circt-llvm.nix +++ b/pkgs/by-name/ci/circt/circt-llvm.nix @@ -1,17 +1,23 @@ -{ lib -, stdenv -, cmake -, ninja -, circt -, llvm -, python3 -}: stdenv.mkDerivation { +{ + lib, + stdenv, + cmake, + ninja, + circt, + llvm, + python3, +}: +stdenv.mkDerivation { pname = circt.pname + "-llvm"; inherit (circt) version src; requiredSystemFeatures = [ "big-parallel" ]; - nativeBuildInputs = [ cmake ninja python3 ]; + nativeBuildInputs = [ + cmake + ninja + python3 + ]; preConfigure = '' cd llvm/llvm @@ -30,7 +36,11 @@ "-DLLVM_INSTALL_UTILS=ON" ]; - outputs = [ "out" "lib" "dev" ]; + outputs = [ + "out" + "lib" + "dev" + ]; # Get rid of ${extra_libdir} (which ends up containing a path to circt-llvm.dev # in circt) so that we only have to remove the one fixed rpath. diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index c3f16b447e2f..7a3f6f989962 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -1,15 +1,16 @@ -{ stdenv -, lib -, cmake -, coreutils -, python3 -, git -, fetchFromGitHub -, ninja -, lit -, z3 -, gitUpdater -, callPackage +{ + stdenv, + lib, + cmake, + coreutils, + python3, + git, + fetchFromGitHub, + ninja, + lit, + z3, + gitUpdater, + callPackage, }: let @@ -29,7 +30,13 @@ stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; - nativeBuildInputs = [ cmake ninja git pythonEnv z3 ]; + nativeBuildInputs = [ + cmake + ninja + git + pythonEnv + z3 + ]; buildInputs = [ circt-llvm ]; cmakeFlags = [ @@ -65,7 +72,11 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "check-circt check-circt-integration"; - outputs = [ "out" "lib" "dev" ]; + outputs = [ + "out" + "lib" + "dev" + ]; # Copy circt-llvm's postFixup stage so that it can make all our dylib references # absolute as well. @@ -89,7 +100,11 @@ stdenv.mkDerivation rec { description = "Circuit IR compilers and tools"; homepage = "https://circt.org/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ sharzy pineapplehunter sequencer ]; + maintainers = with lib.maintainers; [ + sharzy + pineapplehunter + sequencer + ]; platforms = lib.platforms.all; }; } From d24b911161eee648457643546beaa1e1cbf74e0a Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Sat, 12 Oct 2024 02:20:25 +0900 Subject: [PATCH 10/41] circt: fix build failure on darwin platforms --- pkgs/by-name/ci/circt/circt-llvm.nix | 2 +- pkgs/by-name/ci/circt/package.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ci/circt/circt-llvm.nix b/pkgs/by-name/ci/circt/circt-llvm.nix index f5f7a685e2f4..6c9ec00564dd 100644 --- a/pkgs/by-name/ci/circt/circt-llvm.nix +++ b/pkgs/by-name/ci/circt/circt-llvm.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { # # Inspired by fixDarwinDylibNames. postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - local flags=(-delete_rpath @loader_path/../lib) + local flags for file in "$lib"/lib/*.dylib; do flags+=(-change @rpath/"$(basename "$file")" "$file") done diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix index 7a3f6f989962..180fc1d2fbe4 100644 --- a/pkgs/by-name/ci/circt/package.nix +++ b/pkgs/by-name/ci/circt/package.nix @@ -72,6 +72,12 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "check-circt check-circt-integration"; + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + echo moving libarc-jit-env.dylib to '$lib' before check because archilator links to the output path + mkdir -pv $lib/lib + cp -v ./lib/libarc-jit-env.dylib $lib/lib + ''; + outputs = [ "out" "lib" From d371bd12884e3945732cf178198f94f1c98f3ae4 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Thu, 26 Sep 2024 11:42:16 +0800 Subject: [PATCH 11/41] light: nixfmt --- pkgs/os-specific/linux/light/default.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index 5a5064719fef..41442b372576 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, coreutils }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + autoreconfHook, + coreutils, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.2.2"; pname = "light"; src = fetchFromGitHub { owner = "haikarainen"; repo = "light"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s"; }; @@ -36,7 +43,10 @@ stdenv.mkDerivation rec { homepage = "https://haikarainen.github.io/light/"; license = lib.licenses.gpl3; mainProgram = "light"; - maintainers = with lib.maintainers; [ puffnfresh dtzWill ]; + maintainers = with lib.maintainers; [ + puffnfresh + dtzWill + ]; platforms = lib.platforms.linux; }; -} +}) From 7edefa55310801f15b8a4dcb9529883c8563f5cc Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Thu, 26 Sep 2024 11:50:39 +0800 Subject: [PATCH 12/41] light: fetch source from gitlab; move to by-name --- ...0001-define-light-loglevel-as-extern.patch | 38 ++++++++++++++ pkgs/by-name/li/light/package.nix | 47 +++++++++++++++++ pkgs/os-specific/linux/light/default.nix | 52 ------------------- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 85 insertions(+), 54 deletions(-) create mode 100644 pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch create mode 100644 pkgs/by-name/li/light/package.nix delete mode 100644 pkgs/os-specific/linux/light/default.nix diff --git a/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch b/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch new file mode 100644 index 000000000000..082f8f3f10e1 --- /dev/null +++ b/pkgs/by-name/li/light/0001-define-light-loglevel-as-extern.patch @@ -0,0 +1,38 @@ +From 47f163f6bcd1d66bebc49d96abcf46853a0708fb Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Tue, 22 Oct 2024 07:48:34 +0800 +Subject: [PATCH] fix build + +--- + src/helpers.c | 1 + + src/helpers.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/helpers.c b/src/helpers.c +index c7bc4de..00e6098 100644 +--- a/src/helpers.c ++++ b/src/helpers.c +@@ -9,6 +9,7 @@ + #include // errno + #include // dirname + ++light_loglevel_t light_loglevel; + + bool light_file_read_uint64(char const *filename, uint64_t *val) + { +diff --git a/src/helpers.h b/src/helpers.h +index f73714b..4a92753 100644 +--- a/src/helpers.h ++++ b/src/helpers.h +@@ -21,7 +21,7 @@ typedef enum { + LIGHT_NOTE_LEVEL + } light_loglevel_t; + +-light_loglevel_t light_loglevel; ++extern light_loglevel_t light_loglevel; + + #define LIGHT_LOG(lvl, fp, fmt, args...)\ + if(light_loglevel >= lvl)\ +-- +2.46.1 + diff --git a/pkgs/by-name/li/light/package.nix b/pkgs/by-name/li/light/package.nix new file mode 100644 index 000000000000..aa16262a8d93 --- /dev/null +++ b/pkgs/by-name/li/light/package.nix @@ -0,0 +1,47 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + autoreconfHook, + coreutils, +}: + +stdenv.mkDerivation { + version = "1.2.2"; + pname = "light"; + + src = fetchFromGitLab { + owner = "dpeukert"; + repo = "light"; + rev = "2a54078cbe3814105ee4f565f451b1b5947fbde0"; + hash = "sha256-OmHdVJvBcBjJiPs45JqOHxFoJYvKIEIpt9pFhBz74Kg="; + }; + + configureFlags = [ "--with-udev" ]; + + nativeBuildInputs = [ autoreconfHook ]; + + patches = [ + ./0001-define-light-loglevel-as-extern.patch + ]; + + # ensure udev rules can find the commands used + postPatch = '' + substituteInPlace 90-backlight.rules \ + --replace-fail '/bin/chgrp' '${coreutils}/bin/chgrp' \ + --replace-fail '/bin/chmod' '${coreutils}/bin/chmod' + ''; + + meta = { + description = "GNU/Linux application to control backlights"; + homepage = "https://gitlab.com/dpeukert/light"; + license = lib.licenses.gpl3Only; + mainProgram = "light"; + maintainers = with lib.maintainers; [ + puffnfresh + dtzWill + ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix deleted file mode 100644 index 41442b372576..000000000000 --- a/pkgs/os-specific/linux/light/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - autoreconfHook, - coreutils, -}: - -stdenv.mkDerivation (finalAttrs: { - version = "1.2.2"; - pname = "light"; - src = fetchFromGitHub { - owner = "haikarainen"; - repo = "light"; - rev = "refs/tags/v${version}"; - sha256 = "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s"; - }; - - patches = [ - # Pull upstream fix for -fno-common toolchains: - # https://github.com/haikarainen/light/pull/135 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/haikarainen/light/commit/eae912ca7ff3356805e47739114861d2b6ae7ec0.patch"; - sha256 = "15jp8hm5scl0myiy1jmvd6m52lhx5jscvi3rgb5siwakmnkgzx9j"; - }) - ]; - - configureFlags = [ "--with-udev" ]; - - nativeBuildInputs = [ autoreconfHook ]; - - # ensure udev rules can find the commands used - postPatch = '' - substituteInPlace 90-backlight.rules \ - --replace '/bin/chgrp' '${coreutils}/bin/chgrp' \ - --replace '/bin/chmod' '${coreutils}/bin/chmod' - ''; - - meta = { - description = "GNU/Linux application to control backlights"; - homepage = "https://haikarainen.github.io/light/"; - license = lib.licenses.gpl3; - mainProgram = "light"; - maintainers = with lib.maintainers; [ - puffnfresh - dtzWill - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f17b22d3023..4183b3c193cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25413,8 +25413,6 @@ with pkgs; then util-linuxMinimal else null; - light = callPackage ../os-specific/linux/light { }; - lightum = callPackage ../os-specific/linux/lightum { }; ebtables = callPackage ../os-specific/linux/ebtables { }; From 39c8fd647f2976d022cf01fac2d64a2136e0ac8e Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 3 Nov 2024 17:55:30 +0800 Subject: [PATCH 13/41] apostrophe: 3.1 -> 3.2 Changelog: https://gitlab.gnome.org/World/apostrophe/-/releases/v3.2 --- pkgs/by-name/ap/apostrophe/package.nix | 40 ++++++++++---------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index 3f39ac124453..bf7e31ded51c 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -19,36 +19,24 @@ }: let - version = "3.1"; + version = "3.2"; src = fetchFromGitLab { owner = "World"; repo = "apostrophe"; domain = "gitlab.gnome.org"; - rev = "v${version}"; - hash = "sha256-rXaz0EtLuKOBJLF81K/4qoTZtG6B8Wn+KwSiqYvxAVc="; + rev = "refs/tags/v${version}"; + hash = "sha256-NPpBu6Wmd8z99vzVQ394CyHRV2RQBtkbuqcaFqKqlkQ="; }; - # Patches are required by upstream. Without the patches - # typing `- aaa`, newline, `- bbb` the program crashes - gtksourceview5-patched = gtksourceview5.overrideAttrs (prev: { - patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/sourceview_text_commits.patch" ]; - }); - - libspelling-patched = - (libspelling.override { gtksourceview5 = gtksourceview5-patched; }).overrideAttrs - (prev: { - patches = (prev.patches or [ ]) ++ [ "${src}/build-aux/flatpak/libspelling_text_commits.patch" ]; - }); - reveal-js = fetchFromGitHub { owner = "hakimel"; repo = "reveal.js"; # keep in sync with upstream shipped version # in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json - rev = "4.6.0"; - hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ="; + rev = "refs/tags/5.1.0"; + hash = "sha256-L6KVBw20K67lHT07Ws+ZC2DwdURahqyuyjAaK0kTgN0="; }; in python3Packages.buildPythonApplication { @@ -67,13 +55,14 @@ python3Packages.buildPythonApplication { + '' substituteInPlace apostrophe/preview_converter.py \ --replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js" - '' - # Should be done in postInstall, but meson checks this eagerly before build - + '' - install -d $out/share/apostrophe/libs - cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js ''; + # Should be done in postInstall, but meson checks this eagerly before build + preConfigure = '' + install -d $out/share/apostrophe/libs + cp -r ${reveal-js} $out/share/apostrophe/libs/reveal.js + ''; + nativeBuildInputs = [ meson ninja @@ -85,8 +74,8 @@ python3Packages.buildPythonApplication { buildInputs = [ libadwaita - gtksourceview5-patched - libspelling-patched + gtksourceview5 + libspelling webkitgtk_6_0 ]; @@ -94,6 +83,7 @@ python3Packages.buildPythonApplication { pygobject3 pypandoc chardet + levenshtein ]; dontWrapGApps = true; @@ -107,7 +97,7 @@ python3Packages.buildPythonApplication { ''; passthru = { - inherit gtksourceview5-patched libspelling-patched reveal-js; + inherit reveal-js; }; meta = { From 799ae392daa7a111bc29df7a707c7f387b4006e7 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 3 Nov 2024 19:29:38 +0800 Subject: [PATCH 14/41] rtorrent: Format using nixfmt-rfc-style --- pkgs/by-name/rt/rtorrent/package.nix | 48 ++++++++++++++++------------ 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index b2739defd11b..6feb575febcd 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, autoconf-archive -, autoreconfHook -, cppunit -, curl -, fetchFromGitHub -, installShellFiles -, libsigcxx -, libtool -, libtorrent -, ncurses -, openssl -, pkg-config -, xmlrpc_c -, zlib -, nixosTests -, gitUpdater +{ + lib, + stdenv, + autoconf-archive, + autoreconfHook, + cppunit, + curl, + fetchFromGitHub, + installShellFiles, + libsigcxx, + libtool, + libtorrent, + ncurses, + openssl, + pkg-config, + xmlrpc_c, + zlib, + nixosTests, + gitUpdater, }: stdenv.mkDerivation rec { @@ -29,7 +30,10 @@ stdenv.mkDerivation rec { hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; passthru = { inherit libtorrent; @@ -77,7 +81,11 @@ stdenv.mkDerivation rec { homepage = "https://rakshasa.github.io/rtorrent/"; description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ]; + maintainers = with lib.maintainers; [ + ebzzry + codyopel + thiagokokada + ]; platforms = lib.platforms.unix; mainProgram = "rtorrent"; }; From 93f868007bfabc7e7f730ffd7ee69985954cfcdd Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 3 Nov 2024 19:40:15 +0800 Subject: [PATCH 15/41] rtorrent: Fix build on darwin --- pkgs/by-name/rt/rtorrent/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 6feb575febcd..94da18d76891 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -6,6 +6,7 @@ cppunit, curl, fetchFromGitHub, + fetchpatch, installShellFiles, libsigcxx, libtool, @@ -30,6 +31,14 @@ stdenv.mkDerivation rec { hash = "sha256-G/30Enycpqg/pWC95CzT9LY99kN4tI+S8aSQhnQO+M8="; }; + patches = [ + # fix: use fsync for osx builds + (fetchpatch { + url = "https://github.com/rakshasa/rtorrent/commit/5ce84929e44fbe3f8d6cf142e3133f43afa4071f.patch"; + hash = "sha256-bFDxbpkTZ6nIUT2zMxKMgV94vWlVNzBbIbhx4Bpr8gw="; + }) + ]; + outputs = [ "out" "man" From 73e301522dd29beed7cfb6d5bb1bc69ffccb5c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 3 Nov 2024 09:47:26 -0300 Subject: [PATCH 16/41] lxqt.obconf-qt: 0.16.4 -> 0.16.5 --- pkgs/desktops/lxqt/obconf-qt/default.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 3b7c5f55f548..254ab75ed921 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , libSM , libXdmcp @@ -19,13 +18,13 @@ stdenv.mkDerivation rec { pname = "obconf-qt"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "lxqt"; - repo = pname; + repo = "obconf-qt"; rev = version; - hash = "sha256-uF90v56BthEts/Jy+a6kH2b1QFHCtft4ZLxyi/K/Vnc="; + hash = "sha256-C7s312DeLiustPBBY4OdjYvN7X6noktLA8LuhlOaVRo="; }; nativeBuildInputs = [ @@ -46,22 +45,14 @@ stdenv.mkDerivation rec { qtwayland ]; - patches = [ - (fetchpatch { - name = "obconf-qt.port-to-qt6"; - url = "https://patch-diff.githubusercontent.com/raw/lxqt/obconf-qt/pull/230.patch"; - hash = "sha256-XLt8+/4oMXeli07qTAGc73U9RD1fGYqxTX0QdhuXpII="; - }) - ]; - passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://github.com/lxqt/obconf-qt"; description = "Qt port of obconf, the Openbox configuration tool"; mainProgram = "obconf-qt"; - license = licenses.gpl2Plus; - platforms = with platforms; unix; - maintainers = teams.lxqt.members; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = lib.teams.lxqt.members; }; } From de88955be618163fab1e4151e91df3d0eb3610f0 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 3 Nov 2024 14:24:39 +0100 Subject: [PATCH 17/41] =?UTF-8?q?sqruff:=200.17.0=20=E2=86=92=200.20.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diff: https://github.com/quarylabs/sqruff/compare/v0.17.0...v0.20.2 --- pkgs/by-name/sq/sqruff/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index d1c9343296ef..f923d3a1edfb 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - installShellFiles, stdenv, darwin, rust-jemalloc-sys, @@ -11,21 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "sqruff"; - version = "0.17.0"; + version = "0.20.2"; src = fetchFromGitHub { owner = "quarylabs"; repo = "sqruff"; rev = "refs/tags/v${version}"; - hash = "sha256-uUtbVf4U59jne5uORXpyzpqhFQoviKi2O9KQ5s1CfhU="; + hash = "sha256-Vlre3D1ydDqFdysf5no2rW2V2U/BimhCeV1vWZ2JPSM="; }; - cargoHash = "sha256-kIBjPh+rL4vzIAqGNYMpw39A0vADbHxi/PkhoG+QL6c="; - - # Requires nightly features (feature(let_chains) and feature(trait_upcasting)) - RUSTC_BOOTSTRAP = true; - - nativeBuildInputs = [ installShellFiles ]; + cargoHash = "sha256-WqkHZcA4FBm8zubAnDrJGH+fgLVIxsNNm3B+mdj5Sxw="; buildInputs = [ rust-jemalloc-sys @@ -35,8 +29,8 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace crates/cli/tests/ui.rs \ --replace-fail \ - 'config.program.program = format!("../../target/{profile}/sqruff").into();' \ - 'config.program.program = "../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/sqruff".into();' + 'sqruff_path.push(format!("../../target/{}/sqruff", profile));' \ + 'sqruff_path.push(format!("../../target/${stdenv.hostPlatform.rust.cargoShortTarget}/{}/sqruff", profile));' ''; nativeCheckInputs = [ versionCheckHook ]; From f0668b4886f06a09a2be67f0821f472e23a86c55 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 4 Nov 2024 09:37:33 +0100 Subject: [PATCH 18/41] cargo-sweep: fix build by disabling broken test --- pkgs/development/tools/rust/cargo-sweep/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 8e04ed2bc9f8..323ce9378a24 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -16,6 +16,8 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Requires a rustup toolchain to be installed. "--skip check_toolchain_listing_on_multiple_projects" + # Does not work with a `--target` build in the environment + "--skip empty_project_output" ]; meta = with lib; { From c351ae969d6ffb852e85b362189770e13ce5eda3 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 4 Nov 2024 09:38:00 +0100 Subject: [PATCH 19/41] cargo-sweep: format using nixfmt --- pkgs/development/tools/rust/cargo-sweep/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 323ce9378a24..98b23c9d0e70 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -1,4 +1,8 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ + lib, + rustPlatform, + fetchFromGitHub, +}: rustPlatform.buildRustPackage rec { pname = "cargo-sweep"; @@ -25,6 +29,9 @@ rustPlatform.buildRustPackage rec { mainProgram = "cargo-sweep"; homepage = "https://github.com/holmgr/cargo-sweep"; license = licenses.mit; - maintainers = with maintainers; [ xrelkd matthiasbeyer ]; + maintainers = with maintainers; [ + xrelkd + matthiasbeyer + ]; }; } From 9da04cc7dbadb156efa0aeba2e8d0f3fb75a874b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 16:48:34 -0600 Subject: [PATCH 20/41] afuse: format --- pkgs/os-specific/linux/afuse/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 33d950b76cd6..587f1305741f 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }: +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + autoreconfHook, + fuse, +}: stdenv.mkDerivation rec { pname = "afuse"; @@ -11,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-KpysJRvDx+12BSl9pIGRqbJAM4W1NbzxMgDycGCr2RM="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ fuse ]; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' From 0acd19c9fc147d487154242239bd851c67c4b142 Mon Sep 17 00:00:00 2001 From: Kek5chen Date: Mon, 4 Nov 2024 22:15:43 +0100 Subject: [PATCH 21/41] onionshare: fix runtime --- pkgs/applications/networking/onionshare/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 9e7152393a4d..e0b6a80c1749 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -82,6 +82,7 @@ rec { pysocks qrcode requests + setuptools stem unidecode waitress From 209e024a2d470c997b6bff423a345d4d8724d877 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 5 Nov 2024 12:35:41 +0100 Subject: [PATCH 22/41] uv: 0.4.29 -> 0.4.30 Diff: https://github.com/astral-sh/uv/compare/refs/tags/0.4.29...0.4.30 Changelog: https://github.com/astral-sh/uv/blob/refs/tags/0.4.30/CHANGELOG.md --- pkgs/by-name/uv/uv/Cargo.lock | 189 +++++++++++++++++---------------- pkgs/by-name/uv/uv/package.nix | 11 +- 2 files changed, 98 insertions(+), 102 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 81507fd74255..651d4c41cc0b 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -49,26 +49,26 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.91" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" +checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" [[package]] name = "arrayref" @@ -183,14 +183,14 @@ dependencies = [ [[package]] name = "async_http_range_reader" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a0e0571c5d724d17fbe0b608d31a91e94938722c141877d3a2982216b084c2" +checksum = "4015e7130cf870da1c64a9c7ba474f4b3772a530edbeb05f8358bc9a02f8e505" dependencies = [ "bisection", "futures", "http-content-range", - "itertools 0.12.1", + "itertools 0.13.0", "memmap2 0.9.5", "reqwest", "reqwest-middleware", @@ -229,12 +229,13 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axoasset" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e7b7ac1c1cd4fdcaa2f9e704defa9defd996039083d85e17efa5e8eefb3bd2" +checksum = "90f16d4ba2365a6f9b4394b369597b9bc00a1651db758edbe6d63a34879b9024" dependencies = [ "camino", "image", + "lazy_static", "miette", "mime", "reqwest", @@ -269,9 +270,9 @@ dependencies = [ [[package]] name = "axoupdater" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe17874ee40fb66fe1d2cb7871b14de4d298fbf77ea29a6cedb8027365e1a33" +checksum = "7fb8d8889305a413a040f281197bb2f8982a1d25c9696707cab350e3cc780ba5" dependencies = [ "axoasset", "axoprocess", @@ -284,6 +285,7 @@ dependencies = [ "tempfile", "thiserror", "tokio", + "url", ] [[package]] @@ -420,9 +422,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "bzip2" @@ -465,9 +467,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc680c90073156fb5280c0c0127b779eef1f6292e41f7d6621acba3041e81c7d" +checksum = "b6dd67a24439ca5260a08128b6cbf4b0f4453497a2f60508163ab9d5b534b122" dependencies = [ "anyhow", "core-foundation", @@ -483,7 +485,7 @@ dependencies = [ "tempfile", "tracing", "walkdir", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -494,9 +496,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.30" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -577,9 +579,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.33" +version = "4.5.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb" +checksum = "86bc73de94bc81e52f3bebec71bc4463e9748f7a59166663e32044669577b0e2" dependencies = [ "clap", ] @@ -662,9 +664,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "colored" @@ -948,6 +950,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + [[package]] name = "dunce" version = "1.0.5" @@ -974,9 +982,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1056,9 +1064,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" +checksum = "07c6f4c64c1d33a3111c4466f7365ebdcc37c5bd1ea0d62aae2e3d722aacbedb" dependencies = [ "simd-adler32", ] @@ -1207,9 +1215,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210" dependencies = [ "fastrand", "futures-core", @@ -1470,9 +1478,9 @@ dependencies = [ [[package]] name = "http-content-range" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa7929c876417cd3ece616950474c7dff5b0150a2b53bd7e7fda55afa086c22b" +checksum = "91314cc9d86f625097a3365cab4e4b6f190eac231650f8f41c1edd8080cea1d0" [[package]] name = "httparse" @@ -1528,9 +1536,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1573,9 +1581,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" dependencies = [ "bytemuck", "byteorder-lite", @@ -1620,9 +1628,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "insta" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef" +checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8" dependencies = [ "console", "lazy_static", @@ -1684,15 +1692,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -1710,9 +1709,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jiff" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a45489186a6123c128fdf6016183fcfab7113e1820eb813127e036e287233fb" +checksum = "b9d9d414fc817d3e3d62b2598616733f76c4cc74fbac96069674739b881295c8" dependencies = [ "jiff-tzdb-platform", "serde", @@ -2320,18 +2319,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", @@ -2340,9 +2339,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -2477,23 +2476,22 @@ dependencies = [ [[package]] name = "procfs" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" +checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f" dependencies = [ "bitflags 2.6.0", "flate2", "hex", - "lazy_static", "procfs-core", "rustix", ] [[package]] name = "procfs-core" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec" dependencies = [ "bitflags 2.6.0", "hex", @@ -2569,10 +2567,11 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", @@ -2764,9 +2763,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "async-compression", "base64 0.22.1", @@ -3016,9 +3015,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.15" +version = "0.23.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" +checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" dependencies = [ "once_cell", "ring", @@ -3206,9 +3205,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] @@ -3226,9 +3225,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", @@ -3490,9 +3489,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.85" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -3645,18 +3644,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.65" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" +checksum = "3b3c6efbfc763e64eb85c11c25320f0737cb7364c4b6336db90aa9ebe27a0bbd" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.65" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" +checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6" dependencies = [ "proc-macro2", "quote", @@ -4023,12 +4022,9 @@ checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicase" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] +checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" @@ -4176,7 +4172,7 @@ checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uv" -version = "0.4.29" +version = "0.4.30" dependencies = [ "anstream", "anyhow", @@ -4188,6 +4184,7 @@ dependencies = [ "clap", "console", "ctrlc", + "dotenvy", "etcetera", "filetime", "flate2", @@ -4208,7 +4205,6 @@ dependencies = [ "regex", "reqwest", "rustc-hash", - "same-file", "serde", "serde_json", "similar", @@ -4257,6 +4253,7 @@ dependencies = [ "uv-shell", "uv-static", "uv-tool", + "uv-trampoline-builder", "uv-types", "uv-version", "uv-virtualenv", @@ -4945,6 +4942,7 @@ name = "uv-performance-flate2-backend" version = "0.1.0" dependencies = [ "flate2", + "libz-ng-sys", ] [[package]] @@ -4983,15 +4981,17 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "sha2", "thiserror", "tokio", "tokio-util", "tracing", "url", + "uv-cache", "uv-client", "uv-configuration", "uv-distribution-filename", + "uv-distribution-types", + "uv-extract", "uv-fs", "uv-metadata", "uv-pypi-types", @@ -5072,6 +5072,7 @@ dependencies = [ "uv-pypi-types", "uv-state", "uv-static", + "uv-trampoline-builder", "uv-warnings", "which", "windows-registry 0.3.0", @@ -5270,6 +5271,9 @@ dependencies = [ [[package]] name = "uv-static" version = "0.0.1" +dependencies = [ + "uv-macros", +] [[package]] name = "uv-tool" @@ -5333,7 +5337,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.29" +version = "0.4.30" [[package]] name = "uv-virtualenv" @@ -5366,7 +5370,6 @@ version = "0.0.1" dependencies = [ "anyhow", "assert_fs", - "either", "fs-err", "glob", "insta", @@ -5521,9 +5524,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-streams" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -5574,9 +5577,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" -version = "6.0.3" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" +checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b" dependencies = [ "either", "home", diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index ef4814207cab..2652cbbc3e89 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -1,28 +1,25 @@ { lib, cmake, - darwin, fetchFromGitHub, installShellFiles, - libiconv, pkg-config, python3Packages, rustPlatform, - stdenv, versionCheckHook, nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.29"; + version = "0.4.30"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-FJJnb4m9yPf1bBvlAyAgQKgAzt4O0tbokYkz4iY6kbg="; + hash = "sha256-xy/fgy3+YvSdfq5ngPVbAmRpYyJH27Cft5QxBwFQumU="; }; cargoDeps = rustPlatform.importCargoLock { @@ -43,10 +40,6 @@ python3Packages.buildPythonApplication rec { rustPlatform.maturinBuildHook ]; - buildInputs = [ - libiconv - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - dontUseCmakeConfigure = true; cargoBuildFlags = [ From df58e0e34da77b0ee3909c9687406f25756dd229 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Tue, 5 Nov 2024 13:32:35 +0100 Subject: [PATCH 23/41] python312Packages.llm: 0.16 -> 0.17.1 --- pkgs/development/python-modules/llm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 7f3f07250ae5..568c57683215 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -10,6 +10,7 @@ openai, pip, pluggy, + puremagic, pydantic, python-ulid, pyyaml, @@ -21,7 +22,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.16"; + version = "0.17.1"; pyproject = true; build-system = [ setuptools ]; @@ -32,7 +33,7 @@ let owner = "simonw"; repo = "llm"; rev = "refs/tags/${version}"; - hash = "sha256-ew8080Lv1ObjUaGicaGrj8IXXA7rtdgcWhp41O8gfVE="; + hash = "sha256-6OO0SIIxChM5HRJoUM4CYGbsINmc3i+iyL/oahLHhrY="; }; patches = [ ./001-disable-install-uninstall-commands.patch ]; @@ -43,6 +44,7 @@ let openai pip pluggy + puremagic pydantic python-ulid pyyaml From 53b356fcd79884d8f08f56e46ab467512eaeca92 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Nov 2024 15:07:33 +0100 Subject: [PATCH 24/41] python312Packages.django_5: 5.1.2 -> 5.1.3 https://docs.djangoproject.com/en/5.1/releases/5.1.3/ --- pkgs/development/python-modules/django/5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 39be46703e68..456cae7155a9 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pname = "django"; - version = "5.1.2"; + version = "5.1.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,7 +52,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-HQt7et2PBG5rPCFCl64CIr+jTpty0a5IxJ0rKP6QCBM="; + hash = "sha256-TqOVe+QkwNx/SpI/6X/AQaqLHk3LDSupoRl3RKL6kac="; }; patches = From 377462189133351261c27d68439759a4584485ba Mon Sep 17 00:00:00 2001 From: linuxissuper Date: Sat, 21 Sep 2024 15:14:46 +0200 Subject: [PATCH 25/41] meteo-qt: init at 3.4 --- pkgs/by-name/me/meteo-qt/package.nix | 45 ++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/me/meteo-qt/package.nix diff --git a/pkgs/by-name/me/meteo-qt/package.nix b/pkgs/by-name/me/meteo-qt/package.nix new file mode 100644 index 000000000000..33df8b4095b5 --- /dev/null +++ b/pkgs/by-name/me/meteo-qt/package.nix @@ -0,0 +1,45 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + qt5, +}: + +python3Packages.buildPythonApplication rec { + pname = "meteo-qt"; + version = "3.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "dglent"; + repo = "meteo-qt"; + rev = "refs/tags/v${version}"; + hash = "sha256-J9R6UGfj3vaPfn0vmjeRMsHryc/1pxoKyIE9wteVYbY="; + }; + + nativeBuildInputs = [ + qt5.qttools + qt5.wrapQtAppsHook + ]; + + build-system = with python3Packages; [ sip ]; + + dependencies = with python3Packages; [ + lxml + pyqt5 + ]; + + pythonImportsCheck = [ "meteo_qt" ]; + + makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + + meta = { + description = "System tray application for weather status information"; + homepage = "https://github.com/dglent/meteo-qt"; + changelog = "https://github.com/dglent/meteo-qt/blob/${src.rev}/CHANGELOG"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ linuxissuper ]; + mainProgram = "meteo-qt"; + platforms = lib.platforms.linux; + }; +} From b4bdaa19e24400dbfdb2c87e86407f710742a8e6 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 5 Oct 2024 18:05:22 -0400 Subject: [PATCH 26/41] hof: nixfmt --- pkgs/by-name/ho/hof/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ho/hof/package.nix b/pkgs/by-name/ho/hof/package.nix index d82299492db1..13a14c4a5b13 100644 --- a/pkgs/by-name/ho/hof/package.nix +++ b/pkgs/by-name/ho/hof/package.nix @@ -1,10 +1,11 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles +{ + lib, + buildGo122Module, + fetchFromGitHub, + installShellFiles, }: -buildGoModule rec { +buildGo122Module rec { pname = "hof"; version = "0.6.9"; From d353f6161f1b303457d35ba9d7b93cd83ae8e5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Wed, 23 Oct 2024 22:05:44 +0100 Subject: [PATCH 27/41] infrastructure-agent: init at 1.57.2 fix: lowercase maintainer name style: reduce `with` scope usage Update pkgs/by-name/in/infrastructure-agent/package.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> Update pkgs/by-name/in/infrastructure-agent/package.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- .../in/infrastructure-agent/package.nix | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/in/infrastructure-agent/package.nix diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix new file mode 100644 index 000000000000..7812ec87e160 --- /dev/null +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "infrastructure-agent"; + version = "1.57.2"; + + src = fetchFromGitHub { + owner = "newrelic"; + repo = "infrastructure-agent"; + rev = version; + hash = "sha256-74aBFGBrrEiqAVG3kVYLOz3P4VTCw4G3vV/iBucFPYs="; + }; + + vendorHash = "sha256-0WLL15CXRi/flp4EV3Qt0wO1VaUmAokzsChpiqjs+YQ="; + + ldflags = [ + "-s" + "-w" + "-X main.buildVersion=${version}" + "-X main.gitCommit=${src.rev}" + ]; + + CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0"; + + subPackages = [ + "cmd/newrelic-infra" + "cmd/newrelic-infra-ctl" + "cmd/newrelic-infra-service" + ]; + + meta = { + description = "New Relic Infrastructure Agent"; + homepage = "https://github.com/newrelic/infrastructure-agent.git"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ davsanchez ]; + mainProgram = "newrelic-infra"; + }; +} From 092fef0ac8b67f8edd3a613c413ffc0bfb6a6786 Mon Sep 17 00:00:00 2001 From: Nipe Setiawan Harefa Date: Mon, 4 Nov 2024 04:29:43 +0700 Subject: [PATCH 28/41] sidekick: init at 0.6.6 --- pkgs/by-name/si/sidekick/package.nix | 54 ++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/si/sidekick/package.nix diff --git a/pkgs/by-name/si/sidekick/package.nix b/pkgs/by-name/si/sidekick/package.nix new file mode 100644 index 000000000000..3ff0b4340c44 --- /dev/null +++ b/pkgs/by-name/si/sidekick/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + installShellFiles, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "sidekick"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "MightyMoud"; + repo = "sidekick"; + rev = "v${version}"; + hash = "sha256-Y/dQRix/cxV3NGqTGtRP6Bcprj0jzzOpudgm9a1UMLc="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + doInstallCheck = true; + + doCheck = true; + + vendorHash = "sha256-35MThhVqCcIFH2oQNw6n73JqNVr2T6mXaIJMK9LiXq8="; + + ldflags = [ + "-s" + "-w" + "-X github.com/mightymoud/sidekick/cmd.version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd sidekick \ + --bash <($out/bin/sidekick completion bash) \ + --fish <($out/bin/sidekick completion fish) \ + --zsh <($out/bin/sidekick completion zsh) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + meta = { + description = "Command-line tool designed to simplify the process of deploying and managing applications on a VPS"; + mainProgram = "sidekick"; + homepage = "https://github.com/MightyMoud/sidekick"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ nipeharefa ]; + }; +} From 012055eb87c6d4aed16deccdcfa5cb335c99005e Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 21 Jun 2024 18:41:01 -0400 Subject: [PATCH 29/41] systemd-netlogd: init at 1.4.2 --- pkgs/by-name/sy/systemd-netlogd/package.nix | 87 +++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 pkgs/by-name/sy/systemd-netlogd/package.nix diff --git a/pkgs/by-name/sy/systemd-netlogd/package.nix b/pkgs/by-name/sy/systemd-netlogd/package.nix new file mode 100644 index 000000000000..177994c04c53 --- /dev/null +++ b/pkgs/by-name/sy/systemd-netlogd/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gperf, + libcap, + meson, + ninja, + nix-update-script, + openssl, + pkg-config, + pkgsCross, + sphinx, + systemd, + systemdLibs, + opensslSupport ? true, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "systemd-netlogd"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = "systemd-netlogd"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-FwBwhsnVathlRQjKyrsPpZZlCb2rIpVuHGq9mG3mNsw="; + }; + + # Fixup a few installation paths + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "get_option('prefix')" "get_option('bindir')" + substituteInPlace doc/meson.build \ + --replace-fail "'/usr/share/man/man8'" "get_option('mandir') / 'man8'" + substituteInPlace units/meson.build \ + --replace-fail "get_option('prefix') / 'system'" "get_option('libdir') / 'systemd/system'" + + substituteInPlace units/systemd-netlogd.service.in \ + --replace-fail '@PKGPREFIX@/systemd-netlogd' '${placeholder "out"}/bin/systemd-netlogd' + ''; + + outputs = [ + "out" + "man" + ]; + + strictDeps = true; + + nativeBuildInputs = [ + gperf + meson + ninja + pkg-config + sphinx + ]; + + buildInputs = [ + libcap + systemdLibs + ] ++ lib.optional opensslSupport openssl; + + mesonFlags = [ + "--sysconfdir=${placeholder "out"}/etc/systemd" + (lib.mesonBool "openssl" opensslSupport) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru = { + # Make sure x86_64-linux -> aarch64-linux cross compilation works + tests = lib.optionalAttrs (stdenv.buildPlatform.system == "x86_64-linux") { + aarch64-cross = pkgsCross.aarch64-multiplatform.systemd-netlogd; + }; + updateScript = nix-update-script { }; + }; + + meta = { + description = "Forwards messages from the journal to other hosts over the network"; + homepage = "https://github.com/systemd/systemd-netlogd"; + changelog = "https://github.com/systemd/systemd-netlogd/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ getchoo ]; + inherit (systemd.meta) platforms; + mainProgram = "systemd-netlogd"; + }; +}) From 265c6a8046e34560e7486c5ee37dc2bd5ff5e4d0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 4 Nov 2024 16:50:14 -0600 Subject: [PATCH 30/41] afuse: fix darwin build --- .../linux/afuse/001-darwin-fdatasync.patch | 15 +++++++++++++++ pkgs/os-specific/linux/afuse/default.nix | 3 +++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch diff --git a/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch b/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch new file mode 100644 index 000000000000..6a576c3a01a3 --- /dev/null +++ b/pkgs/os-specific/linux/afuse/001-darwin-fdatasync.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index ef07d70..2da26aa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,9 +27,9 @@ if test "$have_fuse_opt_parse" = no; then + fi + AM_CONDITIONAL(FUSE_OPT_COMPAT, test "$have_fuse_opt_parse" = no) + + +-AC_CHECK_FUNCS([setxattr fdatasync getline fgetln]) ++AC_CHECK_FUNCS([setxattr getline fgetln]) + + AC_CONFIG_FILES([Makefile + src/Makefile + compat/Makefile]) diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 587f1305741f..f5d57ce67b1c 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -22,8 +22,11 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config ]; + buildInputs = [ fuse ]; + patches = [ ./001-darwin-fdatasync.patch ]; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed substituteInPlace configure.ac --replace \ From 0d204871a02d071f0a753cef09653bafd0beb635 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 5 Nov 2024 14:17:17 -0600 Subject: [PATCH 31/41] afuse: replace -> replace-fail --- pkgs/os-specific/linux/afuse/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index f5d57ce67b1c..81b168a4712e 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Fix the build on macOS with macFUSE installed - substituteInPlace configure.ac --replace \ + substituteInPlace configure.ac --replace-fail \ 'export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH' \ "" ''; From 232ece2599ef8541e9cbe3f0da3dce91a40a6c70 Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Tue, 5 Nov 2024 20:47:26 +0000 Subject: [PATCH 32/41] maintainers: remove ianmjones --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/misc/deckmaster/default.nix | 2 +- pkgs/by-name/ob/obs-cmd/package.nix | 2 +- pkgs/by-name/sc/scd2html/package.nix | 2 +- pkgs/by-name/sn/snippetexpander/package.nix | 2 +- pkgs/by-name/sn/snippetexpanderd/package.nix | 2 +- pkgs/by-name/sn/snippetexpandergui/package.nix | 2 +- pkgs/by-name/sn/snippetexpanderx/package.nix | 2 +- pkgs/development/tools/wails/default.nix | 2 +- pkgs/tools/text/snippetpixie/default.nix | 2 +- 10 files changed, 9 insertions(+), 15 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 61a95b7f88f6..a066000a1530 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9151,12 +9151,6 @@ githubId = 30196; name = "Ian Liu Rodrigues"; }; - ianmjones = { - email = "ian@ianmjones.com"; - github = "ianmjones"; - githubId = 4710; - name = "Ian M. Jones"; - }; ianwookim = { email = "ianwookim@gmail.com"; github = "wavewave"; diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix index 5574b645d6ae..eb913847221d 100644 --- a/pkgs/applications/misc/deckmaster/default.nix +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -41,7 +41,7 @@ buildGoModule rec { homepage = "https://github.com/muesli/deckmaster"; changelog = "https://github.com/muesli/deckmaster/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ianmjones ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index a0a495247172..96c39964a39f 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/grigio/obs-cmd"; changelog = "https://github.com/grigio/obs-cmd/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ ianmjones ]; + maintainers = with maintainers; [ ]; mainProgram = "obs-cmd"; }; } diff --git a/pkgs/by-name/sc/scd2html/package.nix b/pkgs/by-name/sc/scd2html/package.nix index 17cd4f211685..8ca7f8824a80 100644 --- a/pkgs/by-name/sc/scd2html/package.nix +++ b/pkgs/by-name/sc/scd2html/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "scd2html generates HTML from scdoc source files"; homepage = "https://git.sr.ht/~bitfehler/scd2html"; license = licenses.mit; - maintainers = with maintainers; [ ianmjones ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "scd2html"; }; diff --git a/pkgs/by-name/sn/snippetexpander/package.nix b/pkgs/by-name/sn/snippetexpander/package.nix index 31c1a59f84a0..4aed8b58adeb 100644 --- a/pkgs/by-name/sn/snippetexpander/package.nix +++ b/pkgs/by-name/sn/snippetexpander/package.nix @@ -50,7 +50,7 @@ buildGoModule rec { description = "Your little expandable text snippet helper CLI"; homepage = "https://snippetexpander.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ianmjones ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "snippetexpander"; }; diff --git a/pkgs/by-name/sn/snippetexpanderd/package.nix b/pkgs/by-name/sn/snippetexpanderd/package.nix index fbaa7541e8fe..e657ed758ff7 100644 --- a/pkgs/by-name/sn/snippetexpanderd/package.nix +++ b/pkgs/by-name/sn/snippetexpanderd/package.nix @@ -61,7 +61,7 @@ buildGoModule rec { description = "Your little expandable text snippet helper daemon"; homepage = "https://snippetexpander.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ianmjones ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "snippetexpanderd"; }; diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index 5e5e6a60cda7..ed496b76b905 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -65,7 +65,7 @@ buildGoModule rec { description = "Your little expandable text snippet helper GUI"; homepage = "https://snippetexpander.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ianmjones ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "snippetexpandergui"; }; diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix index 5f67512edda6..e88cbe15ae0d 100644 --- a/pkgs/by-name/sn/snippetexpanderx/package.nix +++ b/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "Your little expandable text snippet helper auto expander daemon"; homepage = "https://snippetexpander.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ianmjones ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "snippetexpanderx"; }; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 4ae5a8bd63a5..b024d5fe710c 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -69,7 +69,7 @@ buildGoModule rec { description = "Build applications using Go + HTML + CSS + JS"; homepage = "https://wails.io"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ianmjones ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "wails"; platforms = lib.platforms.unix; }; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 40267ea7e148..49b633b02f01 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ianmjones ] ++ teams.pantheon.members; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "com.github.bytepixie.snippetpixie"; }; From 509620877774f4bd9f0306830398579b44c19ebb Mon Sep 17 00:00:00 2001 From: Steven Keuchel Date: Tue, 5 Nov 2024 22:20:48 +0100 Subject: [PATCH 33/41] expressvpn: fix build Small regression of the buildFHSEnv updates in https://github.com/NixOS/nixpkgs/pull/351928 --- pkgs/applications/networking/expressvpn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/expressvpn/default.nix b/pkgs/applications/networking/expressvpn/default.nix index 5334fc01ffc4..b1b925075a7e 100644 --- a/pkgs/applications/networking/expressvpn/default.nix +++ b/pkgs/applications/networking/expressvpn/default.nix @@ -58,6 +58,7 @@ let # expressvpnd binary has hard-coded the path /sbin/sysctl hence below workaround. extraBuildCommands = '' + mkdir -p sbin chmod +w sbin ln -s ${sysctl}/bin/sysctl sbin/sysctl ''; From 0d0690dc79bd71174cd834a09643624ff3578321 Mon Sep 17 00:00:00 2001 From: AnnaGraphic Date: Fri, 1 Nov 2024 20:54:00 +0100 Subject: [PATCH 34/41] nixos/bluetooth: reference bluez doc in descriptions --- nixos/modules/services/hardware/bluetooth.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index a73cc970576a..741abfba30b6 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -62,7 +62,10 @@ in ControllerMode = "bredr"; }; }; - description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; + description = '' + Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf). + See for full list of options. + ''; }; input = mkOption { @@ -74,7 +77,10 @@ in ClassicBondedOnly = true; }; }; - description = "Set configuration for the input service (/etc/bluetooth/input.conf)."; + description = '' + Set configuration for the input service (/etc/bluetooth/input.conf). + See for full list of options. + ''; }; network = mkOption { @@ -85,7 +91,10 @@ in DisableSecurity = true; }; }; - description = "Set configuration for the network service (/etc/bluetooth/network.conf)."; + description = '' + Set configuration for the network service (/etc/bluetooth/network.conf). + See for full list of options. + ''; }; }; }; From 6ac5588872e2d6b9312877df49446d6d77a5485a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Nov 2024 23:34:47 +0100 Subject: [PATCH 35/41] python312Packages.pyinstaller: reformat --- .../python-modules/pyinstaller/default.nix | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index 943a48d843a0..36ce797b959f 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -1,19 +1,19 @@ { - lib -, buildPythonPackage -, fetchPypi -, setuptools -, zlib -, altgraph -, packaging -, pyinstaller-hooks-contrib -, testers -, pyinstaller -, glibc -, binutils -, macholib -, installShellFiles -, stdenv + lib, + buildPythonPackage, + fetchPypi, + setuptools, + zlib, + altgraph, + packaging, + pyinstaller-hooks-contrib, + testers, + pyinstaller, + glibc, + binutils, + macholib, + installShellFiles, + stdenv, }: buildPythonPackage rec { @@ -26,7 +26,6 @@ buildPythonPackage rec { hash = "sha256-FDhA+AVv97kQv48W9s2SzBCmwmgLt20KJdVY1UPSEnA="; }; - build-system = [ setuptools ]; nativeBuildInputs = [ installShellFiles ]; @@ -41,7 +40,13 @@ buildPythonPackage rec { ]; makeWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ - "--prefix" "PATH" ":" (lib.makeBinPath [ glibc binutils ]) + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + glibc + binutils + ]) ]; postInstall = '' From 16aaf3b433f4b0ada61cb667507f94be171e7719 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Nov 2024 23:41:54 +0100 Subject: [PATCH 36/41] python312Packages.pyinstaller: 6.10.0 -> 6.11.0 https://pyinstaller.org/en/v6.11.0/CHANGES.html --- .../python-modules/pyinstaller/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index 36ce797b959f..b76b5bc2440a 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -1,35 +1,40 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, + + # build-system setuptools, + + # native dependencies zlib, + + # dependencies altgraph, + macholib, packaging, pyinstaller-hooks-contrib, - testers, - pyinstaller, - glibc, + + # tests binutils, - macholib, - installShellFiles, - stdenv, + glibc, + pyinstaller, + testers, }: buildPythonPackage rec { pname = "pyinstaller"; - version = "6.10.0"; + version = "6.11.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-FDhA+AVv97kQv48W9s2SzBCmwmgLt20KJdVY1UPSEnA="; + hash = "sha256-y01DOj2zDZ0Xz18s97tN+Ap4jUk8HWfdgi3FeR2YZK8="; }; build-system = [ setuptools ]; - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ zlib.dev ]; dependencies = [ @@ -49,10 +54,6 @@ buildPythonPackage rec { ]) ]; - postInstall = '' - installManPage doc/pyinstaller.1 doc/pyi-makespec.1 - ''; - pythonImportsCheck = [ "PyInstaller" ]; passthru.tests.version = testers.testVersion { From 94d80c6fa435c90a7d4d8a9ede75c2892551851f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 6 Nov 2024 00:21:28 +0100 Subject: [PATCH 37/41] python312Packages.transformers: 4.46.1 -> 4.46.2 Diff: https://github.com/huggingface/transformers/compare/refs/tags/v4.46.1...v4.46.2 Changelog: https://github.com/huggingface/transformers/releases/tag/v4.46.2 --- pkgs/development/python-modules/transformers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index f3dc2897f798..746b27514632 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -58,14 +58,14 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.46.1"; + version = "4.46.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-lVpzOjBb92EZpNLSPBSWrpkENgdovCDSoMp6R13nzsM="; + hash = "sha256-5bYjgrW2ITJ/bc8BP/tWjzwLrLQHgvKSVyUCNsRniFM="; }; build-system = [ setuptools ]; From e71a6e47787f05f24293ea86df27a283ed325ba0 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 3 Nov 2024 18:18:40 +0000 Subject: [PATCH 38/41] tailspin: Patch the test binary path for the integration tests. --- pkgs/tools/misc/tailspin/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/tools/misc/tailspin/default.nix index 51e0c19590c8..bb4c046462b0 100644 --- a/pkgs/tools/misc/tailspin/default.nix +++ b/pkgs/tools/misc/tailspin/default.nix @@ -16,6 +16,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ohfza2ti7Ar/9TV/WoTL5g6CPaONrxtr7nW0qmLdB/8="; + postPatch = '' + substituteInPlace tests/utils.rs --replace-fail \ + 'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/debug" + ''; + meta = with lib; { description = "Log file highlighter"; homepage = "https://github.com/bensadeh/tailspin"; From 71f04a2e549681c3690951418af046414a715b46 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sun, 3 Nov 2024 18:27:50 +0000 Subject: [PATCH 39/41] tailspin: Migrated to by-name. --- .../tailspin/default.nix => by-name/ta/tailspin/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/tailspin/default.nix => by-name/ta/tailspin/package.nix} (100%) diff --git a/pkgs/tools/misc/tailspin/default.nix b/pkgs/by-name/ta/tailspin/package.nix similarity index 100% rename from pkgs/tools/misc/tailspin/default.nix rename to pkgs/by-name/ta/tailspin/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bdc9c28edc5..b2e73171af9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24996,8 +24996,6 @@ with pkgs; tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; - tailspin = callPackage ../tools/misc/tailspin { }; - trafficserver = callPackage ../servers/http/trafficserver { }; inherit (callPackages ../servers/http/tomcat { }) From 4d3b8eddbdb994b36d97ad6a082cf76f84c22182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Wed, 6 Nov 2024 06:12:29 +0100 Subject: [PATCH 40/41] dua: 2.29.2 -> 2.29.4 (#353603) * dua: move to by-name * dua: format * dua: 2.29.3 -> 2.29.4 Diff: https://github.com/Byron/dua-cli/compare/v2.29.3...v2.29.4 Changelog: https://github.com/Byron/dua-cli/blob/v2.29.4/CHANGELOG.md --- pkgs/by-name/du/dua/package.nix | 54 +++++++++++++++++++++++++++++++++ pkgs/tools/misc/dua/default.nix | 40 ------------------------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 54 insertions(+), 42 deletions(-) create mode 100644 pkgs/by-name/du/dua/package.nix delete mode 100644 pkgs/tools/misc/dua/default.nix diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix new file mode 100644 index 000000000000..01ef5d8f9203 --- /dev/null +++ b/pkgs/by-name/du/dua/package.nix @@ -0,0 +1,54 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "dua"; + version = "2.29.4"; + + src = fetchFromGitHub { + owner = "Byron"; + repo = "dua-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-TVwRz5bAdJMtmhhzfZZ/NuV+YrLcnuK6d86Oj/JmgW4="; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + postFetch = '' + rm -r $out/tests/fixtures + ''; + }; + + cargoHash = "sha256-h4Z0Gb4lf/KXrBxU6gEGcRvuhqjUABsggcv/A+AFclo="; + + checkFlags = [ + # Skip interactive tests + "--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only" + "--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion" + "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels" + "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_without_reaching_the_top" + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to conveniently learn about the disk usage of directories"; + homepage = "https://github.com/Byron/dua-cli"; + changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ + figsoda + killercup + ]; + mainProgram = "dua"; + }; +} diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix deleted file mode 100644 index 67a897403bd7..000000000000 --- a/pkgs/tools/misc/dua/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "dua"; - version = "2.29.3"; - - src = fetchFromGitHub { - owner = "Byron"; - repo = "dua-cli"; - rev = "v${version}"; - hash = "sha256-cxMims1b4zOmpRZSn9rovUCnUT66omgNYjDJWuIDnSk="; - # Remove unicode file names which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalisation. - postFetch = '' - rm -r $out/tests/fixtures - ''; - }; - - cargoHash = "sha256-/7A1XW6EbOQpXeAlsOe1YoY6MdBQ3kC98TTBMs3Zfy8="; - - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - ]; - - doCheck = false; - - meta = with lib; { - description = "Tool to conveniently learn about the disk usage of directories"; - homepage = "https://github.com/Byron/dua-cli"; - changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ figsoda killercup ]; - mainProgram = "dua"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2e73171af9f..cdf056feef01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4698,8 +4698,6 @@ with pkgs; dtrx = callPackage ../tools/compression/dtrx { }; - dua = callPackage ../tools/misc/dua { }; - duf = callPackage ../tools/misc/duf { }; dum = callPackage ../development/tools/dum { }; From 4069d47036144ba67543554a1e2fc2d0fd35f37c Mon Sep 17 00:00:00 2001 From: Aleksana Date: Wed, 6 Nov 2024 13:12:53 +0800 Subject: [PATCH 41/41] fractal: fix image loading by applying glycin patch (#353845) --- .../instant-messengers/fractal/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index e61d1e297f60..ba81763a8e47 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -22,6 +22,7 @@ , sqlite , xdg-desktop-portal , libseccomp +, glycin-loaders }: stdenv.mkDerivation rec { @@ -44,6 +45,14 @@ stdenv.mkDerivation rec { }; }; + # Dirty approach to add patches after cargoSetupPostUnpackHook + # We should eventually use a cargo vendor patch hook instead + preConfigure = '' + pushd ../$(stripHash $cargoDeps)/glycin-2.* + patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch} + popd + ''; + nativeBuildInputs = [ glib gtk4 @@ -77,6 +86,12 @@ stdenv.mkDerivation rec { gst-plugins-good ]); + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + passthru = { updateScript = nix-update-script { }; };