From 06c403e846dca7c06924a1cf754cfa10b608616f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sun, 11 Nov 2018 21:04:26 -0600 Subject: [PATCH] treewide: remove unstable packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There’s nothing wrong with unstable packages when they are maintained and frequently updated. However, when they become out-of-date, as many do, it is usually best to just get rid of them as the stable version is become newer than the unstable version. This removes any packages called "unstable" that have not been updated in over 1 year. Affected packages include: - isyncUnstable - sxhkd-unstable - dosbox-unstable Revert "treewide: remove unstable packages" This reverts commit df01b0b37a04624cfe6f8d2ccb42b99289841b68. --- .../window-managers/sxhkd/unstable.nix | 23 ----------- pkgs/misc/emulators/dosbox/unstable.nix | 41 ------------------- pkgs/tools/networking/isync/unstable.nix | 31 -------------- pkgs/top-level/all-packages.nix | 6 --- 4 files changed, 101 deletions(-) delete mode 100644 pkgs/applications/window-managers/sxhkd/unstable.nix delete mode 100644 pkgs/misc/emulators/dosbox/unstable.nix delete mode 100644 pkgs/tools/networking/isync/unstable.nix diff --git a/pkgs/applications/window-managers/sxhkd/unstable.nix b/pkgs/applications/window-managers/sxhkd/unstable.nix deleted file mode 100644 index a3379259a8c4..000000000000 --- a/pkgs/applications/window-managers/sxhkd/unstable.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }: - -stdenv.mkDerivation rec { - name = "sxhkd-unstable-2016-08-29"; - - src = fetchFromGitHub { - owner = "baskerville"; - repo = "sxhkd"; - rev = "69b6acc7831bd333b39286c37188e5638ad0de27"; - sha256 = "11i451hz0icsbxnvbq2bdl6r5kacxf6ps0yvi9ix3vkpxn4zcanh"; - }; - - buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; - - makeFlags = ''PREFIX=$(out)''; - - meta = with stdenv.lib; { - description = "Simple X hotkey daemon (git version)"; - inherit (src.meta) homepage; - license = licenses.bsd2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix deleted file mode 100644 index e1762d66641a..000000000000 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }: - -let revision = "4025"; - revisionDate = "2017-07-02"; - revisionSha = "0hbghdlvm6qibp0df35qxq35km4nza3sm301x380ghamxq2vgy6a"; -in stdenv.mkDerivation rec { - name = "dosbox-unstable-${revisionDate}"; - - src = fetchsvn { - url = "https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk"; - rev = revision; - sha256 = revisionSha; - }; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ SDL SDL_net SDL_sound libpng libGLU_combined ]; - - desktopItem = makeDesktopItem { - name = "dosbox"; - exec = "dosbox"; - comment = "x86 emulator with internal DOS"; - desktopName = "DOSBox (SVN)"; - genericName = "DOS emulator"; - categories = "Application;Emulator;"; - }; - - postInstall = '' - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - ''; - - meta = { - homepage = http://www.dosbox.com/; - description = "A DOS emulator"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ binarin ]; - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix deleted file mode 100644 index 9d32f91d0e19..000000000000 --- a/pkgs/tools/networking/isync/unstable.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - stdenv, fetchgit, - autoconf, automake, cyrus_sasl, db, openssl, perl, pkgconfig, zlib, -}: - -stdenv.mkDerivation rec { - name = "isync-git-20170514"; - rev = "4b3768806278a70db696ba52645dc1b6eb8de58a"; - - src = fetchgit { - url = "https://git.code.sf.net/p/isync/isync"; - inherit rev; - sha256 = "1cv1isw01cfp7724z6f4pf6k4rx3k1lg0pc1xcq17zpikx9d10fb"; - }; - - nativeBuildInputs = [ autoconf automake perl pkgconfig ]; - buildInputs = [ cyrus_sasl db openssl zlib ]; - - preConfigure = '' - touch ChangeLog - ./autogen.sh - ''; - - meta = with stdenv.lib; { - homepage = http://isync.sourceforge.net/; - description = "Free IMAP and MailDir mailbox synchronizer"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ the-kenny ttuegel ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 638d76af7608..ff5fa11ad957 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3490,7 +3490,6 @@ with pkgs; ispike = callPackage ../development/libraries/science/robotics/ispike { }; isync = callPackage ../tools/networking/isync { }; - isyncUnstable = callPackage ../tools/networking/isync/unstable.nix { }; jaaa = callPackage ../applications/audio/jaaa { }; @@ -15987,8 +15986,6 @@ with pkgs; bspwm = callPackage ../applications/window-managers/bspwm { }; - bspwm-unstable = callPackage ../applications/window-managers/bspwm/unstable.nix { }; - btops = callPackage ../applications/window-managers/btops { }; bvi = callPackage ../applications/editors/bvi { }; @@ -18231,8 +18228,6 @@ with pkgs; sxhkd = callPackage ../applications/window-managers/sxhkd { }; - sxhkd-unstable = callPackage ../applications/window-managers/sxhkd/unstable.nix { }; - mpop = callPackage ../applications/networking/mpop { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -21987,7 +21982,6 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; dosbox = callPackage ../misc/emulators/dosbox { }; - dosbox-unstable = callPackage ../misc/emulators/dosbox/unstable.nix { }; dpkg = callPackage ../tools/package-management/dpkg { };