From 3ef3b08083b865d67c3c9692add60e98134b12d0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 09:59:05 -0400 Subject: [PATCH 1/4] pkgs/tools/audio: remove dead code --- pkgs/tools/audio/botamusique/default.nix | 1 - pkgs/tools/audio/isrcsubmit/default.nix | 2 +- pkgs/tools/audio/kaldi/default.nix | 3 +-- pkgs/tools/audio/midimonster/default.nix | 6 ++---- pkgs/tools/audio/mpd-notification/default.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/audio/botamusique/default.nix b/pkgs/tools/audio/botamusique/default.nix index 5eaaa9c873e3..02460f61d93b 100644 --- a/pkgs/tools/audio/botamusique/default.nix +++ b/pkgs/tools/audio/botamusique/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , python3Packages , ffmpeg , makeWrapper diff --git a/pkgs/tools/audio/isrcsubmit/default.nix b/pkgs/tools/audio/isrcsubmit/default.nix index fa01756f8982..f135cccbc6cd 100644 --- a/pkgs/tools/audio/isrcsubmit/default.nix +++ b/pkgs/tools/audio/isrcsubmit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "isrcsubmit"; diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 777a7535a10c..7ea5cf622b57 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -7,7 +7,6 @@ , cmake , pkg-config , fetchFromGitHub -, git , python3 , Accelerate , _experimental-update-script-combinators @@ -88,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { updateSource updateOpenfst ]; - }; + }; meta = with lib; { description = "Speech Recognition Toolkit"; diff --git a/pkgs/tools/audio/midimonster/default.nix b/pkgs/tools/audio/midimonster/default.nix index 841704427c2b..ec55367474f5 100644 --- a/pkgs/tools/audio/midimonster/default.nix +++ b/pkgs/tools/audio/midimonster/default.nix @@ -1,7 +1,5 @@ { lib , stdenv -, fetchurl -, zlib , fetchFromGitHub , gnumake , gcc @@ -15,7 +13,7 @@ , libevdev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "midimonster"; version = "0.6.0"; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { owner = "cbdevnet"; rev = "f16f7db86662fcdbf45b6373257c90c824b0b4b0"; sha256 = "131zs4j9asq9xl72cbyi463xpkj064ca1s7i77q5jrwqysgy52sp"; -}; + }; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/tools/audio/mpd-notification/default.nix b/pkgs/tools/audio/mpd-notification/default.nix index 66f6d1880a61..03b632ae7e0e 100644 --- a/pkgs/tools/audio/mpd-notification/default.nix +++ b/pkgs/tools/audio/mpd-notification/default.nix @@ -2,7 +2,6 @@ , stdenv , pkg-config , fetchFromGitHub -, systemd , file , iniparser , ffmpeg @@ -33,9 +32,9 @@ stdenv.mkDerivation rec { ffmpeg libmpdclient discount - ]; + ]; - installPhase = '' + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -48,10 +47,10 @@ stdenv.mkDerivation rec { ''; postPatch = '' - substituteInPlace systemd/mpd-notification.service --replace /usr $out - ''; + substituteInPlace systemd/mpd-notification.service --replace /usr $out + ''; - meta = with lib; { + meta = with lib; { description = "Notifications for mpd"; homepage = "https://github.com/eworm-de/mpd-notification"; license = licenses.gpl3Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba142c1e461a..a2d7b6e7391a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9212,7 +9212,7 @@ with pkgs; ispike = callPackage ../development/libraries/science/robotics/ispike { }; - isrcsubmit = callPackage ../tools/audio/isrcsubmit { stdenv = gcc10StdenvCompat; }; + isrcsubmit = callPackage ../tools/audio/isrcsubmit { }; isync = callPackage ../tools/networking/isync { inherit (darwin.apple_sdk.frameworks) Security; From d454e416fd9ac69f575198b4865838749db98546 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 09:59:31 -0400 Subject: [PATCH 2/4] pkgs/tools/bluetooth: remove dead code --- pkgs/tools/bluetooth/blueberry/default.nix | 1 - pkgs/tools/bluetooth/blueman/default.nix | 2 +- pkgs/tools/bluetooth/bluetuith/default.nix | 2 +- pkgs/tools/bluetooth/nrfconnect/default.nix | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index ac64242fe646..63845045c06b 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -5,7 +5,6 @@ , cinnamon , gnome , gobject-introspection -, intltool , libnotify , pavucontrol , python3Packages diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 5b887222c513..cc4f15d1bea8 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 -, obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 +, obex_data_server, xdg-utils, dnsmasq, dhcp, iproute2 , gnome, librsvg, wrapGAppsHook, gobject-introspection , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: diff --git a/pkgs/tools/bluetooth/bluetuith/default.nix b/pkgs/tools/bluetooth/bluetuith/default.nix index 7a86be1fa1d8..7904e8d5b5d0 100644 --- a/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/pkgs/tools/bluetooth/bluetuith/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bluetuith"; diff --git a/pkgs/tools/bluetooth/nrfconnect/default.nix b/pkgs/tools/bluetooth/nrfconnect/default.nix index 8a89f5fc840f..07dc7303a06e 100644 --- a/pkgs/tools/bluetooth/nrfconnect/default.nix +++ b/pkgs/tools/bluetooth/nrfconnect/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , appimageTools }: From d80e7644338d1002d7a3787d18046a903c530c19 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 09:59:51 -0400 Subject: [PATCH 3/4] ventoy: remove dead code --- pkgs/tools/cd-dvd/ventoy/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/ventoy/default.nix b/pkgs/tools/cd-dvd/ventoy/default.nix index bc29040d89d4..1983018788ea 100644 --- a/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/pkgs/tools/cd-dvd/ventoy/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoPatchelfHook , bash , copyDesktopItems From 0f00e2f1cf73d8638c816e064da10732f8162627 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 25 Jul 2023 10:00:01 -0400 Subject: [PATCH 4/4] pkgs/tools/compression: remove dead code --- pkgs/tools/compression/zopfli/default.nix | 2 +- pkgs/tools/compression/zstd/default.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix index 753368b70b97..2c844cffc21b 100644 --- a/pkgs/tools/compression/zopfli/default.nix +++ b/pkgs/tools/compression/zopfli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "zopfli"; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 3a51bdce190b..791dda4f11ef 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file -, fetchpatch , legacySupport ? false , static ? stdenv.hostPlatform.isStatic # these need to be ran on the host, thus disable when cross-compiling