From fb9ca468ea9b554bc406353581128cbcfe0ea42a Mon Sep 17 00:00:00 2001 From: Zebreus Date: Wed, 8 May 2024 13:17:43 +0200 Subject: [PATCH 01/61] hterm: init at 0.8.9 --- pkgs/by-name/ht/hterm/package.nix | 72 +++++++++++++++++++++++++++++++ pkgs/by-name/ht/hterm/update.sh | 18 ++++++++ 2 files changed, 90 insertions(+) create mode 100644 pkgs/by-name/ht/hterm/package.nix create mode 100755 pkgs/by-name/ht/hterm/update.sh diff --git a/pkgs/by-name/ht/hterm/package.nix b/pkgs/by-name/ht/hterm/package.nix new file mode 100644 index 000000000000..22acf86af892 --- /dev/null +++ b/pkgs/by-name/ht/hterm/package.nix @@ -0,0 +1,72 @@ +{ + stdenv, + lib, + fetchurl, + cairo, + pango, + libpng, + expat, + fontconfig, + gtk2, + xorg, + autoPatchelfHook, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "hterm"; + version = "0.8.9"; + + src = + let + versionWithoutDots = builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version; + in + if stdenv.targetPlatform.is64bit then + fetchurl { + url = "https://www.der-hammer.info/terminal/hterm${versionWithoutDots}-linux-64.tgz"; + hash = "sha256-DY+X7FaU1UBbNf/Kgy4TzBZiocQ4/TpJW3KLW1iu0M0="; + } + else + fetchurl { + url = "https://www.der-hammer.info/terminal/hterm${versionWithoutDots}-linux-32.tgz"; + hash = "sha256-7wJFCpeXNMX94tk0QVc0T22cbv3ODIswFge5Cs0JhI8="; + }; + sourceRoot = "."; + + nativeBuildInputs = [ autoPatchelfHook ]; + + buildInputs = [ + cairo + pango + libpng + expat + fontconfig.lib + gtk2 + xorg.libSM + ]; + + installPhase = '' + runHook preInstall + install -m755 -D hterm $out/bin/hterm + install -m644 -D desktop/hterm.png $out/share/pixmaps/hterm.png + install -m644 -D desktop/hterm.desktop $out/share/applications/hterm.desktop + runHook postInstall + ''; + + passthru = { + updateScript = ./update.sh; + }; + + meta = { + homepage = "https://www.der-hammer.info/pages/terminal.html"; + changelog = "https://www.der-hammer.info/terminal/CHANGELOG.txt"; + description = "A terminal program for serial communication"; + # See https://www.der-hammer.info/terminal/LICENSE.txt + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; + maintainers = with lib.maintainers; [ zebreus ]; + mainProgram = "hterm"; + }; +}) diff --git a/pkgs/by-name/ht/hterm/update.sh b/pkgs/by-name/ht/hterm/update.sh new file mode 100755 index 000000000000..31966eec66d0 --- /dev/null +++ b/pkgs/by-name/ht/hterm/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl +# shellcheck shell=bash + +set -eu -o pipefail + +# The first valid version in the changelog should always be the latest version. +version="$(curl https://www.der-hammer.info/terminal/CHANGELOG.txt | grep -m1 -Po '[0-9]+\.[0-9]+\.[0-9]+')" + +function update_hash_for_system() { + local system="$1" + # Reset the version number so the second architecture update doesn't get ignored. + update-source-version hterm 0 "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" --system="$system" + update-source-version hterm "$version" --system="$system" +} + +update_hash_for_system x86_64-linux +update_hash_for_system i686-linux From 0613c3f1cbafe410ff0ce6781e31baa58196ad2b Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 6 Jul 2024 22:38:30 +1000 Subject: [PATCH 02/61] spacectl: init at 1.0.1 --- pkgs/by-name/sp/spacectl/package.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/sp/spacectl/package.nix diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix new file mode 100644 index 000000000000..7afba8a8abd7 --- /dev/null +++ b/pkgs/by-name/sp/spacectl/package.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "spacectl"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "spacelift-io"; + repo = "spacectl"; + rev = "v${version}"; + hash = "sha256-w49nsPzEWfYeYxWNOl4VrWdQvL3zGafLxL5kUH4YaqM="; + }; + + vendorHash = "sha256-hVAQaM8Xank+l283D1Tq9TA/yiOiLGO7/3IyZkXj15Q="; + + meta = { + homepage = "https://github.com/spacelift-io/spacectl"; + description = "Spacelift client and CLI"; + changelog = "https://github.com/spacelift-io/spacectl/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kashw2 ]; + mainProgram = "spacectl"; + }; +} From d7eb7d3cb8db63465855204d0b1d59cb583e7479 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 19 Aug 2024 12:46:04 +0200 Subject: [PATCH 03/61] mpvScripts.mpv-osc-tethys: init at 0-unstable-2024-08-19 --- .../video/mpv/scripts/default.nix | 1 + .../video/mpv/scripts/mpv-osc-tethys.nix | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index de0ee95044ca..62f94519555e 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -113,6 +113,7 @@ let mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; mpv-notify-send = callPackage ./mpv-notify-send.nix { }; mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; + mpv-osc-tethys = callPackage ./mpv-osc-tethys.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; mpv-slicing = callPackage ./mpv-slicing.nix { }; mpv-webm = callPackage ./mpv-webm.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix b/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix new file mode 100644 index 000000000000..6f0d6bddb4a4 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix @@ -0,0 +1,26 @@ +{ + lib, + buildLua, + fetchFromGitHub, +}: +buildLua (finalAttrs: { + pname = "mpv-osc-tethys"; + version = "0-unstable-2024-08-19"; + + scriptPath = "osc_tethys.lua"; + extraScripts = [ "mpv_thumbnail_script_server.lua" ]; + + src = fetchFromGitHub { + owner = "Zren"; + repo = "mpv-osc-tethys"; + rev = "c4167f88a0e9944738419e90a71f1f80fba39ccb"; + hash = "sha256-eAY+ZUuOxPJiNCuL7lqMBU4iURCMz12LQdfaYj4WFQc="; + }; + + meta = { + description = "OSC UI replacement for MPV with icons from the bomi video player"; + homepage = "https://github.com/Zren/mpv-osc-tethys"; + license = lib.licenses.unfree; # no license specified + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + }; +}) From e81bb18a0f23dc88f08ccd58d526be969934a01c Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 11 Aug 2024 13:14:36 -0300 Subject: [PATCH 04/61] kak-tree-sitter: init at 1.1.2 --- .../ka/kak-tree-sitter-unwrapped/package.nix | 35 +++++++++++++++++++ pkgs/by-name/ka/kak-tree-sitter/package.nix | 27 ++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix create mode 100644 pkgs/by-name/ka/kak-tree-sitter/package.nix diff --git a/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix new file mode 100644 index 000000000000..49c04df4dd03 --- /dev/null +++ b/pkgs/by-name/ka/kak-tree-sitter-unwrapped/package.nix @@ -0,0 +1,35 @@ +{ + lib, + rustPlatform, + fetchFromSourcehut, + nix-update-script, + testers, + kak-tree-sitter-unwrapped, +}: + +rustPlatform.buildRustPackage rec { + pname = "kak-tree-sitter-unwrapped"; + version = "1.1.2"; + + src = fetchFromSourcehut { + owner = "~hadronized"; + repo = "kak-tree-sitter"; + rev = "kak-tree-sitter-v${version}"; + hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; + }; + + cargoHash = "sha256-v0DNcWPoHdquOlyPoPLoFulz66yCPR1W1Z3uuTjli5k="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = kak-tree-sitter-unwrapped; }; + }; + + meta = { + homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter"; + description = "Server that interfaces tree-sitter with kakoune"; + mainProgram = "kak-tree-sitter"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ lelgenio ]; + }; +} diff --git a/pkgs/by-name/ka/kak-tree-sitter/package.nix b/pkgs/by-name/ka/kak-tree-sitter/package.nix new file mode 100644 index 000000000000..e80edb2f369e --- /dev/null +++ b/pkgs/by-name/ka/kak-tree-sitter/package.nix @@ -0,0 +1,27 @@ +{ + lib, + makeWrapper, + symlinkJoin, + tinycc, + kak-tree-sitter-unwrapped, +}: + +symlinkJoin rec { + pname = lib.replaceStrings [ "-unwrapped" ] [ "" ] kak-tree-sitter-unwrapped.pname; + inherit (kak-tree-sitter-unwrapped) version; + name = "${pname}-${version}"; + + paths = [ kak-tree-sitter-unwrapped ]; + nativeBuildInputs = [ makeWrapper ]; + + # Tree-Sitter grammars are C programs that need to be compiled + # Use tinycc as cc to reduce closure size + postBuild = '' + mkdir -p $out/libexec/tinycc/bin + ln -s ${lib.getExe tinycc} $out/libexec/tinycc/bin/cc + wrapProgram "$out/bin/ktsctl" \ + --suffix PATH : $out/libexec/tinycc/bin + ''; + + inherit (kak-tree-sitter-unwrapped) meta; +} From 37e443af61dcbd8939e873ff9ae775ef2e1febec Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:07:10 +0000 Subject: [PATCH 05/61] ayatana-ido: move to pkgs/by-name --- .../ay/ayatana-ido/package.nix} | 20 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 insertions(+), 7 deletions(-) rename pkgs/{development/libraries/ayatana-ido/default.nix => by-name/ay/ayatana-ido/package.nix} (75%) diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/by-name/ay/ayatana-ido/package.nix similarity index 75% rename from pkgs/development/libraries/ayatana-ido/default.nix rename to pkgs/by-name/ay/ayatana-ido/package.nix index af3476ce1a69..bef38a42a476 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -1,6 +1,10 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, cmake -, gtk3 +{ + cmake, + fetchFromGitHub, + gtk3, + lib, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { @@ -14,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ gtk3 ]; @@ -22,7 +29,10 @@ stdenv.mkDerivation rec { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; - license = [ licenses.lgpl3Plus licenses.lgpl21Plus ]; + license = [ + licenses.lgpl3Plus + licenses.lgpl21Plus + ]; maintainers = [ maintainers.nickhu ]; platforms = platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1352af0af5c4..1d2cff810b40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19437,8 +19437,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; - ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; - ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { }; azmq = callPackage ../development/libraries/azmq { }; From e272eb2fd75c38299905032fb1d3086021f7bd47 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:10:22 +0000 Subject: [PATCH 06/61] ayatana-ido: fix cross compilation --- pkgs/by-name/ay/ayatana-ido/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ay/ayatana-ido/package.nix b/pkgs/by-name/ay/ayatana-ido/package.nix index bef38a42a476..ae8f9419fb89 100644 --- a/pkgs/by-name/ay/ayatana-ido/package.nix +++ b/pkgs/by-name/ay/ayatana-ido/package.nix @@ -1,6 +1,7 @@ { cmake, fetchFromGitHub, + glib, gtk3, lib, pkg-config, @@ -20,11 +21,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + glib # for glib-mkenums pkg-config ]; buildInputs = [ gtk3 ]; + strictDeps = true; + meta = with lib; { description = "Ayatana Display Indicator Objects"; homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; From 9baa4280ed94f4e169fa4718fe56e416d42c40e5 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:11:30 +0000 Subject: [PATCH 07/61] libayatana-indicator: move to pkgs/by-name --- .../li/libayatana-indicator/package.nix} | 17 ++++++++++++----- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 7 deletions(-) rename pkgs/{development/libraries/libayatana-indicator/default.nix => by-name/li/libayatana-indicator/package.nix} (83%) diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/by-name/li/libayatana-indicator/package.nix similarity index 83% rename from pkgs/development/libraries/libayatana-indicator/default.nix rename to pkgs/by-name/li/libayatana-indicator/package.nix index 0cadea9f9902..9e6f58ca7527 100644 --- a/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/pkgs/by-name/li/libayatana-indicator/package.nix @@ -1,7 +1,11 @@ -{ stdenv, fetchFromGitHub, lib -, pkg-config, cmake -, gtk3 -, ayatana-ido +{ + ayatana-ido, + cmake, + fetchFromGitHub, + gtk3, + lib, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { @@ -15,7 +19,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-OsguZ+jl274uPSCTFHq/ZwUE3yHR7MlUPHCpfmn1F7A="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = [ gtk3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d2cff810b40..66c4c0b7a525 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21627,8 +21627,6 @@ with pkgs; libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; - libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { }; - libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; libiodbc = callPackage ../development/libraries/libiodbc { From 8e2f23d65ad4231d7bf3b6764cd0408ff2cfa493 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 1 Sep 2024 12:13:17 +0000 Subject: [PATCH 08/61] libayatana-indicator: fix cross compilation --- pkgs/by-name/li/libayatana-indicator/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/li/libayatana-indicator/package.nix b/pkgs/by-name/li/libayatana-indicator/package.nix index 9e6f58ca7527..852c61d3ea13 100644 --- a/pkgs/by-name/li/libayatana-indicator/package.nix +++ b/pkgs/by-name/li/libayatana-indicator/package.nix @@ -2,6 +2,7 @@ ayatana-ido, cmake, fetchFromGitHub, + glib, gtk3, lib, pkg-config, @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + glib # for glib-mkenums pkg-config ]; @@ -28,6 +30,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ ayatana-ido ]; + strictDeps = true; + meta = with lib; { description = "Ayatana Indicators Shared Library"; homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; From 1ebdef25c2f5ebe484793de09a3f74d035ca0a99 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sat, 7 Sep 2024 22:31:42 +0200 Subject: [PATCH 09/61] pytr: 0.2.2 -> 0.2.4 --- pkgs/by-name/py/pytr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix index 0afe8ad3bc44..64de02060d7b 100644 --- a/pkgs/by-name/py/pytr/package.nix +++ b/pkgs/by-name/py/pytr/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "pytr"; - version = "0.2.2"; + version = "0.2.4"; pyproject = true; src = fetchFromGitHub { owner = "pytr-org"; repo = "pytr"; - rev = "refs/tags/${version}"; - hash = "sha256-0ekUpkuyT0TB2YQi7CUMwosLI2tR0owJE2XQBaiy8Iw="; + rev = "refs/tags/v${version}"; + hash = "sha256-ejXedAfbZJzfCSkW9X1yH+I03+kjIs/xiSkyJk7FEO0="; }; build-system = with python3Packages; [ From 1c7e6a2de9f2a0fa149ef36c1e2be6d4fafca822 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:21:14 +0530 Subject: [PATCH 10/61] nixos/shairport-sync: Add pulse group also for pipewire Works according to https://github.com/mikebrady/shairport-sync/issues/1171 From https://github.com/NixOS/nixpkgs/pull/181350/commits/0e4664b4976a748702d493e43d7a796b82222ddc --- nixos/modules/services/networking/shairport-sync.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index eb61663e4d92..df7e143bb41f 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -82,7 +82,7 @@ in createHome = true; home = "/var/lib/shairport-sync"; group = cfg.group; - extraGroups = [ "audio" ] ++ optional config.hardware.pulseaudio.enable "pulse"; + extraGroups = [ "audio" ] ++ optional (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) "pulse"; }; groups.${cfg.group} = {}; }; From 4491e4b44c9de0e5db275e00b0518214094c8655 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Thu, 12 Sep 2024 22:05:17 -0400 Subject: [PATCH 11/61] prometheus-elasticsearch-exporter: init at 1.7.0 --- .../package.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix new file mode 100644 index 000000000000..7c8718e81b3f --- /dev/null +++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "elasticsearch_exporter"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "prometheus-community"; + repo = "elasticsearch_exporter"; + rev = "v${version}"; + hash = "sha256-a70huy6J0Ob9LkLuCSVZqJChTo/4cPufbkq1v/QcKE4="; + }; + + vendorHash = "sha256-5uQfeDRi7EMcUCkXdbNlSe1IUpv6e5ueXtZ4C5SWAmw="; + + meta = with lib; { + description = "Elasticsearch stats exporter for Prometheus"; + mainProgram = "elasticsearch_exporter"; + homepage = "https://github.com/prometheus-community/elasticsearch_exporter"; + license = licenses.asl20; + maintainers = teams.deshaw.members; + }; +} From c58be9af5b65ab6e3b7eecd7b732e538c849d1b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 15:38:48 +0000 Subject: [PATCH 12/61] seaweedfs: 3.72 -> 3.73 --- pkgs/applications/networking/seaweedfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 5586fbbdba41..a43e954e70f4 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.72"; + version = "3.73"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-5ANhRknN8EOUw+Ifsd2zCKDpDeoWJzUuwGMDMkZOwls="; + hash = "sha256-5CgkpL0nBLKojKPSfkYxh8F5Ub+yWhfmOsKC5qQ4QaE="; }; - vendorHash = "sha256-3CrWrv8kXnbZUcaI2CG/x7MUWlR14OLbjen5FbljTEI="; + vendorHash = "sha256-rj5BbbT3/IBtPZ1MqbwC9TNp+N9ec90Anear2AWBZZU="; subPackages = [ "weed" ]; From cd6f76b2eba53789d19dd47f6a5d8e7bd3493012 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:12:12 +0200 Subject: [PATCH 13/61] proton-vpn-session: use pytest-cov-stub, add sebtm as maintainer --- .../python-modules/proton-vpn-session/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix index 5210c4237311..c74e55d1b8f4 100644 --- a/pkgs/development/python-modules/proton-vpn-session/default.nix +++ b/pkgs/development/python-modules/proton-vpn-session/default.nix @@ -13,6 +13,7 @@ pytest-asyncio, requests, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -37,11 +38,6 @@ buildPythonPackage rec { pynacl ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton.vpn.session --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.session" ]; postInstall = '' @@ -55,12 +51,13 @@ buildPythonPackage rec { pytest-asyncio requests pytestCheckHook + pytest-cov-stub ]; meta = { description = "Provides utility classes to manage VPN sessions"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-session"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sebtm ]; }; } From 6795ced0171b9175caf18554bcfe39d29130e2f3 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:13:04 +0200 Subject: [PATCH 14/61] proton-vpn-logger: use pytest-cov-stub, add sebtm as maintainer --- .../proton-vpn-logger/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix index d492ed146eb7..7211293b99c8 100644 --- a/pkgs/development/python-modules/proton-vpn-logger/default.nix +++ b/pkgs/development/python-modules/proton-vpn-logger/default.nix @@ -5,6 +5,7 @@ setuptools, proton-core, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -23,24 +24,22 @@ buildPythonPackage rec { propagatedBuildInputs = [ proton-core ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton/vpn/logging/ --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.logging" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; preCheck = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) ''; - meta = with lib; { + meta = { description = "General purpose logging package for the entire ProtonVPN Linux client"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-logger"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From e6767d0fe14363a541085a0d147057ec04dd3476 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:13:36 +0200 Subject: [PATCH 15/61] proton-keyring-linux: use pytest-cov-stub, add sebtm as maintainer --- .../proton-keyring-linux/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index a0f63f4222da..ad5b4d46779c 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -6,6 +6,7 @@ keyring, proton-core, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -27,19 +28,17 @@ buildPythonPackage rec { proton-core ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton.keyring_linux.core --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.keyring_linux.core" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "ProtonVPN core component to access Linux's keyring"; homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From 1082bdf7bbea761110912643abcb1aef2d694302 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:14:05 +0200 Subject: [PATCH 16/61] proton-keyring-linux-secretservice: use pytest-cov-stub, add sebtm as maintainer --- .../default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix index ab9cefd53a99..7d4a36b5e5e8 100644 --- a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix @@ -5,6 +5,7 @@ setuptools, proton-keyring-linux, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -23,19 +24,17 @@ buildPythonPackage rec { propagatedBuildInputs = [ proton-keyring-linux ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton.keyring_linux.secretservice --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.keyring_linux" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "ProtonVPN component to access Linux's keyring secret service API"; homepage = "https://github.com/ProtonVPN/python-proton-keyring-linux-secretservice"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From e40d48e87577dc5763901c9f8d13663831d63c4f Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:14:49 +0200 Subject: [PATCH 17/61] proton-vpn-connection: use pytest-cov-stub, add sebtm as maintainer --- .../proton-vpn-connection/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix index 0df1b42a2bc4..d527df7fbbd6 100644 --- a/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ b/pkgs/development/python-modules/proton-vpn-connection/default.nix @@ -8,6 +8,7 @@ proton-vpn-logger, jinja2, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -31,14 +32,12 @@ buildPythonPackage rec { proton-vpn-logger ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton.vpn.connection --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.connection" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; disabledTests = [ # Permission denied: '/run' @@ -59,10 +58,10 @@ buildPythonPackage rec { "test_ovpnconfig_with_malformed_server_and_credentials" ]; - meta = with lib; { + meta = { description = "Defines the interface that VPN connection backends should implement"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-connection"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From 5f37311137264da67f7d27749ff5fa39b10d4c50 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:15:24 +0200 Subject: [PATCH 18/61] proton-vpn-killswitch: use pytest-cov-stub, add sebtm as maintainer --- .../proton-vpn-killswitch/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix index c2ed563df880..65633318496e 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix @@ -5,6 +5,7 @@ setuptools, proton-core, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -23,19 +24,17 @@ buildPythonPackage rec { propagatedBuildInputs = [ proton-core ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton --cov-report=html --cov-report=term" "" - ''; - pythonImportsCheck = [ "proton.vpn.killswitch.interface" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "Defines the ProtonVPN kill switch interface"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From 571da80ef3841af6b7e9d5ba7fa26923172420bb Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:17:36 +0200 Subject: [PATCH 19/61] proton-core: 0.1.16 -> 0.2.0, use pytest-cov-stub, add sebtm as maintainer --- .../python-modules/proton-core/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index c19ef3b31d17..d42dc2c8954f 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -9,18 +9,20 @@ python-gnupg, requests, pytestCheckHook, + pyotp, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-core"; - version = "0.1.16"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-core"; rev = "refs/tags/v${version}"; - hash = "sha256-072XuHvgWludlFwp/tqLpuAU89vzifFhwQ01FuiCoL8="; + hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ="; }; nativeBuildInputs = [ setuptools ]; @@ -33,14 +35,13 @@ buildPythonPackage rec { requests ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + pyotp + ]; disabledTestPaths = [ # Single test, requires internet connection @@ -68,6 +69,6 @@ buildPythonPackage rec { description = "Core logic used by the other Proton components"; homepage = "https://github.com/ProtonVPN/python-proton-core"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sebtm ]; }; } From 681c4337d6a349cc9439b108842980bcb53f7e21 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:18:27 +0200 Subject: [PATCH 20/61] proton-vpn-api-core: 0.22.3 -> 0.32.2, use pytest-cov-stub, add sebtm as maintainer --- .../proton-vpn-api-core/default.nix | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index c3597acd9e5c..0191084642dd 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -11,18 +11,19 @@ sentry-sdk, distro, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-vpn-api-core"; - version = "0.22.3"; + version = "0.32.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-api-core"; - rev = "refs/tags/v${version}"; - hash = "sha256-BGei6tw6VTKkHmaIWa2VJfKOL5cRUbauOQ7zp1RY9Bo="; + rev = "v${version}"; + hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI="; }; nativeBuildInputs = [ setuptools ]; @@ -37,24 +38,33 @@ buildPythonPackage rec { sentry-sdk ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton/vpn/core/ --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.core" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; preCheck = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) ''; - meta = with lib; { + disabledTests = [ + # Permission denied: '/run' + "test_ensure_configuration_file_is_created" + "test_ovpnconfig_with_settings" + "test_wireguard_config_content_generation" + "test_wireguard_with_non_certificate" + "test_ensure_generate_is_returning_expected_content" + "test_ensure_same_configuration_file_in_case_of_duplicate" + "test_ensure_configuration_file_is_deleted" + ]; + + meta = { description = "Acts as a facade to the other Proton VPN components, exposing a uniform API to the available Proton VPN services"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-api-core"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From 5804fda435494baec4547bafe285ac6f1b851f31 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:18:58 +0200 Subject: [PATCH 21/61] proton-vpn-killswitch-network-manager: 0.4.3 -> 0.5.4, use pytest-cov-stub, add sebtm as maintainer --- .../default.nix | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix index 68e024501cb6..5dbf2eb5fe73 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix @@ -5,23 +5,25 @@ gobject-introspection, setuptools, networkmanager, + proton-vpn-api-core, proton-vpn-killswitch, proton-vpn-logger, pycairo, pygobject3, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-vpn-killswitch-network-manager"; - version = "0.4.3"; + version = "0.5.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-killswitch-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-kN41b6OZ2YXoBsmNZD3NrX4uJChSmm6DVP+5LYwiZMw="; + hash = "sha256-iUm+hpqgI4jG+1Cd9F6pBjodxHpq9/2ovXRT877biXQ="; }; nativeBuildInputs = [ @@ -33,25 +35,24 @@ buildPythonPackage rec { propagatedBuildInputs = [ # Needed here for the NM namespace networkmanager + proton-vpn-api-core proton-vpn-killswitch proton-vpn-logger pycairo pygobject3 ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton.vpn.killswitch.backend.linux.networkmanager --cov-report=html --cov-report=term" "" - ''; - pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.networkmanager" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "Implementation of the proton-vpn-killswitch interface using Network Manager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-killswitch-network-manager"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From 85507659d5c58b059d1c6486bd85d83d6718e8e0 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:19:33 +0200 Subject: [PATCH 22/61] proton-vpn-network-manager: 0.4.2 -> 0.5.2, use pytest-cov-stub, add sebtm as maintainer --- .../proton-vpn-network-manager/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index 97dd1d52dca9..4409103ca7d6 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -6,23 +6,25 @@ setuptools, networkmanager, proton-core, + proton-vpn-api-core, proton-vpn-connection, pycairo, pygobject3, pytest-asyncio, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-vpn-network-manager"; - version = "0.4.2"; + version = "0.5.2"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager"; rev = "refs/tags/v${version}"; - hash = "sha256-zw6fzay1zCBIrouDg2EMhaxDLKIYV5TKYK5lQ3v8W6o="; + hash = "sha256-hTJE9sUjPMsE9d0fIA/OhoasumtfsWuFwn0aTm10PN4="; }; nativeBuildInputs = [ @@ -35,27 +37,24 @@ buildPythonPackage rec { # Needed here for the NM namespace networkmanager proton-core + proton-vpn-api-core proton-vpn-connection pycairo pygobject3 ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton/vpn/backend/linux/networkmanager --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager" ]; nativeCheckInputs = [ - pytest-asyncio pytestCheckHook + pytest-cov-stub + pytest-asyncio ]; - meta = with lib; { + meta = { description = "Provides the necessary functionality for other ProtonVPN components to interact with NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From ae79f1a82c0083288ada84507979a9a2278a9930 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:20:08 +0200 Subject: [PATCH 23/61] proton-vpn-network-manager-openvpn: 0.0.7 -> 0.1.0, use pytest-cov-stub, add sebtm as maintainer --- .../default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix index c10b489ed6b0..3cdbc53aa6e8 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix @@ -7,18 +7,19 @@ proton-core, proton-vpn-network-manager, pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { pname = "proton-vpn-network-manager-openvpn"; - version = "0.0.7"; + version = "0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "python-proton-vpn-network-manager-openvpn"; rev = "refs/tags/v${version}"; - hash = "sha256-AHG4jEEv1ihpboQwz6FmNtlqCE83qyOeGzBDHQcvD6o="; + hash = "sha256-eDBcpuz37crfAFX6oysB4FCkSmVLyfLJ0R2L0cZgjRo="; }; nativeBuildInputs = [ @@ -32,19 +33,17 @@ buildPythonPackage rec { proton-vpn-network-manager ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=proton.vpn.backend.linux.networkmanager.protocol.openvpn --cov-report html --cov-report term" "" - ''; - pythonImportsCheck = [ "proton.vpn.backend.linux.networkmanager.protocol" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; - meta = with lib; { + meta = { description = "Adds support for the OpenVPN protocol using NetworkManager"; homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-openvpn"; - license = licenses.gpl3Only; - maintainers = [ ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; }; } From f497d48d2972d412c1273a2e9af2abf33b780854 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:21:03 +0200 Subject: [PATCH 24/61] proton-vpn-killswitch-network-manager-wireguard: init at 0.1.4 --- .../default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix new file mode 100644 index 000000000000..e5dcedfb6d3b --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix @@ -0,0 +1,64 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gobject-introspection, + setuptools, + networkmanager, + proton-vpn-api-core, + proton-vpn-killswitch, + proton-vpn-logger, + pycairo, + pygobject3, + pytestCheckHook, + iproute2, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "proton-vpn-killswitch-network-manager-wireguard"; + version = "0.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-killswitch-network-manager-wireguard"; + rev = "v${version}"; + hash = "sha256-4sYD2X1U066FMjrtbTb31wvkCDWAw+eXod+pi0gGsCQ="; + }; + + nativeBuildInputs = [ + # Solves ImportError: cannot import name NM, introspection typelib not found + gobject-introspection + setuptools + ]; + + propagatedBuildInputs = [ + # Needed here for the NM namespace + networkmanager + proton-vpn-api-core + proton-vpn-killswitch + proton-vpn-logger + pycairo + pygobject3 + ]; + + postPatch = '' + substituteInPlace proton/vpn/killswitch/backend/linux/wireguard/killswitch_connection_handler.py \ + --replace '/usr/sbin/ip' '${iproute2}/bin/ip' + ''; + + pythonImportsCheck = [ "proton.vpn.killswitch.backend.linux.wireguard" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + meta = { + description = "Implementation of the proton-vpn-killswitch interface using Network Manager with wireguard-protocol"; + homepage = "https://github.com/ProtonVPN/proton-vpn-killswitch-network-manager-wireguard"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb1c6cdddf59..113a7cd492b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10607,6 +10607,8 @@ self: super: with self; { proton-vpn-killswitch-network-manager = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager { }; + proton-vpn-killswitch-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-killswitch-network-manager-wireguard { }; + proton-vpn-logger = callPackage ../development/python-modules/proton-vpn-logger { }; proton-vpn-network-manager = callPackage ../development/python-modules/proton-vpn-network-manager { }; From b287e96043c88c3dd4e9cb81fa2a0b8e524bf017 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:23:05 +0200 Subject: [PATCH 25/61] proton-vpn-network-manager-wireguard: init at 0.4.1 --- .../default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix new file mode 100644 index 000000000000..516b3306fc6b --- /dev/null +++ b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + gobject-introspection, + setuptools, + proton-core, + proton-vpn-killswitch-network-manager-wireguard, + proton-vpn-network-manager, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage rec { + pname = "proton-vpn-network-manager-wireguard"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ProtonVPN"; + repo = "python-proton-vpn-network-manager-wireguard"; + rev = "v${version}"; + hash = "sha256-DZXixcm2VwXhbN4buABlkybDgXIg/mbeUVHOpdoj0Kw="; + }; + + nativeBuildInputs = [ + # Solves Namespace NM not available + gobject-introspection + setuptools + ]; + + propagatedBuildInputs = [ + proton-core + proton-vpn-killswitch-network-manager-wireguard + proton-vpn-network-manager + ]; + + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + meta = { + description = "Adds support for the Wireguard protocol using NetworkManager"; + homepage = "https://github.com/ProtonVPN/python-proton-vpn-network-manager-wireguard"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sebtm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 113a7cd492b1..1be455a2bbe8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10615,6 +10615,8 @@ self: super: with self; { proton-vpn-network-manager-openvpn = callPackage ../development/python-modules/proton-vpn-network-manager-openvpn { }; + proton-vpn-network-manager-wireguard = callPackage ../development/python-modules/proton-vpn-network-manager-wireguard { }; + proton-vpn-session = callPackage ../development/python-modules/proton-vpn-session { }; protonup-ng = callPackage ../development/python-modules/protonup-ng { }; From 27c4af822bfcf7f82b6ea9387a1ba37c9d7f205f Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:39:13 +0200 Subject: [PATCH 26/61] protonvpn-gui: 4.3.0 -> 4.4.4, add sebtm as maintainer --- .../networking/protonvpn-gui/default.nix | 80 +++++++++---------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index abeabcd1610f..f0349f09b720 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,47 +1,46 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, gobject-introspection -, setuptools -, wrapGAppsHook3 -, dbus-python -, packaging -, proton-core -, proton-keyring-linux -, proton-keyring-linux-secretservice -, proton-vpn-api-core -, proton-vpn-connection -, proton-vpn-killswitch -, proton-vpn-killswitch-network-manager -, proton-vpn-logger -, proton-vpn-network-manager -, proton-vpn-network-manager-openvpn -, proton-vpn-session -, pycairo -, pygobject3 -, pytest-cov-stub -, pytestCheckHook -, withIndicator ? true -, libappindicator-gtk3 -, libayatana-appindicator +{ + lib, + buildPythonApplication, + fetchFromGitHub, + gobject-introspection, + setuptools, + wrapGAppsHook3, + dbus-python, + packaging, + proton-core, + proton-keyring-linux, + proton-keyring-linux-secretservice, + proton-vpn-api-core, + proton-vpn-connection, + proton-vpn-killswitch, + proton-vpn-killswitch-network-manager, + proton-vpn-logger, + proton-vpn-network-manager, + proton-vpn-network-manager-openvpn, + proton-vpn-network-manager-wireguard, + proton-vpn-session, + pycairo, + pygobject3, + withIndicator ? true, + libappindicator-gtk3, + libayatana-appindicator, }: buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.3.0"; + version = "4.4.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-H4m4u9zksab47W5aIsQZPQTPEYiXbmrVCnT67b+A5Tc="; + hash = "sha256-e581FgXrk1cfjsl/UaG9M+3VBYXcV0mggeLeEW9s9KM="; }; nativeBuildInputs = [ # Needed for the NM namespace gobject-introspection - setuptools wrapGAppsHook3 ]; @@ -52,6 +51,10 @@ buildPythonApplication rec { libayatana-appindicator ]; + build-system = [ + setuptools + ]; + propagatedBuildInputs = [ dbus-python packaging @@ -65,6 +68,7 @@ buildPythonApplication rec { proton-vpn-logger proton-vpn-network-manager proton-vpn-network-manager-openvpn + proton-vpn-network-manager-wireguard proton-vpn-session pycairo pygobject3 @@ -76,25 +80,15 @@ buildPythonApplication rec { install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps ''; - nativeCheckInputs = [ - pytest-cov-stub - pytestCheckHook - ]; - - preCheck = '' - # Needed for Permission denied: '/homeless-shelter' - export HOME=$(mktemp -d) - ''; - # Gets a segmentation fault after the widgets test doCheck = false; - meta = with lib; { + meta = { description = "Proton VPN GTK app for Linux"; homepage = "https://github.com/ProtonVPN/proton-vpn-gtk-app"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "protonvpn-app"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sebtm ]; }; } From 96c8a4f14959a27b1ffafd7678781b7c2fe93f75 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 5 Sep 2024 19:39:44 +0200 Subject: [PATCH 27/61] protonvpn-gui_legacy: nixfmt (rfc-style) --- .../networking/protonvpn-gui/legacy.nix | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix index a749b2875aff..19a2fe7288e9 100644 --- a/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ b/pkgs/applications/networking/protonvpn-gui/legacy.nix @@ -1,22 +1,24 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, setuptools -, wrapGAppsHook3 -, gdk-pixbuf -, glib-networking -, gobject-introspection -, imagemagick -, librsvg -, pango -, python3 -, webkitgtk -# Python libs -, protonvpn-nm-lib -, psutil -# Optionals -, withIndicator ? true -, libappindicator-gtk3 }: +{ + lib, + buildPythonApplication, + fetchFromGitHub, + setuptools, + wrapGAppsHook3, + gdk-pixbuf, + glib-networking, + gobject-introspection, + imagemagick, + librsvg, + pango, + python3, + webkitgtk, + # Python libs + protonvpn-nm-lib, + psutil, + # Optionals + withIndicator ? true, + libappindicator-gtk3, +}: buildPythonApplication rec { pname = "protonvpn-gui"; From 301d342dca3d2ac244c07728bbbe6beefee0f62a Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 12 Sep 2024 00:09:27 +0200 Subject: [PATCH 28/61] protonvpn-gui/proton-*: refactor to use build-system and dependencies --- pkgs/applications/networking/protonvpn-gui/default.nix | 7 ++++++- pkgs/development/python-modules/proton-core/default.nix | 4 ++-- .../proton-keyring-linux-secretservice/default.nix | 4 ++-- .../python-modules/proton-keyring-linux/default.nix | 4 ++-- .../python-modules/proton-vpn-api-core/default.nix | 4 ++-- .../python-modules/proton-vpn-connection/default.nix | 4 ++-- .../default.nix | 5 ++++- .../proton-vpn-killswitch-network-manager/default.nix | 5 ++++- .../python-modules/proton-vpn-killswitch/default.nix | 4 ++-- .../python-modules/proton-vpn-logger/default.nix | 6 ++++-- .../proton-vpn-network-manager-openvpn/default.nix | 5 ++++- .../proton-vpn-network-manager-wireguard/default.nix | 5 ++++- .../python-modules/proton-vpn-network-manager/default.nix | 5 ++++- .../python-modules/proton-vpn-session/default.nix | 6 ++++-- 14 files changed, 46 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index f0349f09b720..9484a1c42dcf 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -55,7 +55,7 @@ buildPythonApplication rec { setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dbus-python packaging proton-core @@ -80,6 +80,11 @@ buildPythonApplication rec { install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps ''; + preCheck = '' + # Needed for Permission denied: '/homeless-shelter' + export HOME=$(mktemp -d) + ''; + # Gets a segmentation fault after the widgets test doCheck = false; diff --git a/pkgs/development/python-modules/proton-core/default.nix b/pkgs/development/python-modules/proton-core/default.nix index d42dc2c8954f..12df2934bff2 100644 --- a/pkgs/development/python-modules/proton-core/default.nix +++ b/pkgs/development/python-modules/proton-core/default.nix @@ -25,9 +25,9 @@ buildPythonPackage rec { hash = "sha256-IiKmtgcCSe2q3qaNuUSaC/D/vSQzVq7w8VN2Xq81+tQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bcrypt aiohttp pyopenssl diff --git a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix index 7d4a36b5e5e8..4bb419d21b20 100644 --- a/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux-secretservice/default.nix @@ -20,9 +20,9 @@ buildPythonPackage rec { hash = "sha256-IZPT2bL/1YD2TH/djwIQHUE1RRbYMTkQDacjjoqDQWo="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ proton-keyring-linux ]; + dependencies = [ proton-keyring-linux ]; pythonImportsCheck = [ "proton.keyring_linux" ]; diff --git a/pkgs/development/python-modules/proton-keyring-linux/default.nix b/pkgs/development/python-modules/proton-keyring-linux/default.nix index ad5b4d46779c..51617e71a0f8 100644 --- a/pkgs/development/python-modules/proton-keyring-linux/default.nix +++ b/pkgs/development/python-modules/proton-keyring-linux/default.nix @@ -21,9 +21,9 @@ buildPythonPackage rec { hash = "sha256-c2wdbd8Hkz2hF9zYMy4/V/W6uZRItz7tWqLJqTsJoHU="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ keyring proton-core ]; diff --git a/pkgs/development/python-modules/proton-vpn-api-core/default.nix b/pkgs/development/python-modules/proton-vpn-api-core/default.nix index 0191084642dd..219dd94b3142 100644 --- a/pkgs/development/python-modules/proton-vpn-api-core/default.nix +++ b/pkgs/development/python-modules/proton-vpn-api-core/default.nix @@ -26,9 +26,9 @@ buildPythonPackage rec { hash = "sha256-n4TZkp2ZMSJ1w1wQUMsAhX8kmWu59udlsXXEhIM83mI="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ distro proton-core proton-vpn-connection diff --git a/pkgs/development/python-modules/proton-vpn-connection/default.nix b/pkgs/development/python-modules/proton-vpn-connection/default.nix index d527df7fbbd6..7da811dc3a31 100644 --- a/pkgs/development/python-modules/proton-vpn-connection/default.nix +++ b/pkgs/development/python-modules/proton-vpn-connection/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { hash = "sha256-Ze/te0G0tDzyZPGVVqvuJlZoHWJqJ36LnHO+Cy5nxx8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jinja2 proton-core proton-vpn-killswitch diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix index e5dcedfb6d3b..8ff9321fc57c 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager-wireguard/default.nix @@ -30,10 +30,13 @@ buildPythonPackage rec { nativeBuildInputs = [ # Solves ImportError: cannot import name NM, introspection typelib not found gobject-introspection + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ # Needed here for the NM namespace networkmanager proton-vpn-api-core diff --git a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix index 5dbf2eb5fe73..c8d30741930c 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch-network-manager/default.nix @@ -29,10 +29,13 @@ buildPythonPackage rec { nativeBuildInputs = [ # Solves ImportError: cannot import name NM, introspection typelib not found gobject-introspection + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ # Needed here for the NM namespace networkmanager proton-vpn-api-core diff --git a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix index 65633318496e..ae83dd1e5baa 100644 --- a/pkgs/development/python-modules/proton-vpn-killswitch/default.nix +++ b/pkgs/development/python-modules/proton-vpn-killswitch/default.nix @@ -20,9 +20,9 @@ buildPythonPackage rec { hash = "sha256-XZqjAhxgIiATJd3JcW2WWUMC1b6+cfZRhXlIPyMUFH8="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ proton-core ]; + dependencies = [ proton-core ]; pythonImportsCheck = [ "proton.vpn.killswitch.interface" ]; diff --git a/pkgs/development/python-modules/proton-vpn-logger/default.nix b/pkgs/development/python-modules/proton-vpn-logger/default.nix index 7211293b99c8..402b6e0e4910 100644 --- a/pkgs/development/python-modules/proton-vpn-logger/default.nix +++ b/pkgs/development/python-modules/proton-vpn-logger/default.nix @@ -20,9 +20,11 @@ buildPythonPackage rec { hash = "sha256-/LfMjyTs/EusgnKEQugsdJzqDZBvaAhbsTUVLDCRw0I="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ proton-core ]; + dependencies = [ proton-core ]; pythonImportsCheck = [ "proton.vpn.logging" ]; diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix index 3cdbc53aa6e8..25c9715e7e6b 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager-openvpn/default.nix @@ -25,10 +25,13 @@ buildPythonPackage rec { nativeBuildInputs = [ # Solves Namespace NM not available gobject-introspection + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ proton-core proton-vpn-network-manager ]; diff --git a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix index 516b3306fc6b..e32a4b5a1b88 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager-wireguard/default.nix @@ -26,10 +26,13 @@ buildPythonPackage rec { nativeBuildInputs = [ # Solves Namespace NM not available gobject-introspection + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ proton-core proton-vpn-killswitch-network-manager-wireguard proton-vpn-network-manager diff --git a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix index 4409103ca7d6..fea0d2e304d0 100644 --- a/pkgs/development/python-modules/proton-vpn-network-manager/default.nix +++ b/pkgs/development/python-modules/proton-vpn-network-manager/default.nix @@ -30,10 +30,13 @@ buildPythonPackage rec { nativeBuildInputs = [ # Needed to recognize the NM namespace gobject-introspection + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ # Needed here for the NM namespace networkmanager proton-core diff --git a/pkgs/development/python-modules/proton-vpn-session/default.nix b/pkgs/development/python-modules/proton-vpn-session/default.nix index c74e55d1b8f4..ee27bfb9b466 100644 --- a/pkgs/development/python-modules/proton-vpn-session/default.nix +++ b/pkgs/development/python-modules/proton-vpn-session/default.nix @@ -28,9 +28,11 @@ buildPythonPackage rec { hash = "sha256-/5ju/2bxhqK6JWchkxFe3amBKHtO98GCVQWIrUsn+nQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ cryptography distro proton-core From 6157b42ca70bacfc249988398a65272874d3fe49 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sat, 14 Sep 2024 10:29:43 -0700 Subject: [PATCH 29/61] doc/hooks/haredo: add documentation Hook introduced in #269767 by @pbsds. Part of #341479. --- doc/hooks/haredo.section.md | 29 +++++++++++++++++++++++++++++ doc/hooks/index.md | 1 + 2 files changed, 30 insertions(+) create mode 100644 doc/hooks/haredo.section.md diff --git a/doc/hooks/haredo.section.md b/doc/hooks/haredo.section.md new file mode 100644 index 000000000000..e7ec269a7364 --- /dev/null +++ b/doc/hooks/haredo.section.md @@ -0,0 +1,29 @@ +# `haredo` {#haredo-hook} + +This hook uses [the `haredo` command runner](https://sr.ht/~autumnull/haredo/) to build, check, and install the package. It overrides `buildPhase`, `checkPhase`, and `installPhase` by default. + +The hook builds its targets in parallel if [`config.enableParallelBuilding`](#var-stdenv-enableParallelBuilding) is set to `true`. + +## `buildPhase` {#haredo-hook-buildPhase} + +This phase attempts to build the default target. + +[]{#haredo-hook-haredoBuildTargets} Targets can be explicitly set by adding a string to the `haredoBuildTargets` list. + +[]{#haredo-hook-dontUseHaredoBuild} This behavior can be disabled by setting `dontUseHaredoBuild` to `true`. + +## `checkPhase` {#haredo-hook-checkPhase} + +This phase searches for the `check.do` or `test.do` targets, running them if they exist. + +[]{#haredo-hook-haredoCheckTargets} Targets can be explicitly set by adding a string to the `haredoCheckTargets` list. + +[]{#haredo-hook-dontUseHaredoCheck} This behavior can be disabled by setting `dontUseHaredoCheck` to `true`. + +## `installPhase` {#haredo-hook-installPhase} + +This phase attempts to build the `install.do` target, if it exists. + +[]{#haredo-hook-haredoInstallTargets} Targets can be explicitly set by adding a string to the `haredoInstallTargets` list. + +[]{#haredo-hook-dontUseHaredoInstall} This behavior can be disabled by setting `dontUseHaredoInstall` to `true`. diff --git a/doc/hooks/index.md b/doc/hooks/index.md index 42a6553344b2..e49f470fffea 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -15,6 +15,7 @@ cmake.section.md gdk-pixbuf.section.md ghc.section.md gnome.section.md +haredo.section.md installShellFiles.section.md libiconv.section.md libxml2.section.md From 039893032ec0535ac8d9e143c36e086bd4b84f0d Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:23:08 +0800 Subject: [PATCH 30/61] vinagre: remove --- pkgs/by-name/vi/vinagre/package.nix | 70 ----------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/by-name/vi/vinagre/package.nix diff --git a/pkgs/by-name/vi/vinagre/package.nix b/pkgs/by-name/vi/vinagre/package.nix deleted file mode 100644 index cf5b182ed6b1..000000000000 --- a/pkgs/by-name/vi/vinagre/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchpatch, - pkg-config, - gtk3, - gnome, - adwaita-icon-theme, - vte, - libxml2, - gtk-vnc, - intltool, - libsecret, - itstool, - wrapGAppsHook3, - librsvg, -}: - -stdenv.mkDerivation rec { - pname = "vinagre"; - version = "3.22.0"; - - src = fetchurl { - url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/vinagre-${version}.tar.xz"; - hash = "sha256-zRzbrMolyNHev4R0VRVe55jD5nogkD34sijU7OVQXoI="; - }; - - patches = [ - # Pull fix pending upstream inclusion for -fno-common toolchain support: - # https://gitlab.gnome.org/Archive/vinagre/-/merge_requests/8 - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitlab.gnome.org/Archive/vinagre/-/commit/c51662cf4338516773d64776c3c92796917ff2bd.diff"; - hash = "sha256-KEdNcOMOFzu6BDRNQDqAic0PX6DunSZ4Nr9JOFJjyH4="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - intltool - itstool - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - vte - libxml2 - gtk-vnc - libsecret - adwaita-icon-theme - librsvg - ]; - - env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - - passthru = { - updateScript = gnome.updateScript { packageName = "vinagre"; }; - }; - - meta = with lib; { - description = "Remote desktop viewer for GNOME"; - mainProgram = "vinagre"; - homepage = "https://gitlab.gnome.org/Archive/vinagre"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 19bfd3ff3eef..aaaa2359ce1e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1603,6 +1603,7 @@ mapAliases ({ vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 + vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14 vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 From c92c230c35527fd713905dbd2e355396d7aff45d Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:26:31 +0800 Subject: [PATCH 31/61] gnome-hexgl: remove --- pkgs/games/gnome-hexgl/default.nix | 44 ------------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/games/gnome-hexgl/default.nix diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix deleted file mode 100644 index 41cc79f26c2e..000000000000 --- a/pkgs/games/gnome-hexgl/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, ninja -, meson -, pkg-config -, gthree -, gsound -, libepoxy -, gtk3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-hexgl"; - version = "unstable-2020-07-24"; - - src = fetchFromGitHub { - owner = "alexlarsson"; - repo = "gnome-hexgl"; - rev = "f47a351055a235730795341dcd6b2397cc4bfa0c"; - sha256 = "yZWGymaSUfnCP8VAEdDH64w0muSnRK/XPi1/IqTrE4k="; - }; - - nativeBuildInputs = [ - ninja - meson - pkg-config - ]; - - buildInputs = [ - gthree - gsound - libepoxy - gtk3 - ]; - - meta = with lib; { - description = "Gthree port of HexGL"; - mainProgram = "gnome-hexgl"; - homepage = "https://github.com/alexlarsson/gnome-hexgl"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index aaaa2359ce1e..548d8930055d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -563,6 +563,7 @@ mapAliases ({ gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25 gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 + gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7af2a949ef06..9a9a97cdd5e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35042,8 +35042,6 @@ with pkgs; gamepad-tool = callPackage ../games/gamepad-tool { }; - gnome-hexgl = callPackage ../games/gnome-hexgl { }; - gotypist = callPackage ../games/gotypist { }; heroic-unwrapped = callPackage ../games/heroic { From d49f90a01c2243068513277d45334f8ef65ff774 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:30:23 +0800 Subject: [PATCH 32/61] gmtp: remove --- pkgs/applications/misc/gmtp/default.nix | 39 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/applications/misc/gmtp/default.nix diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix deleted file mode 100644 index e3a33cace9cb..000000000000 --- a/pkgs/applications/misc/gmtp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings-desktop-schemas, wrapGAppsHook3 -}: - -let version = "1.3.11"; in - -stdenv.mkDerivation { - pname = "gmtp"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; - sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; - - enableParallelBuilding = true; - - # Workaround build failure on -fno-common toolchains: - # ld: gmtp-preferences.o:src/main.h:72: multiple definition of - # `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here - # TODO: can be removed when 1.4.0 is released. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preFixup = '' - gappsWrapperArgs+=(--add-flags "--datapath $out/share"); - ''; - - meta = { - description = "Simple MP3 and Media player client for UNIX and UNIX like systems"; - mainProgram = "gmtp"; - homepage = "https://gmtp.sourceforge.io"; - platforms = lib.platforms.linux; - maintainers = [ ]; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 548d8930055d..6a35aeab9af5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -520,6 +520,7 @@ mapAliases ({ gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a9a97cdd5e8..6b4283cd705e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30365,8 +30365,6 @@ with pkgs; gmpc = callPackage ../applications/audio/gmpc { }; - gmtp = callPackage ../applications/misc/gmtp { }; - gnomecast = callPackage ../applications/video/gnomecast { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; From 27fc947777ba42ae791347c48a07b4480097a487 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:35:04 +0800 Subject: [PATCH 33/61] mp3info: remove --- pkgs/applications/audio/mp3info/default.nix | 46 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 pkgs/applications/audio/mp3info/default.nix diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix deleted file mode 100644 index 86c1f87f5227..000000000000 --- a/pkgs/applications/audio/mp3info/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: - -stdenv.mkDerivation rec { - pname = "mp3info"; - version = "0.8.5a"; - - src = fetchurl { - url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${pname}/${pname}-${version}.tgz"; - sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses gtk2 ]; - - hardeningDisable = [ "format" ]; - - configurePhase = - '' sed -i Makefile \ - -e "s|^prefix=.*$|prefix=$out|g ; - s|/bin/rm|rm|g ; - s|/usr/bin/install|install|g" - ''; - - preInstall = - '' mkdir -p "$out/bin" - mkdir -p "$out/man/man1" - ''; - - meta = { - description = "MP3 technical info viewer and ID3 1.x tag editor"; - - longDescription = - '' MP3Info is a little utility used to read and modify the ID3 tags of - MP3 files. MP3Info can also display various techincal aspects of an - MP3 file including playing time, bit-rate, sampling frequency and - other attributes in a pre-defined or user-specifiable output format. - ''; - - homepage = "http://www.ibiblio.org/mp3info/"; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6a35aeab9af5..4d1f88c21c9e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1016,6 +1016,7 @@ mapAliases ({ moz-phab = mozphab; # Added 2022-08-09 mozart-binary = throw "'mozart-binary' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 mozart = throw "'mozart' has been renamed to/replaced by 'mozart2-binary'"; # Converted to throw 2023-09-10 + mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 mpdevil = plattenalbum; # Added 2024-05-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b4283cd705e..e42f6d5f82b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31775,8 +31775,6 @@ with pkgs; mp3gain = callPackage ../applications/audio/mp3gain { }; - mp3info = callPackage ../applications/audio/mp3info { }; - mp3splt = callPackage ../applications/audio/mp3splt { }; mp3val = callPackage ../applications/audio/mp3val { }; From 50713e031f80040e74eef4bc50bf6d01c6159228 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:54:38 +0800 Subject: [PATCH 34/61] gmtk: remove --- pkgs/development/libraries/gmtk/default.nix | 32 ------------------- .../libraries/gmtk/fix-paths.patch | 20 ------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/development/libraries/gmtk/default.nix delete mode 100644 pkgs/development/libraries/gmtk/fix-paths.patch diff --git a/pkgs/development/libraries/gmtk/default.nix b/pkgs/development/libraries/gmtk/default.nix deleted file mode 100644 index 6f2906a8234e..000000000000 --- a/pkgs/development/libraries/gmtk/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, libtool, pkg-config, intltool, glib, gtk3 -, libpulseaudio, mplayer, gnome_mplayer }: - -stdenv.mkDerivation rec { - pname = "gmtk"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "kdekorte"; - repo = "gmtk"; - rev = "v${version}"; - sha256 = "1zb5m1y1gckal3140gvx31572a6xpccwfmdwa1w5lx2wdq1pwk1i"; - }; - - nativeBuildInputs = [ libtool pkg-config intltool ]; - buildInputs = [ glib gtk3 libpulseaudio ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - mplayer = "${mplayer}/bin/mplayer"; - }) - ]; - - meta = with lib; { - description = "Common functions for gnome-mplayer and gecko-mediaplayer"; - homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; - license = licenses.gpl2; - maintainers = gnome_mplayer.meta.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/gmtk/fix-paths.patch b/pkgs/development/libraries/gmtk/fix-paths.patch deleted file mode 100644 index 64738300aba4..000000000000 --- a/pkgs/development/libraries/gmtk/fix-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/gmtk_media_player.c -+++ b/src/gmtk_media_player.c -@@ -2449,7 +2449,7 @@ - player->minimum_mplayer = detect_mplayer_features(player); - - if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { -- argv[argn++] = g_strdup_printf("mplayer"); -+ argv[argn++] = g_strdup_printf("@mplayer@"); - } else { - argv[argn++] = g_strdup_printf("%s", player->mplayer_binary); - } -@@ -4135,7 +4135,7 @@ - return ret; - - if (player->mplayer_binary == NULL || !g_file_test(player->mplayer_binary, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", player->mplayer_binary); - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4d1f88c21c9e..a323daad49ac 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -520,6 +520,7 @@ mapAliases ({ gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e42f6d5f82b2..77e8d00a7e34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30312,8 +30312,6 @@ with pkgs; glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; - gmtk = callPackage ../development/libraries/gmtk { }; - gmu = callPackage ../applications/audio/gmu { }; gnaural = callPackage ../applications/audio/gnaural { }; From 6abef67bb487ad81774c6cf5f2c255f8e138a32b Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:37:31 +0800 Subject: [PATCH 35/61] gnome_mplayer: remove --- .../video/gnome-mplayer/default.nix | 39 --------- .../video/gnome-mplayer/fix-paths.patch | 87 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 pkgs/applications/video/gnome-mplayer/default.nix delete mode 100644 pkgs/applications/video/gnome-mplayer/fix-paths.patch diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix deleted file mode 100644 index 3d6b281ef07b..000000000000 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib -, libnotify, libpulseaudio, mplayer, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - pname = "gnome-mplayer"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "kdekorte"; - repo = "gnome-mplayer"; - rev = "v${version}"; - sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; - }; - - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; - buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - mencoder = "${mplayer}/bin/mencoder"; - mplayer = "${mplayer}/bin/mplayer"; - }) - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: mpris-interface.o:src/playlist.h:32: multiple definition of - # `plclose'; gui.o:src/playlist.h:32: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - description = "Gnome MPlayer, a simple GUI for MPlayer"; - mainProgram = "gnome-mplayer"; - homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch deleted file mode 100644 index ede4991c4662..000000000000 --- a/pkgs/applications/video/gnome-mplayer/fix-paths.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/src/gui.c -+++ b/src/gui.c -@@ -7470,7 +7470,7 @@ - filename = g_strdup_printf("%s/00000001.jpg", dirname); - g_free(basepath); - // run mplayer and try to get the first frame and convert it to a jpeg -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/property_page_common.c -+++ b/src/property_page_common.c -@@ -80,7 +80,7 @@ - MetaData *ret; - ret = g_new0(MetaData, 1); - -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("null"); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/support.c -+++ b/src/support.c -@@ -566,7 +566,7 @@ - } else { - playlist = FALSE; - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -728,7 +728,7 @@ - playlist = FALSE; - // run mplayer and try to get the first frame and convert it to a jpeg - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -825,7 +825,7 @@ - playlist = FALSE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1251,7 +1251,7 @@ - gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name); - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1532,7 +1532,7 @@ - return 0; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1597,7 +1597,7 @@ - - if (control_id == 0) { - ac = 0; -- av[ac++] = g_strdup_printf("mencoder"); -+ av[ac++] = g_strdup_printf("@mencoder@"); - av[ac++] = g_strdup_printf("-ovc"); - av[ac++] = g_strdup_printf("copy"); - av[ac++] = g_strdup_printf("-oac"); -@@ -2830,7 +2830,7 @@ - gboolean ret = TRUE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a323daad49ac..a62f97668656 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -567,6 +567,7 @@ mapAliases ({ gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 + gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 gnome-resources = resources; # added 2023-12-10 gnome_user_docs = throw "'gnome_user_docs' has been renamed to/replaced by 'gnome-user-docs'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77e8d00a7e34..0836ec8f476a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30316,8 +30316,6 @@ with pkgs; gnaural = callPackage ../applications/audio/gnaural { }; - gnome_mplayer = callPackage ../applications/video/gnome-mplayer { }; - gnumeric = callPackage ../applications/office/gnumeric { }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; From 578b246a0788ecd34dcb845ad2bf56ee32824196 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:41:11 +0800 Subject: [PATCH 36/61] gtkperf: remove --- .../tools/misc/gtkperf/bench.patch | 60 ------------------- .../tools/misc/gtkperf/default.nix | 26 -------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 pkgs/development/tools/misc/gtkperf/bench.patch delete mode 100644 pkgs/development/tools/misc/gtkperf/default.nix diff --git a/pkgs/development/tools/misc/gtkperf/bench.patch b/pkgs/development/tools/misc/gtkperf/bench.patch deleted file mode 100644 index 3d00a03e9a58..000000000000 --- a/pkgs/development/tools/misc/gtkperf/bench.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- gtkperf/src/callbacks.c 2005-10-30 11:33:42.000000000 +0000 -+++ gtkperf-patched/src/callbacks.c 2008-05-23 23:41:17.000000000 +0100 -@@ -219,6 +219,13 @@ - } - - -+void -+on_cmdline_test(char *optarg) -+{ -+ appdata->test_type = atoi(optarg); -+} -+ -+ - /* Initialize appdata */ - void - setup_appdata(AppData * appdata_in) -@@ -398,7 +405,7 @@ - appdata->pixbuf_drawing = gdk_pixbuf_new_from_file (filename, NULL); - - gtk_combo_box_set_active (GTK_COMBO_BOX (appdata->combobox_testtype), -- 0); -+ appdata->test_type); - - /* create end mark to info textview */ - GtkTextIter iter; ---- gtkperf/src/callbacks.h 2005-10-30 10:21:23.000000000 +0000 -+++ gtkperf-patched/src/callbacks.h 2008-05-23 23:22:30.000000000 +0100 -@@ -13,6 +13,7 @@ - void on_cmdline_run_all (); - void on_cmdline_help () ; - void on_cmdline_count (char *optarg) ; -+void on_cmdline_test (char *optarg) ; - void on_window_main_show (AppData * data); - - gboolean ---- gtkperf/src/main.c 2005-10-30 11:26:42.000000000 +0000 -+++ gtkperf-patched/src/main.c 2008-05-23 23:44:02.000000000 +0100 -@@ -65,9 +65,10 @@ - {"help", 0, 0, 0}, - {"automatic", 0, 0, 0}, - {"count", 1, 0, 0}, -+ {"test", 1, 0, 0}, - {0, 0, 0, 0} - }; -- c = getopt_long (argc, argv, "hac:", -+ c = getopt_long (argc, argv, "hac:t:", - long_options, &option_index); - if (c == -1) - break; -@@ -104,6 +105,10 @@ - on_cmdline_count(optarg); - break; - -+ case 't': -+ on_cmdline_test(optarg); -+ break; -+ - default: - case 'h': - on_cmdline_help (); diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix deleted file mode 100644 index 0d3da390847a..000000000000 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchurl, gtk2, pkg-config, libintl }: - -stdenv.mkDerivation rec { - pname = "gtkperf"; - version = "0.40.0"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}_${lib.versions.majorMinor version}.tar.gz"; - sha256 = "0yxj3ap3yfi76vqg6xjvgc16nfi9arm9kp87s35ywf10fd73814p"; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 libintl ]; - - # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db - patches = [ ./bench.patch ]; - - meta = with lib; { - description = "Application designed to test GTK performance"; - mainProgram = "gtkperf"; - homepage = "https://gtkperf.sourceforge.net/"; - license = with licenses; [ gpl2 ]; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a62f97668656..08ef844b4c5f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -644,6 +644,7 @@ mapAliases ({ grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtkcord4 = dissent; # Added 2024-03-10 + gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gtkpod = throw "'gtkpod' was removed due to one of its dependencies, 'anjuta' being unmaintained"; # Added 2024-01-16 guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09 guile-disarchive = disarchive; # Added 2023-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0836ec8f476a..da9beb6548b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8441,8 +8441,6 @@ with pkgs; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; - gtkperf = callPackage ../development/tools/misc/gtkperf { }; - gtkradiant = callPackage ../applications/misc/gtkradiant { }; gtk-frdp = callPackage ../development/libraries/gtk-frdp { }; From 9af58a2f4f7114954d6689290b2adf34efe6e895 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 21:44:17 +0800 Subject: [PATCH 37/61] gnome-dictionary: remove --- pkgs/by-name/gn/gnome-dictionary/package.nix | 86 -------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 pkgs/by-name/gn/gnome-dictionary/package.nix diff --git a/pkgs/by-name/gn/gnome-dictionary/package.nix b/pkgs/by-name/gn/gnome-dictionary/package.nix deleted file mode 100644 index f0b600f58dc1..000000000000 --- a/pkgs/by-name/gn/gnome-dictionary/package.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, meson -, ninja -, pkg-config -, desktop-file-utils -, appstream-glib -, libxslt -, libxml2 -, gettext -, itstool -, wrapGAppsHook3 -, docbook_xsl -, docbook_xml_dtd_43 -, gnome -, adwaita-icon-theme -, gtk3 -, glib -, gsettings-desktop-schemas -}: - -stdenv.mkDerivation rec { - pname = "gnome-dictionary"; - version = "40.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/gnome-dictionary-${version}.tar.xz"; - hash = "sha256-LmUMKkzqjMTQLUpYPEVsu8nRhx6RjH3E3ggd7R2DDbU="; - }; - - patches = [ - # Fix test dependencies with meson 0.57, can be removed on next bump - # We need to explicitly depend on the generated files. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/87c026cfe4acbcfc62d15950f88a71d8d9678c7e.patch"; - hash = "sha256-tKesWeOK3OqOxrXm4dZvCZHHdTD7AQbYDjtYDCsLd3A="; - }) - # Fix build with meson 0.61, can be removed on next bump - # data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. - (fetchpatch { - url = "https://gitlab.gnome.org/Archive/gnome-dictionary/-/commit/cf3f8a67cd6f3059c555ed9cf0f5fba10abb7f68.patch"; - hash = "sha256-cIRM6ACqsnEo2JWYvr6EBye5o0BudugZMShCe1U5hz8="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook3 - libxml2 - gettext - itstool - desktop-file-utils - appstream-glib - libxslt - docbook_xsl - docbook_xml_dtd_43 - ]; - - buildInputs = [ - gtk3 - glib - gsettings-desktop-schemas - adwaita-icon-theme - ]; - - doCheck = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-dictionary"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/Archive/gnome-dictionary"; - description = "Dictionary is the GNOME application to look up definitions"; - mainProgram = "gnome-dictionary"; - maintainers = [ ]; - license = licenses.gpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 08ef844b4c5f..7a416164e879 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -564,6 +564,7 @@ mapAliases ({ gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25 gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25 gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25 + gnome-dictionary = throw "'gnome-dictionary' has been removed as it has been archived upstream. Consider using 'wordbook' instead"; # Added 2024-09-14 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 From 8d9d116f351dba71e459a0ddf40d8d7b76d54704 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:02:33 +0800 Subject: [PATCH 38/61] psensor: remove --- pkgs/tools/system/psensor/default.nix | 51 --------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/tools/system/psensor/default.nix diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix deleted file mode 100644 index 3d0fa0d62ac2..000000000000 --- a/pkgs/tools/system/psensor/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, lm_sensors -, libgtop -, libatasmart -, gtk3 -, libnotify -, udisks2 -, libXNVCtrl -, wrapGAppsHook3 -, libappindicator -}: - -stdenv.mkDerivation rec { - pname = "psensor"; - - version = "1.2.1"; - - src = fetchurl { - url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz"; - sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8"; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - - buildInputs = [ - lm_sensors - libgtop - libatasmart - gtk3 - libnotify - udisks2 - libappindicator - ]; - - preConfigure = '' - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXNVCtrl}/include -Wno-error" - NIX_LDFLAGS="$NIX_LDFLAGS -L${libXNVCtrl}/lib" - ''; - - meta = with lib; { - description = "Graphical hardware monitoring application for Linux"; - homepage = "https://wpitchoune.net/psensor/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ ]; - mainProgram = "psensor"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7a416164e879..9caad6509e41 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1282,6 +1282,7 @@ mapAliases ({ protonup = protonup-ng; # Added 2022-11-06 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 + psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 pyls-black = throw "pyls-black has been removed from nixpkgs. Use python-lsp-black instead."; # Added 2023-01-09 pyls-mypy = throw "pyls-mypy has been removed from nixpkgs. Use pylsp-mypy instead."; # Added 2023-01-09 pygmentex = throw "'pygmentex' has been renamed to/replaced by 'texlive.bin.pygmentex'"; # Converted to throw 2023-09-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da9beb6548b8..0b0110bd8bfe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11682,10 +11682,6 @@ with pkgs; psudohash = callPackage ../tools/security/psudohash { }; - psensor = callPackage ../tools/system/psensor { - libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; - }; - pubs = callPackage ../tools/misc/pubs { }; pulldown-cmark = callPackage ../tools/typesetting/pulldown-cmark { }; From dae90a0d29343bbb9ffc5d3f7bcfb816fca3e639 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:05:32 +0800 Subject: [PATCH 39/61] gmpc: remove --- pkgs/applications/audio/gmpc/default.nix | 67 ------------------- .../gmpc/libmpd-11.8.17-remove-strndup.patch | 15 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 pkgs/applications/audio/gmpc/default.nix delete mode 100644 pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix deleted file mode 100644 index e3f5f4580d6f..000000000000 --- a/pkgs/applications/audio/gmpc/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libtool -, intltool -, pkg-config -, glib -, gtk2 -, curl -, libmpdclient -, libsoup -, gob2 -, vala -, libunique -, libSM -, libICE -, sqlite -, hicolor-icon-theme -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gmpc"; - version = "11.8.16"; - - libmpd = stdenv.mkDerivation { - pname = "libmpd"; - version = "11.8.17"; - src = fetchurl { - url = "https://download.sarine.nl/Programs/gmpc/${lib.versions.majorMinor version}/libmpd-${version}.tar.gz"; - sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; - }; - patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - }; - - src = fetchurl { - url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz"; - sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; - }; - - nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook3 ]; - buildInputs = [ - glib - gtk2 - curl - libmpdclient - libsoup - libunique - libmpd - libSM - libICE - sqlite - hicolor-icon-theme - ]; - - meta = with lib; { - homepage = "https://gmpclient.org"; - description = "GTK2 frontend for Music Player Daemon"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} -# TODO: what is this libmpd derivation embedded above? diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch deleted file mode 100644 index ad4fdc02ef3e..000000000000 --- a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h -index c84c3a4..51be441 100644 ---- a/src/libmpd-internal.h -+++ b/src/libmpd-internal.h -@@ -206,10 +206,6 @@ int mpd_unlock_conn(MpdObj *mi); - MpdData * mpd_misc_sort_tag_list(MpdData *data); - - --#ifndef HAVE_STRNDUP --char * strndup (const char *s, size_t n); --#endif -- - int mpd_server_get_allowed_commands(MpdObj *mi); - typedef enum _MpdSearchType { - MPD_SEARCH_TYPE_NONE, diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9caad6509e41..bb96a8f8455d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -520,6 +520,7 @@ mapAliases ({ gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b0110bd8bfe..a4014bbb166b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30353,8 +30353,6 @@ with pkgs; gqview = callPackage ../applications/graphics/gqview { }; - gmpc = callPackage ../applications/audio/gmpc { }; - gnomecast = callPackage ../applications/video/gnomecast { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { }; From 68467caab1361c1c55d00678398eef53fccf8155 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:16:59 +0800 Subject: [PATCH 40/61] xprite-editor: remove --- pkgs/tools/misc/xprite-editor/default.nix | 47 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/tools/misc/xprite-editor/default.nix diff --git a/pkgs/tools/misc/xprite-editor/default.nix b/pkgs/tools/misc/xprite-editor/default.nix deleted file mode 100644 index f5581bd354c1..000000000000 --- a/pkgs/tools/misc/xprite-editor/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, rustPlatform -, gtk3 -, AppKit -, pkg-config -, python3 -}: - -rustPlatform.buildRustPackage rec { - pname = "xprite-editor-unstable"; - version = "2019-09-22"; - - src = fetchFromGitHub { - owner = "rickyhan"; - repo = "xprite-editor"; - rev = "7f899dff982642927024540e4bafd74e4ea5e52a"; - sha256 = "1k6k8y8gg1vdmyjz27q689q9rliw0rrnzwlpjcd4vlc6swaq9ahx"; - fetchSubmodules = true; - # Rename unicode file name which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalization. - postFetch = '' - mv $out/config/palettes/Sweet\ Guaran*.hex $out/config/palettes/Sweet\ Guarana.hex - ''; - }; - - buildInputs = lib.optionals stdenv.isLinux [ gtk3 ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ]; - - cargoHash = "sha256-k53nSYBIJJHPivz6IvF5t0eZVkTvj1ZT3RyHdoy5MXw="; - - cargoBuildFlags = [ "--bin" "xprite-native" ]; - - meta = with lib; { - # error[E0034]: multiple applicable items in scope - # multiple `clamp` found - # https://github.com/NixOS/nixpkgs/issues/146949 - broken = true; - homepage = "https://github.com/rickyhan/xprite-editor"; - description = "Pixel art editor"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bb96a8f8455d..c62857b2c216 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1676,6 +1676,7 @@ mapAliases ({ xmlada = gnatPackages.xmlada; # Added 2024-02-25 xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15 xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18 + xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 xvfb_run = xvfb-run; # Added 2021-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4014bbb166b..4458f5e4120b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14225,10 +14225,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - xprite-editor = callPackage ../tools/misc/xprite-editor { - inherit (darwin.apple_sdk.frameworks) AppKit; - }; - xq-xml = callPackage ../tools/text/xml/xq { }; xsecurelock = callPackage ../tools/X11/xsecurelock { }; From 646ef5a89cf9d549b98157eaeba3f8dd79c8993f Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:23:04 +0800 Subject: [PATCH 41/61] aumix: remove --- pkgs/applications/audio/aumix/default.nix | 49 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/applications/audio/aumix/default.nix diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix deleted file mode 100644 index ef0560fdc2ad..000000000000 --- a/pkgs/applications/audio/aumix/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, gettext -, ncurses -, gtkGUI ? false -, pkg-config -, gtk2 -}: - -stdenv.mkDerivation rec { - pname = "aumix"; - version = "2.9.1"; - - src = fetchurl { - url = "http://www.jpj.net/~trevor/aumix/releases/aumix-${version}.tar.bz2"; - sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; - }; - - patches = [ - # Pull Gentoo fix for -fno-common toolchains. Upstream does not - # seem to have the contacts - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/aumix/files/aumix-2.9.1-fno-common.patch?id=496c9ec7355f06f6d1d19be780a6981503e6df1f"; - sha256 = "0qwylhx1hawsmx1pc7ykrjq9phksc73dq9rss6ggq15n3ggnc95y"; - }) - ]; - - nativeBuildInputs = lib.optionals gtkGUI [ pkg-config ]; - - buildInputs = [ gettext ncurses ] - ++ lib.optionals gtkGUI [ gtk2 ]; - - configureFlags = lib.optionals (!gtkGUI) ["--without-gtk"]; - - meta = with lib; { - description = "Audio mixer for X and the console"; - longDescription = '' - Aumix adjusts an audio mixer from X, the console, a terminal, - the command line or a script. - ''; - homepage = "http://www.jpj.net/~trevor/aumix.html"; - license = licenses.gpl2Plus; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c62857b2c216..4dba8d534b76 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -138,6 +138,7 @@ mapAliases ({ atomPackages = throw "'atomPackages' has been removed because 'atom' is discontinued and deprecated. Consider using 'pulsar', a maintained fork"; # Added 2023-10-01 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 + aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19 avldrums-lv2 = x42-avldrums; # Added 2020-03-29 avrlibcCross = avrlibc; # Added 2024-09-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4458f5e4120b..32e83cb21e68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28822,10 +28822,6 @@ with pkgs; armcord = callPackage ../applications/networking/instant-messengers/armcord { }; - aumix = callPackage ../applications/audio/aumix { - gtkGUI = false; - }; - autopanosiftc = callPackage ../applications/graphics/autopanosiftc { }; ausweisapp = qt6Packages.callPackage ../applications/misc/ausweisapp { }; From 4b37f165fda99debcb8230cf06164de28b09049b Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:29:08 +0800 Subject: [PATCH 42/61] mhwaveedit: remove --- .../applications/audio/mhwaveedit/default.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/applications/audio/mhwaveedit/default.nix diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix deleted file mode 100644 index 5714de0ee7b4..000000000000 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsa-lib, autoreconfHook, gtk2, libjack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame -, vorbis-tools }: - -stdenv.mkDerivation rec { - pname = "mhwaveedit"; - version = "1.4.24"; - - src = fetchFromGitHub { - owner = "magnush"; - repo = "mhwaveedit"; - rev = "v${version}"; - sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y"; - }; - - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - - preAutoreconf = "(cd docgen && sh gendocs.sh)"; - - buildInputs = [ - SDL alsa-lib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio - ]; - - configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; - - postInstall = '' - wrapProgram $out/bin/mhwaveedit \ - --prefix PATH : ${lame}/bin/ \ - --prefix PATH : ${vorbis-tools}/bin/ - ''; - - meta = with lib; { - description = "Graphical program for editing, playing and recording sound files"; - mainProgram = "mhwaveedit"; - homepage = "https://github.com/magnush/mhwaveedit"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4dba8d534b76..57da02c21e62 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -984,6 +984,7 @@ mapAliases ({ mdt = md-tui; # Added 2024-09-03 meme = meme-image-generator; # Added 2021-04-21 mess = throw "'mess' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 + mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; microcodeAmd = microcode-amd; # Added 2024-09-08 microcodeIntel = microcode-intel; # Added 2024-09-08 microsoft_gsl = microsoft-gsl; # Added 2023-05-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32e83cb21e68..897b92d3b779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31595,10 +31595,6 @@ with pkgs; metersLv2 = callPackage ../applications/audio/meters_lv2 { }; - mhwaveedit = callPackage ../applications/audio/mhwaveedit { - autoreconfHook = buildPackages.autoreconfHook269; - }; - michabo = libsForQt5.callPackage ../applications/misc/michabo { }; mid2key = callPackage ../applications/audio/mid2key { }; From 19808ce7f0bc4cc694d3ef99c9edd7ae7388aa74 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 14 Sep 2024 22:37:30 +0800 Subject: [PATCH 43/61] l3afpad: remove --- pkgs/applications/editors/l3afpad/default.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/applications/editors/l3afpad/default.nix diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix deleted file mode 100644 index bcf20e4af55d..000000000000 --- a/pkgs/applications/editors/l3afpad/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, intltool, pkg-config, gtk3, fetchFromGitHub -, autoreconfHook, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - version = "unstable-2022-02-14"; - pname = "l3afpad"; - - src = fetchFromGitHub { - owner = "stevenhoneyman"; - repo = pname; - rev = "16f22222116b78b7f6a6fd83289937cdaabed624"; - sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 intltool ]; - buildInputs = [ gtk3 ]; - - meta = with lib; { - description = "Simple text editor forked from Leafpad using GTK+ 3.x"; - homepage = "https://github.com/stevenhoneyman/l3afpad"; - platforms = platforms.linux; - maintainers = [ ]; - license = licenses.gpl2; - mainProgram = "l3afpad"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 57da02c21e62..d206e71f3170 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -769,6 +769,7 @@ mapAliases ({ ### L ### + l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14 larynx = piper-tts; # Added 2023-05-09 LASzip = laszip; # Added 2024-06-12 LASzip2 = laszip_2; # Added 2024-06-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 897b92d3b779..7fa21dc916ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9792,8 +9792,6 @@ with pkgs; leafpad = callPackage ../applications/editors/leafpad { }; - l3afpad = callPackage ../applications/editors/l3afpad { }; - leanblueprint = with python3Packages; toPythonApplication leanblueprint; leanify = callPackage ../tools/misc/leanify { }; From 090dbc264ff67408f943efd165a16ea7d4d44f41 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 15 Sep 2024 08:43:35 -0400 Subject: [PATCH 44/61] envoy: 1.31.0 -> 1.31.1 --- pkgs/servers/http/envoy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 5fbd3cdaf0d0..0b57e3b37b8c 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -25,16 +25,16 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.31.0"; - rev = "7b8baff1758f0a584dcc3cb657b5032000bcb3d7"; - hash = "sha256-pKERyXABcpMpKMRRvqJavp2jYGXTxwFLDPERqDT6jnY="; + version = "1.31.1"; + rev = "1f44388cee449c9dae8ae34c0b4f09036bcbf560"; + hash = "sha256-XvlF3hMS2PH87HgFwKoFzxHDYgRjZmxn02L1aLwYOrY="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-33yu2oxP2zgKs01qn6RIyZx6zHJ1NuCNxolgk0/uWpM="; - aarch64-linux = "sha256-ox7CJPqNbwucMDORQvx8SFs4oXR/WKixwJ6uK+l4NJc="; + x86_64-linux = "sha256-9KXZdSvRfi5mWOSotG//+ljsx64I4bYwzbeQFuCIwDE="; + aarch64-linux = "sha256-knrCfUYUL+bYuHSNrNeX3SwoGDf2rLYNXuukEmj4BjA="; } .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in From 00e9c6bafcf8b628cf74e60a6e95001eb22363db Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 15 Sep 2024 08:46:18 -0400 Subject: [PATCH 45/61] envoy: move to by-name --- .../en}/envoy/0001-nixpkgs-use-system-Python.patch | 0 .../http => by-name/en}/envoy/0002-nixpkgs-use-system-Go.patch | 0 .../en}/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch | 0 .../http/envoy/default.nix => by-name/en/envoy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers/http => by-name/en}/envoy/0001-nixpkgs-use-system-Python.patch (100%) rename pkgs/{servers/http => by-name/en}/envoy/0002-nixpkgs-use-system-Go.patch (100%) rename pkgs/{servers/http => by-name/en}/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch (100%) rename pkgs/{servers/http/envoy/default.nix => by-name/en/envoy/package.nix} (100%) diff --git a/pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch b/pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch similarity index 100% rename from pkgs/servers/http/envoy/0001-nixpkgs-use-system-Python.patch rename to pkgs/by-name/en/envoy/0001-nixpkgs-use-system-Python.patch diff --git a/pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch b/pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch similarity index 100% rename from pkgs/servers/http/envoy/0002-nixpkgs-use-system-Go.patch rename to pkgs/by-name/en/envoy/0002-nixpkgs-use-system-Go.patch diff --git a/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch similarity index 100% rename from pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch rename to pkgs/by-name/en/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/by-name/en/envoy/package.nix similarity index 100% rename from pkgs/servers/http/envoy/default.nix rename to pkgs/by-name/en/envoy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7af2a949ef06..5ffdf9d60c1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24769,7 +24769,7 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { }; - envoy = callPackage ../servers/http/envoy { + envoy = callPackage ../by-name/en/envoy/package.nix { jdk = openjdk11_headless; gn = gn1924; }; From 2f3798116dc522866f129f222a8e8b631503c7eb Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Sat, 17 Aug 2024 14:27:53 +0200 Subject: [PATCH 46/61] fabric-ai: init at 1.4.14 --- pkgs/by-name/fa/fabric-ai/package.nix | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/fa/fabric-ai/package.nix diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix new file mode 100644 index 000000000000..8b25b890e24d --- /dev/null +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "fabric-ai"; + version = "1.4.14"; + + src = fetchFromGitHub { + owner = "danielmiessler"; + repo = "fabric"; + rev = "v${version}"; + hash = "sha256-syQVGtEFCC7ZVcs6ZIJgH0EXItclV2rPO7xTfsG2g7Q="; + }; + + vendorHash = "sha256-CHgeHumWtNt8SrbzzCWqBdLxTmmyDD2bfLkriPeez2E="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fabric is an open-source framework for augmenting humans using AI. It provides a modular framework for solving specific problems using a crowdsourced set of AI prompts that can be used anywhere"; + homepage = "https://github.com/danielmiessler/fabric"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jaredmontoya ]; + mainProgram = "fabric"; + }; +} From d6725bb4e318c25f5d6f909cad7ea3e7688ab238 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 15 Sep 2024 16:23:57 +0200 Subject: [PATCH 47/61] spotube: 3.8.0 -> 3.8.1, fix webview --- pkgs/by-name/sp/spotube/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index 0ddb42d15805..38be57a23ebe 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -9,19 +9,20 @@ makeWrapper, undmg, wrapGAppsHook3, - gtk3, - libsoup_3, - webkitgtk_4_1, + glib-networking, + gtk3, libappindicator, libnotify, + libsoup_3, mpv-unwrapped, xdg-user-dirs, + webkitgtk_4_1, }: let pname = "spotube"; - version = "3.8.0"; + version = "3.8.1"; meta = { description = "Open source, cross-platform Spotify client compatible across multiple platforms"; @@ -55,7 +56,7 @@ let src = fetchArtifact { filename = "Spotube-macos-universal.dmg"; - hash = "sha256-qQDbGRnia8JAclm2AgT2FCxhYS6WoNuDWIMbG76pDB0="; + hash = "sha256-NbKFvg50n/GByVU6/vNLmTTV9bhIhl3AxlwAcG60KVY="; }; sourceRoot = "."; @@ -79,7 +80,7 @@ let src = fetchArtifact { filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-xgwHRaFeQ182kRhUzCEvMx56WyPnHu8aCDyQ5wzVKRw="; + hash = "sha256-R/yHXx29T/7NNc1L1AmevzXp1k98qnmvOEd3cfSlJuA="; }; nativeBuildInputs = [ @@ -90,6 +91,7 @@ let ]; buildInputs = [ + glib-networking gtk3 libappindicator libnotify From e11598efb90882e8a7d5ce3a510eb016cd1c62c0 Mon Sep 17 00:00:00 2001 From: shenleban tongying Date: Sun, 15 Sep 2024 10:43:44 -0400 Subject: [PATCH 48/61] goldendict-ng: 24.05.05 -> 24.09.0 --- pkgs/applications/misc/goldendict-ng/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 344f3439ef80..4d7c70e8bddb 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; - version = "24.05.05"; + version = "24.09.0"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - rev = "v${finalAttrs.version}-LiXia.ecd1138c"; - hash = "sha256-C/0FUFLE3R+tZyCL88BiSFOHPTanILD/fIIQ/OQBSfk="; + rev = "v${finalAttrs.version}-Release.316ec900"; + hash = "sha256-LriKJLjqEuD0v8yjoE35O+V6oUX2jhWGFguqlXaDlQA="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook3 ]; @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { qtwebengine qt5compat qtmultimedia - qtspeech qtwayland libvorbis tomlplusplus From 5fc58c6b7a27f7705453643254ec1a090bfe649b Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Sep 2024 21:02:47 +0300 Subject: [PATCH 49/61] linux_6_11: init at 6.11 --- pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++++ pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c0bc223b9a05..2a7672465d81 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -460,6 +460,9 @@ let # Enable AMD secure display when available DRM_AMD_SECURE_DISPLAY = whenAtLeast "5.13" yes; + # Enable AMD image signal processor + DRM_AMD_ISP = whenAtLeast "6.11" yes; + # Enable new firmware (and by extension NVK) for compatible hardware on Nouveau DRM_NOUVEAU_GSP_DEFAULT = whenAtLeast "6.8" yes; @@ -736,6 +739,10 @@ let # Enable stack smashing protections in schedule() # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.8&id=0d9e26329b0c9263d4d9e0422d80a0e73268c52f SCHED_STACK_END_CHECK = yes; + + # Enable separate slab buckets for user controlled allocations + # See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=67f2df3b82d091ed095d0e47e1f3a9d3e18e4e41 + SLAB_BUCKETS = whenAtLeast "6.11" yes; } // lib.optionalAttrs stdenv.hostPlatform.isx86_64 { # Enable Intel SGX X86_SGX = whenAtLeast "5.11" yes; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5007b5bf8ccc..ce729e618e43 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -38,5 +38,9 @@ "6.10": { "version": "6.10.10", "hash": "sha256:1kcvh1g3p1sj4q34ylcmm43824f97z4k695lcxnzp7pbnlsyg1z6" + }, + "6.11": { + "version": "6.11", + "hash": "sha256:0bnbvadm4wvnwzcq319gsgl03ijvvljn7mj8qw87ihpb4p0cdljm" } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d13703498d2..896c8a419ded 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -861,6 +861,7 @@ mapAliases ({ linuxPackages_6_8 = linuxKernel.packages.linux_6_8; linuxPackages_6_9 = linuxKernel.packages.linux_6_9; linuxPackages_6_10 = linuxKernel.packages.linux_6_10; + linuxPackages_6_11 = linuxKernel.packages.linux_6_11; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3; linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; @@ -890,6 +891,7 @@ mapAliases ({ linux_6_8 = linuxKernel.kernels.linux_6_8; linux_6_9 = linuxKernel.kernels.linux_6_9; linux_6_10 = linuxKernel.kernels.linux_6_10; + linux_6_11 = linuxKernel.kernels.linux_6_11; linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi02w = linuxKernel.kernels.linux_rpi3; linux_rpi1 = linuxKernel.kernels.linux_rpi1; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 3e910943790e..cbcee495efd8 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -194,6 +194,14 @@ in { ]; }; + linux_6_11 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.11"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { # A special branch that tracks the kernel under the release process @@ -629,6 +637,7 @@ in { linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_10 = recurseIntoAttrs (packagesFor kernels.linux_6_10); + linux_6_11 = recurseIntoAttrs (packagesFor kernels.linux_6_11); } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08 linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11 @@ -697,7 +706,7 @@ in { packageAliases = { linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_10; + linux_latest = packages.linux_6_11; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; From 35333be988e07c7250f172bce1c372e8f0aa6006 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Sep 2024 18:05:44 +0000 Subject: [PATCH 50/61] regal: 0.25.0 -> 0.26.2 --- pkgs/by-name/re/regal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 7372fac74436..b58a9268f946 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "regal"; - version = "0.25.0"; + version = "0.26.2"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-yhlkvvNkZtpVx2uZVvXjr3eqBFXHDJ5qyO6k5EPNfww="; + hash = "sha256-QfxgfwBGAib+mqT2v/8/rhl5Ufjwjf9BouCTYqs6wlw="; }; - vendorHash = "sha256-gZYQEJAlm8qslHGfUsA8np43zdiPDYyhKm8HZIBR3ys="; + vendorHash = "sha256-5ImRjMPl+qc2iQEXg9OzKphPpRXhjYvu+1q1ol3M8Yg="; meta = with lib; { description = "Linter and language server for Rego"; From 4e54a5a38a40315bb4b71bff068d10bc5d9fc4c4 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 15 Sep 2024 21:14:52 +0300 Subject: [PATCH 51/61] linuxPackages_6_11.perf: fix build --- pkgs/os-specific/linux/kernel/perf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 17f1fc2da464..15f92157e147 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { # Fix 6.10.0 holding pkg-config completely wrong. # Patches from perf-tools-next, should be in 6.11 or hopefully backported. - patches = lib.optionals (lib.versionAtLeast kernel.version "6.10") [ + patches = lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [ (fetchpatch { url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b"; hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM="; From fc851ed483a60556016e08d7ba0ee5f8842a964c Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 16 Sep 2024 00:01:18 +0530 Subject: [PATCH 52/61] bcachefs-tools: remove johnrtitor as maintainer I have moved to ext4 LVM to look for stability. After constant breaking changes for the past 6 months, even in mid rc kernel, and with each kernel update requiring fscks (and data corruption), I have decided to give in. Due to me no longer using bcachefs, I don't think I can be a maintainer of this. I am still willing to merge non-complex updates and such if necesary, but keep in mind that I can not test them. --- pkgs/by-name/bc/bcachefs-tools/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 0ea0c06ea167..a230087ae894 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -130,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ davidak - johnrtitor Madouura ]; platforms = lib.platforms.linux; From 4c1d53818b5766629cfb4c4dce890a4571a7abd9 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sun, 15 Sep 2024 21:48:27 +0300 Subject: [PATCH 53/61] nixos/doc: update `Installing` section (#341995) Mention how to set a user password right after installation. Also don't suggest to use `useradd` to add users. --- .../manual/installation/installing.chapter.md | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 9f3ff2ac6bac..8f37eb353937 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -496,6 +496,12 @@ Use the following commands: Retype new password: *** ``` + If you have a user account declared in your `configuration.nix` and plan to log in using this user, set a password before rebooting, e.g. for the `alice` user: + + ```ShellSession + # nixos-enter --root /mnt -c 'passwd alice' + ``` + ::: {.note} For unattended installations, it is possible to use `nixos-install --no-root-passwd` in order to disable the password @@ -515,15 +521,13 @@ Use the following commands: menu. This allows you to easily roll back to a previous configuration if something goes wrong. - You should log in and change the `root` password with `passwd`. + Use your declared user account to log in. + If you didn’t declare one, you should still be able to log in using the `root` user. - You'll probably want to create some user accounts as well, which can - be done with `useradd`: - - ```ShellSession - $ useradd -c 'Eelco Dolstra' -m eelco - $ passwd eelco - ``` + ::: {.note} + Some graphical display managers such as SDDM do not allow `root` login by default, so you might need to switch to TTY. + Refer to [](#sec-user-management) for details on declaring user accounts. + ::: You may also want to install some software. This will be covered in [](#sec-package-management). From 4b8711284895989bc89c13eed746d622d218fb5e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 15 Sep 2024 14:56:36 -0400 Subject: [PATCH 54/61] ollama: add cuda-merged to buildInputs --- pkgs/by-name/ol/ollama/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 8519d7cd1287..c1451d42faae 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -141,6 +141,7 @@ goBuild ( buildInputs = lib.optionals enableRocm (rocmLibs ++ [ libdrm ]) ++ lib.optionals enableCuda [ + cudaToolkit cudaPackages.cuda_cudart cudaPackages.cuda_cccl cudaPackages.libcublas From 980f840859cfe91b6702440d36c40d7a83a46c0f Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 15 Sep 2024 11:09:39 +0800 Subject: [PATCH 55/61] emacs: factor out elisp package override helpers --- .../elisp-packages/elpa-devel-packages.nix | 8 ++--- .../emacs/elisp-packages/elpa-packages.nix | 8 ++--- .../elisp-packages/lib-override-helper.nix | 28 +++++++++++++++ .../emacs/elisp-packages/melpa-packages.nix | 36 ++++--------------- 4 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 5f9a2196f9c3..5744eaa4e5a1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -26,11 +26,9 @@ formats commits for you. self: let - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; + inherit (import ./lib-override-helper.nix pkgs) + markBroken + ; # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 283c762bd2ae..d20a2249703b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -26,11 +26,9 @@ formats commits for you. self: let - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; + inherit (import ./lib-override-helper.nix pkgs) + markBroken + ; # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix new file mode 100644 index 000000000000..74d185641e3d --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix @@ -0,0 +1,28 @@ +pkgs: + +rec { + buildWithGit = + pkg: + pkg.overrideAttrs (previousAttrs: { + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.git ]; + }); + + dontConfigure = pkg: pkg.overrideAttrs { dontConfigure = true; }; + + externalSrc = + pkg: epkg: + pkg.overrideAttrs (previousAttrs: { + inherit (epkg) src version; + propagatedUserEnvPkgs = previousAttrs.propagatedUserEnvPkgs or [ ] ++ [ epkg ]; + }); + + fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags); + + markBroken = + pkg: + pkg.overrideAttrs (previousAttrs: { + meta = previousAttrs.meta or { } // { + broken = true; + }; + }); +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 2a31b8d97cc8..a8285a4d790c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -30,35 +30,13 @@ in { lib, pkgs }: variant: self: let - dontConfigure = pkg: - pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - dontConfigure = true; - }); - }); - - markBroken = pkg: - pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or { }) // { broken = true; }; - }); - }); - - externalSrc = pkg: epkg: - pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - inherit (epkg) src version; - - propagatedUserEnvPkgs = [ epkg ]; - }); - }); - - buildWithGit = pkg: pkg.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; - }); - - fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags); + inherit (import ./lib-override-helper.nix pkgs) + buildWithGit + dontConfigure + externalSrc + fix-rtags + markBroken + ; generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive }: From 16f8c5365295c816ae7eaef0caba019253e83ce3 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 16 Sep 2024 05:10:55 +0800 Subject: [PATCH 56/61] emacsPackages.mu4e: make pname and version overridable --- .../emacs/elisp-packages/manual-packages/mu4e/package.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index 99cd5c6aa9e3..08dfeff50896 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -1,11 +1,8 @@ { elpaBuild, mu }: -let +elpaBuild { pname = "mu4e"; version = mu.mu4e.version; -in -elpaBuild { - inherit pname version; src = mu.mu4e; @@ -17,7 +14,7 @@ elpaBuild { # "(elisp) Multi-file Packages" for elpaBuild to install postUnpack = '' pushd mu-*-mu4e - local content_directory=${pname}-${version} + local content_directory=$pname-$version mkdir $content_directory cp --verbose share/emacs/site-lisp/mu4e/*.el $content_directory/ rm --verbose --force $content_directory/mu4e-autoloads.el From be4319b9186a4b4140d9b09f7671f77009d066da Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 16 Sep 2024 05:12:04 +0800 Subject: [PATCH 57/61] emacsPackages.mu4e: build package tarball in postBuild instead --- .../emacs/elisp-packages/manual-packages/mu4e/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index 08dfeff50896..8afe2b5dc86d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -12,8 +12,7 @@ elpaBuild { # prepare a multi-file package tar archive according to info # "(elisp) Multi-file Packages" for elpaBuild to install - postUnpack = '' - pushd mu-*-mu4e + postBuild = '' local content_directory=$pname-$version mkdir $content_directory cp --verbose share/emacs/site-lisp/mu4e/*.el $content_directory/ @@ -21,7 +20,6 @@ elpaBuild { cp --verbose share/info/* $content_directory/ src=$PWD/$content_directory.tar tar --create --verbose --file=$src $content_directory - popd ''; ignoreCompilationError = false; From 859dde2eb5df4308e5ffa04fbfdfa8a0e33bdc33 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 16 Sep 2024 05:13:25 +0800 Subject: [PATCH 58/61] emacsPackages.mu4e: stop setting wrong meta.mainProgram --- .../emacs/elisp-packages/manual-packages/mu4e/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index 8afe2b5dc86d..5fed9635536e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -24,7 +24,7 @@ elpaBuild { ignoreCompilationError = false; - meta = mu.meta // { + meta = removeAttrs mu.meta [ "mainProgram" ] // { description = "Full-featured e-mail client"; }; } From 8acaf55d0aca15edf7ba210cd057e5d053e75cca Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 16 Sep 2024 05:13:51 +0800 Subject: [PATCH 59/61] emacsPackages.mu4e: add linj to maintainers --- .../emacs/elisp-packages/manual-packages/mu4e/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index 5fed9635536e..b1c378cf31c4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -1,4 +1,8 @@ -{ elpaBuild, mu }: +{ + lib, + elpaBuild, + mu, +}: elpaBuild { pname = "mu4e"; @@ -26,5 +30,6 @@ elpaBuild { meta = removeAttrs mu.meta [ "mainProgram" ] // { description = "Full-featured e-mail client"; + maintainers = mu.meta.maintainers ++ (with lib.maintainers; [ linj ]); }; } From 94c62f5036e7744247309cf5a11847e1168ac289 Mon Sep 17 00:00:00 2001 From: azahi Date: Mon, 16 Sep 2024 01:10:55 +0300 Subject: [PATCH 60/61] nixos/networking.firewall: fix refactor regression This fixes a regression that was introduced in #335631 --- nixos/modules/services/networking/firewall.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 5021ef6f502a..27e17c464ba9 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -186,7 +186,7 @@ in ''; }; - lib.filterForward = lib.mkOption { + filterForward = lib.mkOption { type = lib.types.bool; default = false; description = '' @@ -263,7 +263,7 @@ in assertions = [ { - assertion = cfg.lib.filterForward -> config.networking.nftables.enable; + assertion = cfg.filterForward -> config.networking.nftables.enable; message = "filterForward only works with the nftables based firewall"; } { From ad11a7357b6cedf22b27e8df1ed26ba97f74cb71 Mon Sep 17 00:00:00 2001 From: KFearsoff <66781795+KFearsoff@users.noreply.github.com> Date: Mon, 16 Sep 2024 02:57:14 +0400 Subject: [PATCH 61/61] maintainers: remove kfears (#342128) remove kfears from maintainers --- maintainers/maintainer-list.nix | 7 ------- nixos/tests/grafana/provision/default.nix | 2 +- pkgs/tools/networking/openvpn3/default.nix | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 78100e49ad34..eabddaab16c0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10889,13 +10889,6 @@ githubId = 8211181; name = "Kevin Kandlbinder"; }; - kfears = { - email = "kfearsoff@gmail.com"; - github = "KFearsoff"; - githubId = 66781795; - matrix = "@kfears:matrix.org"; - name = "KFears"; - }; kfollesdal = { email = "kfollesdal@gmail.com"; github = "kfollesdal"; diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 775fae9b71ba..4a137638800b 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -162,7 +162,7 @@ in { name = "grafana-provision"; meta = with maintainers; { - maintainers = [ kfears willibutz ]; + maintainers = [ willibutz ]; }; inherit nodes; diff --git a/pkgs/tools/networking/openvpn3/default.nix b/pkgs/tools/networking/openvpn3/default.nix index 5ab94c798f4f..9473277d291f 100644 --- a/pkgs/tools/networking/openvpn3/default.nix +++ b/pkgs/tools/networking/openvpn3/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { description = "OpenVPN 3 Linux client"; license = licenses.agpl3Plus; homepage = "https://github.com/OpenVPN/openvpn3-linux/"; - maintainers = with maintainers; [ shamilton kfears ]; + maintainers = with maintainers; [ shamilton ]; platforms = platforms.linux; }; }