From fe4acbaaa8a1abb96c2ce87006f9e849574b4cf3 Mon Sep 17 00:00:00 2001 From: gileri Date: Sun, 25 Aug 2024 20:25:18 +0200 Subject: [PATCH 01/52] maintainers: Add gileri --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a071bfdabb1e..a1f0e3e73117 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7553,6 +7553,17 @@ githubId = 15957973; name = "Jeffry Molanus"; }; + gileri = { + email = "s@linuxw.info"; + github = "gileri"; + githubId = 493438; + name = "Éric Gillet"; + keys = [ + { + fingerprint = "E478 85DC 8F33 FA86 D3FC 183D 80A8 14DB 8ED5 70BC"; + } + ]; + }; gilice = { email = "gilice@proton.me"; github = "gilice"; From 1afb6314f6341224c989ab02f8a878a289399e11 Mon Sep 17 00:00:00 2001 From: gileri Date: Sun, 25 Aug 2024 20:25:44 +0200 Subject: [PATCH 02/52] nixos/bitmagnet: init module --- .../manual/release-notes/rl-2411.section.md | 3 + nixos/modules/services/torrent/bitmagnet.nix | 185 ++++++++++++++++++ 2 files changed, 188 insertions(+) create mode 100644 nixos/modules/services/torrent/bitmagnet.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 5153aa0525c4..1c287414435d 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -94,6 +94,9 @@ - [chromadb](https://www.trychroma.com/), an open-source AI application database. Batteries included. Available as [services.chromadb](options.html#opt-services.chromadb.enable). +- [bitmagnet](https://bitmagnet.io/), A self-hosted BitTorrent indexer, DHT crawler, content classifier and torrent search engine with web UI, GraphQL API and Servarr stack integration. + Available as [services.bitmagnet](options.html#opt-services.bitmagnet.enable). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} - `transmission` package has been aliased with a `trace` warning to `transmission_3`. Since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0), and Transmission 3 will eventually go away, it was decided perform this warning alias to make people aware of the new version. The `services.transmission.package` defaults to `transmission_3` as well because the upgrade can cause data loss in certain specific usage patterns (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory per your usage: diff --git a/nixos/modules/services/torrent/bitmagnet.nix b/nixos/modules/services/torrent/bitmagnet.nix new file mode 100644 index 000000000000..8d96c0b430a9 --- /dev/null +++ b/nixos/modules/services/torrent/bitmagnet.nix @@ -0,0 +1,185 @@ +{ + pkgs, + config, + lib, + ... +}: +let + cfg = config.services.bitmagnet; + inherit (lib) + mkEnableOption + mkIf + mkOption + mkPackageOption + optional + ; + inherit (lib.types) + bool + int + port + str + submodule + ; + inherit (lib.generators) toYAML; + + freeformType = (pkgs.formats.yaml { }).type; +in +{ + options.services.bitmagnet = { + enable = mkEnableOption "Bitmagnet service"; + useLocalPostgresDB = mkOption { + description = "Use a local postgresql database, create user and database"; + type = bool; + default = true; + }; + settings = mkOption { + description = "Bitmagnet configuration (https://bitmagnet.io/setup/configuration.html)."; + default = { }; + type = submodule { + inherit freeformType; + options = { + http_server = mkOption { + default = { }; + type = submodule { + inherit freeformType; + options = { + port = mkOption { + type = str; + default = ":3333"; + }; + }; + }; + }; + dht_server = mkOption { + default = { }; + type = submodule { + inherit freeformType; + options = { + port = mkOption { + type = port; + default = 3334; + }; + }; + }; + }; + postgres = mkOption { + default = { }; + type = submodule { + inherit freeformType; + options = { + host = mkOption { + type = str; + default = ""; + }; + name = mkOption { + type = str; + default = "bitmagnet"; + }; + user = mkOption { + type = str; + default = ""; + }; + password = mkOption { + type = str; + default = ""; + }; + }; + }; + }; + }; + }; + }; + package = mkPackageOption pkgs "bitmagnet" { }; + user = mkOption { + description = "User running bitmagnet"; + type = str; + default = "bitmagnet"; + }; + group = mkOption { + description = "Group of user running bitmagnet"; + type = str; + default = "bitmagnet"; + }; + openFirewall = mkOption { + description = "Open DHT ports in firewall"; + type = bool; + default = false; + }; + }; + config = mkIf cfg.enable { + environment.etc."xdg/bitmagnet/config.yml" = { + text = toYAML { } cfg.settings; + mode = "0440"; + user = cfg.user; + group = cfg.group; + }; + systemd.services.bitmagnet = { + enable = true; + wantedBy = [ "multi-user.target" ]; + after = [ + "network.target" + ] ++ optional cfg.useLocalPostgresDB "postgresql.service"; + requires = optional cfg.useLocalPostgresDB "postgresql.service"; + serviceConfig = { + Type = "simple"; + DynamicUser = true; + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/bitmagnet worker run --all"; + Restart = "on-failure"; + WorkingDirectory = "/var/lib/bitmagnet"; + StateDirectory = "bitmagnet"; + + # Sandboxing (sorted by occurrence in https://www.freedesktop.org/software/systemd/man/systemd.exec.html) + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + PrivateMounts = true; + }; + }; + users.users = mkIf (cfg.user == "bitmagnet") { + bitmagnet = { + group = cfg.group; + isSystemUser = true; + }; + }; + users.groups = mkIf (cfg.group == "bitmagnet") { bitmagnet = { }; }; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.dht_server.port ]; + allowedUDPPorts = [ cfg.dht_server.port ]; + }; + services.postgresql = mkIf cfg.useLocalPostgresDB { + enable = true; + ensureDatabases = [ + cfg.settings.postgres.name + (if (cfg.settings.postgres.user == "") then cfg.user else cfg.settings.postgres.user) + ]; + ensureUsers = [ + { + name = if (cfg.settings.postgres.user == "") then cfg.user else cfg.settings.postgres.user; + ensureDBOwnership = true; + } + ]; + }; + }; + + meta.maintainers = with lib.maintainers; [ gileri ]; +} From c4045a54b42d02e16dd3f1f6761a13b920dcd2f0 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 22 Sep 2024 08:58:42 +0300 Subject: [PATCH 03/52] waycorner: move to by-name overlay; format via nixfmt --- .../wa/waycorner/package.nix} | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) rename pkgs/{applications/misc/waycorner/default.nix => by-name/wa/waycorner/package.nix} (91%) diff --git a/pkgs/applications/misc/waycorner/default.nix b/pkgs/by-name/wa/waycorner/package.nix similarity index 91% rename from pkgs/applications/misc/waycorner/default.nix rename to pkgs/by-name/wa/waycorner/package.nix index 2d1303bb26c7..0c850dfa4cfa 100644 --- a/pkgs/applications/misc/waycorner/default.nix +++ b/pkgs/by-name/wa/waycorner/package.nix @@ -1,10 +1,10 @@ -{ lib -, makeWrapper -, rustPlatform -, pkg-config -, fetchFromGitHub -, wayland -, +{ + lib, + makeWrapper, + rustPlatform, + pkg-config, + fetchFromGitHub, + wayland, }: rustPlatform.buildRustPackage rec { pname = "waycorner"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d90dcf21119..0484cff1219c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30375,8 +30375,6 @@ with pkgs; remontoire = callPackage ../applications/misc/remontoire { }; - waycorner = callPackage ../applications/misc/waycorner { }; - wayshot = callPackage ../tools/misc/wayshot { }; waylevel = callPackage ../tools/misc/waylevel { }; From 68c7d64d1a3e01266645f0d9a5266fc8df7052c9 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 22 Sep 2024 09:14:20 +0300 Subject: [PATCH 04/52] waycorner: modernize derivation - Use `refs/tags/${version}` over ${version} - Get rid of nested `with lib;` - Remove redundant build input (tested build & functionality) - Update changelog link to use current ref --- pkgs/by-name/wa/waycorner/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wa/waycorner/package.nix b/pkgs/by-name/wa/waycorner/package.nix index 0c850dfa4cfa..4ca5ca58b04c 100644 --- a/pkgs/by-name/wa/waycorner/package.nix +++ b/pkgs/by-name/wa/waycorner/package.nix @@ -9,33 +9,34 @@ rustPlatform.buildRustPackage rec { pname = "waycorner"; version = "0.2.3"; + src = fetchFromGitHub { owner = "AndreasBackx"; repo = "waycorner"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y="; }; + cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU="; - buildInputs = [ - wayland - ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; + postFixup = '' # the program looks for libwayland-client.so at runtime wrapProgram $out/bin/waycorner \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]} ''; - meta = with lib; { + meta = { description = "Hot corners for Wayland"; mainProgram = "waycorner"; - changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md"; + changelog = "https://github.com/AndreasBackx/waycorner/blob/${version}/CHANGELOG.md"; homepage = "https://github.com/AndreasBackx/waycorner"; - platforms = platforms.linux; - license = licenses.mit; - maintainers = with maintainers; [ NotAShelf ]; + platforms = lib.platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ NotAShelf ]; }; } From aca69fd697e3c3c7688f5ab0b25d6563b56e7fed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Sep 2024 06:34:17 +0000 Subject: [PATCH 05/52] foxotron: 2023-07-16 -> 2024-09-23 --- pkgs/applications/graphics/foxotron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index d71c1999fa55..1ccbc136c7c9 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "foxotron"; - version = "2023-07-16"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Gargaj"; repo = "Foxotron"; rev = version; fetchSubmodules = true; - hash = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; + hash = "sha256-OnZWoiQ5ASKQV73/W6nl17B2ANwqCy/PlybHbNwrOyQ="; }; patches = [ From 9e012ecbf272fb46b60a4a7fd97cf7c28aa39ecd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 30 Aug 2024 15:14:37 -0400 Subject: [PATCH 06/52] nixos/sing-box: generate config file into RuntimeDirectory --- nixos/modules/services/networking/sing-box.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix index 9f09e528e74d..1eadeaf4cbc1 100644 --- a/nixos/modules/services/networking/sing-box.nix +++ b/nixos/modules/services/networking/sing-box.nix @@ -55,11 +55,17 @@ in systemd.packages = [ cfg.package ]; systemd.services.sing-box = { - preStart = '' - umask 0077 - mkdir -p /etc/sing-box - ${utils.genJqSecretsReplacementSnippet cfg.settings "/etc/sing-box/config.json"} - ''; + preStart = utils.genJqSecretsReplacementSnippet cfg.settings "/run/sing-box/config.json"; + serviceConfig = { + StateDirectory = "sing-box"; + StateDirectoryMode = "0700"; + RuntimeDirectory = "sing-box"; + RuntimeDirectoryMode = "0700"; + ExecStart = [ + "" + "${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${RUNTIME_DIRECTORY} run" + ]; + }; wantedBy = [ "multi-user.target" ]; }; }; From dd53928de81cda8c2fe8f1acdf9f0f0c02ee91f1 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 5 Oct 2024 10:06:31 -0700 Subject: [PATCH 07/52] freecad: work around https://github.com/FreeCAD/FreeCAD/issues/10514 * Fixes #284880 * Also discussed on https://discourse.nixos.org/t/freecad-failed-to-compute-left-right-minimum-bearings-for-cursor-pcf/35266 Symptom is that failure to load a fixed font is followed by a flood of 'Failed to compute left/right minimum bearings for "cursor.pcf"' messages that can freeze up the machine. Isssue FreeCAD issue tracker https://github.com/FreeCAD/FreeCAD/issues/10514 Is not yet fixed, but with a working solution, which has not made it into the repo yet: https://github.com/FreeCAD/FreeCAD/issues/10514#issuecomment-1849176386 The hotfix from that comment is added here slightly adated as freecad-font-10514.patch --- .../0003-freecad-font-issue-10514.patch | 61 +++++++++++++++++++ pkgs/by-name/fr/freecad/package.nix | 1 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/by-name/fr/freecad/0003-freecad-font-issue-10514.patch diff --git a/pkgs/by-name/fr/freecad/0003-freecad-font-issue-10514.patch b/pkgs/by-name/fr/freecad/0003-freecad-font-issue-10514.patch new file mode 100644 index 000000000000..3e55b6610265 --- /dev/null +++ b/pkgs/by-name/fr/freecad/0003-freecad-font-issue-10514.patch @@ -0,0 +1,61 @@ +diff --git a/src/Gui/PreferencePages/DlgSettingsEditor.cpp b/src/Gui/PreferencePages/DlgSettingsEditor.cpp +index 5f92058c18..b00104497b 100644 +--- a/src/Gui/PreferencePages/DlgSettingsEditor.cpp ++++ b/src/Gui/PreferencePages/DlgSettingsEditor.cpp +@@ -56,27 +56,34 @@ namespace + * + * Based on + * https://stackoverflow.com/questions/18896933/qt-qfont-selection-of-a-monospace-font-doesnt-work ++ * Local fix to based on comment in ++ * https://github.com/FreeCAD/FreeCAD/issues/10514#issuecomment-1849176386 + */ ++bool hasFixedPitch(const QFont& font) ++{ ++ return QFontInfo(font).fixedPitch(); ++} ++ + QFont getMonospaceFont() + { +- QFont font(QString::fromLatin1("monospace")); +- if (font.fixedPitch()) { +- return font; +- } +- font.setStyleHint(QFont::Monospace); +- if (font.fixedPitch()) { +- return font; ++ if (QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); hasFixedPitch(font)) { ++ return font; // should typically work. + } +- font.setStyleHint(QFont::TypeWriter); +- if (font.fixedPitch()) { ++ ++ QFont font; // default QApplication font ++ font.setStyleHint(QFont::Courier); // may not work ++ if (hasFixedPitch(font)) { + return font; + } +- font.setFamily(QString::fromLatin1("courier")); +- if (font.fixedPitch()) { +- return font; ++ for (const char* family : {"Monospace", "Courier"}) { ++ font.setFamily(QString::fromLatin1(family)); ++ if (hasFixedPitch(font)) { ++ return font; ++ } + } +- return font; // We failed, but return whatever we have anyway ++ return font; + } ++ + } // namespace + + /* TRANSLATOR Gui::Dialog::DlgSettingsEditor */ +@@ -302,7 +309,7 @@ void DlgSettingsEditor::loadSettings() + ui->fontSize->setValue(10); + ui->fontSize->setValue(hGrp->GetInt("FontSize", ui->fontSize->value())); + +- QByteArray defaultMonospaceFont = getMonospaceFont().family().toLatin1(); ++ QByteArray defaultMonospaceFont = QFontInfo(getMonospaceFont()).family().toLatin1(); + + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QStringList familyNames = QFontDatabase().families(QFontDatabase::Any); diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index adb558c7e406..83d7598ce3e0 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -131,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch ./0002-FreeCad-OndselSolver-pkgconfig.patch + ./0003-freecad-font-issue-10514.patch ]; cmakeFlags = [ From 1bcd4549ffd3c81c217e604824526b0614706c24 Mon Sep 17 00:00:00 2001 From: Erik Alonso Date: Mon, 7 Oct 2024 11:26:19 +0100 Subject: [PATCH 08/52] maintainers: add erikeah --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e568256461f6..ec89e7a895af 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6474,6 +6474,13 @@ githubId = 46724898; name = "Erik Backman"; }; + erikeah = { + email = "erikeah@protonmail.com"; + github = "erikeah"; + githubId = 11900869; + keys = [ { fingerprint = "4142 0380 C7F8 BCDA CC9E 7ABA 0FF3 076B 71F2 5DEF"; } ]; + name = "Erik Alonso"; + }; erikryb = { email = "erik.rybakken@math.ntnu.no"; github = "erikryb"; From 4fa2c2b5aa9ec73b0abcc3b458cfed0e29e9fd5a Mon Sep 17 00:00:00 2001 From: Erik Alonso Date: Mon, 7 Oct 2024 11:31:48 +0100 Subject: [PATCH 09/52] kamp: init at 0.2.1 --- pkgs/by-name/ka/kamp/package.nix | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ka/kamp/package.nix diff --git a/pkgs/by-name/ka/kamp/package.nix b/pkgs/by-name/ka/kamp/package.nix new file mode 100644 index 000000000000..954527213054 --- /dev/null +++ b/pkgs/by-name/ka/kamp/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage rec { + pname = "kamp"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "vbauerster"; + repo = pname; + rev = "v${version}"; + hash = "sha256-9cakFhA9niMZ0jD0ilgCUztk4uL6wDp6zfHUJY/yLYw="; + }; + + cargoHash = "sha256-BnVV0UnXEebq1kbQvv8PkmntLK0BwrOcMxxIODpZrxc="; + + postInstall = '' + install scripts/* -Dt $out/bin + ''; + + meta = { + description = "Tool to control Kakoune editor from the command line"; + homepage = "https://github.com/vbauerster/kamp"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ erikeah ]; + mainProgram = "kamp"; + platforms = lib.platforms.linux; + }; +} From 082968923081a72a04db3adab29d8f55e5ef0a31 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 16 Oct 2024 01:39:31 +0300 Subject: [PATCH 10/52] pappl: 1.4.6 -> 1.4.7 https://github.com/michaelrsweet/pappl/releases/tag/v1.4.7 --- pkgs/applications/printing/pappl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index abeb83c9271c..7655ce5d3de8 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pappl"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d7QD6Kz4tBVHGFPBYcvRSzW+EtsNgpfweFvCx3ovfWE="; + sha256 = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; }; outputs = [ "out" "dev" ]; From 91d64e1154010426cfce7d73de0ec099b5c47ac9 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 16 Oct 2024 01:45:07 +0300 Subject: [PATCH 11/52] pappl: modernize derivation; add changelog --- pkgs/applications/printing/pappl/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 7655ce5d3de8..a9b778ab32ac 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "michaelrsweet"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; + repo = "pappl"; + rev = "refs/tagsv${version}"; + hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; }; outputs = [ "out" "dev" ]; @@ -52,12 +52,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "C-based framework/library for developing CUPS Printer Applications"; + changelog = "https://github.com/michaelrsweet/pappl/blob/v${version}/CHANGES.md"; mainProgram = "pappl-makeresheader"; homepage = "https://github.com/michaelrsweet/pappl"; - license = licenses.asl20; - platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = [ ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; # should also work for darwin, but requires additional work + maintainers = [lib.maintainers.NotAShelf]; }; } From 740ad128e263394fba709b23685f723dd289a948 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 16 Oct 2024 01:46:15 +0300 Subject: [PATCH 12/52] pappl: format via nixfmt --- pkgs/applications/printing/pappl/default.nix | 62 ++++++++++++-------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index a9b778ab32ac..54343e4e08c3 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -1,13 +1,17 @@ -{ lib, stdenv, fetchFromGitHub -, avahi -, cups -, gnutls -, libjpeg -, libpng -, libusb1 -, pkg-config -, withPAMSupport ? true, pam -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + avahi, + cups, + gnutls, + libjpeg, + libpng, + libusb1, + pkg-config, + withPAMSupport ? true, + pam, + zlib, }: stdenv.mkDerivation rec { @@ -21,26 +25,32 @@ stdenv.mkDerivation rec { hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - cups - libjpeg - libpng - libusb1 - zlib - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - # upstream mentions these are not needed for Mac - # see: https://github.com/michaelrsweet/pappl#requirements - avahi - gnutls - ] ++ lib.optionals withPAMSupport [ - pam - ]; + buildInputs = + [ + cups + libjpeg + libpng + libusb1 + zlib + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # upstream mentions these are not needed for Mac + # see: https://github.com/michaelrsweet/pappl#requirements + avahi + gnutls + ] + ++ lib.optionals withPAMSupport [ + pam + ]; # testing requires some networking # doCheck = true; @@ -59,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/pappl"; license = lib.licenses.asl20; platforms = lib.platforms.linux; # should also work for darwin, but requires additional work - maintainers = [lib.maintainers.NotAShelf]; + maintainers = [ lib.maintainers.NotAShelf ]; }; } From 8ed9892aacfed2da8d7c9ee132b8461044ee9362 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Oct 2024 06:16:12 +0000 Subject: [PATCH 13/52] zziplib: 0.13.74 -> 0.13.78 --- pkgs/by-name/zz/zziplib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zz/zziplib/package.nix b/pkgs/by-name/zz/zziplib/package.nix index 154a8f2a9e37..2ab8d1ffddc8 100644 --- a/pkgs/by-name/zz/zziplib/package.nix +++ b/pkgs/by-name/zz/zziplib/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "zziplib"; - version = "0.13.74"; + version = "0.13.78"; src = fetchFromGitHub { owner = "gdraheim"; repo = pname; rev = "v${version}"; - hash = "sha256-MjqGHzb+dsAq2PrcBhU3sv4eMX3afkgFWUbhDp+5o/s="; + hash = "sha256-8QxQrxqYO4LtB8prMqgz5a0QqvSKL7KzTkgi+VdHp6A="; }; nativeBuildInputs = [ From d566d7927c0892c3b780866e3d803a4e97210c93 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 14 Oct 2024 09:43:53 +0200 Subject: [PATCH 14/52] linuxPackages.ena: 2.12.3->2.13.0 --- ...001-workaround-patch-for-kernel-6.10.patch | 82 ------------------- pkgs/os-specific/linux/ena/default.nix | 9 +- 2 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch diff --git a/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch b/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch deleted file mode 100644 index ae684d9be234..000000000000 --- a/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 4ff06a845979bd65e672ff4ab09f5310c681e13b Mon Sep 17 00:00:00 2001 -From: Arthur Kiyanovski -Date: Tue, 30 Jul 2024 05:06:14 +0000 -Subject: [PATCH] workaround patch for kernel 6.10 - -Signed-off-by: Arthur Kiyanovski ---- - kernel/linux/ena/config/test_defs.sh | 12 ++++++++++++ - kernel/linux/ena/ena_xdp.c | 5 ++--- - kernel/linux/ena/kcompat.h | 12 +++++++++++- - 3 files changed, 25 insertions(+), 4 deletions(-) - -diff --git a/kernel/linux/ena/config/test_defs.sh b/kernel/linux/ena/config/test_defs.sh -index f8951c3..0cf366b 100755 ---- a/kernel/linux/ena/config/test_defs.sh -+++ b/kernel/linux/ena/config/test_defs.sh -@@ -60,3 +60,15 @@ try_compile_async "#include " \ - "ENA_HAVE_ETH_HW_ADDR_SET" \ - "" \ - "5.15.0 <= LINUX_VERSION_CODE" -+ -+try_compile_async "#include " \ -+ "xsk_buff_dma_sync_for_cpu(NULL);" \ -+ "ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG" \ -+ "" \ -+ "6.10.0 <= LINUX_VERSION_CODE" -+ -+try_compile_async "#include " \ -+ "__napi_alloc_skb(NULL, 0, 0);" \ -+ "ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK" \ -+ "" \ -+ "6.10.0 > LINUX_VERSION_CODE" -diff --git a/kernel/linux/ena/ena_xdp.c b/kernel/linux/ena/ena_xdp.c -index 204389f..ecbaa9f 100644 ---- a/kernel/linux/ena/ena_xdp.c -+++ b/kernel/linux/ena/ena_xdp.c -@@ -746,9 +746,8 @@ static struct sk_buff *ena_xdp_rx_skb_zc(struct ena_ring *rx_ring, struct xdp_bu - data_addr = xdp->data; - - /* allocate a skb to store the frags */ -- skb = __napi_alloc_skb(rx_ring->napi, -- headroom + data_len, -- GFP_ATOMIC | __GFP_NOWARN); -+ skb = napi_alloc_skb(rx_ring->napi, -+ headroom + data_len); - if (unlikely(!skb)) { - ena_increase_stat(&rx_ring->rx_stats.skb_alloc_fail, 1, - &rx_ring->syncp); -diff --git a/kernel/linux/ena/kcompat.h b/kernel/linux/ena/kcompat.h -index 6d5a069..7511087 100644 ---- a/kernel/linux/ena/kcompat.h -+++ b/kernel/linux/ena/kcompat.h -@@ -998,10 +998,11 @@ static inline bool ktime_after(const ktime_t cmp1, const ktime_t cmp2) - #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)) && \ - !(RHEL_RELEASE_CODE && \ - (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 2))) -+#define ENA_KCOMAPT_NAPI_ALLOC_SKB - static inline struct sk_buff *napi_alloc_skb(struct napi_struct *napi, - unsigned int length) - { -- return netdev_alloc_skb_ip_align(napi->dev, length); -+ return __netdev_alloc_skb_ip_align(napi->dev, length, GFP_ATOMIC | __GFP_NOWARN); - } - #endif - -@@ -1150,4 +1151,13 @@ static inline int irq_update_affinity_hint(unsigned int irq, const struct cpumas - #define ethtool_puts ethtool_sprintf - #endif /* ENA_HAVE_ETHTOOL_PUTS */ - -+#ifdef ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG -+#include -+#define xsk_buff_dma_sync_for_cpu(xdp, xsk_pool) xsk_buff_dma_sync_for_cpu(xdp) -+#endif /* ENA_XSK_BUFF_DMA_SYNC_SINGLE_ARG */ -+ -+#if defined(ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK) && !defined(ENA_KCOMAPT_NAPI_ALLOC_SKB) -+#define napi_alloc_skb(napi, len) __napi_alloc_skb(napi, len, GFP_ATOMIC | __GFP_NOWARN) -+#endif /* ENA_NAPI_ALLOC_SKB_EXPLICIT_GFP_MASK && !ENA_KCOMAPT_NAPI_ALLOC_SKB*/ -+ - #endif /* _KCOMPAT_H_ */ --- -2.40.1 - diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 90167977cf5c..6e6e5d7444cc 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "2.12.3"; + version = "2.13.0"; name = "ena-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "amzn"; repo = "amzn-drivers"; rev = "ena_linux_${version}"; - hash = "sha256-F8vDPPwO0PnGXhqt0EeT4m/+d8w/rjMHWRV3RYC/wVQ="; + hash = "sha256-uYWKu9M/5PcHV4WdMSi0f29S7KnQft67dgjdN0AS1d8="; }; hardeningDisable = [ "pic" ]; @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { env.KERNEL_BUILD_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - patches = [ - # https://github.com/amzn/amzn-drivers/issues/313 - ./0001-workaround-patch-for-kernel-6.10.patch - ]; - configurePhase = '' runHook preConfigure cd kernel/linux/ena From 294db84cc769355e196969192104efa52798a1b4 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 16 Oct 2024 19:14:42 +0800 Subject: [PATCH 15/52] vimPlugins.hunk-nvim: init at 2024-09-19 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 01c5e79950e4..f0120852a898 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5015,6 +5015,18 @@ final: prev: meta.homepage = "https://github.com/othree/html5.vim/"; }; + hunk-nvim = buildVimPlugin { + pname = "hunk.nvim"; + version = "2024-09-19"; + src = fetchFromGitHub { + owner = "julienvincent"; + repo = "hunk.nvim"; + rev = "eb89245a66bdfce10436d15923bf4deb43d23c96"; + sha256 = "19j3gcv83gpqqpk39dd1q3wd7p3wrxgry57i3z21rchmd13dzfq9"; + }; + meta.homepage = "https://github.com/julienvincent/hunk.nvim/"; + }; + hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; version = "2024-09-05"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c4d547e962e4..304b5d7e595e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -419,6 +419,7 @@ https://github.com/smoka7/hop.nvim/,, https://github.com/rktjmp/hotpot.nvim/,, https://github.com/lewis6991/hover.nvim/,HEAD, https://github.com/othree/html5.vim/,HEAD, +https://github.com/julienvincent/hunk.nvim/,HEAD, https://github.com/nvimtools/hydra.nvim/,HEAD, https://github.com/mboughaba/i3config.vim/,, https://github.com/cocopon/iceberg.vim/,, From 3f5a08f36da63e38f47dba4e1c572047362bc325 Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Thu, 17 Oct 2024 06:49:17 +0800 Subject: [PATCH 16/52] clipboard-jh: 0.9.0.1 -> 0.9.1 https://github.com/Slackadays/Clipboard/releases/tag/0.9.1 --- pkgs/tools/misc/clipboard-jh/default.nix | 53 +++++++++++++----------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index 9b0369e8fad2..2f62d7751068 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -1,27 +1,29 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libffi -, pkg-config -, wayland-protocols -, wayland-scanner -, wayland -, xorg -, darwin -, nix-update-script -, alsa-lib +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libffi, + pkg-config, + wayland-protocols, + wayland-scanner, + wayland, + xorg, + darwin, + nix-update-script, + alsa-lib, + openssl, }: stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.9.0.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - hash = "sha256-iILtyURYCshicgAV3MWkgMQsXHe7Unj1A08W7tUMU2o="; + hash = "sha256-1vGM9OUE7b4XVTm4Gf20CO80hjYAooeVt0REkY3xu3U="; }; postPatch = '' @@ -34,15 +36,18 @@ stdenv.mkDerivation rec { wayland-scanner ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - libffi - wayland-protocols - wayland - xorg.libX11 - alsa-lib - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libffi + wayland-protocols + wayland + xorg.libX11 + alsa-lib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ]; cmakeBuildType = "MinSizeRel"; From c9160efd8169760283d8bb5aa7f16162bc85833f Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 18 Oct 2024 11:18:39 +0200 Subject: [PATCH 17/52] nixos/kmonad: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/kmonad.nix | 190 +++++++++++++++++++++ 2 files changed, 191 insertions(+) create mode 100644 nixos/modules/services/hardware/kmonad.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6ac03cca94e9..c66b916d7d74 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -593,6 +593,7 @@ ./services/hardware/irqbalance.nix ./services/hardware/joycond.nix ./services/hardware/kanata.nix + ./services/hardware/kmonad.nix ./services/hardware/lcd.nix ./services/hardware/libinput.nix ./services/hardware/lirc.nix diff --git a/nixos/modules/services/hardware/kmonad.nix b/nixos/modules/services/hardware/kmonad.nix new file mode 100644 index 000000000000..bc1b5409f9dd --- /dev/null +++ b/nixos/modules/services/hardware/kmonad.nix @@ -0,0 +1,190 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.kmonad; + + # Per-keyboard options: + keyboard = + { name, ... }: + { + options = { + name = lib.mkOption { + type = lib.types.str; + example = "laptop-internal"; + description = "Keyboard name."; + }; + + device = lib.mkOption { + type = lib.types.path; + example = "/dev/input/by-id/some-dev"; + description = "Path to the keyboard's device file."; + }; + + extraGroups = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Extra permission groups to attach to the KMonad instance for + this keyboard. + + Since KMonad runs as an unprivileged user, it may sometimes + need extra permissions in order to read the keyboard device + file. If your keyboard's device file isn't in the input + group you'll need to list its group in this option. + ''; + }; + + defcfg = { + enable = lib.mkEnableOption '' + Automatically generate the defcfg block. + + When this is option is set to true the config option for + this keyboard should not include a defcfg block. + ''; + + compose = { + key = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = "ralt"; + description = "The (optional) compose key to use."; + }; + + delay = lib.mkOption { + type = lib.types.int; + default = 5; + description = "The delay (in milliseconds) between compose key sequences."; + }; + }; + + fallthrough = lib.mkEnableOption "Re-emit unhandled key events."; + + allowCommands = lib.mkEnableOption "Allow keys to run shell commands."; + }; + + config = lib.mkOption { + type = lib.types.lines; + description = "Keyboard configuration."; + }; + }; + + config = { + name = lib.mkDefault name; + }; + }; + + # Create a complete KMonad configuration file: + mkCfg = + keyboard: + let + defcfg = '' + (defcfg + input (device-file "${keyboard.device}") + output (uinput-sink "kmonad-${keyboard.name}") + ${ + lib.optionalString (keyboard.defcfg.compose.key != null) '' + cmp-seq ${keyboard.defcfg.compose.key} + cmp-seq-delay ${toString keyboard.defcfg.compose.delay} + '' + } + fallthrough ${lib.boolToString keyboard.defcfg.fallthrough} + allow-cmd ${lib.boolToString keyboard.defcfg.allowCommands} + ) + ''; + in + pkgs.writeTextFile { + name = "kmonad-${keyboard.name}.cfg"; + text = lib.optionalString keyboard.defcfg.enable (defcfg + "\n") + keyboard.config; + checkPhase = "${cfg.package}/bin/kmonad -d $out"; + }; + + # Build a systemd path config that starts the service below when a + # keyboard device appears: + mkPath = + keyboard: + let + name = "kmonad-${keyboard.name}"; + in + lib.nameValuePair name { + description = "KMonad trigger for ${keyboard.device}"; + wantedBy = [ "paths.target" ]; + pathConfig = { + Unit = "${name}.service"; + PathExists = keyboard.device; + }; + }; + + # Build a systemd service that starts KMonad: + mkService = + keyboard: + let + cmd = [ + (lib.getExe cfg.package) + "--input" + ''device-file "${keyboard.device}"'' + ] ++ cfg.extraArgs ++ [ "${mkCfg keyboard}" ]; + in + lib.nameValuePair "kmonad-${keyboard.name}" { + description = "KMonad for ${keyboard.device}"; + script = lib.escapeShellArgs cmd; + unitConfig = { + # Control rate limiting. + # Stop the restart logic if we restart more than + # StartLimitBurst times in a period of StartLimitIntervalSec. + StartLimitIntervalSec = 2; + StartLimitBurst = 5; + }; + serviceConfig = { + Restart = "always"; + # Restart at increasing intervals from 2s to 1m + RestartSec = 2; + RestartSteps = 30; + RestartMaxDelaySec = "1min"; + Nice = -20; + DynamicUser = true; + User = "kmonad"; + Group = "kmonad"; + SupplementaryGroups = [ + # These ensure that our dynamic user has access to the device node + config.users.groups.input.name + config.users.groups.uinput.name + ] ++ keyboard.extraGroups; + }; + }; +in +{ + options.services.kmonad = { + enable = lib.mkEnableOption "KMonad: An advanced keyboard manager."; + + package = lib.mkPackageOption pkgs "kmonad" { }; + + keyboards = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule keyboard); + default = { }; + description = "Keyboard configuration."; + }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ + "--log-level" + "debug" + ]; + description = "Extra arguments to pass to KMonad."; + }; + }; + + config = lib.mkIf cfg.enable { + hardware.uinput.enable = true; + + systemd = { + paths = lib.mapAttrs' (_: mkPath) cfg.keyboards; + services = lib.mapAttrs' (_: mkService) cfg.keyboards; + }; + }; +} From 6776adca27f26fcea947a78ee46b9c0b67c7c2b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Oct 2024 17:13:12 +0000 Subject: [PATCH 18/52] go-swag: 1.16.3 -> 1.16.4 --- pkgs/development/tools/go-swag/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-swag/default.nix b/pkgs/development/tools/go-swag/default.nix index 25ceb20089e0..1903ff57ef33 100644 --- a/pkgs/development/tools/go-swag/default.nix +++ b/pkgs/development/tools/go-swag/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swag"; - version = "1.16.3"; + version = "1.16.4"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-wS5m3dBiILxmVb6P559fGcONdCWc/5hhLAVMC+G1QZs="; + sha256 = "sha256-wqBT7uan5XL51HHDGINRH9NTb1tybF44d/rWRxl6Lak="; }; - vendorHash = "sha256-BxWmEcx5IIT/yI46CJGE0vE1BRm5zwngc0x1dVy/04s="; + vendorHash = "sha256-6L5LzXtYjrA/YKmNEC/9dyiHpY/8gkH/CvW0JTo+Bwc="; subPackages = [ "cmd/swag" ]; From c6fd18ff5e6b9c7686c749faac26094703790223 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 18 Oct 2024 08:41:54 -0500 Subject: [PATCH 19/52] curl: Remove forcing static build on Windows There does not appear to be any justification for forcing curl to build its static form on Windows without the shared form. Reverting changes made in commit 1660098d8425a190d42d5604afb54354625392b8 --- pkgs/tools/networking/curl/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index e00aecd50a22..bf01bc98852f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -149,10 +149,7 @@ stdenv.mkDerivation (finalAttrs: { # For the 'urandom', maybe it should be a cross-system option ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-random=/dev/urandom" - ++ lib.optionals stdenv.hostPlatform.isWindows [ - "--disable-shared" - "--enable-static" - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. "--without-ca-bundle" From 052ce831da91ae340779a45e26d73b11bd31a0bb Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Oct 2024 00:55:00 +0300 Subject: [PATCH 20/52] openai-whisper-cpp: 1.7.0 -> 1.7.1 Diff: https://www.github.com/ggerganov/whisper.cpp/compare/refs/tags/v1.7.0...v1.7.1 --- pkgs/tools/audio/openai-whisper-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index eff1c3321496..2cdb208dd8f4 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -25,13 +25,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "whisper-cpp"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; rev = "refs/tags/v${finalAttrs.version}" ; - hash = "sha256-obAXqqQEs7lkv6v1vl3aN+Vh6wPSYSXXbI6mlee6/QM="; + hash = "sha256-EDFUVjud79ZRCzGbOh9L9NcXfN3ikvsqkVSOME9F9oo="; }; # The upstream download script tries to download the models to the From b88b179d26913818afeb537a8707ac2bc95e71de Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 19 Oct 2024 01:26:09 +0300 Subject: [PATCH 21/52] openai-whisper-cpp: install all binaries built by default ``` whisper-cpp whisper-cpp-bench whisper-cpp-command whisper-cpp-lsp whisper-cpp-quantize whisper-cpp-server whisper-cpp-stream whisper-cpp-talk-llama ``` --- pkgs/tools/audio/openai-whisper-cpp/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix index 2cdb208dd8f4..a041635746b4 100644 --- a/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -78,15 +78,18 @@ effectiveStdenv.mkDerivation (finalAttrs: { GGML_CUDA = "1"; }; - makeFlags = [ "main" "stream" "command" ]; - installPhase = '' runHook preInstall mkdir -p $out/bin + cp ./main $out/bin/whisper-cpp - cp ./stream $out/bin/whisper-cpp-stream - cp ./command $out/bin/whisper-cpp-command + + for file in *; do + if [[ -x "$file" && -f "$file" && "$file" != "main" ]]; then + cp "$file" "$out/bin/whisper-cpp-$file" + fi + done cp models/download-ggml-model.sh $out/bin/whisper-cpp-download-ggml-model From 8654f82ed69c36a9b66bf275dd39297f7b83c83f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 19 Oct 2024 01:20:21 +0200 Subject: [PATCH 22/52] python312Packages.cachier: 3.0.1 -> 3.1.0 Changelog: https://github.com/python-cachier/cachier/releases/tag/v3.1.0 --- pkgs/development/python-modules/cachier/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index 93a0def9973c..313b36781170 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -4,6 +4,7 @@ pythonOlder, fetchFromGitHub, setuptools, + click, watchdog, portalocker, pytestCheckHook, @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "3.0.1"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "python-cachier"; repo = "cachier"; rev = "refs/tags/v${version}"; - hash = "sha256-VApP1DRs+mjx+SELpdDOm2Sa7zBYHDqD/htFF/eNLu0="; + hash = "sha256-LphmYL8Jmry8Jmd5Eps68wD113JMWwyBl18pqdtl+DQ="; }; pythonRemoveDeps = [ "setuptools" ]; @@ -38,6 +39,8 @@ buildPythonPackage rec { dependencies = [ watchdog portalocker + # not listed as dep, but needed to run main script entrypoint + click ]; nativeCheckInputs = [ @@ -63,6 +66,10 @@ buildPythonPackage rec { # don't test formatting "test_flake8" + + # timing sensitive + "test_being_calc_next_time" + "test_pickle_being_calculated" ]; preBuild = '' @@ -73,6 +80,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/python-cachier/cachier"; + changelog = "https://github.com/python-cachier/cachier/releases/tag/v${version}"; description = "Persistent, stale-free, local and cross-machine caching for functions"; mainProgram = "cachier"; maintainers = with lib.maintainers; [ pbsds ]; From a0477dd37db84f69dfad8bad4e0b7f96a1b474fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 02:13:48 +0000 Subject: [PATCH 23/52] kubernetes-helmPlugins.helm-secrets: 4.6.1 -> 4.6.2 --- .../networking/cluster/helm/plugins/helm-secrets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 2ff96adaac19..c432ec035cd7 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-AAc680STuXiGEw9ibFRHMrOxGs/c5pS0iEoymNHu+c8="; + hash = "sha256-s76XIB7s92zSzG8GGsJJuTG3cwbGHL7oc1x30k/WoOU="; }; nativeBuildInputs = [ makeWrapper ]; From 305a2b04f2373281d3afa9280b1cd01dec230b87 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 19 Oct 2024 11:34:03 +0900 Subject: [PATCH 24/52] mactop: 0.1.8 -> 0.1.9 Diff: https://github.com/context-labs/mactop/compare/refs/tags/v0.1.8...v0.1.9 Changelog: https://github.com/context-labs/mactop/releases/tag/v0.1.9 --- pkgs/by-name/ma/mactop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mactop/package.nix b/pkgs/by-name/ma/mactop/package.nix index 568898652e4b..660e642a33f6 100644 --- a/pkgs/by-name/ma/mactop/package.nix +++ b/pkgs/by-name/ma/mactop/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mactop"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "context-labs"; repo = "mactop"; rev = "refs/tags/v${version}"; - hash = "sha256-BcBUOI5EE04ZTPoHGrNQjctsDFbMoe/6MZaLj/58c34="; + hash = "sha256-r9je+oeedQJsFBWWbOUcUls/EX0JZveUkmsXXtC8O0Q="; }; vendorHash = "sha256-/KecVx4Gp776t8gFSO29E1q9v29nwrKIWZYCpj7IlSo="; From 7f3a15e75aaeaf3216e73a71871d8e543a3dc8bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 04:18:01 +0000 Subject: [PATCH 25/52] firewalld-gui: 2.2.1 -> 2.2.3 --- pkgs/applications/networking/firewalld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index 1ea6f2f8d593..70fe4b26f600 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-VI1LyedohInmZb7heNoZ/4cvLz5IImEE2tyNylvr2mU="; + sha256 = "sha256-ugDleco/Ep+10ku+5xcW4zq/RrhruZCRlX0zKeXzLhg="; }; patches = [ From a008fe5c51ff5bcf8083cf5fc87d054d6677f77a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 06:21:39 +0000 Subject: [PATCH 26/52] frp: 0.60.0 -> 0.61.0 --- pkgs/tools/networking/frp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 4427d2b88a9d..f68a4e5e74d0 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.60.0"; + version = "0.61.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - hash = "sha256-sVJvy2WFMlMEg4D4kU4ikw5tyikYVMdfw/GPptS83Iw="; + hash = "sha256-ZanHYU7UEPsI/KAygxcTszUB4emnrrqxiuuLsCVk+cM="; }; vendorHash = "sha256-ySONxi45Ckq0y4BNyTcm8s6KcnXW+k6thqL7qh6mbBc="; From f46ab77becc67a84e5306cf864a2b61639656784 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 06:23:00 +0000 Subject: [PATCH 27/52] nstool: 1.9.1 -> 1.9.2 --- pkgs/by-name/ns/nstool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ns/nstool/package.nix b/pkgs/by-name/ns/nstool/package.nix index 77c8dbe25e14..c8186bee9644 100644 --- a/pkgs/by-name/ns/nstool/package.nix +++ b/pkgs/by-name/ns/nstool/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nstool"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "jakcron"; repo = "nstool"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-FF+USFL5Y6MkAKvfR05D/+L/XJSmkiSp9WLbF7Gg2V8="; + hash = "sha256-az6AkBCO7Ew5jK/9qKQ65adwAKYf+H7QEvVI6LCXFS0="; fetchSubmodules = true; }; From d4c4e2312ca8d0579b5767fc55f5a9a197abd37e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Oct 2024 09:36:37 +0200 Subject: [PATCH 28/52] python312Packages.serpent: refactor --- .../python-modules/serpent/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index f6ddf5540703..9a1708593f32 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -1,25 +1,27 @@ { lib, + attrs, buildPythonPackage, fetchPypi, - isPy27, - enum34, - attrs, - pytz, pytestCheckHook, + pythonOlder, + pytz, + setuptools, }: buildPythonPackage rec { pname = "serpent"; version = "1.41"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; hash = "sha256-BAcDX+PGZEOH1Iz/FGfVqp/v+BTQc3K3hnftDuPtcJU="; }; - propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; + build-system = [ setuptools ]; nativeCheckInputs = [ attrs @@ -27,9 +29,12 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "serpent" ]; + meta = with lib; { description = "Simple serialization library based on ast.literal_eval"; homepage = "https://github.com/irmen/Serpent"; + changelog = "https://github.com/irmen/Serpent/releases/tag/serpent-${version}"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; From 9a15135f47aee5017efdf7c2583058b0a104e8ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 07:53:41 +0000 Subject: [PATCH 29/52] ddns-go: 6.7.0 -> 6.7.2 --- pkgs/tools/networking/ddns-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 3d696e952037..848c75355d74 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.7.0"; + version = "6.7.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-8NiJgvZ6Z1QGHX3LeNtipQDbntppE1WO2HbinlgKiNE="; + hash = "sha256-kfQo86Kii9kL1K5L2vTjw9fo65f4H0ikwUGFaSL/Ck8="; }; - vendorHash = "sha256-XAAJ3XuT0OqUAhkkRRftbxYsiPg7OfRnpnWtoUytJ2o="; + vendorHash = "sha256-IkwTi6szNf1Hh50z2jDZsJ2nncvJjnanCsQlrFELpc0="; ldflags = [ "-X main.version=${version}" From 1ecc7fe442573fea753827afa2219c6cfdd205e1 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 19 Oct 2024 09:37:05 +0200 Subject: [PATCH 30/52] electrum: fix build with protobuf dependency Since the update to version 5 with https://github.com/NixOS/nixpkgs/commit/7cdaa0b80c9da64b2acb6cc8e8f73d2f4489aaeb , the `python3Packages.protobuf` package no longer provides the `protoc` program. Instead, one has to add the `protobuf` package (not the python package) directly. --- pkgs/applications/misc/electrum/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 0faaf369125d..8c277b05bb44 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, protobuf , wrapQtAppsHook , python3 , zbar @@ -70,7 +71,7 @@ python.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/tests ''; - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; + nativeBuildInputs = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python.pkgs; [ From 4e8643ac1580f3ce6920233581454716fc30a365 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 16 Oct 2024 01:47:51 +0300 Subject: [PATCH 31/52] pappl: migrate to by-name --- .../printing/pappl/default.nix => by-name/pa/pappl/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/printing/pappl/default.nix => by-name/pa/pappl/package.nix} (97%) diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/by-name/pa/pappl/package.nix similarity index 97% rename from pkgs/applications/printing/pappl/default.nix rename to pkgs/by-name/pa/pappl/package.nix index 54343e4e08c3..2e9ecc8150ca 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/by-name/pa/pappl/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "michaelrsweet"; repo = "pappl"; - rev = "refs/tagsv${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-Npry3H+QbAH19hoqAZuOwjpZwCPhOLewD8uKZlo4gdQ="; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d60050bd692d..ffc3a33f7a81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10962,8 +10962,6 @@ with pkgs; papertrail = callPackage ../tools/text/papertrail { }; - pappl = callPackage ../applications/printing/pappl { }; - par2cmdline = callPackage ../tools/networking/par2cmdline { }; parallel = callPackage ../tools/misc/parallel { }; From c25de294d4bc6c3795b9bc81dd219c45e8732128 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 19 Oct 2024 12:10:46 +0200 Subject: [PATCH 32/52] python312Packages.equinox: 0.11.7 -> 0.11.8 Diff: https://github.com/patrick-kidger/equinox/compare/refs/tags/v0.11.7...v0.11.8 Changelog: https://github.com/patrick-kidger/equinox/releases/tag/v0.11.8 --- pkgs/development/python-modules/equinox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 80f1b114f473..b1cdd8d36fb0 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.7"; + version = "0.11.8"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-0waIpsVWoABtf4M0IOie9nJDk+e75ArTVmGqYg9AlnI="; + hash = "sha256-lZb2NobSELz8kviPd4Z8PPEEaydaEC5Z6eb9pzC7Ki8="; }; build-system = [ hatchling ]; From 1841da399fe96f474505c93d1fc5dd82e882606d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 11:16:01 +0000 Subject: [PATCH 33/52] python312Packages.lm-format-enforcer: 0.10.7 -> 0.10.9 --- .../development/python-modules/lm-format-enforcer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lm-format-enforcer/default.nix b/pkgs/development/python-modules/lm-format-enforcer/default.nix index f615bea4926c..3abbc92bcc5c 100644 --- a/pkgs/development/python-modules/lm-format-enforcer/default.nix +++ b/pkgs/development/python-modules/lm-format-enforcer/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "lm-format-enforcer"; - version = "0.10.7"; + version = "0.10.9"; pyproject = true; src = fetchFromGitHub { owner = "noamgat"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-25/qnSKBXbyAnasNYuv+LV2U2KLipKtH6B+wXlH6eRs="; + hash = "sha256-8+hve/6YezM07+4BmmBEAPZ0B2d8xDguXoHf7FuQWP8="; }; build-system = [ poetry-core ]; From d326fa896f612085d6d9337b1ec69fb31f50fec1 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 19 Oct 2024 11:27:46 +0200 Subject: [PATCH 34/52] electrum: 4.5.5 -> 4.5.6 Release notes: https://github.com/spesmilo/electrum/blob/4.5.6/RELEASE-NOTES Beginning with this update, electrum includes its tests in its release tarballs, cf. https://github.com/spesmilo/electrum/issues/9207 https://github.com/spesmilo/electrum/commit/3ec16a08e5665014b882b1037be727faa6a11df6 https://github.com/spesmilo/electrum/blob/4.5.6/RELEASE-NOTES#L31 Therefore we drop the separate download of tests. --- pkgs/applications/misc/electrum/default.nix | 27 +++------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 8c277b05bb44..27b0ab659303 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchFromGitHub , protobuf , wrapQtAppsHook , python3 @@ -14,8 +13,6 @@ }: let - version = "4.5.5"; - python = python3.override { self = python; packageOverrides = self: super: { @@ -42,35 +39,17 @@ let else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; - # Not provided in official source releases, which are what upstream signs. - tests = fetchFromGitHub { - owner = "spesmilo"; - repo = "electrum"; - rev = version; - sha256 = "sha256-CbhI/q+zjk9odxuvdzpogi046FqkedJooiQwS+WAkJ8="; - - postFetch = '' - mv $out ./all - mv ./all/tests $out - ''; - }; - in -python.pkgs.buildPythonApplication { +python.pkgs.buildPythonApplication rec { pname = "electrum"; - inherit version; + version = "4.5.6"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1jiagz9avkbd158pcip7p4wz0pdsxi94ndvg5p8afvshb32aqwav"; + hash = "sha256-LO2ZUvbDJaIxrdgA+cM3sGgqJ+N+UlA9ObNINQcrorA="; }; - postUnpack = '' - # can't symlink, tests get confused - cp -ar ${tests} $sourceRoot/tests - ''; - nativeBuildInputs = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; From 09ff437fe9b0dd46d7bf5eb38734da96019ba129 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 19 Oct 2024 13:13:59 +0200 Subject: [PATCH 35/52] Revert "electrum: pin ledger-bitcoin to 0.2.1" This reverts commit 54bea4702bcf038be9d09b70022ffa7730cbe088. It is no longer needed as electrum 4.5.6 raised its `ledger-bitcoin` version limit to "<0.4", cf. https://github.com/spesmilo/electrum/issues/9035 https://github.com/spesmilo/electrum/commit/719292f8189b70b83d145f3928a14de9ef5d4186 https://github.com/spesmilo/electrum/blob/4.5.6/RELEASE-NOTES#L24 --- pkgs/applications/misc/electrum/default.nix | 25 ++++----------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 27b0ab659303..2e7aeb20b20a 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -9,26 +9,9 @@ , enableQt ? true , callPackage , qtwayland -, fetchPypi }: let - python = python3.override { - self = python; - packageOverrides = self: super: { - # Pin ledger-bitcoin to 0.2.1 - ledger-bitcoin = super.ledger-bitcoin.overridePythonAttrs (oldAttrs: rec { - version = "0.2.1"; - format = "pyproject"; - src = fetchPypi { - pname = "ledger_bitcoin"; - inherit version; - hash = "sha256-AWl/q2MzzspNIo6yf30S92PgM/Ygsb+1lJsg7Asztso="; - }; - }); - }; - }; - libsecp256k1_name = if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" @@ -41,7 +24,7 @@ let in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "electrum"; version = "4.5.6"; @@ -53,7 +36,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -84,7 +67,7 @@ python.pkgs.buildPythonApplication rec { qdarkstyle ]; - checkInputs = with python.pkgs; lib.optionals enableQt [ + checkInputs = with python3.pkgs; lib.optionals enableQt [ pyqt6 ]; @@ -116,7 +99,7 @@ python.pkgs.buildPythonApplication rec { wrapQtApp $out/bin/electrum ''; - nativeCheckInputs = with python.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "tests" ]; From 45039a6730fc7101363c2f3050dcdb87bf839ac8 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 5 Oct 2024 15:34:33 +0800 Subject: [PATCH 36/52] snoop: init at 0.4 --- pkgs/by-name/sn/snoop/package.nix | 74 +++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/sn/snoop/package.nix diff --git a/pkgs/by-name/sn/snoop/package.nix b/pkgs/by-name/sn/snoop/package.nix new file mode 100644 index 000000000000..3736427ef953 --- /dev/null +++ b/pkgs/by-name/sn/snoop/package.nix @@ -0,0 +1,74 @@ +{ + stdenv, + lib, + fetchFromGitLab, + python3, + meson, + ninja, + cmake, + vala, + gettext, + desktop-file-utils, + appstream-glib, + glib, + pkg-config, + libadwaita, + nix-update-script, + gtksourceview5, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "snoop"; + version = "0.4"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "philippun1"; + repo = "snoop"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-JrSUGxhlr4wCGoh589AkPRhNmfsi7msv9EO2k1pHlKY="; + }; + + patchPhase = '' + runHook prePatch + + substituteInPlace build-aux/meson/postinstall.py \ + --replace-fail "/usr/bin/env python3" "${lib.getExe python3}" + + sed -i '/gtk-update-icon-cache/d' build-aux/meson/postinstall.py + sed -i '/update-desktop-database/d' build-aux/meson/postinstall.py + + runHook postPatch + ''; + + nativeBuildInputs = [ + meson + ninja + cmake + gettext + vala + desktop-file-utils + appstream-glib + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + libadwaita + gtksourceview5 + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://gitlab.gnome.org/philippun1/snoop"; + changelog = "https://gitlab.gnome.org/philippun1/snoop/-/releases/${finalAttrs.version}"; + description = "Search through file contents in a given folder"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + license = lib.licenses.gpl3Plus; + mainProgram = "snoop"; + platforms = lib.platforms.unix; + }; +}) From 7ab639c51e72996a81331cd6615f57bf935ac42f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 11:24:27 +0000 Subject: [PATCH 37/52] catppuccin-whiskers: 2.5.0 -> 2.5.1 --- pkgs/by-name/ca/catppuccin-whiskers/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/catppuccin-whiskers/package.nix b/pkgs/by-name/ca/catppuccin-whiskers/package.nix index 4d578abdd941..a24ba429388e 100644 --- a/pkgs/by-name/ca/catppuccin-whiskers/package.nix +++ b/pkgs/by-name/ca/catppuccin-whiskers/package.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, rustPlatform }: -let version = "2.5.0"; +let version = "2.5.1"; in rustPlatform.buildRustPackage { pname = "catppuccin-whiskers"; inherit version; @@ -8,10 +8,10 @@ in rustPlatform.buildRustPackage { owner = "catppuccin"; repo = "whiskers"; rev = "refs/tags/v${version}"; - hash = "sha256-HsHBMJPSoDhSNwjAR7LbFG4Za4H2H+7itqgiKRdb4M8="; + hash = "sha256-OLEXy9MCrPQu1KWICsYhe/ayVqxkYIFwyJoJhgiNDz4="; }; - cargoHash = "sha256-FpBgXP4kXSzrYP+ad+KubUG4NSDpyoaJwyReS86ETy8="; + cargoHash = "sha256-5FvW+ioeDi0kofDswyQpUC21wbEZM8TAeUEUemnNfnA="; meta = { homepage = "https://github.com/catppuccin/whiskers"; From b3d9e85d5333e7c142cc6ef318b64994e72ce12d Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sat, 19 Oct 2024 13:42:32 +0200 Subject: [PATCH 38/52] electrum: migrate to `build-system`/`dependencies` .. replacing `nativeBuildInputs` and `propagatedBuildInputs`. --- pkgs/applications/misc/electrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 2e7aeb20b20a..50c6c9ac944a 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -33,10 +33,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-LO2ZUvbDJaIxrdgA+cM3sGgqJ+N+UlA9ObNINQcrorA="; }; - nativeBuildInputs = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; + build-system = [ protobuf ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx From aad0a65ebf77b1ea1f0ab8b5af0028566192bd9e Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Sat, 19 Oct 2024 13:53:24 +0200 Subject: [PATCH 39/52] podman-desktop: use correct version for changelog Remove discouraged use of `with lib;` which allowed the change of `finalAttrs.version` to `version` in meta.changelog work albeit with the wrong version from lib. --- .../virtualization/podman-desktop/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 8b27d6323d4a..1762e96e2a04 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -107,12 +107,12 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta = with lib; { + meta = { description = "A graphical tool for developing on containers and Kubernetes"; homepage = "https://podman-desktop.io"; - changelog = "https://github.com/containers/podman-desktop/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ booxter panda2134 ]; + changelog = "https://github.com/containers/podman-desktop/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ booxter panda2134 ]; inherit (electron.meta) platforms; mainProgram = "podman-desktop"; }; From 58a84c6727dbe95ab32e3a7802a9d7fd30b408e9 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 19 Oct 2024 15:45:18 +0300 Subject: [PATCH 40/52] bitmagnet: pin Go 1.22 --- pkgs/by-name/bi/bitmagnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix index dfeb7b31e86c..565d53048851 100644 --- a/pkgs/by-name/bi/bitmagnet/package.nix +++ b/pkgs/by-name/bi/bitmagnet/package.nix @@ -1,10 +1,10 @@ { lib -, buildGoModule +, buildGo122Module # builds, but does not start on 1.23 , fetchFromGitHub , nix-update-script }: -buildGoModule rec { +buildGo122Module rec { pname = "bitmagnet"; version = "0.9.5"; From 788722ec5feb30f364d6c5e4af5c4db9c305aef3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 12:49:02 +0000 Subject: [PATCH 41/52] containerd: 1.7.22 -> 1.7.23 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 3b9dcf0bfad4..ad2a338ba8fb 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.22"; + version = "1.7.23"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; + hash = "sha256-vuOefU1cZr1pKCYHKyDBx/ohghgPlXhK3a38PQKH0pc="; }; vendorHash = null; From 3a4fc1a18321efe1e8e6546f219aa162b407cdcd Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 19 Oct 2024 15:50:18 +0300 Subject: [PATCH 42/52] nixos: add bitmagnet module to the list Fixes #337310 --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6ac03cca94e9..6a1fd5a45dc2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1359,6 +1359,7 @@ ./services/system/uptimed.nix ./services/system/userborn.nix ./services/system/zram-generator.nix + ./services/torrent/bitmagnet.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix ./services/torrent/flood.nix From fcc185b9863251246b8f7cbe819fce4279e7241a Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 19 Oct 2024 15:55:15 +0300 Subject: [PATCH 43/52] nixos/bitmagnet: add help text for the options, fix typo --- nixos/modules/services/torrent/bitmagnet.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/torrent/bitmagnet.nix b/nixos/modules/services/torrent/bitmagnet.nix index 8d96c0b430a9..c0929b69f451 100644 --- a/nixos/modules/services/torrent/bitmagnet.nix +++ b/nixos/modules/services/torrent/bitmagnet.nix @@ -40,48 +40,57 @@ in options = { http_server = mkOption { default = { }; + description = "HTTP server settings"; type = submodule { inherit freeformType; options = { port = mkOption { type = str; default = ":3333"; + description = "HTTP server listen port"; }; }; }; }; dht_server = mkOption { default = { }; + description = "DHT server settings"; type = submodule { inherit freeformType; options = { port = mkOption { type = port; default = 3334; + description = "DHT listen port"; }; }; }; }; postgres = mkOption { default = { }; + description = "PostgreSQL database configuration"; type = submodule { inherit freeformType; options = { host = mkOption { type = str; default = ""; + description = "Address, hostname or Unix socket path of the database server"; }; name = mkOption { type = str; default = "bitmagnet"; + description = "Database name to connect to"; }; user = mkOption { type = str; default = ""; + description = "User to connect as"; }; password = mkOption { type = str; default = ""; + description = "Password for database user"; }; }; }; @@ -163,8 +172,8 @@ in }; users.groups = mkIf (cfg.group == "bitmagnet") { bitmagnet = { }; }; networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.dht_server.port ]; - allowedUDPPorts = [ cfg.dht_server.port ]; + allowedTCPPorts = [ cfg.settings.dht_server.port ]; + allowedUDPPorts = [ cfg.settings.dht_server.port ]; }; services.postgresql = mkIf cfg.useLocalPostgresDB { enable = true; From 470efda5ce82a286687fa619ddd0a0c81257eb27 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 19 Oct 2024 21:13:23 +0800 Subject: [PATCH 44/52] clash-geoip: drop --- pkgs/data/misc/clash-geoip/default.nix | 32 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/data/misc/clash-geoip/default.nix diff --git a/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix deleted file mode 100644 index 885d952c3230..000000000000 --- a/pkgs/data/misc/clash-geoip/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenvNoCC, fetchurl, nix-update-script }: - -stdenvNoCC.mkDerivation rec { - pname = "clash-geoip"; - version = "20240912"; - - src = fetchurl { - url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-3Cxq5vA53g7+LUgvSneuq7UBjdKppvcVy3fh/cOwDI8="; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/etc/clash - install -Dm 0644 $src -D $out/etc/clash/Country.mmdb - runHook postInstall - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "GeoLite2 data created by MaxMind"; - homepage = "https://github.com/Dreamacro/maxmind-geoip"; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fad47d137f0f..6f586dd99c3d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -280,6 +280,7 @@ mapAliases { crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06 cryptowatch-desktop = throw "Cryptowatch Desktop was sunset on September 30th 2023 and has been removed from nixpkgs"; # Added 2023-12-22 clash = throw "'clash' has been removed, upstream gone. Consider using 'mihomo' instead."; # added 2023-11-10 + clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19 clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17 clasp = clingo; # added 2022-12-22 claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85dc76a96bfc..127639772726 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4303,8 +4303,6 @@ with pkgs; map-cmd = callPackage ../tools/misc/map { }; - clash-geoip = callPackage ../data/misc/clash-geoip { }; - clevercsv = with python3Packages; toPythonApplication clevercsv; cli53 = callPackage ../tools/admin/cli53 { }; From f3a4421f274951117a13c4dc37ab78c2de51bd2c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 19 Oct 2024 14:12:19 +0200 Subject: [PATCH 45/52] buildMozillaMach: change tests to an attrset --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- .../applications/networking/browsers/firefox/packages.nix | 8 ++++---- pkgs/applications/networking/browsers/floorp/default.nix | 4 +++- .../networking/browsers/librewolf/default.nix | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 77e020ff0cea..3b4e6cdba26e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -18,7 +18,7 @@ , extraBuildInputs ? [] , extraMakeFlags ? [] , extraPassthru ? {} -, tests ? [] +, tests ? {} }: let diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 882345b6db6f..f31e07452884 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -27,7 +27,7 @@ license = lib.licenses.mpl20; mainProgram = "firefox"; }; - tests = [ nixosTests.firefox ]; + tests = { inherit (nixosTests) firefox; }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; }; @@ -55,7 +55,7 @@ license = lib.licenses.mpl20; mainProgram = "firefox"; }; - tests = [ nixosTests.firefox-beta ]; + tests = { inherit (nixosTests) firefox-beta; }; updateScript = callPackage ./update.nix { attrPath = "firefox-beta-unwrapped"; versionSuffix = "b[0-9]*"; @@ -86,7 +86,7 @@ license = lib.licenses.mpl20; mainProgram = "firefox"; }; - tests = [ nixosTests.firefox-devedition ]; + tests = { inherit (nixosTests) firefox-devedition; }; updateScript = callPackage ./update.nix { attrPath = "firefox-devedition-unwrapped"; versionSuffix = "b[0-9]*"; @@ -115,7 +115,7 @@ license = lib.licenses.mpl20; mainProgram = "firefox"; }; - tests = [ nixosTests.firefox-esr-128 ]; + tests = { inherit (nixosTests) firefox-esr-128; }; updateScript = callPackage ./update.nix { attrPath = "firefox-esr-128-unwrapped"; versionPrefix = "128"; diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index d75f70c33a00..1ac055213e1b 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -58,7 +58,9 @@ license = lib.licenses.mpl20; mainProgram = "floorp"; }; - tests = [ nixosTests.floorp ]; + tests = { + inherit (nixosTests) floorp; + }; }).override { # Upstream build configuration can be found at diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 04c253f7d4f1..1a485d86f0bb 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -26,7 +26,7 @@ in license = lib.licenses.mpl20; mainProgram = "librewolf"; }; - tests = [ nixosTests.librewolf ]; + tests = { inherit (nixosTests) librewolf; }; updateScript = callPackage ./update.nix { attrPath = "librewolf-unwrapped"; }; From a9c9efc92238986885089b921ae7a3b27dedbb99 Mon Sep 17 00:00:00 2001 From: dr56ekgbb Date: Sat, 19 Oct 2024 20:30:32 +0800 Subject: [PATCH 46/52] bitcomet: init at 2.10.0 --- pkgs/by-name/bi/bitcomet/package.nix | 43 ++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 pkgs/by-name/bi/bitcomet/package.nix diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix new file mode 100644 index 000000000000..8b249d403ba6 --- /dev/null +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchurl, + appimageTools, + webkitgtk_4_0, +}: +let + pname = "bitcomet"; + version = "2.10.0"; + src = fetchurl { + url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage"; + hash = "sha256-HC9kThRuDcc7oWXuMeWe9g6P/v6GZQ8ho5sc4bNzsYw="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = + pkgs: with pkgs; [ + libxml2 + libpng + webkitgtk_4_0 + ]; + + extraInstallCommands = '' + mkdir -p $out/share/applications + install -m 444 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop + substituteInPlace $out/share/applications/bitcomet.desktop \ + --replace-fail 'Exec=usr/bin/BitComet' 'Exec=bitcomet' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = { + homepage = "https://www.bitcomet.com"; + description = "Free BitTorrent download client"; + mainProgram = "bitcomet"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ aucub ]; + }; +} From d5ed4f8d7f59d56570ffb1cd404492acc4c2c4d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 14:18:11 +0000 Subject: [PATCH 47/52] speakersafetyd: 1.0.0 -> 1.0.2 --- pkgs/by-name/sp/speakersafetyd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/speakersafetyd/package.nix b/pkgs/by-name/sp/speakersafetyd/package.nix index 550b8af9a5f1..9cac13c15bc5 100644 --- a/pkgs/by-name/sp/speakersafetyd/package.nix +++ b/pkgs/by-name/sp/speakersafetyd/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "speakersafetyd"; - version = "1.0.0"; + version = "1.0.2"; src = fetchCrate { inherit pname version; - hash = "sha256-I1RTtD5V4Z8R8zed/b4FitHyE7gFAja5YcA+z0VvSX0="; + hash = "sha256-3DzBNebg1y/+psD2zOpDsnRJmabQLeO1UMxPq9M0CsU="; }; - cargoHash = "sha256-8Dmts6SCRrZqyI+pdfgqsXfJy9Hqspbdb6EpQChMKDA="; + cargoHash = "sha256-InWaPybZbUbhIF1MEMeTUGa8LRUPwcTdw7uclZ1zBu4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; From 9746e073f70023c6d363eeaa23e21d5feb4071ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 10 Oct 2024 17:40:22 +0200 Subject: [PATCH 48/52] level-zero: 1.17.45 -> 1.18.3 Diff: https://github.com/oneapi-src/level-zero/compare/refs/tags/v1.17.45...v1.18.3 Changelog: https://github.com/oneapi-src/level-zero/blob/v1.18.3/CHANGELOG.md --- pkgs/development/libraries/level-zero/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index e0d130d80f44..a92eb386830e 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.17.45"; + version = "1.18.3"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-2uWZsy8aIV/ToDVuVxpyXoI1GbwZ9IxeLh+1hgjlfEM="; + hash = "sha256-ep9RYHnqmOEqfdFtYzOZnv0aWu4TA8JMyWOj0E2uSYk="; }; nativeBuildInputs = [ cmake addDriverRunpath ]; @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/oneapi-src/level-zero"; changelog = "https://github.com/oneapi-src/level-zero/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + platforms = platforms.linux; maintainers = [ maintainers.ziguana ]; }; } From 21c852eea4319e9d11aebe214c9019a563aaca2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 14:29:41 +0000 Subject: [PATCH 49/52] obs-studio-plugins.obs-source-record: 0.3.4 -> 0.3.5 --- .../video/obs-studio/plugins/obs-source-record.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix index 23cc300d7f70..0d91a79aff9a 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-source-record"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-source-record"; rev = version; - sha256 = "sha256-VgG9Fn75aKTkth4TC9rhfj/HIOO2lIO4n3ZYmemkzx8="; + sha256 = "sha256-RodZjab3DKiJwYuspdpCsF0ah4u5JtDDYoZPUGk36H4="; }; nativeBuildInputs = [ cmake ]; From 3b50cae2b01005c1505c64c67b6ecdfe5719e156 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sat, 19 Oct 2024 16:41:43 +0200 Subject: [PATCH 50/52] desed: 1.2.1-unstable-2024-09-06 -> 1.2.2 --- pkgs/by-name/de/desed/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix index a6909bbde844..321123acb0ee 100644 --- a/pkgs/by-name/de/desed/package.nix +++ b/pkgs/by-name/de/desed/package.nix @@ -4,21 +4,21 @@ fetchFromGitHub, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "desed"; - version = "1.2.1-unstable-2024-09-06"; + version = "1.2.2"; src = fetchFromGitHub { owner = "SoptikHa2"; repo = "desed"; - rev = "master"; - hash = "sha256-iCpEfefXXognk4YI1LLb3mwgaqMw4m3haq/gdS1JbQU="; + rev = "refs/tags/v${version}"; + hash = "sha256-FL9w+XdClLBCRp+cLqDzTVj8j9LMUp8jZ6hiG4KvIds="; }; - cargoHash = "sha256-z2qv394C0GhQC21HuLyvlNjrM65KFEZh1XLj+Y/B9ZM="; + cargoHash = "sha256-inH8fUpUR0WXYY2JX72evZqVp3GlnGKBBlrbai/fU6U="; meta = { - changelog = "https://github.com/SoptikHa2/desed/releases/tag/v1.2.1"; + changelog = "https://github.com/SoptikHa2/desed/releases/tag/v${version}"; description = "Debugger for Sed: demystify and debug your sed scripts, from comfort of your terminal. "; homepage = "https://github.com/SoptikHa2/desed"; license = lib.licenses.gpl3Only; From e2d6858147926918ccf124e3a5b24311e37ea330 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sat, 19 Oct 2024 16:43:35 +0200 Subject: [PATCH 51/52] desed: improve description --- pkgs/by-name/de/desed/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix index 321123acb0ee..b8f2934f7314 100644 --- a/pkgs/by-name/de/desed/package.nix +++ b/pkgs/by-name/de/desed/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = { changelog = "https://github.com/SoptikHa2/desed/releases/tag/v${version}"; - description = "Debugger for Sed: demystify and debug your sed scripts, from comfort of your terminal. "; + description = "Debugger for Sed: demystify and debug your sed scripts, from comfort of your terminal"; homepage = "https://github.com/SoptikHa2/desed"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ vinylen ]; From 55219f08a21beea57e354c66d0d50dc722f4e67c Mon Sep 17 00:00:00 2001 From: a-kenji Date: Sat, 19 Oct 2024 16:44:29 +0200 Subject: [PATCH 52/52] desed: add nix-update-script --- pkgs/by-name/de/desed/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/de/desed/package.nix b/pkgs/by-name/de/desed/package.nix index b8f2934f7314..03afc5e20090 100644 --- a/pkgs/by-name/de/desed/package.nix +++ b/pkgs/by-name/de/desed/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -17,6 +18,8 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-inH8fUpUR0WXYY2JX72evZqVp3GlnGKBBlrbai/fU6U="; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/SoptikHa2/desed/releases/tag/v${version}"; description = "Debugger for Sed: demystify and debug your sed scripts, from comfort of your terminal";