From 49efe74808867b6a65c4a70986a4c0313035160e Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Thu, 21 Apr 2022 13:46:06 -0500 Subject: [PATCH] snack: remove --- .../misc/audio/wavesurfer/default.nix | 30 ---------------- pkgs/development/libraries/snack/default.nix | 36 ------------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 6 ---- 4 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 pkgs/applications/misc/audio/wavesurfer/default.nix delete mode 100644 pkgs/development/libraries/snack/default.nix diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix deleted file mode 100644 index 99cdc9ade21b..000000000000 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, snack, tcl, tk, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "wavesurfer"; - version = "1.8.5"; - - src = fetchurl { - url = "https://www.speech.kth.se/wavesurfer/wavesurfer-${version}.tar.gz"; - sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ snack tcl tk ]; - - installPhase = '' - mkdir -p $out/{bin,nix-support,share/wavesurfer/} - mv doc $out/share/wavesurfer - mv * $out/nix-support - ln -s $out/{nix-support,bin}/wavesurfer.tcl - wrapProgram "$out/nix-support/wavesurfer.tcl" \ - --set TCLLIBPATH "${snack}/lib" \ - --prefix PATH : "${lib.makeBinPath [ tcl tk ]}" - ''; - - meta = { - description = "Tool for recording, playing, editing, viewing and labeling of audio"; - homepage = "https://www.speech.kth.se/wavesurfer/"; - license = lib.licenses.bsd0; - }; -} diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix deleted file mode 100644 index 1c876cf36360..000000000000 --- a/pkgs/development/libraries/snack/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -# alsa-lib vorbis-tools python2 can be made optional - -{ lib, stdenv, fetchurl, python2, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }: - -stdenv.mkDerivation rec { - pname = "snack"; - version = "2.2.10"; - - src = fetchurl { - url = "https://www.speech.kth.se/snack/dist/${pname}${version}.tar.gz"; - sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; - }; - - configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" ]; - - postUnpack = ''sourceRoot="$sourceRoot/unix"''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ python2 tcl tk vorbis-tools xlibsWrapper ]; - - hardeningDisable = [ "format" ]; - - postInstall = "aoeu"; - - installPhase = '' - mkdir -p $out - make install DESTDIR="$out" - ''; - - meta = { - description = "The Snack Sound Toolkit (Tcl)"; - homepage = "https://www.speech.kth.se/snack/"; - license = lib.licenses.gpl2; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index db330743e50d..36d8ad178416 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1167,6 +1167,7 @@ mapAliases ({ slurm-llnl-full = slurm-full; # renamed July 2017 smbclient = throw "'smbclient' has been renamed to/replaced by 'samba'"; # Converted to throw 2022-02-22 smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries"; # Added 2020-11-04 + snack = throw "snack has been removed: broken for 5+ years"; # Added 2022-04-21 solr_8 = solr; # Added 2021-01-30 # Added 2020-02-10 @@ -1334,6 +1335,7 @@ mapAliases ({ ### W ### + wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21 way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 webbrowser = throw "webbrowser was removed because it's unmaintained upstream and was marked as broken in nixpkgs for over a year"; # Added 2022-03-21 webkit = throw "'webkit' has been renamed to/replaced by 'webkitgtk'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434d94509ab4..c8a1bb95e9e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20460,10 +20460,6 @@ with pkgs; smpeg2 = callPackage ../development/libraries/smpeg2 { }; - snack = callPackage ../development/libraries/snack { - # optional - }; - snappy = callPackage ../development/libraries/snappy { }; snow = callPackage ../tools/security/snow { }; @@ -26232,8 +26228,6 @@ with pkgs; w_scan = callPackage ../applications/video/w_scan { }; - wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; - wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; welle-io = libsForQt5.callPackage ../applications/radio/welle-io { };