From 5a166ffd4733ff7049c2c57d42beb3ed4c15cbbf Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 8 Sep 2018 10:16:48 +0200 Subject: [PATCH 1/3] boo: remove, broken since Jun 2016 marked broken in June 2016, no visible attempt to fix it, so let's get rid of it --- pkgs/development/compilers/boo/config.patch | 45 -------------------- pkgs/development/compilers/boo/default.nix | 46 --------------------- pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 95 deletions(-) delete mode 100644 pkgs/development/compilers/boo/config.patch delete mode 100644 pkgs/development/compilers/boo/default.nix diff --git a/pkgs/development/compilers/boo/config.patch b/pkgs/development/compilers/boo/config.patch deleted file mode 100644 index f6e0eee29b1..00000000000 --- a/pkgs/development/compilers/boo/config.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/default.build b/default.build -index e48fd9e..b0dee4f 100644 ---- a/default.build -+++ b/default.build -@@ -23,14 +23,14 @@ - - - -- -+ - - - - - - -- -+ - - - -@@ -575,9 +575,9 @@ - key files for mime detection, etc - --> - -- -+ - -- -+ - - - -@@ -707,9 +707,9 @@ - key files for mime detection, etc - --> - -- -+ - -- -+ - - - diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix deleted file mode 100644 index ec5e08ffda4..00000000000 --- a/pkgs/development/compilers/boo/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper, nant -, shared-mime-info, gtksourceview, gtk2 }: - -let - release = "alpha"; -in stdenv.mkDerivation rec { - name = "boo-${version}"; - version = "2013-10-21"; - - src = fetchFromGitHub { - owner = "boo-lang"; - repo = "boo"; - - rev = "${release}"; - sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - mono makeWrapper nant shared-mime-info gtksourceview - gtk2 - ]; - - patches = [ ./config.patch ]; - - postPatch = '' - sed -e 's|\$out|'$out'|' -i default.build - ''; - - buildPhase = '' - nant -t:mono-4.5 - ''; - - installPhase = '' - nant install - cp $out/lib/mono/boo/*.dll $out/lib/boo/ - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "The Boo Programming Language"; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fbddb94b1b..8c36b24bcf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6310,10 +6310,6 @@ with pkgs; binaryen = callPackage ../development/compilers/binaryen { }; - boo = callPackage ../development/compilers/boo { - inherit (gnome2) gtksourceview; - }; - colm = callPackage ../development/compilers/colm { }; fetchegg = callPackage ../build-support/fetchegg { }; From dc84de59d13953d3e906a6e2d27b232b4d3ef5ce Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 8 Sep 2018 10:11:51 +0200 Subject: [PATCH 2/3] nant: remove - our version is from 2015 - it doesn't build - upstream project is dead, last release 2012, last commit Oct 2016. - used by only 1 nixpkgs package: `boo`, marked broken since 2016. --- .../tools/build-managers/nant/default.nix | 71 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 73 deletions(-) delete mode 100644 pkgs/development/tools/build-managers/nant/default.nix diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix deleted file mode 100644 index c394d87e09e..00000000000 --- a/pkgs/development/tools/build-managers/nant/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper -, targetVersion ? "4.5" }: - -let - version = "2015-11-15"; - - src = fetchFromGitHub { - owner = "nant"; - repo = "nant"; - rev = "19bec6eca205af145e3c176669bbd57e1712be2a"; - sha256 = "11l5y76csn686p8i3kww9s0sxy659ny9l64krlqg3y2nxaz0fk6l"; - }; - - nant-bootstrapped = stdenv.mkDerivation { - name = "nant-bootstrapped-${version}"; - inherit src; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mono makeWrapper ]; - - buildFlags = "bootstrap"; - - dontStrip = true; - - installPhase = '' - mkdir -p $out/lib/nant-bootstrap - cp -r bootstrap/* $out/lib/nant-bootstrap - - mkdir -p $out/bin - makeWrapper "${mono}/bin/mono" $out/bin/nant \ - --add-flags "$out/lib/nant-bootstrap/NAnt.exe" - ''; - }; - -in stdenv.mkDerivation { - name = "nant-${version}"; - inherit src; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mono makeWrapper nant-bootstrapped ]; - - dontStrip = true; - - buildPhase = '' - nant -t:mono-${targetVersion} - ''; - - installPhase = '' - mkdir -p $out/lib/nant - cp -r build/mono-${targetVersion}.unix/nant-debug/bin/* $out/lib/nant/ - - mkdir -p $out/bin - makeWrapper "${mono}/bin/mono" $out/bin/nant \ - --add-flags "$out/lib/nant/NAnt.exe" - ''; - - meta = with stdenv.lib; { - homepage = http://nant.sourceforge.net; - description = "NAnt is a free .NET build tool"; - - longDescription = '' - NAnt is a free .NET build tool. In theory it is kind of like make without - make's wrinkles. In practice it's a lot like Ant. - ''; - - license = licenses.gpl2Plus; - maintainers = with maintainers; [ zohl ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c36b24bcf2..f5ca0d6a1f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8492,8 +8492,6 @@ with pkgs; nailgun = callPackage ../development/tools/nailgun { }; - nant = callPackage ../development/tools/build-managers/nant { }; - ninja = callPackage ../development/tools/build-managers/ninja { }; gn = callPackage ../development/tools/build-managers/gn { }; From 2953d4c9947fbc152ccda2e8941c2a4f9c908f12 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 8 Sep 2018 10:24:22 +0200 Subject: [PATCH 3/3] banshee: remove - was broken since June 2016 because it depends on `boo` - no visible attempts to fix in over 2 years --- pkgs/applications/audio/banshee/default.nix | 57 --------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 62 deletions(-) delete mode 100644 pkgs/applications/audio/banshee/default.nix diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix deleted file mode 100644 index 8a4e8893c8d..00000000000 --- a/pkgs/applications/audio/banshee/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base -, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib -, mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0 -, boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp -, libmtp, libgpod, mono-zeroconf }: - -stdenv.mkDerivation rec { - name = "banshee-${version}"; - version = "2.6.2"; - - src = fetchurl { - url = "https://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; - sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p"; - }; - - dontStrip = true; - - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ - gtk-sharp-2_0.gtk gstreamer gst-plugins-base gst-plugins-good - gst-plugins-bad gst-plugins-ugly gst-ffmpeg - mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp - gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans - gio-sharp libmtp libgpod mono-zeroconf - ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - postPatch = '' - patchShebangs data/desktop-files/update-desktop-file.sh - patchShebangs build/private-icon-theme-installer - sed -i "s,DOCDIR=.*,DOCDIR=$out/lib/monodoc," configure - ''; - - postInstall = let - ldLibraryPath = lib.makeLibraryPath [ gtk-sharp-2_0.gtk gtk-sharp-2_0 sqlite gconf glib gstreamer ]; - - monoGACPrefix = lib.concatStringsSep ":" [ - mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp gtk-sharp-2_0 - boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans - gio-sharp libmtp libgpod mono-zeroconf - ]; - in '' - sed -e '2a export MONO_GAC_PREFIX=${monoGACPrefix}' \ - -e 's|LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${ldLibraryPath}:|' \ - -e "s|GST_PLUGIN_PATH=|GST_PLUGIN_PATH=$GST_PLUGIN_SYSTEM_PATH:|" \ - -e 's| mono | ${mono}/bin/mono |' \ - -i $out/bin/banshee - ''; - meta = with lib; { - homepage = "http://banshee.fm/"; - description = "A music player written in C# using GNOME technologies"; - platforms = platforms.linux; - maintainers = [ maintainers.zohl ]; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5ca0d6a1f3..b61f7441594 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15527,11 +15527,6 @@ with pkgs; barrier = callPackage ../applications/misc/barrier {}; - banshee = callPackage ../applications/audio/banshee { - gconf = pkgs.gnome2.GConf; - libgpod = pkgs.libgpod.override { monoSupport = true; }; - }; - bashSnippets = callPackage ../applications/misc/bashSnippets { }; batik = callPackage ../applications/graphics/batik { };