From 237b25b55629f4bf0c5a87a1330fcf7f64e9a7e3 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Thu, 15 Aug 2024 01:53:26 -0600 Subject: [PATCH 01/21] cinny-desktop: migrate to pkgs/by-name, add ryand56 to maintainers --- .../default.nix => by-name/ci/cinny-desktop/package.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/networking/instant-messengers/cinny-desktop/default.nix => by-name/ci/cinny-desktop/package.nix} (98%) diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/by-name/ci/cinny-desktop/package.nix similarity index 98% rename from pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix rename to pkgs/by-name/ci/cinny-desktop/package.nix index a7742b91e0c7..80d21e621e3b 100644 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -96,7 +96,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; - maintainers = with lib.maintainers; [ qyriad ]; + maintainers = with lib.maintainers; [ qyriad ryand56 ]; license = lib.licenses.agpl3Only; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "cinny"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e56ba32c390..d0225e637019 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4445,8 +4445,6 @@ with pkgs; cht-sh = callPackage ../tools/misc/cht.sh { }; - cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { }; - ckbcomp = callPackage ../tools/X11/ckbcomp { }; clac = callPackage ../tools/misc/clac { }; From ce84b361b57c90788904cc954a4df27481083b96 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 18 Aug 2024 15:59:43 -0600 Subject: [PATCH 02/21] cinny-desktop: override cinny dependency with hashRouter --- pkgs/by-name/ci/cinny-desktop/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 80d21e621e3b..82a34af864be 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -37,7 +37,11 @@ rustPlatform.buildRustPackage rec { postPatch = let cinny' = assert lib.assertMsg (cinny.version == version) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; - cinny; + cinny.override { + conf = { + hashRouter.enabled = true; + }; + }; in '' substituteInPlace tauri.conf.json \ --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' From 9f136138197b9f0e85f9bd9594b234774ff4fbf8 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 18 Aug 2024 16:01:12 -0600 Subject: [PATCH 03/21] cinny-desktop: format using nixfmt-rfc-style --- pkgs/by-name/ci/cinny-desktop/package.nix | 131 ++++++++++++---------- 1 file changed, 74 insertions(+), 57 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 82a34af864be..2d34b78f5eb3 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, darwin -, fetchFromGitHub -, rust -, rustPlatform -, cargo-tauri -, cinny -, copyDesktopItems -, wrapGAppsHook3 -, pkg-config -, openssl -, dbus -, glib -, glib-networking -, libayatana-appindicator -, webkitgtk -, makeDesktopItem +{ + lib, + stdenv, + darwin, + fetchFromGitHub, + rust, + rustPlatform, + cargo-tauri, + cinny, + copyDesktopItems, + wrapGAppsHook3, + pkg-config, + openssl, + dbus, + glib, + glib-networking, + libayatana-appindicator, + webkitgtk, + makeDesktopItem, }: rustPlatform.buildRustPackage rec { @@ -34,37 +35,44 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-bM+V37PJAob/DA2jy2g69zUY99ZyZBzgO6djadbdiJw="; - postPatch = let - cinny' = - assert lib.assertMsg (cinny.version == version) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; - cinny.override { - conf = { - hashRouter.enabled = true; + postPatch = + let + cinny' = + assert lib.assertMsg ( + cinny.version == version + ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; + cinny.override { + conf = { + hashRouter.enabled = true; + }; }; - }; - in '' - substituteInPlace tauri.conf.json \ - --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' - substituteInPlace tauri.conf.json \ - --replace '"cd cinny && npm run build"' '""' - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ - --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - ''; + in + '' + substituteInPlace tauri.conf.json \ + --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' + substituteInPlace tauri.conf.json \ + --replace '"cd cinny && npm run build"' '""' + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ + --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" + ''; postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' cargo tauri build --bundles app --target "${rust.envVars.rustHostPlatform}" ''; - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -DT icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/cinny.png - install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/cinny.png - install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/cinny.png - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p "$out/Applications/" - cp -r "target/${rust.envVars.rustHostPlatform}/release/bundle/macos/Cinny.app" "$out/Applications/" - ln -sf "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny" - ''; + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + install -DT icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/cinny.png + install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/cinny.png + install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/cinny.png + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications/" + cp -r "target/${rust.envVars.rustHostPlatform}/release/bundle/macos/Cinny.app" "$out/Applications/" + ln -sf "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny" + ''; nativeBuildInputs = [ copyDesktopItems @@ -73,18 +81,21 @@ rustPlatform.buildRustPackage rec { cargo-tauri ]; - buildInputs = [ - openssl - dbus - glib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - glib-networking - libayatana-appindicator - webkitgtk - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.DarwinTools - darwin.apple_sdk.frameworks.WebKit - ]; + buildInputs = + [ + openssl + dbus + glib + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking + libayatana-appindicator + webkitgtk + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.DarwinTools + darwin.apple_sdk.frameworks.WebKit + ]; desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { @@ -93,14 +104,20 @@ rustPlatform.buildRustPackage rec { icon = "cinny"; desktopName = "Cinny"; comment = meta.description; - categories = [ "Network" "InstantMessaging" ]; + categories = [ + "Network" + "InstantMessaging" + ]; }) ]; meta = { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; - maintainers = with lib.maintainers; [ qyriad ryand56 ]; + maintainers = with lib.maintainers; [ + qyriad + ryand56 + ]; license = lib.licenses.agpl3Only; platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "cinny"; From b26ca1d0713d21b9c6448a7a6a724dd0ce3e9660 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 18 Aug 2024 16:02:39 -0600 Subject: [PATCH 04/21] cinny-desktop: 4.0.3 -> 4.1.0 --- pkgs/by-name/ci/cinny-desktop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index 2d34b78f5eb3..eaba2e8e40b4 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -22,18 +22,18 @@ rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.0.3"; + version = "4.1.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; - rev = "v${version}"; - hash = "sha256-05T/2e5+st+vGQuO8lRw6KWz3+Qiqd14dCPvayyz5mo="; + rev = "refs/tags/v${version}"; + hash = "sha256-3HwKDD0O1Yx2OIjyO5FhV4d1INAIFXMO7FjSL7cOVmI="; }; sourceRoot = "${src.name}/src-tauri"; - cargoHash = "sha256-bM+V37PJAob/DA2jy2g69zUY99ZyZBzgO6djadbdiJw="; + cargoHash = "sha256-CwB4S/5UuDH1LlJ4CY77XUCriplT3ZFfdg1j41AUoTI="; postPatch = let From 6fa5767e07221bbc6fdfda24904b994becc10e7f Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 21 Aug 2024 20:56:34 +0100 Subject: [PATCH 05/21] tvheadend: drop Closes: #332259 --- .../manual/release-notes/rl-2411.section.md | 6 + nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + .../modules/services/networking/tvheadend.nix | 63 -------- pkgs/servers/tvheadend/default.nix | 134 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 7 files changed, 8 insertions(+), 200 deletions(-) delete mode 100644 nixos/modules/services/networking/tvheadend.nix delete mode 100644 pkgs/servers/tvheadend/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 800bbd03566d..25a9beb55e80 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -334,6 +334,12 @@ were not used by any other package. External users are encouraged to migrate to OpenCV 4. +- The `tvheadend` package and the `services.tvheadend` module have been + removed as nobody was willing to maintain them and they were stuck on + an unmaintained version that required FFmpeg 4; please see [pull + request #332259](https://github.com/NixOS/nixpkgs/pull/332259) if you + are interested in maintaining a newer version. + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cf79c8b4792b..812179b6962a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1239,7 +1239,6 @@ ./services/networking/tox-node.nix ./services/networking/toxvpn.nix ./services/networking/trickster.nix - ./services/networking/tvheadend.nix ./services/networking/twingate.nix ./services/networking/ucarp.nix ./services/networking/unbound.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 374d127198d0..71a4da5419e1 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -94,6 +94,7 @@ in the program being unmaintained. The options `programs.msmtp.*` can be used instead. '') + (mkRemovedOptionModule [ "services" "tvheadend" ] "The tvheadend package and the corresponding module have been removed as nobody was willing to maintain them and they were stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version.") (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "wakeonlan"] "This module was removed in favor of enabling it with networking.interfaces..wakeOnLan") (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix deleted file mode 100644 index 19a10a03bd9b..000000000000 --- a/nixos/modules/services/networking/tvheadend.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let cfg = config.services.tvheadend; - pidFile = "${config.users.users.tvheadend.home}/tvheadend.pid"; -in - -{ - options = { - services.tvheadend = { - enable = mkEnableOption "Tvheadend"; - httpPort = mkOption { - type = types.int; - default = 9981; - description = "Port to bind HTTP to."; - }; - - htspPort = mkOption { - type = types.int; - default = 9982; - description = "Port to bind HTSP to."; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.tvheadend = { - description = "Tvheadend Service user"; - home = "/var/lib/tvheadend"; - createHome = true; - isSystemUser = true; - group = "tvheadend"; - }; - users.groups.tvheadend = {}; - - systemd.services.tvheadend = { - description = "Tvheadend TV streaming server"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - Type = "forking"; - PIDFile = pidFile; - Restart = "always"; - RestartSec = 5; - User = "tvheadend"; - Group = "video"; - ExecStart = '' - ${pkgs.tvheadend}/bin/tvheadend \ - --http_port ${toString cfg.httpPort} \ - --htsp_port ${toString cfg.htspPort} \ - -f \ - -C \ - -p ${pidFile} \ - -u tvheadend \ - -g video - ''; - ExecStop = "${pkgs.coreutils}/bin/rm ${pidFile}"; - }; - }; - }; -} diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix deleted file mode 100644 index 499a046663ae..000000000000 --- a/pkgs/servers/tvheadend/default.nix +++ /dev/null @@ -1,134 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch - -# buildtime -, makeWrapper -, pkg-config -, python3 -, which - -# runtime -, avahi -, bzip2 -, dbus -, dtv-scan-tables -, ffmpeg_4 -, gettext -, gnutar -, gzip -, libiconv -, openssl -, uriparser -, zlib -}: - -let - version = "4.2.8"; -in stdenv.mkDerivation { - pname = "tvheadend"; - inherit version; - - src = fetchFromGitHub { - owner = "tvheadend"; - repo = "tvheadend"; - rev = "v${version}"; - sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m"; - }; - - outputs = [ - "out" - "man" - ]; - - patches = [ - # Pull upstream fix for -fno-common toolchain - # https://github.com/tvheadend/tvheadend/pull/1342 - # TODO: can be removed with 4.3 release. - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/tvheadend/tvheadend/commit/bd92f1389f1aacdd08e913b0383a0ca9dc223153.patch"; - sha256 = "17bsx6mnv4pjiayvx1d57dphva0kvlppvnmmaym06dh4524pnly1"; - }) - ]; - - nativeBuildInputs = [ - makeWrapper - pkg-config - python3 - which - ]; - - buildInputs = [ - avahi - bzip2 - dbus - ffmpeg_4 # depends on libav - gettext - gzip - libiconv - openssl - uriparser - zlib - ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = toString ([ - "-Wno-error=format-truncation" - "-Wno-error=stringop-truncation" - ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ - # Needed with GCC 12 but unrecognized with GCC 9 - "-Wno-error=use-after-free" - ]); - - configureFlags = [ - # disable dvbscan, as having it enabled causes a network download which - # cannot happen during build. We now include the dtv-scan-tables ourselves - "--disable-dvbscan" - "--disable-bintray_cache" - "--disable-ffmpeg_static" - # incompatible with our libhdhomerun version - "--disable-hdhomerun_client" - "--disable-hdhomerun_static" - "--disable-libx264_static" - "--disable-libx265_static" - "--disable-libvpx_static" - "--disable-libtheora_static" - "--disable-libvorbis_static" - "--disable-libfdkaac_static" - "--disable-libmfx_static" - ]; - - preConfigure = '' - substituteInPlace src/config.c \ - --replace /usr/bin/tar ${gnutar}/bin/tar - - substituteInPlace src/input/mpegts/scanfile.c \ - --replace /usr/share/dvb ${dtv-scan-tables}/share/dvbv5 - - # the version detection script `support/version` reads this file if it - # exists, so let's just use that - echo ${version} > rpm/version - ''; - - postInstall = '' - wrapProgram $out/bin/tvheadend \ - --prefix PATH : ${lib.makeBinPath [ bzip2 ]} - ''; - - meta = with lib; { - description = "TV streaming server and digital video recorder"; - longDescription = '' - Tvheadend is a TV streaming server for Linux supporting DVB-S, - DVB-S2, DVB-C, DVB-T, ATSC, IPTV,SAT>IP and other formats - through the unix pipe as input sources. - ''; - homepage = "https://tvheadend.org"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with maintainers; [ simonvandel ]; - mainProgram = "tvheadend"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9194ba9b4c88..b71bd5483295 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1494,6 +1494,7 @@ mapAliases ({ trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15 tvbrowser-bin = tvbrowser; # Added 2023-03-02 + tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 typst-fmt = typstfmt; # Added 2023-07-15 typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f04392e8400..ca628fe80bf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39115,8 +39115,6 @@ with pkgs; tvbrowser = callPackage ../applications/misc/tvbrowser { }; - tvheadend = callPackage ../servers/tvheadend { }; - twitch-cli = callPackage ../development/tools/twitch-cli { }; uacme = callPackage ../tools/admin/uacme { }; From a565cfeac35939ec55cb0bd20d1414ffd10e0685 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 21 Aug 2024 20:58:01 +0100 Subject: [PATCH 06/21] antennas: drop --- .../manual/release-notes/rl-2411.section.md | 3 + nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + .../modules/services/networking/antennas.nix | 77 ------------------- pkgs/servers/antennas/default.nix | 38 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 7 files changed, 5 insertions(+), 118 deletions(-) delete mode 100644 nixos/modules/services/networking/antennas.nix delete mode 100644 pkgs/servers/antennas/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 25a9beb55e80..7d6e3e5be501 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -340,6 +340,9 @@ request #332259](https://github.com/NixOS/nixpkgs/pull/332259) if you are interested in maintaining a newer version. +- The `antennas` package and the `services.antennas` module have been + removed as they only work with `tvheadend` (see above). + ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 812179b6962a..3f06bcfdf859 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -968,7 +968,6 @@ ./services/networking/adguardhome.nix ./services/networking/alice-lg.nix ./services/networking/amuled.nix - ./services/networking/antennas.nix ./services/networking/aria2.nix ./services/networking/asterisk.nix ./services/networking/atftpd.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 71a4da5419e1..91ef9b43cd3e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -51,6 +51,7 @@ in The hidepid module was removed, since the underlying machinery is broken when using cgroups-v2. '') + (mkRemovedOptionModule [ "services" "antennas" ] "The antennas package and the corresponding module have been removed as they only work with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version.") (mkRemovedOptionModule [ "services" "baget" "enable" ] "The baget module was removed due to the upstream package being unmaintained.") (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") diff --git a/nixos/modules/services/networking/antennas.nix b/nixos/modules/services/networking/antennas.nix deleted file mode 100644 index e98b81588044..000000000000 --- a/nixos/modules/services/networking/antennas.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let cfg = config.services.antennas; -in - -{ - options = { - services.antennas = { - enable = mkEnableOption "Antennas"; - - tvheadendUrl = mkOption { - type = types.str; - default = "http://localhost:9981"; - description = "URL of Tvheadend."; - }; - - antennasUrl = mkOption { - type = types.str; - default = "http://127.0.0.1:5004"; - description = "URL of Antennas."; - }; - - tunerCount = mkOption { - type = types.int; - default = 6; - description = "Numbers of tuners in tvheadend."; - }; - - deviceUUID = mkOption { - type = types.str; - default = "2f70c0d7-90a3-4429-8275-cbeeee9cd605"; - description = "Device tuner UUID. Change this if you are running multiple instances."; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.antennas = { - description = "Antennas HDHomeRun emulator for Tvheadend."; - wantedBy = [ "multi-user.target" ]; - - # Config - environment = { - TVHEADEND_URL = cfg.tvheadendUrl; - ANTENNAS_URL = cfg.antennasUrl; - TUNER_COUNT = toString cfg.tunerCount; - DEVICE_UUID = cfg.deviceUUID; - }; - - serviceConfig = { - ExecStart = "${pkgs.antennas}/bin/antennas"; - - # Hardening - CapabilityBoundingSet = [ "" ]; - DynamicUser = true; - LockPersonality = true; - ProcSubset = "pid"; - PrivateDevices = true; - PrivateUsers = true; - PrivateTmp = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RestrictNamespaces = true; - RestrictRealtime = true; - }; - }; - }; -} diff --git a/pkgs/servers/antennas/default.nix b/pkgs/servers/antennas/default.nix deleted file mode 100644 index f9db26ab93e4..000000000000 --- a/pkgs/servers/antennas/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -}: - -buildNpmPackage rec { - pname = "antennas"; - version = "4.2.0"; - - src = fetchFromGitHub { - owner = "jfarseneau"; - repo = "antennas"; - rev = "v${version}"; - hash = "sha256-UQ+wvm7+x/evmtGwzCkUkrrDMCIZzUL4iSkLmYKJ3Mc="; - }; - - npmDepsHash = "sha256-D5ss7nCDY3ogZy64iFqLVKbmibAg7C/A+rEHJaE9c2U="; - - dontNpmBuild = true; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - npm run test - - runHook postCheck - ''; - - meta = { - description = "HDHomeRun emulator for Plex DVR to connect to Tvheadend"; - homepage = "https://github.com/jfarseneau/antennas"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ bachp ]; - mainProgram = "antennas"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b71bd5483295..5ba24464de62 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -110,6 +110,7 @@ mapAliases ({ ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16 ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 + antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4; please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21 androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca628fe80bf3..6ef13babfd59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3379,8 +3379,6 @@ with pkgs; httpServer = true; }; - antennas = callPackage ../servers/antennas { }; - apg = callPackage ../tools/security/apg { }; apt-dater = callPackage ../tools/package-management/apt-dater { From faca03214205b5a489f2c670bcab1e373a043a66 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 23 Aug 2024 12:21:53 -0400 Subject: [PATCH 07/21] wal-listener: init at 2.6.1 Co-authored-by: Anderson Torres --- pkgs/by-name/wa/wal-listener/package.nix | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/wa/wal-listener/package.nix diff --git a/pkgs/by-name/wa/wal-listener/package.nix b/pkgs/by-name/wa/wal-listener/package.nix new file mode 100644 index 000000000000..8768d6eccab2 --- /dev/null +++ b/pkgs/by-name/wa/wal-listener/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + gitUpdater, +}: + +buildGoModule rec { + pname = "wal-listener"; + version = "2.6.1"; + + src = fetchFromGitHub { + owner = "ihippik"; + repo = "wal-listener"; + rev = "v${version}"; + hash = "sha256-OqjCFIdU4wCiPGIMrlp+nGVr0XTNHTE8zB8/toZtM44="; + }; + + vendorHash = "sha256-VUuEVH3IUuvThIt/HJx8OE8oqbjnSeqDIQxP0sl0FJw="; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "PostgreSQL WAL listener"; + homepage = "https://github.com/ihippik/wal-listener"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bbigras ]; + }; +} From e91ed5910cfb9748b2c4adb40d7c00fedf77746f Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 11:35:05 +0200 Subject: [PATCH 08/21] yubico-piv-tool: 2.5.2 -> 2.6.0 https://github.com/Yubico/yubico-piv-tool/releases/tag/yubico-piv-tool-2.6.0 https://github.com/Yubico/yubico-piv-tool/compare/yubico-piv-tool-2.5.2...yubico-piv-tool-2.6.0 --- pkgs/tools/misc/yubico-piv-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index eb3a88d1faac..8fac43e0f3c1 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; - version = "2.5.2"; + version = "2.6.0"; outputs = [ "out" "dev" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Yubico"; repo = "yubico-piv-tool"; rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}"; - hash = "sha256-SBVYr6OcWqT+WKOZgIeZ1TmqCbcGAjbq/HaWIwPduFw="; + hash = "sha256-53cgwXMzVKnouwHhbt6pODhjF2MH0sK5CPWpbZe71jE="; }; postPatch = '' From 5ca5521799aead750e18ef1747ae9ae6314047ea Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 25 Aug 2024 11:36:49 +0200 Subject: [PATCH 09/21] yubico-piv-tool: reformat and migrate to pkgs/by-name --- .../yu/yubico-piv-tool/package.nix} | 59 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 36 insertions(+), 27 deletions(-) rename pkgs/{tools/misc/yubico-piv-tool/default.nix => by-name/yu/yubico-piv-tool/package.nix} (77%) diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/by-name/yu/yubico-piv-tool/package.nix similarity index 77% rename from pkgs/tools/misc/yubico-piv-tool/default.nix rename to pkgs/by-name/yu/yubico-piv-tool/package.nix index 8fac43e0f3c1..1375a66b6582 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/by-name/yu/yubico-piv-tool/package.nix @@ -1,25 +1,30 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, openssl -, check -, pcsclite -, PCSC -, gengetopt -, help2man -, cmake -, zlib -, nix-update-script -, testers -, withApplePCSC ? stdenv.isDarwin +{ + lib, + check, + cmake, + darwin, + fetchFromGitHub, + gengetopt, + help2man, + nix-update-script, + openssl, + pcsclite, + pkg-config, + stdenv, + testers, + zlib, + withApplePCSC ? stdenv.isDarwin, }: stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; version = "2.6.0"; - outputs = [ "out" "dev" "man" ]; + outputs = [ + "out" + "dev" + "man" + ]; src = fetchFromGitHub { owner = "Yubico"; @@ -33,17 +38,16 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ - pkg-config cmake gengetopt help2man + pkg-config ]; buildInputs = [ openssl - zlib.dev - ] - ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); + zlib + ] ++ (if withApplePCSC then [ darwin.apple_sdk.frameworks.PCSC ] else [ pcsclite ]); cmakeFlags = [ (lib.cmakeBool "GENERATE_MAN_PAGES" true) @@ -60,7 +64,10 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = nix-update-script { - extraArgs = [ "--version-regex" "yubico-piv-tool-([0-9.]+)$" ]; + extraArgs = [ + "--version-regex" + "yubico-piv-tool-([0-9.]+)$" + ]; }; tests = { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -87,8 +94,14 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.bsd2; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ viraptor anthonyroussel ]; + maintainers = with lib.maintainers; [ + viraptor + anthonyroussel + ]; mainProgram = "yubico-piv-tool"; - pkgConfigModules = [ "ykcs11" "ykpiv" ]; + pkgConfigModules = [ + "ykcs11" + "ykpiv" + ]; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff352964cc01..375c7bea4d06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24311,10 +24311,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; }; - yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; - yubihsm-connector = callPackage ../tools/security/yubihsm-connector { }; yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; From 935008fd7542025b32c33a1d520dea3d49e17c5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Aug 2024 13:26:45 -0700 Subject: [PATCH 10/21] spotdl: 4.2.5 -> 4.2.6 Diff: https://github.com/spotDL/spotify-downloader/compare/refs/tags/v4.2.5...v4.2.6 Changelog: https://github.com/spotDL/spotify-downloader/releases/tag/v4.2.6 --- pkgs/tools/audio/spotdl/default.nix | 9 +-- .../audio/spotdl/is_lrc_valid-failure.patch | 65 ------------------- 2 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 0131d64ba824..31c825c56cd3 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,25 +6,21 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.5"; + version = "4.2.6"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-vxMhFs2mLbVQndlC2UpeDP+M4pwU9Y4cZHbZ8y3vWbI="; + hash = "sha256-OhZXxGkcO/dlYth9xUnpd/IbyvsbjMzwqQ9lPSvnFSs="; }; build-system = with python3.pkgs; [ poetry-core ]; pythonRelaxDeps = true; - # Remove when https://github.com/spotDL/spotify-downloader/issues/2119 is fixed - patches = [ ./is_lrc_valid-failure.patch ]; - dependencies = with python3.pkgs; [ - bandcamp-api beautifulsoup4 fastapi mutagen @@ -36,7 +32,6 @@ python3.pkgs.buildPythonApplication rec { rapidfuzz requests rich - setuptools soundcloud-v2 spotipy syncedlyrics diff --git a/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch b/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch deleted file mode 100644 index e419bca125d2..000000000000 --- a/pkgs/tools/audio/spotdl/is_lrc_valid-failure.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0c1357470450d98b3b7fe5444ac460ba9ee04425 Mon Sep 17 00:00:00 2001 -From: Jeremy Cutler -Date: Mon, 17 Jun 2024 02:19:33 -0700 -Subject: [PATCH 1/2] Update lrc.py for updated function in python-syncedlyrics - -See syncedlyrics commit: [here](https://github.com/moehmeni/syncedlyrics/commit/64d3f9de3d17bec69cbc3b3b5acd1ab847fde4b2) ---- - spotdl/utils/lrc.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py -index 726fefbee..e59490b53 100644 ---- a/spotdl/utils/lrc.py -+++ b/spotdl/utils/lrc.py -@@ -7,7 +7,7 @@ - from pathlib import Path - - from syncedlyrics import search as syncedlyrics_search --from syncedlyrics.utils import is_lrc_valid, save_lrc_file -+from syncedlyrics.utils import has_translation, save_lrc_file - - from spotdl.types.song import Song - -@@ -25,7 +25,7 @@ def generate_lrc(song: Song, output_file: Path): - - output_file: Path to the output file - """ - -- if song.lyrics and is_lrc_valid(song.lyrics): -+ if song.lyrics and has_translation(song.lyrics): - lrc_data = song.lyrics - else: - try: - -From bfa9456049132e64b5c83655bdeae7c9dcd1b532 Mon Sep 17 00:00:00 2001 -From: Jeremy Cutler -Date: Wed, 26 Jun 2024 18:06:59 -0700 -Subject: [PATCH 2/2] Update lrc.py - -Seems to have fixed the update of syncedlyrics to 1.0.0 ---- - spotdl/utils/lrc.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/spotdl/utils/lrc.py b/spotdl/utils/lrc.py -index e59490b53..cf7478214 100644 ---- a/spotdl/utils/lrc.py -+++ b/spotdl/utils/lrc.py -@@ -7,7 +7,7 @@ - from pathlib import Path - - from syncedlyrics import search as syncedlyrics_search --from syncedlyrics.utils import has_translation, save_lrc_file -+from syncedlyrics.utils import has_translation, Lyrics - - from spotdl.types.song import Song - -@@ -34,7 +34,7 @@ def generate_lrc(song: Song, output_file: Path): - lrc_data = None - - if lrc_data: -- save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data) -+ Lyrics.save_lrc_file(str(output_file.with_suffix(".lrc")), lrc_data) - logger.debug("Saved lrc file for %s", song.display_name) - else: - logger.debug("No lrc file found for %s", song.display_name) From 7d84664fd07fd104de6c28a390aab9abcbff92a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Aug 2024 16:48:32 -0700 Subject: [PATCH 11/21] python312Packages.openapi-core: 0.19.2 -> 0.19.3 Diff: https://github.com/p1c2u/openapi-core/compare/refs/tags/0.19.2...0.19.3 Changelog: https://github.com/python-openapi/openapi-core/releases/tag/0.19.3 --- .../python-modules/openapi-core/default.nix | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 61c4d891bbef..d7effd7ab68e 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -2,7 +2,6 @@ lib, aiohttp, aioitertools, - asgiref, buildPythonPackage, django, falcon, @@ -12,7 +11,7 @@ httpx, isodate, jsonschema, - jsonschema-spec, + jsonschema-path, more-itertools, multidict, openapi-schema-validator, @@ -20,6 +19,7 @@ parse, poetry-core, pytest-aiohttp, + pytest-cov-stub, pytestCheckHook, pythonOlder, responses, @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.19.2"; + version = "0.19.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,28 +40,23 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-6FFJsXObIA9tchTJJmoSu9u+/ZuKuw29AYsLEmvHXrY="; + hash = "sha256-UJkfAVorALGRqeoGr4136n98iTyPt9qzQxwnhkKgRNM="; }; - postPatch = '' - sed -i "/--cov/d" pyproject.toml - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ isodate more-itertools parse openapi-schema-validator openapi-spec-validator werkzeug - jsonschema-spec - asgiref + jsonschema-path jsonschema ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp multidict @@ -82,15 +77,11 @@ buildPythonPackage rec { nativeCheckInputs = [ httpx pytest-aiohttp + pytest-cov-stub pytestCheckHook responses webob - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - - pytestFlagsArray = [ - "-W" - "ignore::DeprecationWarning" - ]; + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ # Requires secrets and additional configuration @@ -104,6 +95,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/python-openapi/openapi-core/releases/tag/${version}"; description = "Client-side and server-side support for the OpenAPI Specification v3"; homepage = "https://github.com/python-openapi/openapi-core"; license = licenses.bsd3; From 7b6f5058cff4df8c5b63156a2b25813f708cd3cb Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 25 Aug 2024 21:09:46 -0700 Subject: [PATCH 12/21] llvmPackages_git: 20.0.0-git-2024-08-13 -> 20.0.0-git-2024-08-25 --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 8df9d56f0947..7b1fc3efebfb 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -25,9 +25,9 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs="; "20.0.0-git".gitRelease = { - rev = "4f5d866af7fed0de1671a68530d3023e9762b71e"; - rev-version = "20.0.0-unstable-2024-08-13"; - sha256 = "sha256-gr1DjZHfJlyGRDwkK7B82agTF8lRlYmCprcb/O4Do9E="; + rev = "2579b411a13799534c8b8a22246134b88ba7785d"; + rev-version = "20.0.0-unstable-2024-08-25"; + sha256 = "sha256-/Gymj9bEoaAAH5kWPRflD+lBWyPjWBpYGnQsP5vAlsk="; }; } // llvmVersions; From f458f520f949ae252ea467295810fa879cf2dd60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 05:44:26 +0000 Subject: [PATCH 13/21] yarn-berry: 4.4.0 -> 4.4.1 --- pkgs/development/tools/yarn-berry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix index 014e43bd87b0..79f3143ef318 100644 --- a/pkgs/development/tools/yarn-berry/default.nix +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-X/axXgRsxek2EJ+B4EogAsaTWTZDEF1m5dXOTZ4OnQQ="; + hash = "sha256-bkhPdnRImeYBd0yY+iRYXk1KELyCWZusSmVGl2tbM+s="; }; buildInputs = [ From 1fc4534a9093dce51cb08a255e6bbdd5f0af4efc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 15:36:02 +0000 Subject: [PATCH 14/21] tuba: 0.8.2 -> 0.8.3 --- pkgs/applications/misc/tuba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index a84da1c0381f..1d2c6681c1b9 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-nBNb2Hqv2AumwYoQnYZnH6YGp9wGr1o9vRO8YOty214="; + hash = "sha256-K0TXWFCSVjwogSXiTRX2eE92w5OzOGVeU4hFkDTJl+M="; }; nativeBuildInputs = [ From 4ef4389aa4b57b1a272e9099200166b69f9dd479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 23:52:33 +0000 Subject: [PATCH 15/21] rcp: 0.11.0 -> 0.12.0 --- pkgs/by-name/rc/rcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 8b92529936e3..941926696c1d 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-ymqglANM4vIIBC/lCnnLbYvAqJzdxX+lZGw4IB5O1sE="; + hash = "sha256-TQTn91FDqDpdPv6dn2cwseGF+3EcJ17sglHKD7EQLeY="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); - cargoHash = "sha256-88DSK0E1Wu9RMYJsbsnnieCorJZ50TRF7Fm/uCSOYHU="; + cargoHash = "sha256-uhE1AphdYKL6pFY8vsmdMGxHxFiVw75oDXNP8qGykBc="; RUSTFLAGS = "--cfg tokio_unstable"; From 220bfd1a190f21d59d882892e4f2ee4ce668c613 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Aug 2024 01:30:50 +0200 Subject: [PATCH 16/21] pretix: 2024.7.0 -> 2024.7.1 https://github.com/pretix/pretix/compare/refs/tags/v2024.7.0...v2024.7.1 Fixes: CVE-2024-8113 --- pkgs/by-name/pr/pretix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 4ce7fb727422..4ea10340adb1 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -51,13 +51,13 @@ let }; pname = "pretix"; - version = "2024.7.0"; + version = "2024.7.1"; src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; rev = "refs/tags/v${version}"; - hash = "sha256-08ykuFPcG3WvinJd9zadirXFqsMt9GbdOGU2CGbW7ls="; + hash = "sha256-lOcV3+CNGyKR0QiQXr/hP/9rhWauEvnSLOvxmQa/DSg="; }; npmDeps = buildNpmPackage { From b70603325285183c4c73843036f901dbe6420c1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 00:30:51 +0000 Subject: [PATCH 17/21] railway: 3.12.2 -> 3.13.0 --- pkgs/by-name/ra/railway/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index b6daf9f26949..16fbe65fb8ab 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.12.2"; + version = "3.13.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-G3sdwQ5SqCA5jEDMny7a446wSMrPmgs4q5u1mcNY7SU="; + hash = "sha256-uCgL08HADAtSt4OGqvHNGq95RG23QRYXHt0vIqCtjno="; }; - cargoHash = "sha256-zyMXx1CITE0y7RyRirT3o5F8U/9ReXwlGr2nrobwmYI="; + cargoHash = "sha256-UblS3jhn5yJTog/qblnoHVaJbXZKYRnw+ZgabZ+pPcI="; nativeBuildInputs = [ pkg-config ]; From d7f277bf85dedc5057b9ad7d6df87f1f7d73e8cf Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 27 Aug 2024 00:21:46 -0400 Subject: [PATCH 18/21] fityk: unpin swig3 --- pkgs/applications/science/misc/fityk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 5ec7973065d2..ed906e7d4c3d 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -10,7 +10,7 @@ , xylib , readline , gnuplot -, swig3 +, swig }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { xylib readline gnuplot - swig3 + swig ]; env.NIX_CFLAGS_COMPILE = toString [ From 5ac1c03aceb9b883c7481c996ce92ba8872d119e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 27 Aug 2024 00:24:38 -0400 Subject: [PATCH 19/21] python311Packages.soapysdr: unpin swig --- pkgs/applications/radio/soapysdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 43e110b1ae3f..68d30ab73cfb 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -10,7 +10,7 @@ ncurses, usePython ? false, python ? null, - swig3, + swig, extraPackages ? [ ], buildPackages, testers, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals usePython [ python - swig3 + swig ]; propagatedBuildInputs = lib.optionals usePython [ python.pkgs.numpy ]; From f5b732e9bf207a4812e354e3401acb48b696c911 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 26 Aug 2024 09:40:02 +0300 Subject: [PATCH 20/21] nixos/eris-server: update comment --- nixos/modules/services/network-filesystems/eris-server.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/network-filesystems/eris-server.nix b/nixos/modules/services/network-filesystems/eris-server.nix index 104676a52c61..7ad190c62f0a 100644 --- a/nixos/modules/services/network-filesystems/eris-server.nix +++ b/nixos/modules/services/network-filesystems/eris-server.nix @@ -53,7 +53,7 @@ in { Add "get" and "put" as query elements to enable those operations. ''; example = [ - "bolt+file:///srv/eris.bolt?get&put" + "badger+file:///var/db/eris.badger?get&put" "coap+tcp://eris.example.com:5683?get" ]; }; From 780a7d3fe0162bdd6fc996844189bd6ee536f26b Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 26 Aug 2024 11:42:34 +0300 Subject: [PATCH 21/21] eris-go: 20240128 -> 20240826 --- pkgs/by-name/er/eris-go/package.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix index 5823756e301d..7787f345c31e 100644 --- a/pkgs/by-name/er/eris-go/package.nix +++ b/pkgs/by-name/er/eris-go/package.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, buildGoModule, fetchFromGitea, mandoc, tup, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitea, nixosTests }: buildGoModule rec { pname = "eris-go"; - version = "20240128"; + version = "20240826"; outputs = [ "out" "man" ]; src = fetchFromGitea { @@ -10,18 +10,11 @@ buildGoModule rec { owner = "eris"; repo = "eris-go"; rev = version; - hash = "sha256-mS5PMrp6rBR8ehlpDAZaTQL8vhFSpcztMaQF5zjozxc="; + hash = "sha256-qw3HdHtyMuWqwkuGzVzQ8bXnXlJJPDpiYrQZb0lIYj8="; }; - vendorHash = "sha256-pA/fz7JpDwdTRFfLDY0M6p9TeBOK68byhy/0Cw53p4M="; + vendorHash = "sha256-TnB4BSO2Yb9AtcHgdEgNrFHAQJ7u4IzmhLdcSjbZ7SA="; - nativeBuildInputs = [ mandoc tup ]; - - postConfigure = '' - rm -f *.md - tupConfigure - ''; - postBuild = "tupBuild"; postInstall = '' install -D *.1.gz -t $man/share/man/man1 ''; @@ -35,7 +28,6 @@ buildGoModule rec { homepage = "https://codeberg.org/eris/eris-go"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ehmry ]; - broken = stdenv.isDarwin; mainProgram = "eris-go"; }; }