summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-02-18 12:04:57 -0600
committerThomas Tuegel <ttuegel@mailbox.org>2017-02-24 16:48:58 -0600
commit14b8fa701750c94a28f2c1632e0a12469593fc22 (patch)
treede4157858621502b97eac830a8abe5e24be47051
parentc9de5eca0f67ef5b56f2cce6f992ebbaf453404d (diff)
downloadnixlib-14b8fa701750c94a28f2c1632e0a12469593fc22.tar
nixlib-14b8fa701750c94a28f2c1632e0a12469593fc22.tar.gz
nixlib-14b8fa701750c94a28f2c1632e0a12469593fc22.tar.bz2
nixlib-14b8fa701750c94a28f2c1632e0a12469593fc22.tar.lz
nixlib-14b8fa701750c94a28f2c1632e0a12469593fc22.tar.xz
nixlib-14b8fa701750c94a28f2c1632e0a12469593fc22.tar.zst
nixlib-14b8fa701750c94a28f2c1632e0a12469593fc22.zip
Remove kde4.krename
- Already updated to KDE 5 in Nixpkgs
-rw-r--r--pkgs/applications/misc/krename/default.nix (renamed from pkgs/applications/misc/krename/kde5.nix)0
-rw-r--r--pkgs/applications/misc/krename/kde4.nix22
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix6
4 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/applications/misc/krename/kde5.nix b/pkgs/applications/misc/krename/default.nix
index a2137060ef64..a2137060ef64 100644
--- a/pkgs/applications/misc/krename/kde5.nix
+++ b/pkgs/applications/misc/krename/default.nix
diff --git a/pkgs/applications/misc/krename/kde4.nix b/pkgs/applications/misc/krename/kde4.nix
deleted file mode 100644
index 1e4da7fa11f7..000000000000
--- a/pkgs/applications/misc/krename/kde4.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, taglib, exiv2, podofo, qt4, phonon
-}:
-
-stdenv.mkDerivation rec {
-  name = "krename-4.0.9";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/krename/${name}.tar.bz2";
-    sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds";
-  };
-
-  buildInputs = [ kdelibs taglib exiv2 podofo qt4 phonon ];
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = {
-    homepage = http://www.krename.net;
-    description = "A powerful batch renamer for KDE";
-    inherit (kdelibs.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4d721bfdad09..14ef7a1cf472 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -63,6 +63,7 @@ doNotDisplayTwice rec {
   keepassx2-http = keepassx-reboot; # added 2016-10-17
   keepassx-reboot = keepassx-community; # added 2017-02-01
   keybase-go = keybase;  # added 2016-08-24
+  krename-qt5 = krename; # added 2017-02-18
   letsencrypt = certbot; # added 2016-05-16
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
   libcap_manpages = libcap.doc; # added 2016-04-29
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 204881c49983..b2b40d142cb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2451,7 +2451,7 @@ with pkgs;
 
   kpcli = callPackage ../tools/security/kpcli { };
 
-  krename-qt5 = qt5.callPackage ../applications/misc/krename/kde5.nix { };
+  krename = qt5.callPackage ../applications/misc/krename { };
 
   kronometer = qt5.callPackage ../tools/misc/kronometer { };
 
@@ -16751,10 +16751,6 @@ with pkgs;
 
         kvirc = callPackage ../applications/networking/irc/kvirc { };
 
-        krename = callPackage ../applications/misc/krename/kde4.nix {
-          taglib = taglib_1_9;
-        };
-
         krusader = callPackage ../applications/misc/krusader { };
 
         ksshaskpass = callPackage ../tools/security/ksshaskpass {};