diff --git a/doc/language-support.xml b/doc/language-support.xml
index 5942fe01e2e..da709b34a94 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -674,6 +674,7 @@ net = buildGoPackage rec {
goPackageAliases = [ "code.google.com/p/go.net" ];
propagatedBuildInputs = [ goPackages.text ];
buildFlags = "--tags release";
+ disabled = isGo13;
};
@@ -731,6 +732,18 @@ the following arguments are of special significance to the function:
+
+
+ If disabled is true,
+ nix will refuse to build this package.
+
+
+ In this example the package will not be built for go 1.3. The isGo13
+ is an utility function that returns true if go used to build the
+ package has version 1.3.x.
+
+
+
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 58134913e6e..875d66e04bd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -43,6 +43,7 @@
bosu = "Boris Sukholitko ";
bramd = "Bram Duvigneau ";
bstrik = "Berno Strik ";
+ c0dehero = "CodeHero ";
calrama = "Moritz Maxeiner ";
campadrenalin = "Philip Horger ";
cdepillabout = "Dennis Gosnell ";
@@ -133,6 +134,7 @@
meditans = "Carlo Nucera ";
meisternu = "Matt Miemiec ";
michelk = "Michel Kuhlmann ";
+ mschristiansen = "Mikkel Christiansen ";
modulistic = "Pablo Costa ";
mornfall = "Petr Ročkai ";
MP2E = "Cray Elliott ";
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index d53f119c955..cf6d2cab349 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -45,7 +45,7 @@ in {
environment.gnome3.packageSet = mkOption {
default = null;
- example = literalExample "pkgs.gnome3_12";
+ example = literalExample "pkgs.gnome3_16";
description = "Which GNOME 3 package set to use.";
apply = p: if p == null then pkgs.gnome3 else p;
};
@@ -109,9 +109,6 @@ in {
# Override default mimeapps
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
- # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility.
- export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
-
# Let nautilus find extensions
export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
diff --git a/nixos/tests/gnome3_16.nix b/nixos/tests/gnome3_16.nix
deleted file mode 100644
index 23a66aba50c..00000000000
--- a/nixos/tests/gnome3_16.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-import ./make-test.nix {
- name = "gnome3";
-
- machine =
- { config, pkgs, ... }:
-
- { imports = [ ./common/user-account.nix ];
-
- services.xserver.enable = true;
-
- services.xserver.displayManager.auto.enable = true;
- services.xserver.displayManager.auto.user = "alice";
- services.xserver.desktopManager.gnome3.enable = true;
-
- environment.gnome3.packageSet = pkgs.gnome3_16;
-
- virtualisation.memorySize = 512;
- };
-
- testScript =
- ''
- $machine->waitForX;
- $machine->sleep(15);
-
- # Check that logging in has given the user ownership of devices.
- $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-
- $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
- $machine->waitForWindow(qr/Terminal/);
- $machine->sleep(20);
- $machine->screenshot("screen");
- '';
-
-}
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index cc13868e9d4..c9b16b65267 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -46,8 +46,8 @@ let
usbmuxd
];
- unwrapped = stdenv.mkDerivation {
- name = "clementine-unwrapped-${version}";
+ free = stdenv.mkDerivation {
+ name = "clementine-free-${version}";
inherit patches src buildInputs;
enableParallelBuilding = true;
meta = with stdenv.lib; {
@@ -91,7 +91,7 @@ with stdenv.lib;
runCommand "clementine-${version}"
{
- inherit blob unwrapped;
+ inherit blob free;
buildInputs = [ makeWrapper ] ++ gst_plugins; # for the setup-hooks
dontPatchELF = true;
dontStrip = true;
@@ -109,7 +109,12 @@ runCommand "clementine-${version}"
}
''
mkdir -p $out/bin
- makeWrapper "$unwrapped/bin/${exeName}" "$out/bin/${exeName}" \
+ makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \
${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+
+ mkdir -p $out/share
+ for dir in applications icons kde4; do
+ ln -s "$free/share/$dir" "$out/share/$dir"
+ done
''
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index db388cea5fb..ba68a46cf0c 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation {
src = fetchgit {
url = "https://github.com/mina86/urxvt-tabbedex";
- rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42";
- sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e";
+ rev = "b0a02018b1cbaaba2a0c8ea7af9368db0adf3363";
+ sha256 = "f0025f2741d424736620147d9fc39faac68193cb9f74bde0fb6e02a6f1ae61c3";
};
installPhase = ''
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 7c1fe5fc5cb..ba3d3db3267 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "termite-${version}";
- version = "9";
+ version = "10";
src = fetchgit {
url = "https://github.com/thestinger/termite";
rev = "refs/tags/v${version}";
- sha256 = "0bnzfjk5yl5i96v5jnlvrz0d1jcp5lal6ppl7y8wx13166i6sdnh";
+ sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2";
};
makeFlags = "VERSION=v${version}";
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 5ebd2607841..409f7d29ba2 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
desktopItem = makeDesktopItem {
name = browserName;
exec = browserName + " %U";
- icon = browserName;
+ inherit icon;
comment = "";
desktopName = desktopName;
genericName = "Web Browser";
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
--suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
- --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}*")"
+ --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)"
${ lib.optionalString libtrick
''
@@ -58,8 +58,14 @@ stdenv.mkDerivation {
''
}
- mkdir -p $out/share/icons
- ln -s $out/lib/${browserName}${nameSuffix}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png
+ if [ -e "${browser}/share/icons" ]; then
+ mkdir -p "$out/share"
+ ln -s "${browser}/share/icons" "$out/share/icons"
+ else
+ mkdir -p "$out/share/icons/hicolor/128x128/apps"
+ ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \
+ "$out/share/icons/hicolor/128x128/apps/${browserName}.png"
+ fi
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index b9f9667ad3b..f82ffa5ecd3 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -5,7 +5,7 @@
let
- version = "2.2.1287";
+ version = "2.2.1373";
rpath = stdenv.lib.makeSearchPath "lib" [
stdenv.glibc
@@ -47,12 +47,12 @@ let
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://downloads.hipchat.com/linux/arch/x86_64/hipchat-${version}-x86_64.pkg.tar.xz";
- sha256 = "170izy3v18rgriz84h4gyf9354jvjrsbkgg53czq9l0scyz8x55b";
+ sha256 = "0mxjzigncp8sh5w2rpr7kvkiahagm3adss1zv6rqk8hc1awrnd8n";
}
else if stdenv.system == "i686-linux" then
fetchurl {
url = "http://downloads.hipchat.com/linux/arch/i686/hipchat-${version}-i686.pkg.tar.xz";
- sha256 = "150q7pxg5vs14is5qf36yfsf7r70g49q9xr1d1rknmc5m4qa5rc5";
+ sha256 = "1f4cjbazgifxpyr6589frs417h4wpxbykf46w5qiw0m2wiqpqff5";
}
else
throw "HipChat is not supported on ${stdenv.system}";
@@ -92,10 +92,11 @@ stdenv.mkDerivation {
mv opt/HipChat/bin/linuxbrowserlaunch $out/libexec/hipchat/bin/
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Desktop client for HipChat services";
homepage = http://www.hipchat.com;
- license = stdenv.lib.licenses.unfree;
+ license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
+ maintainers = with maintainers; [ jgeerds ];
};
}
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index c290975152c..7b80ec85661 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libotr pidgin intltool ];
meta = with stdenv.lib; {
- homepage = http://www.cypherpunks.ca/otr;
+ homepage = https://otr.cypherpunks.ca/;
description = "Plugin for Pidgin 2.x which implements OTR Messaging";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 84d0d4ba239..54e4e64cdcf 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
buildGoPackage rec {
name = "syncthing-${version}";
- version = "0.11.1";
+ version = "0.11.5";
goPackagePath = "github.com/syncthing/syncthing";
src = fetchgit {
url = "git://github.com/syncthing/syncthing.git";
rev = "refs/tags/v${version}";
- sha256 = "518add39e2239fc8575cdf5cafc3562f006df7201fbd272077ed3bbbbfd816d4";
+ sha256 = "3a68cdecaec8d00b0fbf6348fb9b8adc628910e9572a89d9a413d6e7b79e7a06";
};
subPackages = [ "cmd/syncthing" ];
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 83fb7546a3b..be0517b6376 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python3, which
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, perl, python, which, makeWrapper
, libX11, libxcb, qt5, mesa
, ffmpeg
, libchardet
@@ -15,12 +15,16 @@
, portaudioSupport ? false, portaudio ? null
, pulseSupport ? true, pulseaudio ? null
, cddaSupport ? false, libcdda ? null
+, youtubeSupport ? true, youtube-dl ? null
}:
+with stdenv.lib;
+
assert jackSupport -> jack != null;
assert portaudioSupport -> portaudio != null;
assert pulseSupport -> pulseaudio != null;
assert cddaSupport -> libcdda != null;
+assert youtubeSupport -> youtube-dl != null;
let
waf = fetchurl {
@@ -32,18 +36,18 @@ in
stdenv.mkDerivation rec {
name = "bomi-${version}";
- version = "0.9.5";
+ version = "0.9.10";
src = fetchFromGitHub {
owner = "xylosper";
repo = "bomi";
rev = "v${version}";
- sha256 = "1pf82dp7v18yd7knsjl853sfzhq4rqc3sq15jgqiw37096gp0sll";
+ sha256 = "1c7497gks7yxzfy6jx77vn9zs2pdq7y6l9w61miwnkdm91093n17";
};
buildInputs = with stdenv.lib;
[ libX11 libxcb mesa
- qt5.base qt5.quick1 qt5.x11extras
+ qt5.base qt5.x11extras qt5.declarative qt5.quickcontrols
ffmpeg
libchardet
mpg123
@@ -65,13 +69,17 @@ stdenv.mkDerivation rec {
preConfigure = ''
patchShebangs configure
- # src/mpv/waf build-mpv; do
'';
preBuild = ''
- patchShebangs build-mpv
install -m755 ${waf} src/mpv/waf
- sed -i '1 s,.*,#!${python3.interpreter},' src/mpv/waf
+ patchShebangs src/mpv/waf
+ patchShebangs build-mpv
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/bomi \
+ ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
'';
configureFlags = with stdenv.lib;
@@ -82,7 +90,7 @@ stdenv.mkDerivation rec {
++ optional cddaSupport "--enable-cdda"
;
- nativeBuildInputs = [ pkgconfig perl which ];
+ nativeBuildInputs = [ pkgconfig perl python which qt5.tools makeWrapper ];
enableParallelBuilding = true;
diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix
index 69b0ffbe131..79b9ab92ad9 100644
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }:
+{ stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }:
stdenv.mkDerivation rec {
version = "0.2.3.alpha";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
./autogen.sh --prefix=$out
'';
- buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+ buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
meta = with stdenv.lib; {
description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser";
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index 678ba450211..4020a1aca33 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -66,6 +66,12 @@ stdenv.mkDerivation {
makeWrapper "$prog" $out/bin/$(basename "$prog") \
--suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:"
done
+
+ mkdir -p $out/share
+ # Link icons and desktop files into place
+ for dir in applications icons info man; do
+ ln -s $emacs/share/$dir $out/share/$dir
+ done
'';
inherit (emacs) meta;
}
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 6b8399a8b3f..7bc1b9fa1fd 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,38 +1,26 @@
{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive }:
stdenv.mkDerivation rec {
- version = "20141123";
+ version = "0.1.1";
name = "zeal-${version}";
src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
- rev = "76405f8387d6a82697faab9630c78f31417d8450";
- sha256 = "1057py3j2flzxyiks031s0mwm9h82v033iqn5cq8sycmrb3ihj2s";
+ rev = "v${version}";
+ sha256 = "172wf50fq1l5p8hq1irvpwr7ljxkjaby71afrm82jz3ixl6dg2ii";
};
- buildInputs = [ pkgconfig qt5.base qt5.webkit libarchive ];
+ buildInputs = [ pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive ];
- patchPhase = ''
- substituteInPlace src/main.cpp \
- --replace /usr/share/pixmaps/zeal $out/share/pixmaps/zeal
- '';
-
- buildPhase = ''
- qmake PREFIX=$out
- make
+ configurePhase = ''
+ qmake PREFIX=/
'';
installPhase = ''
make INSTALL_ROOT=$out install
'';
- preFixup = ''
- mv $out/usr/bin $out/bin
- mv $out/usr/share $out/share
- rmdir $out/usr
- '';
-
enableParallelBuilding = true;
meta = {
diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix
new file mode 100644
index 00000000000..63f74bb41b4
--- /dev/null
+++ b/pkgs/data/fonts/uni-vga/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation {
+ name = "uni-vga";
+
+ src = fetchurl {
+ url = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz;
+ sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6";
+ };
+
+ buildInputs = [ mkfontdir mkfontscale ];
+
+ installPhase = ''
+ mkdir -p $out/share/fonts
+ cp *.bdf $out/share/fonts
+ cd $out/share/fonts
+ mkfontdir
+ mkfontscale
+ '';
+
+ meta = {
+ description = "Unicode VGA font";
+ maintainers = [stdenv.lib.maintainers.ftrvxmtrx];
+ homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/;
+ license = stdenv.lib.licenses.mit;
+ platforms = stdenv.lib.platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
deleted file mode 100644
index c4f6741c070..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils
-, clutter_gtk, libuuid, webkitgtk, zeitgeist
-, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
- name = "bijiben-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/bijiben/3.12/${name}.tar.xz";
- sha256 = "f319ef2a5b69ff9368e7488a28453da0f10eaa39a0f8e5d74623d0c07c824708";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig glib intltool itstool libxml2
- clutter_gtk libuuid webkitgtk gnome3.tracker
- gnome3.gnome_online_accounts zeitgeist desktop_file_utils
- gnome3.gsettings_desktop_schemas makeWrapper
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- wrapProgram "$out/bin/bijiben" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Bijiben;
- description = "Note editor designed to remain simple to use";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl3;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
deleted file mode 100644
index f0356352098..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight, sqlite
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
-, makeWrapper, itstool, shared_mime_info, libical, db, gcr
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
-
-stdenv.mkDerivation rec {
- name = "evolution-3.12.5";
-
- src = fetchurl {
- url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz";
- sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
- gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu
- gnome3.evolution_data_server libsecret libical gcr
- webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
- libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata
- gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- nss nspr libnotify procps highlight gnome3.libgweather
- gnome3.gsettings_desktop_schemas makeWrapper sqlite ];
-
- configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ];
-
- NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
-
- enableParallelBuilding = true;
-
- preFixup = ''
- for f in $out/bin/* $out/libexec/*; do
- wrapProgram "$f" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Evolution;
- description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.lgpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
deleted file mode 100644
index deff8494866..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
- name = "file-roller-${version}";
-
- majVersion = "3.12";
- version = "${majVersion}.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
- sha256 = "0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf";
- };
-
- # TODO: support nautilus
- # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
-
- buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
- hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
- attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/bin/file-roller" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/FileRoller;
- description = "Archive manager for the GNOME desktop environment";
- platforms = platforms.linux;
- maintainers = [ maintainers.lethalman ];
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
deleted file mode 100644
index c65a28c3446..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, intltool, fetchurl, enchant, isocodes
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libsoup, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
- name = "gedit-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz";
- sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm";
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
- gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup
- gnome3.libpeas gnome3.gtksourceview libxml2
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas makeWrapper file ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- wrapProgram "$out/bin/gedit" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Gedit;
- description = "Official text editor of the GNOME desktop environment";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
deleted file mode 100644
index 4783804f200..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, python
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libxml2, docbook_xsl
-, gnome3, librsvg, gdk_pixbuf, libxslt }:
-
-stdenv.mkDerivation rec {
- name = "glade-3.16.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
- sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
- gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
- gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- wrapProgram "$out/bin/glade" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Glade;
- description = "User interface designer for GTK+ applications";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.lgpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
deleted file mode 100644
index 7d33933656a..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
-, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
-, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio
-}:
-
-# TODO: ovirt (optional)
-
-stdenv.mkDerivation rec {
- name = "gnome-boxes-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-boxes/3.12/${name}.tar.xz";
- sha256 = "0kzdh8kk9isaskbfyj7r7nybgdyhj7i4idkgahdsl9xs9sj2pmc8";
- };
-
- enableParallelBuilding = true;
-
- doCheck = true;
-
- buildInputs = [
- makeWrapper pkgconfig intltool itstool libvirt-glib glib
- gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
- libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
- gdbm cyrus_sasl gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
- librsvg hicolor_icon_theme desktop_file_utils
- ];
-
- preFixup = ''
- for prog in "$out/bin/"*; do
- wrapProgram "$prog" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
- --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
- done
- '';
-
- meta = with stdenv.lib; {
- description = "Simple GNOME 3 application to access remote or virtual systems";
- homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ bjornfor ];
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
deleted file mode 100644
index 47bcbf692ad..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, libgweather, libnotify
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libcanberra_gtk3, libtool
-, gnome3, librsvg, gdk_pixbuf, geoclue2 }:
-
-stdenv.mkDerivation rec {
- name = "gnome-clocks-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-clocks/3.12/${name}.tar.xz";
- sha256 = "3fc0ce2b7b2540d6c2d791ff63ab1670f189a339c804fcf24c9010a478314604";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
- gnome3.gsettings_desktop_schemas makeWrapper
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- gnome3.gnome_desktop gnome3.geocode_glib geoclue2
- libgweather libnotify libtool
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-clocks" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Clocks;
- description = "Clock application designed for GNOME 3";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
deleted file mode 100644
index 642e0044a75..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, intltool, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libxslt, webkitgtk
-, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json_glib
-, gmp, desktop_file_utils }:
-
-stdenv.mkDerivation rec {
- name = "gnome-documents-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-documents/3.12/${name}.tar.xz";
- sha256 = "6d0df1d90781d56992ed5d5c2591833e89e3aa756ccab63f82dd935185ce5a53";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
- docbook_xsl desktop_file_utils
- gnome3.gsettings_desktop_schemas makeWrapper gmp
- gdk_pixbuf gnome3.gnome_icon_theme librsvg evince
- libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
- gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
- gnome3.gnome_desktop gnome3.libzapojit json_glib
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- enableParallelBuilding = true;
-
- preFixup =
- let
- libPath = stdenv.lib.makeLibraryPath
- [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ];
- in
- ''
- substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
-
- for f in $out/bin/* $out/libexec/*; do
- wrapProgram "$f" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix LD_LIBRARY_PATH ":" "${libPath}" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
- --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Documents;
- description = "Document manager application designed to work with GNOME 3";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
deleted file mode 100644
index ebcd4c0d01e..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
-, python3, libxml2, python3Packages, libnotify
-, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
-, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
-
-stdenv.mkDerivation rec {
- name = "gnome-music-3.12.2.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz";
- sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z";
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
- gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 cairo
- gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
- python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
- gst_all_1.gstreamer gst_all_1.gst-plugins-base
- gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas makeWrapper tracker ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-music" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
- --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
- --prefix PYTHONPATH : "$PYTHONPATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Music;
- description = "Music player and management application for the GNOME desktop environment";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
deleted file mode 100644
index 4d080039a88..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, exempi, libxml2
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, gegl, babl, lcms2
-, desktop_file_utils, gmp
-, gnome3, librsvg, gdk_pixbuf, libexif }:
-
-stdenv.mkDerivation rec {
- name = "gnome-photos-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-photos/3.12/${name}.tar.xz";
- sha256 = "077cc6c2ae28680457fba435a22184e25f3a60a6fbe1901a75e42f6f6136538f";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl
- gnome3.gsettings_desktop_schemas makeWrapper gmp
- gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi
- gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
- gnome3.gnome_online_accounts gnome3.gnome_desktop
- lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- preFixup = ''
- substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication"
-
- for f in $out/bin/* $out/libexec/*; do
- wrapProgram "$f" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Photos;
- description = "Photos is an application to access, organize and share your photos with GNOME 3";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
deleted file mode 100644
index 5a85e00e4e4..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
-, gobjectIntrospection, makeWrapper }:
-
-stdenv.mkDerivation rec {
- name = "nautilus-sendto-${version}";
-
- version = "3.8.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
- sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
- };
-
- buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
-
- meta = with stdenv.lib; {
- description = "Integrates Evolution and Pidgin into the Nautilus file manager";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
deleted file mode 100644
index 6289fd4a6db..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib
-, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup
-, gdk_pixbuf, librsvg }:
-
-stdenv.mkDerivation rec {
- name = "polari-3.12.2";
-
- src = fetchurl {
- url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz";
- sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995";
- };
-
- buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3
- telepathy_glib gnome3.gjs telepathy_logger libsoup
- gdk_pixbuf librsvg
- gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- propagatedUserEnvPkgs = [ telepathy_idle ];
-
- preFixup = ''
- wrapProgram "$out/bin/polari" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "Internet Relay Chat (IRC) client designed for GNOME 3";
- homepage = https://wiki.gnome.org/Apps/Polari;
- platforms = platforms.linux;
- maintainers = [ maintainers.lethalman ];
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
deleted file mode 100644
index 152acb26b1b..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
- dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base,
- glib, gobjectIntrospection, hicolor_icon_theme
-}:
-
-stdenv.mkDerivation rec {
- rev = "0.10.3";
- name = "gnome-shell-pomodoro-${rev}-61df3fa";
-
- src = fetchFromGitHub {
- owner = "codito";
- repo = "gnome-shell-pomodoro";
- rev = "${rev}";
- sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship";
- };
-
- configureScript = ''./autogen.sh'';
-
- buildInputs = [
- which automake113x intltool glib gobjectIntrospection pkgconfig libtool
- makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
- gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
- gnome3_12.gsettings_desktop_schemas gnome3_12.gnome_desktop
- gnome3_12.gnome_common gnome3_12.gnome_shell hicolor_icon_theme gtk3
- ];
-
- preBuild = ''
- sed -i \
- -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
- -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3_12.gnome_desktop}\1|' \
- vapi/Makefile
- '';
-
- preFixup = ''
- wrapProgram $out/bin/gnome-pomodoro \
- --prefix XDG_DATA_DIRS : \
- "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://github.com/codito/gnome-shell-pomodoro;
- description =
- "Personal information management application that provides integrated " +
- "mail, calendaring and address book functionality";
- maintainers = with maintainers; [ DamienCassou ];
- license = licenses.gpl3;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
deleted file mode 100644
index 02365d6b3d5..00000000000
--- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, vala
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, gnupg, libsoup
-, gnome3, librsvg, gdk_pixbuf, gpgme
-, libsecret, avahi, p11_kit }:
-
-stdenv.mkDerivation rec {
- name = "seahorse-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/seahorse/3.12/${name}.tar.xz";
- sha256 = "5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
- gnome3.gsettings_desktop_schemas makeWrapper gnupg
- gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme
- libsecret avahi libsoup p11_kit vala gnome3.gcr
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- preFixup = ''
- wrapProgram "$out/bin/seahorse" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Seahorse;
- description = "Application for managing encryption keys and passwords in the GnomeKeyring";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
deleted file mode 100644
index 4d6c91787a3..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
- name = "baobab-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/baobab/3.12/${name}.tar.xz";
- sha256 = "494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c";
- };
-
- doCheck = true;
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
- gnome3.gsettings_desktop_schemas makeWrapper file
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- preFixup = ''
- wrapProgram "$out/bin/baobab" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Baobab;
- description = "Graphical application to analyse disk usage in any Gnome environment";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
deleted file mode 100644
index 3a6c3f0dd35..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
-, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }:
-
-
-stdenv.mkDerivation rec {
- name = "caribou-0.4.13";
-
- src = fetchurl {
- url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz";
- sha256 = "953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782";
- };
-
- buildInputs = with gnome3;
- [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3
- libxml2 libXtst gtk2 intltool libxslt ];
-
- propagatedBuildInputs = [ gnome3.libgee libxklavier ];
-
- preBuild = ''
- patchShebangs .
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
deleted file mode 100644
index a1d98449bee..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
-
-stdenv.mkDerivation rec {
- name = "dconf-${version}";
- version = "0.20.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz";
- sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9";
- };
-
- buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
- intltool docbook_xsl docbook_xsl_ns makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/bin/dconf-editor" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-
- rm $out/lib/gio/modules/giomodule.cache
- rm $out/share/icons/hicolor/icon-theme.cache
- rm $out/share/icons/HighContrast/icon-theme.cache
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
deleted file mode 100644
index a10450d9332..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
-, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
-, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
-, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
-, telepathy_logger, libnotify, clutter, libsoup, gnutls
-, evolution_data_server
-, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }:
-
-# TODO: enable more features
-
-stdenv.mkDerivation rec {
- name = "empathy-3.12.5";
-
- src = fetchurl {
- url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz";
- sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86";
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
- gnome_online_accounts shared_mime_info ];
- propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
- telepathy_mission_control ];
- buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
- libxml2 libxslt icu file makeWrapper
- telepathy_glib clutter_gtk clutter-gst cogl
- gst_all_1.gstreamer gst_all_1.gst-plugins-base
- gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
- libnotify clutter libsoup gnutls libgee p11_kit
- libcanberra_gtk3 telepathy_farstream farstream
- gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas file libtool librsvg ];
-
- NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
- "-I${dbus_libs}/include/dbus-1.0"
- "-I${dbus_libs}/lib/dbus-1.0/include" ];
-
- preFixup = ''
- for f in $out/bin/* $out/libexec/*; do
- wrapProgram $f \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Empathy;
- description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
- maintainers = with maintainers; [ lethalman ];
- # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
deleted file mode 100644
index de30f0dbbe1..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
-, shared_mime_info, makeWrapper, librsvg, libexif }:
-
-
-stdenv.mkDerivation rec {
- name = "eog-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/eog/3.12/${name}.tar.xz";
- sha256 = "0ca8be7f20c98e9b104b2c1fa53df293e5403e6d517de845ae0f3b72777453fd";
- };
-
- buildInputs = with gnome3;
- [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
- gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ];
-
- preFixup = ''
- wrapProgram "$out/bin/eog" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/EyeOfGnome;
- platforms = platforms.linux;
- description = "GNOME image viewer";
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
deleted file mode 100644
index d159965c544..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
-, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
-, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }:
-
-stdenv.mkDerivation rec {
- name = "epiphany-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz";
- sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93";
- };
-
- # Tests need an X display
- configureFlags = [ "--disable-static --disable-tests" ];
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- nativeBuildInputs = [ pkgconfig file ];
-
- configureScript = "./autogen.sh";
-
- buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file
- webkitgtk libsoup libsecret gnome_desktop libnotify libtool
- sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
- gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
-
- NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
-
- enableParallelBuilding = true;
-
- preFixup = ''
- for f in $out/bin/* $out/libexec/*; do
- wrapProgram "$f" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- patches = [ ./libxml_missing_dep.patch ];
- patchFlags = "-p0";
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Epiphany;
- description = "WebKit based web browser for GNOME";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
deleted file mode 100644
index c4dc85cd97e..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig 2014-05-19 13:28:28.493988695 +0200
-+++ configure.ac 2014-05-19 13:28:54.837159748 +0200
-@@ -115,6 +115,7 @@
-
- PKG_CHECK_MODULES(WEB_EXTENSION, [
- $WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED
-+ libxml-2.0 >= $LIBXML_REQUIRED
- libsecret-1 >= $LIBSECRET_REQUIRED
- ])
- AC_SUBST(WEB_EXTENSION_CFLAGS)
diff --git a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
deleted file mode 100644
index d1ad071d426..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
-, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
-, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
-, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
-, gobjectIntrospection
-}:
-
-stdenv.mkDerivation rec {
- name = "evince-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz";
- sha256 = "30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d";
- };
-
- buildInputs = [
- pkgconfig intltool perl perlXMLParser libxml2
- glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
- itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
- poppler ghostscriptX djvulibre libspectre
- makeWrapper libsecret librsvg
- ];
-
- configureFlags = [
- "--disable-nautilus" # Do not use nautilus
- "--enable-introspection"
- ];
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- preConfigure = with stdenv.lib;
- optionalString doCheck ''
- for file in test/*.py; do
- echo "patching $file"
- sed '1s,/usr,${python},' -i "$file"
- done
- '' + optionalString (recentListSize != null) ''
- sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
- sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
- '';
-
- preFixup = ''
- # Tell Glib/GIO about the MIME info directory, which is used
- # by `g_file_info_get_content_type ()'.
- wrapProgram "$out/bin/evince" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- doCheck = false; # would need pythonPackages.dogTail, which is missing
-
- meta = with stdenv.lib; {
- homepage = http://www.gnome.org/projects/evince/;
- description = "GNOME's document viewer";
-
- longDescription = ''
- Evince is a document viewer for multiple document formats. It
- currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal
- of Evince is to replace the multiple document viewers that exist
- on the GNOME Desktop with a single simple application.
- '';
-
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.vcunat ];
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
deleted file mode 100644
index a92cf684a76..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python, sqlite
-, intltool, libsoup, libxml2, libsecret, icu
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
-
-
-stdenv.mkDerivation rec {
- name = "evolution-data-server-3.12.5";
-
- src = fetchurl {
- url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz";
- sha256 = "d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811";
- };
-
- buildInputs = with gnome3;
- [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
- gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper icu sqlite ]
- ++ stdenv.lib.optional valaSupport vala;
-
- # uoa irrelevant for now
- configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
- ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
-
- preFixup = ''
- for f in "$out/libexec/"*; do
- wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- maintainers = [ maintainers.lethalman ];
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
deleted file mode 100644
index 7e3af8405a4..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
-, telepathy_glib, evolution_data_server, libsecret, db }:
-
-# TODO: enable more folks backends
-
-stdenv.mkDerivation rec {
- name = "folks-0.9.8";
-
- src = fetchurl {
- url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz";
- sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj";
- };
-
- propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
- # dbus_daemon needed for tests
- buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
- vala libsecret libxml2 libsoup nspr nss intltool db ];
- nativeBuildInputs = [ pkgconfig ];
-
- configureFlags = "--disable-fatal-warnings";
-
- NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
- "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
-
- enableParallelBuilding = true;
-
- postBuild = "rm -rf $out/share/gtk-doc";
-
- meta = {
- description = "Folks";
-
- homepage = https://wiki.gnome.org/Projects/Folks;
-
- license = stdenv.lib.licenses.lgpl2Plus;
-
- maintainers = with stdenv.lib.maintainers; [ lethalman ];
- platforms = stdenv.lib.platforms.gnu; # arbitrary choice
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
deleted file mode 100644
index a4cb3e8c146..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
-, intltool, polkit, orbit, withGtk ? false }:
-
-assert withGtk -> (gnome3 != null);
-
-stdenv.mkDerivation rec {
-
- versionMajor = "3.2";
- versionMinor = "6";
- moduleName = "GConf";
-
- origName = "${moduleName}-${versionMajor}.${versionMinor}";
-
- name = "gconf-${versionMajor}.${versionMinor}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
- sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
- };
-
- buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
- propagatedBuildInputs = [ glib dbus_glib ];
- nativeBuildInputs = [ pkgconfig intltool ];
-
- # ToDo: ldap reported as not found but afterwards reported as supported
-
- meta = with stdenv.lib; {
- homepage = http://projects.gnome.org/gconf/;
- description = "A system for storing application preferences";
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
deleted file mode 100644
index 6dd69a64fd7..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
-, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt, vala }:
-
-stdenv.mkDerivation rec {
- name = "gcr-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gcr/3.12/${name}.tar.xz";
- sha256 = "456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c";
- };
-
- buildInputs = [
- pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt
- libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
- ];
-
- #doCheck = true;
-
- preFixup = ''
- wrapProgram "$out/bin/gcr-viewer" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
deleted file mode 100644
index a939a8d4fd9..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
- name = "gdm-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gdm/3.12/${name}.tar.xz";
- sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4";
- };
-
- # Only needed to make it build
- preConfigure = ''
- substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
- '';
-
- configureFlags = [ "--localstatedir=/var" "--with-systemd=yes"
- "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
-
- buildInputs = [ pkgconfig glib itstool libxml2 intltool
- accountsservice gnome3.dconf systemd
- gobjectIntrospection libX11 gtk
- libcanberra_gtk3 pam libtool ];
-
- #enableParallelBuilding = true; # problems compiling
-
- preBuild = ''
- substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
- substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
- '';
-
- patches = [ ./xserver_path.patch ./sessions_dir.patch ./propagate_env.patch ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Projects/GDM;
- description = "A program that manages graphical display servers and handles graphical user logins";
- platforms = platforms.linux;
- maintainers = [ maintainers.lethalman ];
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
deleted file mode 100644
index b3e356a65c3..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/daemon/gdm-launch-environment.c 2014-11-24 15:43:55.532879804 +0100
-+++ a/daemon/gdm-launch-environment.c 2014-11-28 18:22:42.636313967 +0100
-@@ -220,8 +220,8 @@
- "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
- "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
- "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
-- "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH",
-- NULL
-+ "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH",
-+ "XDG_CONFIG_DIRS", NULL
- };
- char *system_data_dirs;
- int i;
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
- DATADIR "/wayland-sessions/",
- #endif
-+ NULL,
- NULL
- };
-
-+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
- return search_dirs;
- }
-
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
deleted file mode 100644
index 412daee9f27..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
-
-- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+ if (g_getenv("GDM_X_SERVER") != NULL) {
-+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+ } else {
-+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+ }
- }
-
- static gboolean
diff --git a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
deleted file mode 100644
index 6a461e3bde6..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
-
-
-stdenv.mkDerivation rec {
- name = "geocode-glib-3.12.2";
-
-
- src = fetchurl {
- url = "mirror://gnome/sources/geocode-glib/3.12/${name}.tar.xz";
- sha256 = "5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e";
- };
-
- buildInputs = with gnome3;
- [ intltool pkgconfig glib libsoup json_glib ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
deleted file mode 100644
index c1e5486d3a7..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
-
-
-stdenv.mkDerivation rec {
- name = "gjs-1.40.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gjs/1.40/${name}.tar.xz";
- sha256 = "2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793";
- };
-
- buildInputs = with gnome3;
- [ gobjectIntrospection pkgconfig glib pango ];
-
- propagatedBuildInputs = [ spidermonkey_24 ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
deleted file mode 100644
index 46db008787f..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool }:
-
-stdenv.mkDerivation rec {
- name = "gnome-backgrounds-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz";
- sha256 = "ac4d3e0fffc5991865ca748e728a1ab87f167400105250ce2195b03502427180";
- };
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
deleted file mode 100644
index fae47476898..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
-, udev, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
- name = "gnome-bluetooth-${gnome3.version}.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
- sha256 = "0rsw27yj6887axk7s2vwpsr0pmic0wdskl7sx8rk4kns7b0ifs88";
- };
-
- buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
- gsettings_desktop_schemas itstool ];
-
- meta = with stdenv.lib; {
- homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
- description = "Application that let you manage Bluetooth in the GNOME destkop";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
deleted file mode 100644
index 19d0c9c10e8..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
- name = "gnome-calculator-3.12.3";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz";
- sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410";
- };
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
- libxml2 gnome3.gtksourceview
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-calculator" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
- description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
deleted file mode 100644
index b534d6922b7..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, which, autoconf, automake }:
-
-stdenv.mkDerivation rec {
- name = "gnome-common-3.12.0";
-
- src = fetchurl {
- url = "https://download.gnome.org/sources/gnome-common/3.12/${name}.tar.xz";
- sha256 = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8";
- };
-
- patches = [(fetchurl {
- url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
- sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
- })];
-
- propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
deleted file mode 100644
index 926762defbd..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig 2014-04-08 10:25:49.497620879 +0200
-+++ configure.ac 2014-04-08 10:26:36.639440950 +0200
-@@ -43,6 +43,7 @@
- folks-telepathy
- folks-eds
- libnotify
-+ dbus-glib-1
- telepathy-glib >= 0.17.5
- libebook-1.2 >= 3.5.3
- libedataserver-1.2 >= 3.5.3
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
deleted file mode 100644
index 5b4ca5c3418..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, intltool, fetchurl, evolution_data_server, db
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
-, bash, makeWrapper, itstool, folks, libnotify, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala, dbus_glib, automake114x, autoconf }:
-
-stdenv.mkDerivation rec {
- name = "gnome-contacts-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-contacts/3.12/${name}.tar.xz";
- sha256 = "fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
-
- # force build from vala
- preBuild = ''
- touch src/*.vala
- '';
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
- gnome3.gsettings_desktop_schemas makeWrapper file libnotify
- folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
- libxml2 libsoup gnome3.gnome_online_accounts nspr nss
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- vala automake114x autoconf db ];
-
- preFixup = ''
- for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
- wrapProgram $f \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- patches = [ ./configure_dbus_glib.patch ];
-
- patchFlags = "-p0";
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Contacts;
- description = "Contacts is GNOME's integrated address book";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
deleted file mode 100644
index 4a394b3b897..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig
-, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, krb5, networkmanagerapplet, networkmanager
-, libwacom, samba, shared_mime_info, tzdata, icu, libtool
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
-
-# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
-# TODO: bluetooth, wacom, smbclient, printers
-
-stdenv.mkDerivation rec {
- name = "gnome-control-center-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-control-center/3.12/${name}.tar.xz";
- sha256 = "5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582";
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
-
- enableParallelBuilding = true;
-
- buildInputs = with gnome3;
- [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
- libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
- gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
- accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
- shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
- gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino
- networkmanager modemmanager makeWrapper ];
-
- preBuild = ''
- substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
- substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-
- # hack to make test-endianess happy
- mkdir -p $out/share/locale
- substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
- '';
-
- preFixup = with gnome3; ''
- wrapProgram $out/bin/gnome-control-center \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- for i in $out/share/applications/*; do
- substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
- done
- '';
-
- patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ];
-
- meta = with stdenv.lib; {
- description = "Single sign-on framework for GNOME";
- maintainers = with maintainers; [ lethalman ];
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
deleted file mode 100644
index 7f5ad970f34..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c
-index d08e230..3bff4ad 100644
---- a/panels/search/cc-search-panel.c
-+++ b/panels/search/cc-search-panel.c
-@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self)
- {
- GFile *providers_location;
-
-- providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers");
-+ const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR");
-+ if (search_providers_dir == NULL) {
-+ search_providers_dir = DATADIR "/gnome-shell/search-providers";
-+ }
-+ providers_location = g_file_new_for_path (search_providers_dir);
- g_file_enumerate_children_async (providers_location,
- "standard::type,standard::name,standard::content-type",
- G_FILE_QUERY_INFO_NONE,
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
deleted file mode 100644
index e25105a303f..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
-index 7dc23c2..fcb1384 100644
---- a/panels/network/connection-editor/vpn-helpers.c
-+++ b/panels/network/connection-editor/vpn-helpers.c
-@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
- if (!so_path)
- goto next;
-
-- /* Remove any path and extension components, then reconstruct path
-- * to the SO in LIBDIR
-- */
-- so_name = g_path_get_basename (so_path);
-- g_free (so_path);
-- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
-- g_free (so_name);
--
- module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
- if (!module) {
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
deleted file mode 100644
index e8d4efc1c80..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
-, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
-, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-
- majorVersion = "3.12";
- minorVersion = "2";
- name = "gnome-desktop-${majorVersion}.${minorVersion}";
-
- # this should probably be setuphook for glib
- NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
- enableParallelBuilding = true;
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
- sha256 = "b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d";
- };
-
- buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland
- gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
deleted file mode 100644
index 6f68916b781..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
- name = "gnome-dictionary-3.10.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz";
- sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7";
- };
-
- doCheck = true;
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
- gnome3.gsettings_desktop_schemas makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-dictionary" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Dictionary;
- description = "Dictionary is the GNOME application to look up definitions";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
deleted file mode 100644
index a68624ba0e1..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
-, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
-
-stdenv.mkDerivation rec {
- name = "gnome-disk-utility-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz";
- sha256 = "5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e";
- };
-
- doCheck = true;
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
- libxslt libtool libsecret libpwquality cracklib
- libnotify libdvdread libcanberra_gtk3 docbook_xsl
- gdk_pixbuf gnome3.gnome_icon_theme
- librsvg udisks2 gnome3.gnome_settings_daemon
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-disks" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
- description = "A udisks graphical front-end";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
deleted file mode 100644
index a74c5722ba2..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool
-, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
- name = "gnome-font-viewer-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-font-viewer/3.12/${name}.tar.xz";
- sha256 = "fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45";
- };
-
- doCheck = true;
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-font-viewer" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- description = "Program that can preview fonts and create thumbnails for fonts";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
deleted file mode 100644
index 066951c63a6..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }:
-
-stdenv.mkDerivation rec {
- name = "gnome-icon-theme-symbolic-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/${name}.tar.xz";
- sha256 = "851a4c9d8e8cb0000c9e5e78259ab8b8e67c5334e4250ebcc8dfdaa33520068b";
- };
-
- configureFlags = "--enable-icon-mapping";
-
- # Avoid postinstall make hooks
- installPhase = ''
- make install-exec-am install-data-local install-pkgconfigDATA
- make -C src install
- '';
-
- buildInputs = [ pkgconfig iconnamingutils gtk ];
-
- propagatedBuildInputs = [ gnome3.gnome_icon_theme ];
-
- propagatedUserEnvPkgs = [ gnome3.gnome_icon_theme ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
deleted file mode 100644
index 34a3b67af7e..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
- name = "gnome-icon-theme-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz";
- sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a";
- };
-
- nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
-
- propagatedBuildInputs = [ hicolor_icon_theme ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
deleted file mode 100644
index 59667fe3323..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
-, docbook_xsl_ns, docbook_xsl, gnome3 }:
-
-stdenv.mkDerivation rec {
- name = "gnome-keyring-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-keyring/3.12/${name}.tar.xz";
- sha256 = "3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c";
- };
-
- buildInputs = with gnome3; [
- dbus libgcrypt pam python gtk3 gconf libgnome_keyring
- pango gcr gdk_pixbuf atk p11_kit makeWrapper
- ];
-
- propagatedBuildInputs = [ glib libtasn1 libxslt ];
-
- nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
-
- configureFlags = [
- "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
- "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
- "--with-pkcs11-modules=$$out/lib/pkcs11/"
- ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-keyring" \
- --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- wrapProgram "$out/bin/gnome-keyring-daemon" \
- --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
deleted file mode 100644
index 37d2ea1c086..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
- name = "gnome-menus-${version}";
- version = "3.10.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
- sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
- };
-
- makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
- preBuild = "patchShebangs ./scripts";
-
- buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
-
- meta = {
- homepage = "http://www.gnome.org";
- description = "Gnome menu specification";
-
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
deleted file mode 100644
index e113a854a8b..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib
-, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl
-}:
-
-stdenv.mkDerivation rec {
- name = "gnome-online-accounts-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-online-accounts/3.12/${name}.tar.xz";
- sha256 = "cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec";
- };
-
- NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
-
- enableParallelBuilding = true;
-
- buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
deleted file mode 100644
index 394a3ee447c..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json_glib, gmp, openssl, makeWrapper }:
-
-stdenv.mkDerivation rec {
- name = "gnome-online-miners-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-online-miners/3.12/${name}.tar.xz";
- sha256 = "734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23";
- };
-
- doCheck = true;
-
- buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
- gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
- gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
- gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- for f in $out/libexec/*; do
- wrapProgram "$f" \
- --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
- description = "A set of crawlers that go through your online content and index them locally in Tracker";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
deleted file mode 100644
index 349df0b103c..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
- name = "gnome-screenshot-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz";
- sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1";
- };
-
- doCheck = true;
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
- gnome3.gsettings_desktop_schemas makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-screenshot" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
- description = "Utility used in the GNOME desktop environment for taking screenshots";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
deleted file mode 100644
index bebd0b4b77c..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
-
-
-stdenv.mkDerivation rec {
- name = "gnome-session-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-session/3.12/${name}.tar.xz";
- sha256 = "fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3";
- };
-
- configureFlags = "--enable-systemd";
-
- buildInputs = with gnome3;
- [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt
- gnome3.gnome_settings_daemon xorg.xtrans
- gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-session" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
deleted file mode 100644
index 81b49e6bc64..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
-, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
-
-stdenv.mkDerivation rec {
- name = "gnome-settings-daemon-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-settings-daemon/3.12/${name}.tar.xz";
- sha256 = "e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f";
- };
-
- # fatal error: gio/gunixfdlist.h: No such file or directory
- NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
- buildInputs = with gnome3;
- [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas
- libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio
- libcanberra_gtk3 upower colord libgweather xkeyboard_config
- polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
- libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
-
- preFixup = ''
- wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix PATH : "${glib}/bin" \
- --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
deleted file mode 100644
index 8503af44613..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, intltool, fetchurl, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool
-, gnome3, file }:
-
-stdenv.mkDerivation rec {
- name = "gnome-shell-extensions-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-shell-extensions/3.12/${name}.tar.xz";
- sha256 = "30ba6e4792062e5a5cdd18e4a12230e68bfed1ded7de433ad241dd75e7ae2fc6";
- };
-
- doCheck = true;
-
- buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
- makeWrapper file ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
- description = "Modify and extend GNOME Shell functionality and behavior";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
deleted file mode 100644
index 578081ccf89..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
-, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
-, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, hicolor_icon_theme, sqlite
-, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
-
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
-
-stdenv.mkDerivation rec {
- name = "gnome-shell-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-shell/3.12/${name}.tar.xz";
- sha256 = "3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71";
- };
-
- buildInputs = with gnome3;
- [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
- libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg
- clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
- libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
- libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
- hicolor_icon_theme gnome_icon_theme gnome_icon_theme_symbolic sqlite
- at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
-
- installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
-
- preBuild = ''
- patchShebangs src/data-to-c.pl
- substituteInPlace data/Makefile --replace " install-keysDATA" ""
- '';
-
- preFixup = with gnome3; ''
- wrapProgram "$out/bin/gnome-shell" \
- --prefix PATH : "${unzip}/bin" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
- wrapProgram "$out/libexec/gnome-shell-calendar-server" \
- --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
- echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
- '';
-
- passthru = {
- mozillaPlugin = "/lib/mozilla/plugins";
- };
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
deleted file mode 100644
index 9abeda53744..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
- name = "gnome-system-log-3.9.90";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
- sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
- };
-
- doCheck = true;
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
- gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-system-log" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
- description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
deleted file mode 100644
index 622df1c5db2..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
-
-stdenv.mkDerivation rec {
- name = "gnome-system-monitor-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz";
- sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
- propagatedBuildInputs = [ ];
-
- buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
- gtkmm3 libgtop makeWrapper
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-system-monitor" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
- description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
deleted file mode 100644
index 057ef191a6f..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, libuuid
-, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
-
-stdenv.mkDerivation rec {
-
- versionMajor = "3.12";
- versionMinor = "2";
-
- name = "gnome-terminal-${versionMajor}.${versionMinor}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
- sha256 = "ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd";
- };
-
- buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
- gnome3.dconf itstool makeWrapper gnome3.nautilus ];
-
- nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
-
- # FIXME: enable for gnome3
- configureFlags = [ "--disable-search-provider" "--disable-migration" ];
-
- preFixup = ''
- for f in "$out/libexec/gnome-terminal-server"; do
- wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
deleted file mode 100644
index 5128a195141..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
- name = "gnome-themes-standard-3.12.0";
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-themes-standard/3.12/${name}.tar.xz";
- sha256 = "a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217";
- };
-
- buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
deleted file mode 100644
index 2a237b15c21..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
-
-stdenv.mkDerivation rec {
- name = "gnome-user-docs-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz";
- sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd";
- };
-
- buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
-
- meta = with stdenv.lib; {
- homepage = https://help.gnome.org/users/gnome-help/3.12;
- description = "User and system administration help for the Gnome desktop";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.cc-by-30;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
deleted file mode 100644
index fde47a66340..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
-, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
-, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
-
-stdenv.mkDerivation rec {
- name = "gnome-user-share-3.10.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz";
- sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f";
- };
-
- doCheck = true;
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- preConfigure = ''
- sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf
- '';
-
- configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
- "--with-modules-path=${apacheHttpd_2_2}/modules"
- "--disable-bluetooth"
- "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
- makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- nautilus libnotify libcanberra_gtk3 ];
-
- postInstall = ''
- mkdir -p $out/share/gsettings-schemas/$name
- mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
- ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
- '';
-
- preFixup = ''
- wrapProgram "$out/libexec/gnome-user-share" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://help.gnome.org/users/gnome-user-share/3.8;
- description = "Service that exports the contents of the Public folder in your home directory on the local network";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
deleted file mode 100644
index 9076d5c5839..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
-, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
-, gmime, json_glib, avahi, tracker, itstool }:
-
-stdenv.mkDerivation rec {
- name = "grilo-plugins-0.2.13";
-
- src = fetchurl {
- url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
- sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
- };
-
- installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
-
- buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
- lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
- gnome3.totem-pl-parser gnome3.rest gmime json_glib
- avahi gnome3.libmediaart tracker intltool itstool ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
- description = "A collection of plugins for the Grilo framework";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.lgpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
deleted file mode 100644
index 9c0e3f9a0bc..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup }:
-
-stdenv.mkDerivation rec {
- name = "grilo-0.2.11";
-
- src = fetchurl {
- url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
- sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6";
- };
-
- configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
-
- preConfigure = ''
- for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
- substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
- substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
- done
- '';
-
- buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
- gnome3.totem-pl-parser gobjectIntrospection ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
- description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.lgpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
deleted file mode 100644
index 917bcd99c95..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
- # just for passthru
-, gtk3, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation rec {
-
- versionMajor = "3.12";
- versionMinor = "2";
- moduleName = "gsettings-desktop-schemas";
-
- name = "${moduleName}-${versionMajor}.${versionMinor}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
- sha256 = "da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1";
- };
-
- buildInputs = [ glib gobjectIntrospection ];
-
- nativeBuildInputs = [ pkgconfig intltool ];
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
deleted file mode 100644
index 5779b6d0480..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2Python, perl, intltool, gettext }:
-
-stdenv.mkDerivation rec {
- name = "gtksourceview-${version}";
- version = "3.12.3";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz";
- sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk";
- };
-
- propagatedBuildInputs = [ gtk3 ];
-
- buildInputs = [ pkgconfig atk cairo glib pango
- libxml2Python perl intltool gettext ];
-
- preBuild = ''
- substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
- '';
-
- patches = [ ./nix_share_path.patch ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- maintainers = [ maintainers.lethalman ];
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch
deleted file mode 100644
index c87350167c2..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200
-+++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200
-@@ -68,6 +68,8 @@
- basename,
- NULL));
-
-+ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
-+
- g_ptr_array_add (dirs, NULL);
-
- return (gchar**) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
deleted file mode 100644
index 590f8706fff..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3
-, glib, desktop_file_utils, bash
-, makeWrapper, gnome3, file, itstool, libxml2 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic
-
-stdenv.mkDerivation rec {
- name = "gucharmap-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gucharmap/3.12/${name}.tar.xz";
- sha256 = "5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
- buildInputs = [ pkgconfig gtk3 intltool itstool glib
- gnome3.yelp_tools libxml2 file desktop_file_utils
- gnome3.gsettings_desktop_schemas makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/bin/gucharmap" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Gucharmap;
- description = "GNOME Character Map, based on the Unicode Character Database";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl3;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
deleted file mode 100644
index 1875c1491f9..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
-
-stdenv.mkDerivation rec {
- name = "libcroco-0.6.8";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
- sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
- };
-
- configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
-
- buildInputs = [ pkgconfig libxml2 glib ];
-
- meta = with stdenv.lib; {
- platforms = platforms.unix;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
deleted file mode 100644
index 9a1a45e0d1a..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib
-, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
-
-stdenv.mkDerivation rec {
- name = "libgdata-0.14.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz";
- sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax";
- };
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
-
- buildInputs = with gnome3;
- [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
- liboauth gcr gnome_online_accounts p11_kit openssl ];
-
- meta = with stdenv.lib; {
- description = "GData API library";
- maintainers = with maintainers; [ raskin ];
- platforms = platforms.linux;
- license = licenses.lgpl21Plus;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
deleted file mode 100644
index b21c274ce51..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
-let
- ver_maj = "0.14";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "libgee-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
- sha256 = "08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd";
- };
-
- doCheck = true;
-
- patches = [ ./fix_introspection_paths.patch ];
-
- buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
-
- meta = with stdenv.lib; {
- description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
- license = licenses.lgpl21Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
deleted file mode 100644
index 67003f45164..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000
-+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000
-@@ -12085,8 +12085,8 @@
- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
-+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
deleted file mode 100644
index c6c9323c010..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
- name = "libgnome-keyring-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
- sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
- };
-
- propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
- nativeBuildInputs = [ pkgconfig intltool ];
-
- meta = {
- description = "Framework for managing passwords and other secrets";
- homepage = http://live.gnome.org/GnomeKeyring;
- license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
- inherit (glib.meta) platforms maintainers;
-
- longDescription = ''
- gnome-keyring is a program that keeps password and other secrets for
- users. The library libgnome-keyring is used by applications to integrate
- with the gnome-keyring system.
- '';
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
deleted file mode 100644
index 1156474e5a7..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }:
-
-stdenv.mkDerivation rec {
- name = "libgnomekbd-3.6.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
- sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
- };
-
- buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
-
- preFixup = ''
- wrapProgram $out/bin/gkbd-keyboard-display \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- description = "Keyboard management library";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
deleted file mode 100644
index 8246a2183b7..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata }:
-
-stdenv.mkDerivation rec {
- name = "libgweather-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libgweather/3.12/${name}.tar.xz";
- sha256 = "54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37";
- };
-
- makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
- configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
- propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ];
- nativeBuildInputs = [ pkgconfig intltool ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
deleted file mode 100644
index 72d307f4f1a..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
-, openssl, bzip2, acl, attr
-}:
-
-stdenv.mkDerivation rec {
- name = "libgxps-0.2.2";
-
- src = fetchurl {
- url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
- sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
- };
-
- buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
-
- configureFlags = "--without-liblcms2";
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
deleted file mode 100644
index 547a52ccf9a..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool
-, glib, gtk3, gobjectIntrospection, python, pygobject3
-}:
-
-stdenv.mkDerivation rec {
- name = "libpeas-${version}";
- version = "1.10.0";
-
- buildInputs = [
- intltool pkgconfig
- glib gtk3 gobjectIntrospection python pygobject3
- ];
-
- src = fetchurl {
- url = "mirror://gnome/sources/libpeas/1.10/${name}.tar.xz";
- sha256 = "4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47";
- };
-
- preFixup = ''
- rm $out/share/icons/hicolor/icon-theme.cache
- '';
-
- meta = {
- description = "A GObject-based plugins engine";
- homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
deleted file mode 100644
index 5a8117528b6..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
-
-stdenv.mkDerivation rec {
- name = "libzapojit-0.0.3";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
- sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
- };
-
- buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
deleted file mode 100644
index aa1af1ebd55..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
-, libtool, makeWrapper }:
-
-
-stdenv.mkDerivation rec {
- name = "mutter-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/mutter/3.12/${name}.tar.xz";
- sha256 = "e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173";
- };
-
- # fatal error: gio/gunixfdlist.h: No such file or directory
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra";
-
- buildInputs = with gnome3;
- [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
- gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
- libcanberra_gtk3 zenity libtool makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/bin/mutter" \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
deleted file mode 100644
index dceb7c817bd..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
-, gtk, gnome3, libunique, intltool, gobjectIntrospection
-, libnotify, makeWrapper, exempi, librsvg, tracker }:
-
-stdenv.mkDerivation rec {
- name = "nautilus-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/nautilus/3.12/${name}.tar.xz";
- sha256 = "969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1";
- };
-
- buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
- gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
-
- preFixup = ''
- wrapProgram "$out/bin/nautilus" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- patches = [ ./extension_dir.patch ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
deleted file mode 100644
index 317b8257992..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
-index 6273a76..4adcc8a 100644
---- a/libnautilus-private/nautilus-module.c
-+++ b/libnautilus-private/nautilus-module.c
-@@ -242,11 +242,17 @@ void
- nautilus_module_setup (void)
- {
- static gboolean initialized = FALSE;
-+ const gchar* extensiondir = NULL;
-
- if (!initialized) {
- initialized = TRUE;
--
-- load_module_dir (NAUTILUS_EXTENSIONDIR);
-+
-+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
-+ if (extensiondir == NULL) {
-+ extensiondir = NAUTILUS_EXTENSIONDIR;
-+ }
-+
-+ load_module_dir (extensiondir);
-
- eel_debug_call_at_shutdown (free_module_objects);
- }
diff --git a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
deleted file mode 100644
index 9e19d4f9005..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
- name = "rest-0.7.91";
-
- src = fetchurl {
- url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
- sha256 = "838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a";
- };
-
- buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
-
- configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
deleted file mode 100644
index 2830d5bac27..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
-, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
-, gdk_pixbuf, librsvg, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
- name = "sushi-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz";
- sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff";
- };
-
- propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
- buildInputs = [ pkgconfig file intltool gobjectIntrospection glib
- clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg
- gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ];
-
- enableParallelBuilding = true;
-
- preFixup = ''
- wrapProgram $out/libexec/sushi-start \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
- description = "A quick previewer for Nautilus";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2Plus;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
deleted file mode 100644
index f1b3bfe53c1..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }:
-
-stdenv.mkDerivation rec {
- name = "totem-pl-parser-3.10.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
- sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
- };
-
- buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Videos;
- description = "Simple GObject-based library to parse and save a host of playlist formats";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.lgpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
deleted file mode 100644
index 9c2db40f89d..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, gst_all_1
-, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2, dbus_glib
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
- name = "totem-3.12.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz";
- sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn";
- };
-
- doCheck = true;
-
- enableParallelBuilding = true;
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
- clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
- gst_all_1.gstreamer gst_all_1.gst-plugins-base
- gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
- gnome3.libpeas pygobject3 shared_mime_info dbus_glib
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas makeWrapper file ];
-
- preFixup = ''
- wrapProgram "$out/bin/totem" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
- --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Videos;
- description = "Movie player for the GNOME desktop based on GStreamer";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
deleted file mode 100644
index d14b088f530..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, upower
-, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection
-, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf
-, gnome3, librsvg, gdk_pixbuf, file, libnotify
-, evolution_data_server, gst_all_1, poppler, libtool
-, icu, taglib, libjpeg, libtiff, giflib, libcue
-, libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
-
-stdenv.mkDerivation rec {
- name = "tracker-1.0.3";
-
- src = fetchurl {
- url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz";
- sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h";
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
- enableParallelBuilding = true;
-
- preConfigure = ''
- substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/"
- sed -i -e 's,glib/poppler.h,poppler.h,' src/tracker-extract/tracker-extract-pdf.c
- '';
-
- buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
- bzip2 gnome3.totem-pl-parser gobjectIntrospection
- automake114x autoconf libtool
- gnome3.gsettings_desktop_schemas makeWrapper file
- gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
- upower libnotify evolution_data_server gnome3.libgee
- gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
- poppler icu taglib libjpeg libtiff giflib libvorbis
- exempi networkmanager libpng libexif libgsf libuuid
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
- preFixup = ''
- for f in $out/bin/* $out/libexec/*; do
- wrapProgram $f \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Projects/Tracker;
- description = "Desktop-neutral user information store, search tool and indexer";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
deleted file mode 100644
index 1692b2c9c96..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, hicolor_icon_theme, gnome3
-, libnotify, file, telepathy_glib, dbus_glib }:
-
-stdenv.mkDerivation rec {
- name = "vino-${versionMajor}.${versionMinor}";
- versionMajor = "3.12";
- versionMinor = "0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
- sha256 = "86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b";
- };
-
- doCheck = true;
-
- buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
- hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
- dbus_glib telepathy_glib file makeWrapper ];
-
- preFixup = ''
- wrapProgram "$out/libexec/vino-server" \
- --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Projects/Vino;
- description = "GNOME desktop sharing server";
- maintainers = with maintainers; [ lethalman iElectric ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
deleted file mode 100644
index d3245e232ed..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection
-, selectTextPatch ? false }:
-
-stdenv.mkDerivation rec {
- versionMajor = "0.36";
- versionMinor = "3";
- moduleName = "vte";
-
- name = "${moduleName}-${versionMajor}.${versionMinor}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
- sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
- };
-
- patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch;
-
- buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
-
- configureFlags = [ "--enable-introspection" ];
-
- enableParallelBuilding = true;
-
- postInstall = ''
- substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
- '';
-
- meta = with stdenv.lib; {
- homepage = http://www.gnome.org/;
- description = "A library implementing a terminal emulator widget for GTK+";
- longDescription = ''
- VTE is a library (libvte) implementing a terminal emulator widget for
- GTK+, and a minimal sample application (vte) using that. Vte is
- mainly used in gnome-terminal, but can also be used to embed a
- console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
- character set conversion, as well as emulating any terminal known to
- the system's terminfo database.
- '';
- license = licenses.lgpl2;
- maintainers = with maintainers; [ astsmtl antono lethalman ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
deleted file mode 100644
index ba83380f86d..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
-
-stdenv.mkDerivation rec {
- name = "yelp-tools-3.12.1";
-
- src = fetchurl {
- url = "mirror://gnome/sources/yelp-tools/3.12/${name}.tar.xz";
- sha256 = "7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172";
- };
-
- buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
-
- doCheck = true;
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
- description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
- maintainers = with maintainers; [ iElectric ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
deleted file mode 100644
index e9911823073..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, bash
-, itstool, libxml2, libxslt }:
-
-stdenv.mkDerivation rec {
- name = "yelp-xsl-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/yelp-xsl/3.12/${name}.tar.xz";
- sha256 = "dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656";
- };
-
- doCheck = true;
-
- buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Yelp;
- description = "Yelp's universal stylesheets for Mallard and DocBook";
- maintainers = with maintainers; [ lethalman ];
- license = [licenses.gpl2 licenses.lgpl2];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
deleted file mode 100644
index 2e7715d1efc..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
-, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
-
-stdenv.mkDerivation rec {
- name = "yelp-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/yelp/3.12/${name}.tar.xz";
- sha256 = "0k2a1fggidmh98x2fv8zki2lbx7wx7p4b25iq11p6q8j9fwr2ff8";
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
- buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
- libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
- librsvg gdk_pixbuf gnome3.gnome_icon_theme
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- gnome3.gsettings_desktop_schemas sqlite ];
-
- preFixup = ''
- wrapProgram "$out/bin/yelp" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Yelp;
- description = "The help viewer in Gnome";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
deleted file mode 100644
index ca20bbc785d..00000000000
--- a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
-
-stdenv.mkDerivation rec {
-
- versionMajor = "3.12";
- versionMinor = "1";
-
- name = "zenity-${versionMajor}.${versionMinor}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
- sha256 = "a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11";
- };
-
- buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
-
- nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
deleted file mode 100644
index 670ceb105af..00000000000
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ /dev/null
@@ -1,299 +0,0 @@
-{ callPackage, pkgs }:
-
-rec {
- corePackages = with gnome3; [
- pkgs.desktop_file_utils pkgs.ibus
- pkgs.shared_mime_info # for update-mime-database
- gtk3 # for gtk-update-icon-cache
- glib_networking gvfs dconf gnome-backgrounds gnome_control_center
- gnome-menus gnome_settings_daemon gnome_shell
- gnome_themes_standard defaultIconTheme
- ];
-
- optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
- gucharmap nautilus totem vino yelp gnome-bluetooth
- gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
- gnome-shell-extensions gnome-system-log gnome-system-monitor
- gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
- gnome-clocks gnome-music gnome-tweak-tool gnome-photos
- nautilus-sendto
- ];
-
- inherit (pkgs) glib gtk2 gtk3 gnome2;
- gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; };
-
- # DO NOT UPGRADE CLUTTER, IT BREAKS GNOME 3.12
- clutter = pkgs.clutter_1_18;
- clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; };
- clutter-gst = pkgs.clutter-gst.override { inherit clutter; };
- cogl = pkgs.cogl_1_18;
-
- gtk = gtk3; # just to be sure
- libcanberra = pkgs.libcanberra_gtk3; # just to be sure
- inherit (pkgs.gnome2) ORBit2;
- orbit = ORBit2;
- inherit (pkgs) libsoup;
-
- version = "3.12";
-
-# Simplify the nixos module and gnome packages
- defaultIconTheme = gnome_icon_theme_symbolic;
-
-#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
-
- baobab = callPackage ./core/baobab { };
-
- caribou = callPackage ./core/caribou { };
-
- dconf = callPackage ./core/dconf { };
-
- empathy = callPackage ./core/empathy {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- epiphany = callPackage ./core/epiphany {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
-
- evolution_data_server = callPackage ./core/evolution-data-server { };
-
- gconf = callPackage ./core/gconf { };
-
- geocode_glib = callPackage ./core/geocode-glib { };
-
- gcr = callPackage ./core/gcr { }; # ToDo: tests fail
-
- gdm = callPackage ./core/gdm { };
-
- gjs = callPackage ./core/gjs { };
-
- glib_networking = pkgs.glib_networking.override {
- inherit gsettings_desktop_schemas;
- };
-
- gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
-
- gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
-
- gnome-contacts = callPackage ./core/gnome-contacts { };
-
- gnome_control_center = callPackage ./core/gnome-control-center { };
-
- gnome-calculator = callPackage ./core/gnome-calculator { };
-
- gnome_common = callPackage ./core/gnome-common { };
-
- gnome_desktop = callPackage ./core/gnome-desktop { };
-
- gnome-dictionary = callPackage ./core/gnome-dictionary { };
-
- gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
-
- gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
-
- gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
-
- gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { };
-
- gnome-menus = callPackage ./core/gnome-menus { };
-
- gnome_keyring = callPackage ./core/gnome-keyring { };
-
- libgnome_keyring = callPackage ./core/libgnome-keyring { };
-
- libgnomekbd = callPackage ./core/libgnomekbd { };
-
- folks = callPackage ./core/folks { };
-
- gnome_online_accounts = callPackage ./core/gnome-online-accounts {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- gnome-online-miners = callPackage ./core/gnome-online-miners { };
-
- gnome_session = callPackage ./core/gnome-session { };
-
- gnome_shell = callPackage ./core/gnome-shell { };
-
- gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
-
- gnome-screenshot = callPackage ./core/gnome-screenshot { };
-
- gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
-
- gnome-system-log = callPackage ./core/gnome-system-log { };
-
- gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
-
- gnome_terminal = callPackage ./core/gnome-terminal { };
-
- gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
-
- gnome-user-docs = callPackage ./core/gnome-user-docs { };
-
- gnome-user-share = callPackage ./core/gnome-user-share { };
-
- grilo = callPackage ./core/grilo { };
-
- grilo-plugins = callPackage ./core/grilo-plugins { };
-
- gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
-
- gtksourceview = callPackage ./core/gtksourceview { };
-
- gucharmap = callPackage ./core/gucharmap { };
-
- gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
-
- eog = callPackage ./core/eog { };
-
- libcroco = callPackage ./core/libcroco {};
-
- libgee = callPackage ./core/libgee { };
-
- libgdata = callPackage ./core/libgdata { };
-
- libgxps = callPackage ./core/libgxps { };
-
- libpeas = callPackage ./core/libpeas {};
-
- libgweather = callPackage ./core/libgweather { };
-
- libzapojit = callPackage ./core/libzapojit { };
-
- mutter = callPackage ./core/mutter { };
-
- nautilus = callPackage ./core/nautilus { };
-
- networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
- inherit gnome3;
- };
-
- networkmanager_pptp = pkgs.networkmanager_pptp.override {
- inherit gnome3;
- };
-
- networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
- inherit gnome3;
- };
-
- networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
- inherit gnome3;
- };
-
- networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
- inherit gnome3;
- };
-
- networkmanagerapplet = pkgs.networkmanagerapplet.override {
- inherit gnome3 gsettings_desktop_schemas glib_networking;
- };
-
- rest = callPackage ./core/rest { };
-
- sushi = callPackage ./core/sushi {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- totem = callPackage ./core/totem { };
-
- totem-pl-parser = callPackage ./core/totem-pl-parser { };
-
- tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
-
- vte = callPackage ./core/vte { };
-
- vino = callPackage ./core/vino { };
-
- yelp = callPackage ./core/yelp {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- yelp_xsl = callPackage ./core/yelp-xsl { };
-
- yelp_tools = callPackage ./core/yelp-tools { };
-
- zenity = callPackage ./core/zenity { };
-
-
-#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
-
- bijiben = callPackage ./apps/bijiben {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- evolution = callPackage ./apps/evolution {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- file-roller = callPackage ./apps/file-roller { };
-
- gedit = callPackage ./apps/gedit { };
-
- glade = callPackage ./apps/glade { };
-
- gnome-boxes = callPackage ./apps/gnome-boxes {
- gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
- spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
- };
-
- gnome-clocks = callPackage ./apps/gnome-clocks { };
-
- gnome-documents = callPackage ./apps/gnome-documents {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- gnome-music = callPackage ./apps/gnome-music { };
-
- gnome-photos = callPackage ./apps/gnome-photos { };
-
- nautilus-sendto = callPackage ./apps/nautilus-sendto { };
-
- # scrollkeeper replacement
- rarian = callPackage ./desktop/rarian { };
-
- seahorse = callPackage ./apps/seahorse { };
-
- polari = callPackage ./apps/polari { };
-
- pomodoro = callPackage ./apps/pomodoro { };
-
-#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
-
- anjuta = callPackage ./devtools/anjuta { };
-
- gdl = callPackage ./devtools/gdl { };
-
-#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
-
- geary = callPackage ./misc/geary {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- gfbgraph = callPackage ./misc/gfbgraph { };
-
- goffice = callPackage ./misc/goffice { };
-
- gitg = callPackage ./misc/gitg {
- webkitgtk = pkgs.webkitgtk24x;
- };
-
- libgda = callPackage ./misc/libgda { };
-
- libgit2-glib = callPackage ./misc/libgit2-glib {
- libgit2 = pkgs.libgit2.override { libssh2 = null; };
- };
-
- libmediaart = callPackage ./misc/libmediaart { };
-
- gexiv2 = callPackage ./misc/gexiv2 { };
-
- gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
-
- gpaste = callPackage ./misc/gpaste { };
-
- gtkhtml = callPackage ./misc/gtkhtml { };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
deleted file mode 100644
index a1b38b21869..00000000000
--- a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
-
-stdenv.mkDerivation rec {
- name = "rarian-0.8.1";
- src = fetchurl {
- url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
- sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
- };
-
- buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
- configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix
deleted file mode 100644
index 79bfd895257..00000000000
--- a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
- itstool, python }:
-
-let
- major = "3.13";
- minor = "1";
-
-in stdenv.mkDerivation rec {
- version = "${major}.${minor}";
- name = "anjuta-${version}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
- sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b";
- };
-
- enableParallelBuilding = true;
-
- buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
- gnome3.libgda gnome3.gtksourceview intltool itstool python ];
-
- meta = with stdenv.lib; {
- description = "Software development studio";
- homepage = http://anjuta.org/;
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix
deleted file mode 100644
index 1dae33cd4e9..00000000000
--- a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }:
-
-let
- major = "3.12";
- minor = "0";
-
-in stdenv.mkDerivation rec {
- version = "${major}.${minor}";
- name = "gdl-${version}";
-
- src = fetchurl {
- url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
- sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d";
- };
-
- buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
-
- meta = with stdenv.lib; {
- description = "Gnome docking library";
- homepage = https://developer.gnome.org/gdl/;
- license = [ licenses.gpl2 ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
deleted file mode 100644
index 4df287c7b8b..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
-, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
-, libnotify, libcanberra, libsecret, gmime
-, libpthreadstubs, hicolor_icon_theme, sqlite
-, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
-
-stdenv.mkDerivation rec {
- name = "geary-0.6.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz";
- sha256 = "0ap40mpj89sx82kcxlhl9gipq34ks2b70yhiv9s8zc5wg0nm7rpg";
- };
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
- vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
- libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme
- gdk_pixbuf librsvg gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
-
- preConfigure = ''
- substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
- '';
-
- postInstall = ''
- mkdir -p $out/share/gsettings-schemas/${name}/
- mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
- '';
-
- preFixup = ''
- wrapProgram "$out/bin/geary" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- '';
-
- enableParallelBuilding = true;
-
- patches = [ ./disable_valadoc.patch ];
- patchFlags = "-p0";
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Apps/Geary;
- description = "Mail client for GNOME 3";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.lgpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
deleted file mode 100644
index e65c0dea747..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/geary/disable_valadoc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200
-+++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200
-@@ -696,21 +696,6 @@
- ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
- )
-
--# Valadoc
--#################################################
--foreach(pkg ${ENGINE_PACKAGES})
-- list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
--endforeach(pkg ${ENGINE_PACKAGES})
--
--include(FindValadoc)
--add_custom_target(
-- valadoc
-- WORKING_DIRECTORY
-- ${CMAKE_SOURCE_DIR}/src
-- COMMAND
-- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
--)
--
- ## Make clean: remove copied files
- ##################################################
- set_property(
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix
deleted file mode 100644
index 86942c13f34..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gexiv2/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }:
-
-
-stdenv.mkDerivation rec {
- name = "gexiv2-${version}";
- version = "0.7.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gexiv2/0.7/${name}.tar.xz";
- sha256 = "12pfc5a57dhlf0c3yg5x3jissxi7jy2b6ir6y99cn510801gwcdn";
- };
-
- preConfigure = ''
- patchShebangs .
- '';
-
- buildInputs = [ pkgconfig glib libtool m4 ];
- propagatedBuildInputs = [ exiv2 ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/Projects/gexiv2;
- description = "GObject wrapper around the Exiv2 photo metadata library";
- platforms = platforms.linux;
- };
-}
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
deleted file mode 100644
index d36534f0d32..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gfbgraph/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, gnome3, libsoup, json_glib }:
-
-stdenv.mkDerivation rec {
- name = "gfbgraph-0.2.2";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
- sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4";
- };
-
- buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
- propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "GLib/GObject wrapper for the Facebook Graph API";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.lgpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
deleted file mode 100644
index 37e1975fd57..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
-, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection
-, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic
-
-stdenv.mkDerivation rec {
- name = "gitg-3.13.91";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz";
- sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37";
- };
-
- preCheck = ''
- substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
- '';
- doCheck = true;
-
- makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
- propagatedUserEnvPkgs = [ shared_mime_info
- gnome3.gnome_themes_standard ];
-
- buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
- libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
- gobjectIntrospection makeWrapper gnome3.gnome_icon_theme_symbolic gnome3.gnome_icon_theme ];
-
- preFixup = ''
- wrapProgram "$out/bin/gitg" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
- rm $out/share/gitg/icons/hicolor/icon-theme.cache
- '';
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
- description = "GNOME GUI client to view git repositories";
- maintainers = with maintainers; [ iElectric ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
deleted file mode 100644
index 26e9144349f..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, intltool, fetchurl, python, pygobject3, atk
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup
-, bash, makeWrapper, itstool, libxml2, python3Packages
-, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
-
-stdenv.mkDerivation rec {
- name = "gnome-tweak-tool-3.12.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz";
- sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29";
- };
-
- doCheck = true;
-
- propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
- makeFlags = [ "DESTDIR=/" ];
-
- buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
- gnome3.gsettings_desktop_schemas makeWrapper file
- gdk_pixbuf gnome3.gnome_icon_theme librsvg
- hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
- python pygobject3 libnotify gnome3.gnome_shell
- libsoup gnome3.gnome_settings_daemon gnome3.nautilus
- gnome3.gnome_desktop ];
-
- preFixup = ''
- wrapProgram "$out/bin/gnome-tweak-tool" \
- --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
- --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
- '';
-
- patches = [ ./find_gsettings.patch ];
-
- meta = with stdenv.lib; {
- homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
- description = "A tool to customize advanced GNOME 3 options";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl3;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch
deleted file mode 100644
index 3e68c04cb3a..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/find_gsettings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
-index a00fe19..dce74b2 100644
---- a/gtweak/gsettings.py
-+++ b/gtweak/gsettings.py
-@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
-
- class _GSettingsSchema:
- def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
-- if not schema_dir:
-- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
- if not schema_filename:
- schema_filename = schema_name + ".gschema.xml"
-+ if not schema_dir:
-+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-+ for xdg_dir in GLib.get_system_data_dirs():
-+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
-+ if os.path.exists(os.path.join(dir, schema_filename)):
-+ schema_dir = dir
-+ break
-
- schema_path = os.path.join(schema_dir, schema_filename)
- if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix
deleted file mode 100644
index 02520a9f121..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/goffice/0.8.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
-, pango, libgsf, libxml2, libart, intltool, gettext
-, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
-
-stdenv.mkDerivation rec {
- name = "goffice-0.8.17";
-
- src = fetchurl {
- url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
- sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
- };
-
- # fix linking error: undefined reference to pcre_info
- patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
-
- buildInputs = [
- pkgconfig libglade bzip2 libart intltool gettext
- gconf libgnomeui pcre
- ];
-
- propagatedBuildInputs = [
- # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
- glib libgsf libxml2 gtk libglade libart cairo pango
- ];
-
- postInstall =
- ''
- # Get GnuCash to build. Might be unnecessary if we upgrade pkgconfig.
- substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
- '';
-
- doCheck = true;
-
- meta = gnome3.goffice.meta // {
- maintainers = [ ];
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
deleted file mode 100644
index f116f5b53cd..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/goffice/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
-, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
-
-stdenv.mkDerivation rec {
- name = "goffice-0.10.18";
-
- src = fetchurl {
- url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
- sha256 = "4743a148d4452743f3484ed28285a6889adb4af2a61b72448e0ddfe7d5142c64";
- };
-
- nativeBuildInputs = [ pkgconfig intltool ];
-
- propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
- glib gtk3 libxml2 cairo pango libgsf
- ];
-
- buildInputs = [ libxslt librsvg ];
-
- enableParallelBuilding = true;
- doCheck = true;
-
- meta = {
- description = "A Glib/GTK+ set of document centric objects and utilities";
-
- longDescription = ''
- There are common operations for document centric applications that are
- conceptually simple, but complex to implement fully: plugins, load/save
- documents, undo/redo.
- '';
-
- license = stdenv.lib.licenses.gpl2Plus;
-
- platforms = stdenv.lib.platforms.gnu;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch
deleted file mode 100644
index cd4ef3c9fed..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/goffice/pcre_info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
-index bc4aae4..3adb696 100644
---- a/goffice/utils/regutf8.c
-+++ b/goffice/utils/regutf8.c
-@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
- default: return GO_REG_BADPAT;
- }
- } else {
-- gor->re_nsub = pcre_info (r, NULL, NULL);
-+ gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
- gor->nosub = (cflags & GO_REG_NOSUB) != 0;
- return 0;
- }
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
deleted file mode 100644
index f87431653c9..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gpaste/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
-, pango, gtk3, gnome3, dbus, clutter, appdata-tools, makeWrapper }:
-
-stdenv.mkDerivation rec {
- version = "3.12.3.1";
- name = "gpaste-${version}";
-
- src = fetchurl {
- url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
- sha256 = "05afbhn3gw015cf2z3045lvlnj4cz06p6libkglb2wqsfb7azbl0";
- };
-
- buildInputs = [ intltool autoreconfHook pkgconfig vala glib
- gtk3 gnome3.gnome_control_center dbus.libs
- clutter pango appdata-tools makeWrapper ];
-
- preConfigure = "intltoolize -f";
-
- configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
- "--with-dbusservicesdir=$(out)/share/dbus-1/services" ];
-
- enableParallelBuilding = true;
-
- preFixup =
- let
- libPath = stdenv.lib.makeLibraryPath
- [ glib gtk3 clutter pango ];
- in
- ''
- for i in $out/libexec/gpaste/*; do
- wrapProgram $i \
- --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
- --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
- done
- '';
-
- meta = with stdenv.lib; {
- homepage = https://github.com/Keruspe/GPaste;
- description = "Clipboard management system with GNOME3 integration";
- license = licenses.gpl3;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix
deleted file mode 100644
index 5e27b474cbd..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/gtkhtml/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, intltool
-, gnome3, enchant, isocodes }:
-
-stdenv.mkDerivation rec {
- name = "gtkhtml-4.6.6";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gtkhtml/4.6/${name}.tar.xz";
- sha256 = "145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd";
- };
-
- buildInputs = [ pkgconfig gtk3 intltool gnome3.gnome_icon_theme
- gnome3.gsettings_desktop_schemas ];
-
- propagatedBuildInputs = [ enchant isocodes ];
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix
deleted file mode 100644
index 3944644a453..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/libgda/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }:
-
-let
- major = "5.2";
- minor = "2";
-
-in stdenv.mkDerivation rec {
- version = "${major}.${minor}";
- name = "libgda-${version}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz";
- sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4";
- };
-
- configureFlags = [
- "--enable-gi-system-install=no"
- ];
-
- enableParallelBuilding = true;
-
- buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ];
-
- meta = with stdenv.lib; {
- description = "Database access library";
- homepage = http://www.gnome-db.org/;
- license = [ licenses.lgpl2 licenses.gpl2 ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
deleted file mode 100644
index 94776c90cf9..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
-, gtk_doc, gobjectIntrospection, libgit2, glib }:
-
-stdenv.mkDerivation rec {
- name = "libgit2-glib-${version}";
- version = "0.0.20";
-
- src = fetchurl {
- url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz";
- sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x";
- };
-
- configureScript = "sh ./autogen.sh";
-
- buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
- gtk_doc gobjectIntrospection libgit2 glib ];
-
- meta = with stdenv.lib; {
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix
deleted file mode 100644
index 4985bfa902c..00000000000
--- a/pkgs/desktops/gnome-3/3.12/misc/libmediaart/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
- name = "libmediaart-0.4.0";
-
- src = fetchurl {
- url = "mirror://gnome/sources/libmediaart/0.4/${name}.tar.xz";
- sha256 = "e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c";
- };
-
- buildInputs = [ pkgconfig glib gdk_pixbuf ];
-
- meta = with stdenv.lib; {
- description = "Library tasked with managing, extracting and handling media art caches";
- maintainers = with maintainers; [ lethalman ];
- license = licenses.gpl2;
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index f442bd88973..c425f41e8e1 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig
+, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, pulseaudio, fontconfig
, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, cracklib, python, krb5, networkmanagerapplet, networkmanager
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
- gdk_pixbuf gnome3.adwaita-icon-theme librsvg clutter clutter_gtk
- hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.vino udev
+ gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
+ gnome3.vino udev libcanberra_gtk3
networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
preBuild = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
index f7e3efd1dd9..f99c0c2b5a4 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, hicolor_icon_theme, sqlite, libgweather
+, sqlite, libgweather, libcanberra_gtk3
, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
@@ -23,8 +23,9 @@ stdenv.mkDerivation rec {
libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
- libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
- hicolor_icon_theme adwaita-icon-theme sqlite gnome3.gnome-bluetooth
+ libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
+ libcanberra_gtk3 gnome_control_center
+ defaultIconTheme sqlite gnome3.gnome-bluetooth
libgweather # not declared at build time, but typelib is needed at runtime
gnome3.gnome-clocks # schemas needed
at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
index 82252224906..89a1405f62b 100644
--- a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal";
};
- patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.38.0.patch;
+ patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch;
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
gnome3.gtk3 ncurses vala libxml2 ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch
deleted file mode 100644
index 0a9b82a8598..00000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-Only in vte-0.38.0.new: expose_select_text.patch
-diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c
---- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400
-+++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400
-@@ -1427,7 +1427,7 @@
- *start_offset = offset_from_xy (priv, start_x, start_y);
- _vte_terminal_get_end_selection (terminal, &end_x, &end_y);
- *end_offset = offset_from_xy (priv, end_x, end_y);
-- return _vte_terminal_get_selection (terminal);
-+ return vte_terminal_get_selection (terminal);
- }
-
- static gboolean
-diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
---- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400
-@@ -122,7 +122,6 @@
- gpointer data,
- GArray *attributes,
- gboolean include_trailing_spaces);
--static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
- static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
- static void vte_terminal_stop_processing (VteTerminal *terminal);
-
-@@ -3267,9 +3266,10 @@
- _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
- terminal->pvt->pty_input_source = 0;
- }
--static void
--_vte_terminal_connect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_connect_pty_read(VteTerminal *terminal)
- {
-+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
- if (terminal->pvt->pty_channel == NULL) {
- return;
- }
-@@ -3321,9 +3321,10 @@
- }
- }
-
--static void
--_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_disconnect_pty_read(VteTerminal *terminal)
- {
-+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
- if (terminal->pvt->pty_input_source != 0) {
- _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
- g_source_remove(terminal->pvt->pty_input_source);
-@@ -6154,6 +6155,28 @@
- }
- }
-
-+/**
-+ * vte_terminal_set_cursor_position:
-+ * @terminal: a #VteTerminal
-+ * @column: the new cursor column
-+ * @row: the new cursor row
-+ *
-+ * Set the location of the cursor.
-+ */
-+void
-+vte_terminal_set_cursor_position(VteTerminal *terminal,
-+ long column, long row)
-+{
-+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+
-+ _vte_invalidate_cursor_once(terminal, FALSE);
-+ terminal->pvt->screen->cursor_current.col = column;
-+ terminal->pvt->screen->cursor_current.row = row;
-+ _vte_invalidate_cursor_once(terminal, FALSE);
-+ _vte_check_cursor_blink(terminal);
-+ vte_terminal_queue_cursor_moved(terminal);
-+}
-+
- static GtkClipboard *
- vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
- {
-@@ -6319,7 +6342,7 @@
- vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
-
- /* Temporarily stop caring about input from the child. */
-- _vte_terminal_disconnect_pty_read(terminal);
-+ vte_terminal_disconnect_pty_read(terminal);
- }
-
- static gboolean
-@@ -6336,7 +6359,7 @@
- terminal->pvt->selecting = FALSE;
-
- /* Reconnect to input from the child if we paused it. */
-- _vte_terminal_connect_pty_read(terminal);
-+ vte_terminal_connect_pty_read(terminal);
-
- return TRUE;
- }
-@@ -6834,6 +6857,50 @@
- vte_terminal_deselect_all (terminal);
- }
-
-+/**
-+ * vte_terminal_get_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ *
-+ * Checks whether or not block selection is enabled.
-+ *
-+ * Returns: %TRUE if block selection is enabled, %FALSE if not
-+ */
-+gboolean
-+vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
-+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-+ return terminal->pvt->selection_block_mode;
-+}
-+
-+/**
-+ * vte_terminal_set_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ * @block_mode: whether block selection is enabled
-+ *
-+ * Sets whether or not block selection is enabled.
-+ */
-+void
-+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
-+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+ terminal->pvt->selection_block_mode = block_mode;
-+}
-+
-+/**
-+ * vte_terminal_select_text:
-+ * @terminal: a #VteTerminal
-+ * @start_col: the starting column for the selection
-+ * @start_row: the starting row for the selection
-+ * @end_col: the end column for the selection
-+ * @end_row: the end row for the selection
-+ *
-+ * Sets the current selection region.
-+ */
-+void
-+vte_terminal_select_text(VteTerminal *terminal,
-+ long start_col, long start_row,
-+ long end_col, long end_row) {
-+ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
-+}
-+
- /* Autoscroll a bit. */
- static gboolean
- vte_terminal_autoscroll(VteTerminal *terminal)
-@@ -8476,7 +8543,7 @@
- #endif
- kill(terminal->pvt->pty_pid, SIGHUP);
- }
-- _vte_terminal_disconnect_pty_read(terminal);
-+ vte_terminal_disconnect_pty_read(terminal);
- _vte_terminal_disconnect_pty_write(terminal);
- if (terminal->pvt->pty_channel != NULL) {
- g_io_channel_unref (terminal->pvt->pty_channel);
-@@ -12533,7 +12600,7 @@
- g_object_freeze_notify(object);
-
- if (pvt->pty != NULL) {
-- _vte_terminal_disconnect_pty_read(terminal);
-+ vte_terminal_disconnect_pty_read(terminal);
- _vte_terminal_disconnect_pty_write(terminal);
-
- if (terminal->pvt->pty_channel != NULL) {
-@@ -12588,7 +12655,7 @@
- _vte_terminal_setup_utf8 (terminal);
-
- /* Open channels to listen for input on. */
-- _vte_terminal_connect_pty_read (terminal);
-+ vte_terminal_connect_pty_read (terminal);
-
- g_object_notify(object, "pty");
-
-@@ -12623,7 +12690,7 @@
- }
-
- char *
--_vte_terminal_get_selection(VteTerminal *terminal)
-+vte_terminal_get_selection(VteTerminal *terminal)
- {
- g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
-
-Only in vte-0.38.0.new/src: .vte.c.swp
-diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h
---- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400
-+++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400
-@@ -25,7 +25,6 @@
- G_BEGIN_DECLS
-
- void _vte_terminal_accessible_ref(VteTerminal *terminal);
--char* _vte_terminal_get_selection(VteTerminal *terminal);
- void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
---- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400
-@@ -170,6 +170,18 @@
-
- void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
- void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
-+ gboolean block_mode) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_select_text(VteTerminal *terminal,
-+ long start_col, long start_row,
-+ long end_col, long end_row) _VTE_GNUC_NONNULL(1);
-+char *
-+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+
-+/* pause and unpause output */
-+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
-+void vte_terminal_connect_pty_read(VteTerminal *vte);
-
- /* Set the terminal's size. */
- void vte_terminal_set_size(VteTerminal *terminal,
-@@ -276,6 +288,8 @@
- void vte_terminal_get_cursor_position(VteTerminal *terminal,
- glong *column,
- glong *row) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_cursor_position(VteTerminal *terminal,
-+ long column, long row) _VTE_GNUC_NONNULL(1);
-
- /* Add a matching expression, returning the tag the widget assigns to that
- * expression. */
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
similarity index 82%
rename from pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
rename to pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
index 0a9b82a8598..c18f1b76b41 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
@@ -1,8 +1,8 @@
-Only in vte-0.38.0.new: expose_select_text.patch
-diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c
---- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400
-+++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400
-@@ -1427,7 +1427,7 @@
+Only in vte-0.40.0.new: .git
+diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c
+--- vte-0.40.0/src/vteaccess.c 2015-03-16 06:34:37.000000000 -0400
++++ vte-0.40.0.new/src/vteaccess.c 2015-04-10 00:08:53.146853382 -0400
+@@ -1444,7 +1444,7 @@
*start_offset = offset_from_xy (priv, start_x, start_y);
_vte_terminal_get_end_selection (terminal, &end_x, &end_y);
*end_offset = offset_from_xy (priv, end_x, end_y);
@@ -11,10 +11,10 @@ diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c
}
static gboolean
-diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
---- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400
-@@ -122,7 +122,6 @@
+diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c
+--- vte-0.40.0/src/vte.c 2015-03-18 12:38:09.000000000 -0400
++++ vte-0.40.0.new/src/vte.c 2015-04-10 00:08:53.150186722 -0400
+@@ -123,7 +123,6 @@
gpointer data,
GArray *attributes,
gboolean include_trailing_spaces);
@@ -22,7 +22,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
static void vte_terminal_stop_processing (VteTerminal *terminal);
-@@ -3267,9 +3266,10 @@
+@@ -3344,9 +3343,10 @@
_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
terminal->pvt->pty_input_source = 0;
}
@@ -35,7 +35,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
if (terminal->pvt->pty_channel == NULL) {
return;
}
-@@ -3321,9 +3321,10 @@
+@@ -3398,9 +3398,10 @@
}
}
@@ -48,7 +48,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
if (terminal->pvt->pty_input_source != 0) {
_vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
g_source_remove(terminal->pvt->pty_input_source);
-@@ -6154,6 +6155,28 @@
+@@ -6302,6 +6303,28 @@
}
}
@@ -67,8 +67,8 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
+
+ _vte_invalidate_cursor_once(terminal, FALSE);
-+ terminal->pvt->screen->cursor_current.col = column;
-+ terminal->pvt->screen->cursor_current.row = row;
++ terminal->pvt->cursor.col = column;
++ terminal->pvt->cursor.row = row;
+ _vte_invalidate_cursor_once(terminal, FALSE);
+ _vte_check_cursor_blink(terminal);
+ vte_terminal_queue_cursor_moved(terminal);
@@ -77,7 +77,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
static GtkClipboard *
vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
{
-@@ -6319,7 +6342,7 @@
+@@ -6465,7 +6488,7 @@
vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
/* Temporarily stop caring about input from the child. */
@@ -86,7 +86,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
}
static gboolean
-@@ -6336,7 +6359,7 @@
+@@ -6482,7 +6505,7 @@
terminal->pvt->selecting = FALSE;
/* Reconnect to input from the child if we paused it. */
@@ -95,7 +95,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
return TRUE;
}
-@@ -6834,6 +6857,50 @@
+@@ -6982,6 +7005,50 @@
vte_terminal_deselect_all (terminal);
}
@@ -146,7 +146,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
/* Autoscroll a bit. */
static gboolean
vte_terminal_autoscroll(VteTerminal *terminal)
-@@ -8476,7 +8543,7 @@
+@@ -8631,7 +8698,7 @@
#endif
kill(terminal->pvt->pty_pid, SIGHUP);
}
@@ -155,7 +155,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
_vte_terminal_disconnect_pty_write(terminal);
if (terminal->pvt->pty_channel != NULL) {
g_io_channel_unref (terminal->pvt->pty_channel);
-@@ -12533,7 +12600,7 @@
+@@ -12188,7 +12255,7 @@
g_object_freeze_notify(object);
if (pvt->pty != NULL) {
@@ -164,7 +164,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
_vte_terminal_disconnect_pty_write(terminal);
if (terminal->pvt->pty_channel != NULL) {
-@@ -12588,7 +12655,7 @@
+@@ -12243,7 +12310,7 @@
_vte_terminal_setup_utf8 (terminal);
/* Open channels to listen for input on. */
@@ -173,7 +173,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
g_object_notify(object, "pty");
-@@ -12623,7 +12690,7 @@
+@@ -12276,7 +12343,7 @@
}
char *
@@ -182,10 +182,9 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
{
g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
-Only in vte-0.38.0.new/src: .vte.c.swp
-diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h
---- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400
-+++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400
+diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h
+--- vte-0.40.0/src/vteint.h 2014-05-28 08:22:48.000000000 -0400
++++ vte-0.40.0.new/src/vteint.h 2015-04-10 00:08:53.153520062 -0400
@@ -25,7 +25,6 @@
G_BEGIN_DECLS
@@ -194,10 +193,10 @@ diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h
void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
---- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400
-@@ -170,6 +170,18 @@
+diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h
+--- vte-0.40.0/src/vteterminal.h 2015-03-18 12:38:09.000000000 -0400
++++ vte-0.40.0.new/src/vteterminal.h 2015-04-10 00:08:53.150186722 -0400
+@@ -169,6 +169,18 @@
void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
@@ -214,9 +213,9 @@ diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
+void vte_terminal_connect_pty_read(VteTerminal *vte);
- /* Set the terminal's size. */
- void vte_terminal_set_size(VteTerminal *terminal,
-@@ -276,6 +288,8 @@
+ /* By-word selection */
+ void vte_terminal_set_word_char_exceptions(VteTerminal *terminal,
+@@ -280,6 +292,8 @@
void vte_terminal_get_cursor_position(VteTerminal *terminal,
glong *column,
glong *row) _VTE_GNUC_NONNULL(1);
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 933e89dcd64..6243b2dd6d4 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -19,10 +19,8 @@ rec {
nautilus-sendto dconf-editor
];
- inherit (pkgs) libsoup glib gtk2;
+ inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
inherit (pkgs.gnome2) ORBit2;
- gtk3 = pkgs.gtk3_16;
- gtkmm3 = pkgs.gtkmm3_16;
orbit = ORBit2;
gnome3 = self // { recurseForDerivations = false; };
clutter = pkgs.clutter_1_22;
@@ -34,20 +32,6 @@ rec {
vala = pkgs.vala_0_26;
gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
- # Due to gtk 3.12 -> 3.16 transition
- libcanberra_gtk3 = pkgs.libcanberra_gtk3.override { inherit gtk; };
- libcanberra = libcanberra_gtk3;
- ibus = pkgs.ibus.override { inherit gnome3; };
- colord-gtk = pkgs.colord-gtk.override { inherit gtk3; };
- webkitgtk24x = pkgs.webkitgtk24x.override { inherit gtk3; };
- webkitgtk = pkgs.webkitgtk.override { inherit gtk3; };
- libwnck3 = pkgs.libwnck3.override { inherit gtk3; };
- gtkspell3 = pkgs.gtkspell3.override { inherit gtk3; };
- librsvg = pkgs.librsvg.override { inherit gtk3; };
- iconnamingutils = pkgs.iconnamingutils.override { inherit librsvg; };
- libchamplain = pkgs.libchamplain.override { inherit gtk3 clutter_gtk; };
- djvulibre = pkgs.djvulibre.override { inherit librsvg; };
-
version = "3.16";
# Simplify the nixos module and gnome packages
@@ -295,6 +279,12 @@ rec {
goffice = callPackage ./misc/goffice { };
+ goffice_0_8 = callPackage ./misc/goffice/0.8.nix {
+ inherit (pkgs.gnome2) libglade libgnomeui;
+ gconf = pkgs.gnome2.GConf;
+ libart = pkgs.gnome2.libart_lgpl;
+ };
+
gitg = callPackage ./misc/gitg {
webkitgtk = webkitgtk24x;
};
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
new file mode 100644
index 00000000000..ebfee6c4188
--- /dev/null
+++ b/pkgs/development/compilers/colm/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, makeWrapper, gcc }:
+
+stdenv.mkDerivation rec {
+ name = "colm-${version}";
+ version = "0.12.0";
+
+ src = fetchurl {
+ url = "http://www.colm.net/files/colm/${name}.tar.gz";
+ sha256 = "0kbfipxv3nvggd1a2nahk3jg22iifp2l7lkm55i5r7qkpms5sm3v";
+ };
+
+ buildInputs = [ makeWrapper ];
+
+ doCheck = true;
+ checkPhase = ''sh ./test/runtests.sh'';
+
+ postInstall = ''
+ wrapProgram $out/bin/colm \
+ --prefix PATH ":" ${gcc}/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A programming language for the analysis and transformation of computer languages";
+ homepage = http://www.colm.net/open-source/colm;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ pSub ];
+ };
+}
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 1e755ab6c0c..3a649c2420a 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -97,6 +97,12 @@ stdenv.mkDerivation rec {
[ $(./main) == "yes" ]
'';
- meta.license = stdenv.lib.licenses.bsd3;
- meta.platforms = ["x86_64-linux" "i686-linux"];
+ meta = {
+ homepage = "http://haskell.org/ghc";
+ description = "The Glasgow Haskell Compiler";
+ license = stdenv.lib.licenses.bsd3;
+ platforms = ["x86_64-linux" "i686-linux"];
+ broken = true; # https://github.com/NixOS/nixpkgs/issues/7810
+ };
+
}
diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
index d8157673fbc..0df0ef27ca0 100644
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
description = "The Glasgow Haskell Compiler";
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
inherit (ghc.meta) license;
+ broken = true; # https://github.com/NixOS/nixpkgs/issues/7810
};
}
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index f6beaf3a006..499f1db79ba 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported.
inherit (ghc.meta) license;
+ broken = true; # https://github.com/NixOS/nixpkgs/issues/7810
};
}
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix
index 5497b35ec1d..4323341dc4a 100644
--- a/pkgs/development/compilers/ghc/7.8.4.nix
+++ b/pkgs/development/compilers/ghc/7.8.4.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
version = "7.8.4";
name = "ghc-${version}";
@@ -45,4 +45,7 @@ stdenv.mkDerivation rec {
inherit (ghc.meta) license platforms;
};
-}
+} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+ # https://ghc.haskell.org/trac/ghc/ticket/9762
+ patches = [ ./hpc-7.8.4.patch ];
+})
diff --git a/pkgs/development/compilers/ghc/hpc-7.8.4.patch b/pkgs/development/compilers/ghc/hpc-7.8.4.patch
new file mode 100644
index 00000000000..212989200bc
--- /dev/null
+++ b/pkgs/development/compilers/ghc/hpc-7.8.4.patch
@@ -0,0 +1,13 @@
+diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
+index 991fc57..0aad221 100644
+--- a/compiler/cmm/CLabel.hs
++++ b/compiler/cmm/CLabel.hs
+@@ -877,7 +877,7 @@ labelDynamic dflags this_pkg this_mod lbl =
+
+ PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m)
+
+- HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m)
++ HpcTicksLabel m -> not (gopt Opt_Static dflags) && this_mod /= m
+
+ -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves.
+ _ -> False
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 473ff458ff8..1feaf68930a 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,26 +1,19 @@
-{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }:
+{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security, goPackages }:
let
loader386 = "${glibc}/lib/ld-linux.so.2";
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
loaderArm = "${glibc}/lib/ld-linux.so.3";
- srcs = {
- golang = fetchurl {
- url = https://github.com/golang/go/archive/go1.4.2.tar.gz;
- sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac";
- };
- tools = fetchgit {
- url = https://github.com/golang/tools.git;
- rev = "c836fe615a448dbf9ff5448c1aa657479a0d0aeb";
- sha256 = "0q9jnhmgmm3xzjss7ndsi6nyykmmb1y984n98118c2sipi183xp5";
- };
- };
in
-stdenv.mkDerivation {
- name = "go-1.4.2";
+stdenv.mkDerivation rec {
+ name = "go-${version}";
+ version = "1.4.2";
- src = srcs.golang;
+ src = fetchurl {
+ url = "https://github.com/golang/go/archive/go${version}.tar.gz";
+ sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac";
+ };
# perl is used for testing go vet
buildInputs = [ bison bash makeWrapper perl ]
@@ -41,9 +34,6 @@ stdenv.mkDerivation {
mv * go
fi
- mkdir -p $out/share/go/src/golang.org/x
- cp -r --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/golang.org/x/tools
-
cd go
patchShebangs ./ # replace /bin/bash
@@ -68,7 +58,10 @@ stdenv.mkDerivation {
sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c
'';
- patches = [ ./cacert-1.4.patch ];
+ patches = [
+ ./cacert-1.4.patch
+ ./remove-tools.patch
+ ];
GOOS = if stdenv.isDarwin then "darwin" else "linux";
GOARCH = if stdenv.isDarwin then "amd64"
@@ -91,13 +84,6 @@ stdenv.mkDerivation {
export PATH="$GOBIN:$PATH"
cd ./src
./all.bash
- cd -
-
- # Build extra tooling
- # TODO: Fix godoc tests
- TOOL_ROOT=golang.org/x/tools/cmd
- go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc
- go test -v $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc
'';
setupHook = ./setup-hook.sh;
@@ -107,7 +93,7 @@ stdenv.mkDerivation {
homepage = http://golang.org/;
description = "The Go Programming language";
license = "BSD";
- maintainers = with stdenv.lib.maintainers; [ cstrahan ];
+ maintainers = with stdenv.lib.maintainers; [ cstrahan wkennington ];
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/development/compilers/go/remove-tools.patch b/pkgs/development/compilers/go/remove-tools.patch
new file mode 100644
index 00000000000..807ab8e089c
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-tools.patch
@@ -0,0 +1,81 @@
+diff --git a/misc/makerelease/makerelease.go b/misc/makerelease/makerelease.go
+index 3b511b1..a46ebd8 100644
+--- a/misc/makerelease/makerelease.go
++++ b/misc/makerelease/makerelease.go
+@@ -65,9 +65,6 @@ const (
+ // These must be the command that cmd/go knows to install to $GOROOT/bin
+ // or $GOROOT/pkg/tool.
+ var toolPaths = []string{
+- "golang.org/x/tools/cmd/cover",
+- "golang.org/x/tools/cmd/godoc",
+- "golang.org/x/tools/cmd/vet",
+ }
+
+ var preBuildCleanFiles = []string{
+diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
+index b6c61b4..2006bc2 100644
+--- a/src/cmd/dist/build.c
++++ b/src/cmd/dist/build.c
+@@ -210,7 +210,9 @@ init(void)
+ workdir = xworkdir();
+ xatexit(rmworkdir);
+
+- bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch);
++ xgetenv(&b, "GOTOOLDIR");
++ if (b.len == 0)
++ bpathf(&b, "%s/pkg/tool/%s_%s", goroot, gohostos, gohostarch);
+ tooldir = btake(&b);
+
+ bfree(&b);
+diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
+index b71feb7..8468ea8 100644
+--- a/src/cmd/go/pkg.go
++++ b/src/cmd/go/pkg.go
+@@ -401,9 +401,9 @@ var goTools = map[string]targetDir{
+ "cmd/pack": toTool,
+ "cmd/pprof": toTool,
+ "cmd/yacc": toTool,
+- "golang.org/x/tools/cmd/cover": toTool,
+- "golang.org/x/tools/cmd/godoc": toBin,
+- "golang.org/x/tools/cmd/vet": toTool,
++ "nixos.org/x/tools/cmd/cover": toTool,
++ "nixos.org/x/tools/cmd/godoc": toBin,
++ "nixos.org/x/tools/cmd/vet": toTool,
+ "code.google.com/p/go.tools/cmd/cover": stalePath,
+ "code.google.com/p/go.tools/cmd/godoc": stalePath,
+ "code.google.com/p/go.tools/cmd/vet": stalePath,
+diff --git a/src/go/build/build.go b/src/go/build/build.go
+index 311ecb0..f151d8f 100644
+--- a/src/go/build/build.go
++++ b/src/go/build/build.go
+@@ -1367,7 +1367,7 @@ func init() {
+ }
+
+ // ToolDir is the directory containing build tools.
+-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
++var ToolDir = runtime.GOTOOLDIR()
+
+ // IsLocalImport reports whether the import path is
+ // a local import path, like ".", "..", "./foo", or "../foo".
+diff --git a/src/runtime/extern.go b/src/runtime/extern.go
+index 6cc5df8..9a9a964 100644
+--- a/src/runtime/extern.go
++++ b/src/runtime/extern.go
+@@ -152,6 +152,17 @@ func GOROOT() string {
+ return defaultGoroot
+ }
+
++// GOTOOLDIR returns the root of the Go tree.
++// It uses the GOTOOLDIR environment variable, if set,
++// or else the root used during the Go build.
++func GOTOOLDIR() string {
++ s := gogetenv("GOTOOLDIR")
++ if s != "" {
++ return s
++ }
++ return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
++}
++
+ // Version returns the Go tree's version string.
+ // It is either the commit hash and date at the time of the build or,
+ // when possible, a release tag like "go1.3".
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 271e0ed6633..2b4d59ca7fb 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -2,6 +2,9 @@
{ name, buildInputs ? []
+# Disabled flag
+, disabled ? false
+
# Go import path of the package
, goPackagePath
@@ -15,12 +18,14 @@
, meta ? {}, ... } @ args':
+if disabled then throw "${name} not supported for go ${go.meta.branch}" else
+
let
args = lib.filterAttrs (name: _: name != "extraSrcs") args';
in
go.stdenv.mkDerivation (
- (builtins.removeAttrs args [ "goPackageAliases" ]) // {
+ (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // {
name = "go${go.meta.branch}-${name}";
buildInputs = [ go ] ++ buildInputs ++ (lib.optional (!dontRenameImports) govers) ;
@@ -66,13 +71,15 @@ go.stdenv.mkDerivation (
else
(cd go/src
find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq | while read d; do
- local OUT;
+ [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue
+ local OUT
if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then
if ! echo "$OUT" | grep -q 'no buildable Go source files'; then
echo "$OUT" >&2
exit 1
fi
fi
+ echo "$OUT" >&2
done)
fi
@@ -99,7 +106,7 @@ go.stdenv.mkDerivation (
installPhase = args.installPhase or ''
runHook preInstall
- mkdir $out
+ mkdir -p $out
if [ -z "$dontInstallSrc" ]; then
local dir
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a71fa7fe92e..1f2bbdb6f71 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -813,4 +813,20 @@ self: super: {
cheapskate = markBrokenVersion "0.1.0.3" super.cheapskate;
lit = dontDistribute super.lit;
+ # https://github.com/snapframework/snap/issues/148
+ snap = overrideCabal super.snap (drv: {
+ patchPhase = "sed -i -e 's|attoparsec.*>=.*,|attoparsec,|' -e 's|lens.*>=.*|lens|' snap.cabal";
+ });
+
+ # https://github.com/jwiegley/gitlib/issues/46
+ gitlib = markBroken super.gitlib;
+ gitlib-sample = dontDistribute super.gitlib-sample;
+ gitlib-test = dontDistribute super.gitlib-test;
+
+ # https://github.com/yaccz/saturnin/issues/3
+ Saturnin = dontCheck super.Saturnin;
+
+ # https://github.com/kolmodin/binary/issues/74
+ binary_0_7_4_0 = dontCheck super.binary_0_7_4_0;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 53512826a5b..bfd2e89fa8e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -241,8 +241,6 @@ self: super: {
hbb = dontDistribute super.hbb;
hsdev = dontDistribute super.hsdev;
- # http://hub.darcs.net/ivanm/graphviz/issue/5
- graphviz = markBroken super.graphviz;
Graphalyze = dontDistribute super.Graphalyze;
HLearn-approximation = dontDistribute super.HLearn-approximation;
HLearn-classification = dontDistribute super.HLearn-classification;
@@ -288,9 +286,11 @@ self: super: {
# https://github.com/ocharles/tasty-rerun/issues/5
tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
+ # http://hub.darcs.net/ivanm/graphviz/issue/5
+ graphviz = appendPatch super.graphviz ./graphviz-fix-ghc710.patch;
+
# Broken with GHC 7.10.x.
aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
- annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3;
c2hs_0_20_1 = markBroken super.c2hs_0_20_1;
Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
@@ -298,7 +298,6 @@ self: super: {
control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
equivalence_0_2_5 = markBroken super.equivalence_0_2_5;
haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
- lens_4_7_0_1 = markBroken super.lens_4_7_0_1;
optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;
seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
@@ -310,4 +309,8 @@ self: super: {
# https://github.com/HugoDaniel/RFC3339/issues/14
timerep = dontCheck super.timerep;
+ # Upstream has no issue tracker.
+ harp = markBrokenVersion "0.4" super.harp;
+ happstack-authenticate = dontDistribute super.happstack-authenticate;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 660fc5d9a4e..b7430c455b1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -48,16 +48,6 @@ self: super: {
# haddock-api 2.16 requires ghc>=7.10
haddock-api = super.haddock-api_2_15_0_2;
- # Idris needs special version of some libraries
- idris = let super1 = super; in overrideCabal (super.idris.overrideScope (self: super: {
- annotated-wl-pprint = self.annotated-wl-pprint_0_5_3;
- blaze-html = self.blaze-html_0_7_0_3;
- blaze-markup = self.blaze-markup_0_6_2_0;
- lens = self.lens_4_7_0_1;
- })) (drv: {
- patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +";
- }); # warning: "Module ‘Control.Monad.Error’ is deprecated"
-
# This is part of bytestring in our compiler.
bytestring-builder = dontHaddock super.bytestring-builder;
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index e4e077def96..62d74b0ac7d 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -42,10 +42,11 @@ let
});
callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
- overrideScope = f: callPackageWithScope (fix (extend scope.__unfix__ f)) drv args;
+ overrideScope = f: callPackageWithScope (mkScope (fix (extend scope.__unfix__ f))) drv args;
};
- defaultScope = pkgs // pkgs.xlibs // pkgs.gnome // self;
+ mkScope = scope: pkgs // pkgs.xlibs // pkgs.gnome // scope;
+ defaultScope = mkScope self;
callPackage = drv: args: callPackageWithScope defaultScope drv args;
in
diff --git a/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch
new file mode 100644
index 00000000000..e72bb793da7
--- /dev/null
+++ b/pkgs/development/haskell-modules/graphviz-fix-ghc710.patch
@@ -0,0 +1,11 @@
+diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs
+--- graphviz.old/Data/GraphViz/Algorithms.hs 2015-05-18 15:21:38.379771357 +0300
++++ graphviz/Data/GraphViz/Algorithms.hs 2015-05-18 15:01:01.940122684 +0300
+@@ -38,6 +38,7 @@
+ import Data.GraphViz.Types.Canonical
+ import Data.GraphViz.Types.Internal.Common
+
++import Prelude hiding (traverse)
+ import Control.Arrow (first, second, (***))
+ import Control.Monad (unless)
+ import Control.Monad.Trans.State
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 09156dbb459..328e0fcb966 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -13307,8 +13307,8 @@ self: {
}:
mkDerivation {
pname = "Saturnin";
- version = "0.1.0";
- sha256 = "14ipl6mi1g874y66i3lvaqdisfl3agy5cj005ghpq81hv5wp770g";
+ version = "0.1.0.1";
+ sha256 = "19vbaj2zd083lw4jvgi9sdkhyk0hfgb88i9sksg6i1j569ypjk78";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -18009,15 +18009,18 @@ self: {
}) {};
"alfred" = callPackage
- ({ mkDerivation, aeson, base, bytestring, hexpat, HTTP, network-uri
- , text, xmlgen
+ ({ mkDerivation, aeson, base, bytestring, hexpat, http-conduit
+ , http-types, network-uri, text, xmlgen
}:
mkDerivation {
pname = "alfred";
- version = "0.4";
- sha256 = "1zmjllvcpj42cp01n1p2f2kzzx2ik4fql2vwbzlkaay9v9pskjk0";
+ version = "0.5";
+ revision = "1";
+ sha256 = "1c6ak56g29wkas66x7yhg1zk039mp2mvlp7njixchhh2c4kx9fvn";
+ editedCabalFile = "06e4b9ba672fc3d29452df70d2e9f9018ada5e8b62aa5890b9a70d9d937d6581";
buildDepends = [
- aeson base bytestring hexpat HTTP network-uri text xmlgen
+ aeson base bytestring hexpat http-conduit http-types network-uri
+ text xmlgen
];
description = "utility library for Alfred version 2";
license = stdenv.lib.licenses.bsd3;
@@ -19336,18 +19339,6 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "annotated-wl-pprint_0_5_3" = callPackage
- ({ mkDerivation, base }:
- mkDerivation {
- pname = "annotated-wl-pprint";
- version = "0.5.3";
- sha256 = "0g8b4hmgh7jhiknfrlaqr9sxr7a6sikkpaws15dy8mg4r792bbis";
- buildDepends = [ base ];
- homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
- description = "The Wadler/Leijen Pretty Printer, with annotation support";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
"annotated-wl-pprint" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -21848,8 +21839,8 @@ self: {
}:
mkDerivation {
pname = "auto";
- version = "0.4.2.2";
- sha256 = "1n2kknp7b8agkvn3nk6w6cabzh3n89jakzx8pi46ig2ghcxz90wf";
+ version = "0.4.2.3";
+ sha256 = "1vzsmmim3h3r0ikzci9zb32rm42gr0x2m1lmm11my5jcf88gwck7";
buildDepends = [
base base-orphans bytestring cereal containers deepseq MonadRandom
profunctors random semigroups transformers
@@ -26009,27 +26000,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "blaze-html_0_7_0_3" = callPackage
- ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
- , containers, HUnit, QuickCheck, test-framework
- , test-framework-hunit, test-framework-quickcheck2, text
- }:
- mkDerivation {
- pname = "blaze-html";
- version = "0.7.0.3";
- sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx";
- buildDepends = [ base blaze-builder blaze-markup bytestring text ];
- testDepends = [
- base blaze-builder blaze-markup bytestring containers HUnit
- QuickCheck test-framework test-framework-hunit
- test-framework-quickcheck2 text
- ];
- jailbreak = true;
- homepage = "http://jaspervdj.be/blaze";
- description = "A blazingly fast HTML combinator library for Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
"blaze-html" = callPackage
({ mkDerivation, base, blaze-builder, blaze-markup, bytestring
, containers, HUnit, QuickCheck, test-framework
@@ -26119,26 +26089,6 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "blaze-markup_0_6_2_0" = callPackage
- ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
- , QuickCheck, test-framework, test-framework-hunit
- , test-framework-quickcheck2, text
- }:
- mkDerivation {
- pname = "blaze-markup";
- version = "0.6.2.0";
- sha256 = "034aqkvxw0g6ry4d82bkvxky7w6yx4q6bp1wn4ydj9rqw8yh6m08";
- buildDepends = [ base blaze-builder bytestring text ];
- testDepends = [
- base blaze-builder bytestring containers HUnit QuickCheck
- test-framework test-framework-hunit test-framework-quickcheck2 text
- ];
- jailbreak = true;
- homepage = "http://jaspervdj.be/blaze";
- description = "A blazingly fast markup combinator library for Haskell";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
"blaze-markup" = callPackage
({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit
, QuickCheck, test-framework, test-framework-hunit
@@ -31350,8 +31300,8 @@ self: {
}:
mkDerivation {
pname = "clash-ghc";
- version = "0.5.5";
- sha256 = "1s5r7sjkxri02zxsjnkdxd03sk2j77l5r819sjw1wi6930p2fwa4";
+ version = "0.5.6";
+ sha256 = "0x538nxibz4hiyij1s9ljrgjvsmizha4nacszil1530qh7ss34n9";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -31376,8 +31326,8 @@ self: {
}:
mkDerivation {
pname = "clash-lib";
- version = "0.5.4";
- sha256 = "08is6gr5z2i478lmah6liqinbp8r72zjqfcbfmrxa4vjr3ajrpw7";
+ version = "0.5.5";
+ sha256 = "0k6k45fhkwrr3azqhp278abf4kr7is67zsqyabf71hdyp68242dx";
buildDepends = [
aeson attoparsec base bytestring clash-prelude concurrent-supply
containers deepseq directory errors fgl filepath hashable lens mtl
@@ -33288,14 +33238,13 @@ self: {
}:
mkDerivation {
pname = "compdata-param";
- version = "0.8.0.2";
- sha256 = "0496i1vnawl7m7ymvf5hl3kxy352rnhxy2gni4xkfz36psnnr7fs";
+ version = "0.9";
+ sha256 = "1b7kdg4g1mqpzy10wdxm90mbjfwmfpprkbb52ba9qbcg7scap4i4";
buildDepends = [ base compdata mtl template-haskell transformers ];
testDepends = [
base compdata containers HUnit mtl template-haskell test-framework
test-framework-hunit transformers
];
- jailbreak = true;
description = "Parametric Compositional Data Types";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -37277,6 +37226,7 @@ self: {
];
description = "Library for drawing curve based images";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"custom-prelude" = callPackage
@@ -42596,6 +42546,7 @@ self: {
homepage = "https://github.com/factisresearch/dockercook";
description = "A build tool for multiple docker image layers";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"docopt" = callPackage
@@ -42604,8 +42555,8 @@ self: {
}:
mkDerivation {
pname = "docopt";
- version = "0.7.0.1";
- sha256 = "1i8san365h3g1jhkwh4dyphczdfyd1558744hj4sv5q9lnq86l4q";
+ version = "0.7.0.2";
+ sha256 = "0c62lz0xmrd3ycnpmw254jbc5s999nb0xzrrkbv3cj3n9zzcyzak";
buildDepends = [ base containers parsec template-haskell th-lift ];
testDepends = [
aeson ansi-terminal base bytestring containers parsec split
@@ -44223,17 +44174,18 @@ self: {
}) { inherit (pkgs) libedit;};
"editor-open" = callPackage
- ({ mkDerivation, base, bytestring, directory, process, temporary
- , unix
+ ({ mkDerivation, base, bytestring, conduit, conduit-extra
+ , directory, process, resourcet, temporary, transformers, unix
}:
mkDerivation {
pname = "editor-open";
- version = "0.4.0.2";
- sha256 = "14vddpdwgjj5fi1g7ampqjsxpig87kiyddjw24kjjlxwava6nn16";
+ version = "0.5.0.0";
+ sha256 = "184i45vzf4xv5whp5q688fmrgxwyrhkqg88hw56yx34blcxywzcr";
isLibrary = true;
isExecutable = true;
buildDepends = [
- base bytestring directory process temporary unix
+ base bytestring conduit conduit-extra directory process resourcet
+ temporary transformers unix
];
homepage = "https://github.com/pharpend/editor-open";
description = "Open the user's $EDITOR for text input";
@@ -45008,7 +44960,9 @@ self: {
mkDerivation {
pname = "elocrypt";
version = "0.3.1";
+ revision = "1";
sha256 = "1hh1nf0zfijzrz6pp2gq7zh7rv3fwrybm5cfj59wfb0j0dikz8v4";
+ editedCabalFile = "d5781bd7efe030d5ee31448a6df16a3a6c3e4e72e4cabb73a42ad243240f7f6a";
isLibrary = true;
isExecutable = true;
buildDepends = [ base MonadRandom random ];
@@ -45018,6 +44972,7 @@ self: {
homepage = "https://www.github.com/sgillespie/elocrypt";
description = "Generate easy-to-remember, hard-to-guess passwords";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"email" = callPackage
@@ -45086,7 +45041,9 @@ self: {
mkDerivation {
pname = "email-validate";
version = "2.1.2";
+ revision = "1";
sha256 = "13r67kk5rjl54mwk4shap1rf8jdp1hsd6wpg4hgkf10vzk5vara5";
+ editedCabalFile = "0add2fe9264e4307cb7d464ddaf54c8147396f36740228d124224f5a27689582";
buildDepends = [ attoparsec base bytestring ghc-prim ];
testDepends = [
base bytestring HUnit QuickCheck test-framework
@@ -46334,8 +46291,8 @@ self: {
}:
mkDerivation {
pname = "eventloop";
- version = "0.4.1.0";
- sha256 = "0g4qlkvl313mi4immx5i78bdbzg0ld57ld114l8jf42fwk3qd5zd";
+ version = "0.4.1.1";
+ sha256 = "0d870kzcb08pc0ngrdkfibi0yq4zs5vcgg8acqpa8gdjaiksm8jg";
buildDepends = [
aeson base bytestring network suspend text timers websockets
];
@@ -46511,8 +46468,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "exceptional";
- version = "0.1.4.2";
- sha256 = "0macyynwj779wy1abzrl87g8zmpwa98x5vc5yqc0wnr06glmma2b";
+ version = "0.1.4.3";
+ sha256 = "0rhcqnpw97b9sy87nq7dqwiw8vl91h8yyix68d9sz10s9bi1xnlv";
buildDepends = [ base ];
homepage = "https://github.com/pharpend/exceptional";
description = "Essentially the Maybe type with error messages";
@@ -48276,8 +48233,8 @@ self: {
}:
mkDerivation {
pname = "filediff";
- version = "1.0.0.1";
- sha256 = "1341xriaylrvclbz8c5pc1dppbz4kqq1hmbrga0dlpb6vr83amv2";
+ version = "1.0.0.4";
+ sha256 = "0vzknflpbhxririabjq6wpwb9lvj0829smj94icjyrx3s9i968k6";
buildDepends = [
base bytestring data-default data-memocombinators directory either
mtl rainbow tasty tasty-hunit text threads time transformers Zora
@@ -50811,10 +50768,9 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "functor-monadic";
- version = "0.1.0.2";
- sha256 = "03jipdzark9dhwlym7ky887zzl3cdsc18wwwmg5szl1wgg30li1n";
+ version = "0.1.0.3";
+ sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg";
buildDepends = [ base ];
- jailbreak = true;
homepage = "https://github.com/ombocomp/FunctorMonadic/";
description = "Monad-style combinators for functors";
license = stdenv.lib.licenses.asl20;
@@ -51454,7 +51410,9 @@ self: {
mkDerivation {
pname = "generic-aeson";
version = "0.2.0.5";
+ revision = "1";
sha256 = "109jxrny3r1wsf2kr23vvgdid4rmq5lpqjlfbk4n7yxb9bvdbhy5";
+ editedCabalFile = "9b825c5d437c1a3a47dfb27781100229b7c535982ad42721414083cab309e461";
buildDepends = [
aeson attoparsec base generic-deriving mtl tagged text
unordered-containers vector
@@ -52427,8 +52385,8 @@ self: {
({ mkDerivation, base }:
mkDerivation {
pname = "ghc-prof-flamegraph";
- version = "0.1.0.0";
- sha256 = "1hrikiv6a8l7pq9j7zjb98zl1qlb8gdggfkcw49zmk7zay0bd1c2";
+ version = "0.1.0.1";
+ sha256 = "1k34mh63rsgx71kxhn3brscq2k20pih78axwkr0q9dg7icyg05wi";
isLibrary = false;
isExecutable = true;
buildDepends = [ base ];
@@ -54806,10 +54764,10 @@ self: {
({ mkDerivation, array, base, containers }:
mkDerivation {
pname = "graph-wrapper";
- version = "0.2.4.3";
- sha256 = "1wfazkczc9m1r0snzv5b4ax315g93qgrnqc2wnrqqnzhcfy1symg";
+ version = "0.2.4.4";
+ sha256 = "0ks4mj1f3ky8h8p9kc1djslbzs2vvlh9frab8jl09x63b15f8xzd";
buildDepends = [ array base containers ];
- homepage = "http://www.github.com/batterseapower/graph-wrapper";
+ homepage = "https://github.com/soenkehahn/graph-wrapper";
description = "A wrapper around the standard Data.Graph with a less awkward interface";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -57080,6 +57038,7 @@ self: {
];
description = "Hackage and Portage integration tool";
license = "GPL";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hactor" = callPackage
@@ -58242,6 +58201,7 @@ self: {
homepage = "http://www.happstack.com/";
description = "Happstack Authentication Library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"happstack-clientsession" = callPackage
@@ -59185,6 +59145,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hashids" = callPackage
+ ({ mkDerivation, base, bytestring, containers, split }:
+ mkDerivation {
+ pname = "hashids";
+ version = "1.0.2";
+ sha256 = "07qrsabhb825jhdbc4ka35ss7ci07avgvi8jsr69r17bnp87wnma";
+ buildDepends = [ base bytestring containers split ];
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hashmap" = callPackage
({ mkDerivation, base, containers, deepseq, hashable }:
mkDerivation {
@@ -61780,26 +61751,26 @@ self: {
"hbro" = callPackage
({ mkDerivation, aeson, base, bytestring, classy-prelude, cond
- , containers, data-default-class, dyre, errors, fast-logger, glib
- , gtk3, lens, lifted-async, lifted-base, monad-control
- , monad-logger, mtl, network-uri, optparse-applicative, pango
- , parsec, process, resourcet, safe, semigroups, stm-chans
- , system-fileio, text, time, transformers, transformers-base, unix
- , webkitgtk3, zeromq4-haskell
+ , containers, data-default-class, directory, dyre, errors
+ , exceptions, fast-logger, filepath, glib, gtk3, lens, lifted-async
+ , lifted-base, monad-control, monad-logger, mtl, network-uri
+ , optparse-applicative, pango, parsec, process, resourcet, safe
+ , semigroups, stm-chans, text, time, transformers
+ , transformers-base, unix, webkitgtk3, zeromq4-haskell
}:
mkDerivation {
pname = "hbro";
- version = "1.3.0.0";
- sha256 = "114g9dz9f7s59s9d8hb38qffmdif617nhbs2z9vsdqmylgirirmz";
+ version = "1.4.0.0";
+ sha256 = "08vw5j3a22gszbsjhjp13dkgvxj2875zjsx6w3w7c2dkjg4lijpr";
isLibrary = true;
isExecutable = true;
buildDepends = [
aeson base bytestring classy-prelude cond containers
- data-default-class dyre errors fast-logger glib gtk3 lens
- lifted-async lifted-base monad-control monad-logger mtl network-uri
- optparse-applicative pango parsec process resourcet safe semigroups
- stm-chans system-fileio text time transformers transformers-base
- unix webkitgtk3 zeromq4-haskell
+ data-default-class directory dyre errors exceptions fast-logger
+ filepath glib gtk3 lens lifted-async lifted-base monad-control
+ monad-logger mtl network-uri optparse-applicative pango parsec
+ process resourcet safe semigroups stm-chans text time transformers
+ transformers-base unix webkitgtk3 zeromq4-haskell
];
homepage = "https://github.com/k0ral/hbro";
description = "Minimal extensible web-browser";
@@ -61808,20 +61779,18 @@ self: {
"hbro-contrib" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, bytestring
- , classy-prelude, containers, glib, gtk3, hbro, lens, monad-control
- , mtl, network-uri, pango, parsec, process, resourcet, safe
- , system-fileio, text, time, transformers-base, unix, webkitgtk3
+ , classy-prelude, containers, directory, glib, gtk3, hbro, lens
+ , monad-control, mtl, network-uri, pango, parsec, process
+ , resourcet, safe, text, time, transformers-base, unix, webkitgtk3
}:
mkDerivation {
pname = "hbro-contrib";
- version = "1.3.0.0";
- revision = "1";
- sha256 = "09q7n5x61gsrjcv7ixh36daq3hj4sip5iph5ll7pfwpqd9mhxq95";
- editedCabalFile = "1df0341291f1e2820b8b0833b4951a555a96df54b3ef7cee754d32a6e53c69f0";
+ version = "1.4.0.0";
+ sha256 = "0v7qxg1phac5m06raspaq6782iid7rnvkinkji0fs0yjigbblps2";
buildDepends = [
- aeson aeson-pretty base bytestring classy-prelude containers glib
- gtk3 hbro lens monad-control mtl network-uri pango parsec process
- resourcet safe system-fileio text time transformers-base unix
+ aeson aeson-pretty base bytestring classy-prelude containers
+ directory glib gtk3 hbro lens monad-control mtl network-uri pango
+ parsec process resourcet safe text time transformers-base unix
webkitgtk3
];
homepage = "https://github.com/k0ral/hbro-contrib";
@@ -62572,9 +62541,9 @@ self: {
mkDerivation {
pname = "heist";
version = "0.14.1";
- revision = "3";
+ revision = "4";
sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy";
- editedCabalFile = "eac3bf21f0c39ced491fbd542f7a96928c13e8e3672254eb970414168afbaddf";
+ editedCabalFile = "d61d5b4f4b360c12b46179000fe761037a23182489362188c929476a42248876";
buildDepends = [
aeson attoparsec base blaze-builder blaze-html bytestring
containers directory directory-tree dlist errors filepath hashable
@@ -67330,15 +67299,14 @@ self: {
}:
mkDerivation {
pname = "hruby";
- version = "0.3.1.3";
- sha256 = "1gzbdpsighs8jj92gi1xsrhpb7zh5mc86wiv4fszmgfrwaq1w8ab";
+ version = "0.3.1.4";
+ sha256 = "0pymwdpdl1xwjcgpblsrfyyib4sz2avxwidgxzr2bac91lhf3fpm";
buildDepends = [
aeson attoparsec base bytestring scientific stm text
unordered-containers vector
];
testDepends = [ aeson attoparsec base QuickCheck text vector ];
extraLibraries = [ ruby ];
- jailbreak = true;
description = "Embed a Ruby intepreter in your Haskell program !";
license = stdenv.lib.licenses.bsd3;
}) { inherit (pkgs) ruby;};
@@ -72788,6 +72756,7 @@ self: {
];
description = "Internationalization for Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"iCalendar" = callPackage
@@ -73074,12 +73043,12 @@ self: {
, network, optparse-applicative, parsers, pretty, process, safe
, split, text, time, transformers, transformers-compat, trifecta
, uniplate, unix, unordered-containers, utf8-string, vector
- , vector-binary-instances, xml, zlib
+ , vector-binary-instances, xml, zip-archive, zlib
}:
mkDerivation {
pname = "idris";
- version = "0.9.17.1";
- sha256 = "16a3z7jq1pmqnb411aqn9qmirwyzpx3bqb0hrawc1404kbq7gdx7";
+ version = "0.9.18";
+ sha256 = "09bskx00lxzf7fdw66sbi55bqr7z1d92cabf9askjf2ych07k26s";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -73089,7 +73058,7 @@ self: {
haskeline lens libffi mtl network optparse-applicative parsers
pretty process safe split text time transformers
transformers-compat trifecta uniplate unix unordered-containers
- utf8-string vector vector-binary-instances xml zlib
+ utf8-string vector vector-binary-instances xml zip-archive zlib
];
buildTools = [ happy ];
extraLibraries = [ boehmgc gmp ];
@@ -75178,6 +75147,7 @@ self: {
free haskell-lexer lens network old-locale split stm text time tls
transformers vty x509 x509-store x509-system x509-validation
];
+ jailbreak = true;
homepage = "https://github.com/glguy/irc-core";
description = "An IRC client library and text client";
license = stdenv.lib.licenses.bsd3;
@@ -75237,6 +75207,7 @@ self: {
buildDepends = [ base QuickCheck ];
description = "Real numbers and intervals with relatively efficient exact arithmetic";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"iron-mq" = callPackage
@@ -76245,8 +76216,8 @@ self: {
}:
mkDerivation {
pname = "jmacro";
- version = "0.6.11";
- sha256 = "1b45graag0nmadaf1ssaps4g9p7xx7d2h7dy84nzmdhrpvdlw4xs";
+ version = "0.6.12";
+ sha256 = "08n00mmfixr6s3pgh6mccq1sk7932md8b36wdds3zb1p5icrrdpr";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -76266,8 +76237,8 @@ self: {
}:
mkDerivation {
pname = "jmacro-rpc";
- version = "0.3";
- sha256 = "1fkcky2f51764xcbbwnxpxyhk2mmnp364hf8njfcjsijanv938zw";
+ version = "0.3.2";
+ sha256 = "1nf5f62s749xsji2rg25dgj7mc668l3n7i7l9n1pjkn8gfwm6bx3";
buildDepends = [
aeson attoparsec base blaze-html bytestring containers
contravariant jmacro mtl scientific split text unordered-containers
@@ -76698,6 +76669,7 @@ self: {
homepage = "http://github.com/snoyberg/json-enumerator";
description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"json-extra" = callPackage
@@ -77579,18 +77551,17 @@ self: {
}) {};
"keys" = callPackage
- ({ mkDerivation, array, base, comonad, containers, free
- , semigroupoids, semigroups, transformers
+ ({ mkDerivation, array, base, comonad, containers, free, hashable
+ , semigroupoids, semigroups, transformers, unordered-containers
}:
mkDerivation {
pname = "keys";
- version = "3.10.1";
- sha256 = "007lbpfan5n1cgswsrzc4xjv0kjmjr9vn4lpqm3gwk3lnfpg8i4n";
+ version = "3.10.2";
+ sha256 = "1xmyhsqpz4rvm2i8f8xgd1wpj8qlps0lvbif1li73lzg13jiwps2";
buildDepends = [
- array base comonad containers free semigroupoids semigroups
- transformers
+ array base comonad containers free hashable semigroupoids
+ semigroups transformers unordered-containers
];
- jailbreak = true;
homepage = "http://github.com/ekmett/keys/";
description = "Keyed functors and containers";
license = stdenv.lib.licenses.bsd3;
@@ -79524,12 +79495,17 @@ self: {
}) {};
"lattices" = callPackage
- ({ mkDerivation, base, containers }:
+ ({ mkDerivation, base, containers, deepseq, hashable
+ , unordered-containers
+ }:
mkDerivation {
pname = "lattices";
- version = "1.2.1.1";
- sha256 = "0ppqvc3w7v56zya43b3fqwis50c8b57hlighzmk8jphv39y3ilp6";
- buildDepends = [ base containers ];
+ version = "1.3";
+ sha256 = "1jp63rh1girf9ka0lfi219wlisni8dsckf67h6413ihdxdh2mp3l";
+ buildDepends = [
+ base containers deepseq hashable unordered-containers
+ ];
+ homepage = "http://github.com/phadej/lattices/";
description = "Fine-grained library for constructing and manipulating lattices";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -79839,12 +79815,14 @@ self: {
}) {};
"leapseconds-announced" = callPackage
- ({ mkDerivation, base, time }:
+ ({ mkDerivation, base, QuickCheck, time }:
mkDerivation {
pname = "leapseconds-announced";
- version = "2015";
- sha256 = "14k57jw0n9nqrc9rrqsjiafk3li7z8azf9cm72gm3yrms72ph3m8";
+ version = "2015.0.0.1";
+ sha256 = "0k8khjfq1cr8wb2wgwwk7yv6461h7z6wf6qn21qd9zq9i22bpyhm";
buildDepends = [ base time ];
+ testDepends = [ base QuickCheck time ];
+ homepage = "https://github.com/bjornbm/leapseconds-announced";
description = "Leap seconds announced at library release time";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -80016,43 +79994,6 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "lens_4_7_0_1" = callPackage
- ({ mkDerivation, array, base, bifunctors, bytestring, comonad
- , containers, contravariant, deepseq, directory, distributive
- , doctest, exceptions, filepath, free, generic-deriving, ghc-prim
- , hashable, hlint, HUnit, mtl, nats, parallel, primitive
- , profunctors, QuickCheck, reflection, semigroupoids, semigroups
- , simple-reflect, split, tagged, template-haskell, test-framework
- , test-framework-hunit, test-framework-quickcheck2
- , test-framework-th, text, transformers, transformers-compat
- , unordered-containers, vector, void
- }:
- mkDerivation {
- pname = "lens";
- version = "4.7.0.1";
- revision = "3";
- sha256 = "1j9d7g4sj38zq2r8vhy05b2kbxx1sg2k0b3yx05lbxlb79wcm1j1";
- editedCabalFile = "6ac87d4c8600c9497c965d54b1e97f10d0073bed3c45381b78d1ba4b81da57c8";
- buildDepends = [
- array base bifunctors bytestring comonad containers contravariant
- distributive exceptions filepath free ghc-prim hashable mtl
- parallel primitive profunctors reflection semigroupoids semigroups
- split tagged template-haskell text transformers transformers-compat
- unordered-containers vector void
- ];
- testDepends = [
- base bytestring containers deepseq directory doctest filepath
- generic-deriving hlint HUnit mtl nats parallel QuickCheck
- semigroups simple-reflect split test-framework test-framework-hunit
- test-framework-quickcheck2 test-framework-th text transformers
- unordered-containers vector
- ];
- jailbreak = true;
- homepage = "http://github.com/ekmett/lens/";
- description = "Lenses, Folds and Traversals";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
"lens" = callPackage
({ mkDerivation, array, base, bifunctors, bytestring, comonad
, containers, contravariant, deepseq, directory, distributive
@@ -80066,8 +80007,8 @@ self: {
}:
mkDerivation {
pname = "lens";
- version = "4.10";
- sha256 = "01vmb0kknzayv3ppqgrnhnrybxw192gb4hk1kchwiiam7vr6kngd";
+ version = "4.11";
+ sha256 = "1699jbsdgffnhzpy6c2k6ld13crqibm7vc3x2gx95gwzx5hlccxm";
buildDepends = [
array base bifunctors bytestring comonad containers contravariant
distributive exceptions filepath free ghc-prim hashable
@@ -80290,6 +80231,7 @@ self: {
homepage = "http://github.com/kim/leveldb-haskell";
description = "Haskell bindings to LevelDB";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) { inherit (pkgs) leveldb;};
"leveldb-haskell-fork" = callPackage
@@ -81096,8 +81038,8 @@ self: {
}:
mkDerivation {
pname = "lifted-async";
- version = "0.7.0";
- sha256 = "1i9wm7pz8mh0gjyp7jhf3as82yi1axskv1mp5596gq7pszgglyd6";
+ version = "0.7.0.1";
+ sha256 = "0skfpgqlxni3bdn7pdg2732xkijmwsz655962wrbmflh987ms8y3";
buildDepends = [
async base constraints lifted-base monad-control transformers-base
];
@@ -82877,8 +82819,8 @@ self: {
}:
mkDerivation {
pname = "logic-TPTP";
- version = "0.4.2.0";
- sha256 = "1pqs0hr05b4jsnf73fqfgqng3h63dlswlx18142fbkv1bhphg8al";
+ version = "0.4.3.0";
+ sha256 = "0hjznn92ippwgrsmklj02w2pf6dfylyiw1kifa4svjqwa9mx4hpv";
buildDepends = [
ansi-wl-pprint array base containers mtl pointed QuickCheck syb
transformers transformers-compat
@@ -85441,6 +85383,7 @@ self: {
jailbreak = true;
description = "A silly container";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"mega-sdist" = callPackage
@@ -86835,6 +86778,7 @@ self: {
homepage = "https://github.com/DanBurton/modular-prelude#readme";
description = "A new Prelude featuring first class modules";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"modular-prelude-classy" = callPackage
@@ -89672,6 +89616,7 @@ self: {
];
description = "Monadic interface for mwc-random";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"myTestlll" = callPackage
@@ -89818,16 +89763,15 @@ self: {
}) {};
"mysql-simple-typed" = callPackage
- ({ mkDerivation, base, haskell-src-meta, mysql, mysql-simple
- , template-haskell, typedquery, utf8-string
+ ({ mkDerivation, base, mysql, mysql-simple, template-haskell
+ , typedquery, utf8-string
}:
mkDerivation {
pname = "mysql-simple-typed";
- version = "0.1.1.1";
- sha256 = "0cizs7c51884j05409nc8ldzlsbjcwpwc1ral1p1g1c98y1mpkcc";
+ version = "0.1.1.2";
+ sha256 = "19wnvmrb523n8xl5cp9kypcqcrs0xs8pwdk771y1bdin5ds9j095";
buildDepends = [
- base haskell-src-meta mysql mysql-simple template-haskell
- typedquery utf8-string
+ base mysql mysql-simple template-haskell typedquery utf8-string
];
homepage = "https://github.com/tolysz/mysql-simple-typed";
description = "Typed extension to mysql simple";
@@ -91063,12 +91007,12 @@ self: {
}) {};
"network-data" = callPackage
- ({ mkDerivation, base, bytestring, cereal, pretty, prettyclass }:
+ ({ mkDerivation, base, bytestring, cereal, pretty }:
mkDerivation {
pname = "network-data";
- version = "0.5.2";
- sha256 = "0vbmg1m4qylzbmj3z5746srfkiwvh32qi9zyc39gc87bfw2gzn8s";
- buildDepends = [ base bytestring cereal pretty prettyclass ];
+ version = "0.5.3";
+ sha256 = "0zbwplzrr899lj0ig2nyq58cayy6f8pkn4wnqbrd1i50lhq61szz";
+ buildDepends = [ base bytestring cereal pretty ];
description = "Library for network data structures and their serialization";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -93207,6 +93151,7 @@ self: {
testDepends = [
base postgresql-simple product-profunctors profunctors time
];
+ jailbreak = true;
homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
description = "An SQL-generating DSL targeting PostgreSQL";
license = stdenv.lib.licenses.bsd3;
@@ -96921,6 +96866,7 @@ self: {
jailbreak = true;
description = "Elsen Accelerated Computing Engine";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"phantom-state" = callPackage
@@ -98134,8 +98080,8 @@ self: {
}:
mkDerivation {
pname = "plugins-multistage";
- version = "0.6";
- sha256 = "02wf1q3c65ki0hgmxsqd7x48p42hh33bx3vyjykkv69jiz1why7y";
+ version = "0.6.1";
+ sha256 = "0kwibjp9r9gwkmi8i79cc217jhnqljcgdkvpsk7hclmaa7ir3caq";
buildDepends = [
base directory ghc process template-haskell th-desugar
];
@@ -98144,6 +98090,7 @@ self: {
];
description = "Dynamic linking for embedded DSLs with staged compilation";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"plumbers" = callPackage
@@ -98265,8 +98212,8 @@ self: {
}:
mkDerivation {
pname = "pointed";
- version = "4.2.0.1";
- sha256 = "1ysif8x5vlllib3gpdd3i0kdlanlzaw1pm0sjx1qayv19m1ddph7";
+ version = "4.2.0.2";
+ sha256 = "0ynswx6ybl7b6vbrm2bd2zj2sbvsclhdi440lpv1aix5smd8m2jb";
buildDepends = [
base comonad containers data-default-class hashable kan-extensions
semigroupoids semigroups stm tagged transformers
@@ -98961,17 +98908,18 @@ self: {
}) {};
"posix-pty" = callPackage
- ({ mkDerivation, base, bytestring, unix }:
+ ({ mkDerivation, base, bytestring, process, unix, util }:
mkDerivation {
pname = "posix-pty";
- version = "0.1.1";
- sha256 = "0ndr47bfm07b00kfy2p48jm7fjrd76bxbw3l7wm5yc0d0jyi65cd";
- buildDepends = [ base bytestring unix ];
+ version = "0.2.0.1";
+ sha256 = "1f0jyhfl41fvnjc290lm7x4dik2bhymcfxzf0il1iza5rpcjabxa";
+ buildDepends = [ base bytestring process unix ];
+ extraLibraries = [ util ];
homepage = "https://bitbucket.org/merijnv/posix-pty";
description = "Pseudo terminal interaction with subprocesses";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
+ }) { util = null;};
"posix-realtime" = callPackage
({ mkDerivation, base, unix }:
@@ -99220,18 +99168,17 @@ self: {
}) {};
"postgresql-simple-typed" = callPackage
- ({ mkDerivation, base, haskell-src-meta, postgresql-libpq
- , postgresql-simple, template-haskell, typedquery, utf8-string
+ ({ mkDerivation, base, postgresql-libpq, postgresql-simple
+ , template-haskell, transformers, typedquery, utf8-string
}:
mkDerivation {
pname = "postgresql-simple-typed";
- version = "0.1.0.0";
- sha256 = "1n9fkg1qcrycb7gvx4pln4xq3hpbczic4p2zv0f9hq7ljb5h3f1a";
+ version = "0.1.0.1";
+ sha256 = "0rgy0sx4fwcsr8ln14vhrp23hc1b67c07gw0hj5csrsjn40s0c2c";
buildDepends = [
- base haskell-src-meta postgresql-libpq postgresql-simple
- template-haskell typedquery utf8-string
+ base postgresql-libpq postgresql-simple template-haskell
+ transformers typedquery utf8-string
];
- jailbreak = true;
homepage = "https://github.com/tolysz/postgresql-simple-typed";
description = "Typed extension for PostgreSQL simple";
license = stdenv.lib.licenses.bsd3;
@@ -99263,24 +99210,25 @@ self: {
"postgrest" = callPackage
({ mkDerivation, aeson, base, base64-string, bcrypt, blaze-builder
- , bytestring, case-insensitive, containers, convertible, hasql
- , hasql-backend, hasql-postgres, hlint, hspec, hspec-wai
- , hspec-wai-json, HTTP, http-media, http-types, MissingH, mtl
- , network, network-uri, optparse-applicative, packdeps, process
- , QuickCheck, Ranged-sets, regex-base, regex-tdfa, regex-tdfa-text
- , resource-pool, scientific, split, string-conversions
- , stringsearch, text, time, transformers, unordered-containers
- , vector, wai, wai-cors, wai-extra, wai-middleware-static, warp
+ , bytestring, case-insensitive, cassava, containers, convertible
+ , hasql, hasql-backend, hasql-postgres, heredoc, hlint, hspec
+ , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, MissingH
+ , mtl, network, network-uri, optparse-applicative, packdeps
+ , process, QuickCheck, Ranged-sets, regex-base, regex-tdfa
+ , regex-tdfa-text, resource-pool, scientific, split
+ , string-conversions, stringsearch, text, time, transformers
+ , unordered-containers, vector, wai, wai-cors, wai-extra
+ , wai-middleware-static, warp
}:
mkDerivation {
pname = "postgrest";
- version = "0.2.7.0";
- sha256 = "1mr7wka4kxxmpnhw9p49a4vh68iavrh74shc712z17gmr9yahvcx";
+ version = "0.2.8.0";
+ sha256 = "1hmscdlg89r65q0i43ll22kb6iy9ryx6gmfxk795h8wsrk2f18sw";
isLibrary = false;
isExecutable = true;
buildDepends = [
aeson base base64-string bcrypt blaze-builder bytestring
- case-insensitive containers convertible hasql hasql-backend
+ case-insensitive cassava containers convertible hasql hasql-backend
hasql-postgres HTTP http-types MissingH mtl network network-uri
optparse-applicative Ranged-sets regex-base regex-tdfa
regex-tdfa-text resource-pool scientific split string-conversions
@@ -99289,14 +99237,16 @@ self: {
];
testDepends = [
aeson base base64-string bcrypt blaze-builder bytestring
- case-insensitive containers convertible hasql hasql-backend
- hasql-postgres hlint hspec hspec-wai hspec-wai-json HTTP http-media
- http-types MissingH mtl network network-uri optparse-applicative
- packdeps process QuickCheck Ranged-sets regex-base regex-tdfa
- regex-tdfa-text resource-pool scientific split string-conversions
- stringsearch text time transformers unordered-containers vector wai
- wai-cors wai-extra wai-middleware-static warp
+ case-insensitive cassava containers convertible hasql hasql-backend
+ hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP
+ http-media http-types MissingH mtl network network-uri
+ optparse-applicative packdeps process QuickCheck Ranged-sets
+ regex-base regex-tdfa regex-tdfa-text resource-pool scientific
+ split string-conversions stringsearch text time transformers
+ unordered-containers vector wai wai-cors wai-extra
+ wai-middleware-static warp
];
+ jailbreak = true;
homepage = "https://github.com/begriffs/postgrest";
description = "REST API for any Postgres database";
license = stdenv.lib.licenses.mit;
@@ -100017,6 +99967,7 @@ self: {
];
description = "A Perl printf like formatter";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"printxosd" = callPackage
@@ -100404,6 +100355,7 @@ self: {
editedCabalFile = "ac8ac15500d9a5f4c678489d77c6abea03b24a704ceb235eecf9f49ef08da757";
buildDepends = [ base contravariant profunctors template-haskell ];
testDepends = [ base profunctors ];
+ jailbreak = true;
homepage = "https://github.com/tomjaguarpaw/product-profunctors";
description = "product-profunctors";
license = stdenv.lib.licenses.bsd3;
@@ -100480,8 +100432,8 @@ self: {
}:
mkDerivation {
pname = "profunctors";
- version = "5.0.1";
- sha256 = "1n6lk1r10j5ssb88ia13zll1k2gsakvf314m51sz3nzmdcgx03ll";
+ version = "5.1";
+ sha256 = "0jw563wi9j4l5521jc5lr1apx2msh987r0pbpn3zqhb8c8gqgrgw";
buildDepends = [ base comonad distributive tagged transformers ];
homepage = "http://github.com/ekmett/profunctors/";
description = "Profunctors";
@@ -100801,8 +100753,8 @@ self: {
}:
mkDerivation {
pname = "protobuf";
- version = "0.2.0.4";
- sha256 = "0gg678cb1psgdsjzv9x7mhcjmywj8bgzmp9pd850d3p9zyiw9l2j";
+ version = "0.2.1.0";
+ sha256 = "0i8hjrj6jycqmq7i1wl0kr9s17g4qfyc0gfwcbhbv70yxwf499di";
buildDepends = [
base bytestring cereal data-binary-ieee754 deepseq mtl text
unordered-containers
@@ -101820,16 +101772,16 @@ self: {
"quandl-api" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring
- , http-conduit, http-types, old-locale, syb, text, time
+ , http-conduit, http-types, syb, text, time, time-locale-compat
, unordered-containers
}:
mkDerivation {
pname = "quandl-api";
- version = "0.2.0.0";
- sha256 = "1h6gh9wssb8dw9r5f7caanxq542d0jw9shvp7wx0i1k47f54kb3k";
+ version = "0.2.1.0";
+ sha256 = "01mjwg7myal3hc98s7v582ycabv7qx2j6lcsyvhxbmhzs1wl8sqf";
buildDepends = [
- aeson base blaze-builder bytestring http-conduit http-types
- old-locale syb text time unordered-containers
+ aeson base blaze-builder bytestring http-conduit http-types syb
+ text time time-locale-compat unordered-containers
];
homepage = "https://github.com/pvdbrand/quandl-api";
description = "Quandl.com API library";
@@ -102213,6 +102165,7 @@ self: {
homepage = "http://www.github.com/massysett/quickpull";
description = "Generate Main module with QuickCheck tests";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"quickset" = callPackage
@@ -103476,13 +103429,12 @@ self: {
}:
mkDerivation {
pname = "record";
- version = "0.3.1.1";
- sha256 = "08rmxy2hy19jz614ml5qfwhmdnhfs0qllgk65p0p7bb4v65cg5s9";
+ version = "0.3.1.2";
+ sha256 = "02kpi21l2kwysk8qgxgl10ngqnmc0mx50qxf9jq0fmi8rv3fm9xp";
buildDepends = [
attoparsec base base-prelude template-haskell text transformers
];
testDepends = [ base base-prelude directory doctest filepath ];
- jailbreak = true;
homepage = "https://github.com/nikita-volkov/record";
description = "First class records implemented with quasi-quotation";
license = stdenv.lib.licenses.mit;
@@ -105196,20 +105148,19 @@ self: {
"repl-toolkit" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, directory
- , exceptions, functor-monadic, ListLike, listsafe, monad-loops, mtl
- , numericpeano, parsec, semigroupoids, system-filepath, text
+ , exceptions, filepath, functor-monadic, ListLike, listsafe
+ , monad-loops, mtl, numericpeano, parsec, semigroupoids, text
, transformers
}:
mkDerivation {
pname = "repl-toolkit";
- version = "0.4.0.0";
- sha256 = "1r4gyj3jjm9sv597zlksckg5cl9r2k633hz5avzczf92b0j4ikr3";
+ version = "0.5.0.0";
+ sha256 = "0m0jh734zfmxc2bfilb1ka12y3nhsm94hxcg0q6wwf6bxkl564vq";
buildDepends = [
- aeson base bytestring data-default directory exceptions
+ aeson base bytestring data-default directory exceptions filepath
functor-monadic ListLike listsafe monad-loops mtl numericpeano
- parsec semigroupoids system-filepath text transformers
+ parsec semigroupoids text transformers
];
- jailbreak = true;
homepage = "https://github.com/ombocomp/repl-toolkit";
description = "Toolkit for quickly whipping up config files and command-line interfaces";
license = stdenv.lib.licenses.asl20;
@@ -105510,10 +105461,8 @@ self: {
}:
mkDerivation {
pname = "resourcet";
- version = "1.1.4.1";
- revision = "1";
- sha256 = "1qw9bjr22g8a1fr84cmwjqpqs7cfc8iagix4s618snrg1r1gp6p2";
- editedCabalFile = "28106769e7204b32cfdfb46603990697cfef6f1a9e720d47ec76873edfb06ad7";
+ version = "1.1.5";
+ sha256 = "063v7xfhwqgf1yvdiidg4anx38nfvgcwb0sqim5rcbqhz0fmkypy";
buildDepends = [
base containers exceptions lifted-base mmorph monad-control mtl
transformers transformers-base transformers-compat
@@ -105787,6 +105736,7 @@ self: {
jailbreak = true;
description = "Convert between camel case and separated words style";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"resumable-exceptions" = callPackage
@@ -106275,6 +106225,64 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "rivet" = callPackage
+ ({ mkDerivation, base, rivet-core, rivet-simple-deploy }:
+ mkDerivation {
+ pname = "rivet";
+ version = "0.1.0.0";
+ sha256 = "1hiwgn0xyl42y9cmmc25464y42w7grf68xv8cvjznwzv0v1v63cg";
+ isLibrary = false;
+ isExecutable = true;
+ buildDepends = [ base rivet-core rivet-simple-deploy ];
+ homepage = "https://github.com/dbp/rivet";
+ description = "A project management tool for Haskell applications";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "rivet-core" = callPackage
+ ({ mkDerivation, base, configurator, directory, directory-tree
+ , filepath, postgresql-simple, process, shake, template-haskell
+ , text, time, unordered-containers
+ }:
+ mkDerivation {
+ pname = "rivet-core";
+ version = "0.1.0.1";
+ sha256 = "102zgb1ryfl341h8r9hxm9zbmg8jq67bkn57hxhnfsjxv7952x21";
+ buildDepends = [
+ base configurator directory directory-tree filepath
+ postgresql-simple process shake template-haskell text time
+ unordered-containers
+ ];
+ homepage = "https://github.com/dbp/rivet";
+ description = "Core library for project management tool";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "rivet-migration" = callPackage
+ ({ mkDerivation, base, postgresql-simple, text }:
+ mkDerivation {
+ pname = "rivet-migration";
+ version = "0.1.0.0";
+ sha256 = "1ki6jk2shxh9r4kzpn1bsa1a7jc8vvpgigv4gg87sialr2k0f4zr";
+ buildDepends = [ base postgresql-simple text ];
+ jailbreak = true;
+ homepage = "https://github.com/dbp/rivet";
+ description = "Postgresql migration support for project management tool";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "rivet-simple-deploy" = callPackage
+ ({ mkDerivation, base, configurator, mtl, rivet-core, text }:
+ mkDerivation {
+ pname = "rivet-simple-deploy";
+ version = "0.1.0.0";
+ sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf";
+ buildDepends = [ base configurator mtl rivet-core text ];
+ homepage = "https://github.com/dbp/rivet";
+ description = "Basic deployment support for project management tool";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rmonad" = callPackage
({ mkDerivation, base, containers, HUnit, suitable, test-framework
, test-framework-hunit, transformers
@@ -109832,6 +109840,7 @@ self: {
jailbreak = true;
description = "Use Pandoc to render servant API documentation";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-pool" = callPackage
@@ -111512,8 +111521,8 @@ self: {
}:
mkDerivation {
pname = "simple-sendfile";
- version = "0.2.18";
- sha256 = "1dc7c4bkcwzfhbm982svi9j6dzxxf0z6pjkdrs23m9bc9g8aly49";
+ version = "0.2.19";
+ sha256 = "1qg97j4rm1wksdni29vrrra3rgff04afaadb58q8g1yy2w4lh5a5";
buildDepends = [ base bytestring network unix ];
testDepends = [
base bytestring conduit conduit-extra directory hspec HUnit network
@@ -112388,6 +112397,7 @@ self: {
homepage = "https://github.com/leepike/SmartCheck";
description = "A smarter QuickCheck";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"smartconstructor" = callPackage
@@ -115413,6 +115423,18 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "stable-heap" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "stable-heap";
+ version = "0.1.0.0";
+ sha256 = "14wx42lmk2vd6v356q5cbd78y9xdnmkwcn6ddpnkyzq331hk23s1";
+ buildDepends = [ base ];
+ homepage = "http://hub.darcs.net/jmcarthur/stable-heap";
+ description = "Purely functional stable heaps (fair priority queues)";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"stable-maps" = callPackage
({ mkDerivation, base, containers, ghc-prim }:
mkDerivation {
@@ -115665,8 +115687,8 @@ self: {
}:
mkDerivation {
pname = "stackage-sandbox";
- version = "0.1.3";
- sha256 = "0nkar4nax7h7hp5lmwi98inzy5pyg9sr819rhf78c27vjdmimrjr";
+ version = "0.1.4";
+ sha256 = "0y6m2ph1pgzlncirngbid7igdwkiv7yxcj27cgm0xpq8ii4lsq4x";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -118605,6 +118627,7 @@ self: {
homepage = "https://github.com/d12frosted/CanonicalPath";
description = "Abstract data type for canonical paths with some utilities";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"system-command" = callPackage
@@ -120627,8 +120650,8 @@ self: {
}:
mkDerivation {
pname = "test-framework-th-prime";
- version = "0.0.7";
- sha256 = "056d66jk7gn0ghsb75f2kpspws0gs1w9vnw0ywpq6kbskv992v0p";
+ version = "0.0.8";
+ sha256 = "0gb7bpdxzsd8fnh4ck4p1ks7nxrk7fsw97x90d4zjds5hnw3hchr";
buildDepends = [
base cpphs haskell-src-exts template-haskell test-framework
];
@@ -120672,8 +120695,8 @@ self: {
}:
mkDerivation {
pname = "test-sandbox";
- version = "0.1.4";
- sha256 = "1x7vsi1brrdj71gwszc75qz159y8i4xln9dpcnxf70xjlswjmiqj";
+ version = "0.1.5";
+ sha256 = "1cknqblzf2wqq46casmfq00lx4zh3y9g07bqsbchxbq4xmd000js";
buildDepends = [
base bytestring cereal containers data-default directory filepath
lifted-base monad-control monad-loops mtl network process random
@@ -130064,6 +130087,7 @@ self: {
];
description = "A simple cache for serving static files in a WAI middleware";
license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"wai-static-pages" = callPackage
@@ -130325,6 +130349,7 @@ self: {
jailbreak = true;
description = "Opinionated filesystem watcher";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"watchit" = callPackage
@@ -130722,8 +130747,8 @@ self: {
}:
mkDerivation {
pname = "webcrank";
- version = "0.2.0.1";
- sha256 = "0l6mc3gyflb0lqmcs5x0nc3r5szyf4ig6y268f7crp74h05mvnlr";
+ version = "0.2.1";
+ sha256 = "0px4dy4crivkga0h2ca9j6fxlzwyl8qm8xzd2xyllqm2gzvcc3l7";
buildDepends = [
attoparsec base blaze-builder bytestring case-insensitive either
exceptions http-date http-media http-types lens mtl semigroups text
@@ -132458,12 +132483,11 @@ self: {
}:
mkDerivation {
pname = "xdot";
- version = "0.2.4.6";
- sha256 = "123vygzkqlycc298zh3321y7w85xnynbavzqms6cb8zgzya42wrs";
+ version = "0.2.4.7";
+ sha256 = "1izf892748g7f1h4m49d52zkbzfv164r4zyqss5lsbh3brh15v3g";
isLibrary = true;
isExecutable = true;
buildDepends = [ base cairo graphviz gtk mtl polyparse text ];
- jailbreak = true;
description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -134005,13 +134029,12 @@ self: {
}:
mkDerivation {
pname = "yaml-light-lens";
- version = "0.3.1.9";
- sha256 = "0gxwa792g2nbgm2j6gl478qq5vgr06z6zzbbxranvh5fq7pq6al5";
+ version = "0.3.1.10";
+ sha256 = "1hpjzml8bw5n4lv82x3j6h8dzkz53mbhhsc7dhp79hwn75nq3aiz";
buildDepends = [
base bytestring bytestring-lexing containers lens yaml-light
];
testDepends = [ base doctest ];
- jailbreak = true;
description = "Lens interface to yaml-light";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -135347,6 +135370,7 @@ self: {
homepage = "https://github.com/docmunch/yesod-routes-typescript";
description = "generate TypeScript routes for Yesod";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-rst" = callPackage
diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.18.nix
deleted file mode 100644
index 7a9d114ce8e..00000000000
--- a/pkgs/development/libraries/clutter/1.18.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib,
-gobjectIntrospection
-}:
-
-let
- ver_maj = "1.18";
- ver_min = "2";
-in
-stdenv.mkDerivation rec {
- name = "clutter-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
- sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63";
- };
-
- nativeBuildInputs = [ pkgconfig ];
- propagatedBuildInputs =
- [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
- atk json_glib gobjectIntrospection
- ];
-
- configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
-
- #doCheck = true; # no tests possible without a display
-
- meta = {
- description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
-
- longDescription =
- '' Clutter is free software library for creating fast, compelling,
- portable, and dynamic graphical user interfaces. It is a core part
- of MeeGo, and is supported by the open source community. Its
- development is sponsored by Intel.
-
- Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
- on mobile and embedded platforms), but wraps an easy to use,
- efficient, flexible API around GL's complexity.
-
- Clutter enforces no particular user interface style, but provides a
- rich, generic foundation for higher-level toolkits tailored to
- specific needs.
- '';
-
- license = stdenv.lib.licenses.lgpl2Plus;
- homepage = http://www.clutter-project.org/;
-
- maintainers = with stdenv.lib.maintainers; [ urkud ];
- platforms = stdenv.lib.platforms.mesaPlatforms;
- };
-}
diff --git a/pkgs/development/libraries/cogl/1.18.nix b/pkgs/development/libraries/cogl/1.18.nix
deleted file mode 100644
index f6927770d86..00000000000
--- a/pkgs/development/libraries/cogl/1.18.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
-, pangoSupport ? true, pango, cairo, gobjectIntrospection
-, gstreamerSupport ? true, gst_all_1 }:
-
-let
- ver_maj = "1.18";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "cogl-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
- sha256 = "0phg76jpkn0j948axavzr15gyrqipzmzzr66nlp3dfksgszixnd4";
- };
-
- nativeBuildInputs = [ pkgconfig ];
-
- configureFlags = [
- "--enable-introspection"
- "--enable-gles1"
- "--enable-gles2"
- "--enable-kms-egl-platform"
- ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
-
- propagatedBuildInputs = with xorg; [
- glib gdk_pixbuf gobjectIntrospection
- mesa_noglu libXrandr libXfixes libXcomposite libXdamage
- ]
- ++ libintlOrEmpty
- ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
- gst_all_1.gst-plugins-base ];
-
- buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
-
- COGL_PANGO_DEP_CFLAGS
- = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
- "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
-
- NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
- #doCheck = true; # all tests fail (no idea why)
-
- meta = with stdenv.lib; {
- description = "A small open source library for using 3D graphics hardware for rendering";
- maintainers = with maintainers; [ lovek323 ];
-
- longDescription = ''
- Cogl is a small open source library for using 3D graphics hardware for
- rendering. The API departs from the flat state machine style of OpenGL
- and is designed to make it easy to write orthogonal components that can
- render without stepping on each other's toes.
- '';
-
- platforms = stdenv.lib.platforms.mesaPlatforms;
- };
-}
diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix
index 6eedf6fc23b..7de7cb4d102 100644
--- a/pkgs/development/libraries/double-conversion/default.nix
+++ b/pkgs/development/libraries/double-conversion/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
- version = "2.0.1";
+ version = "1.1.5";
name = "double-conversion-${version}";
src = fetchFromGitHub {
- owner = "floitsch";
+ owner = "google";
repo = "double-conversion";
rev = "v${version}";
- sha256 = "05x5rdwndgp1vdq2z1bpvng0dd8pn93kw4vhl6nsvv9vsara2q4b";
+ sha256 = "1a264wpnvxmnq5pdlnp417ld1ybrng83lnbg38bv4ahz7a29ap4z";
};
nativeBuildInputs = [ cmake ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Binary-decimal and decimal-binary routines for IEEE doubles";
- homepage = https://github.com/floitsch/double-conversion;
+ homepage = https://github.com/google/double-conversion;
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 0110511c335..79584a99f63 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -2,14 +2,14 @@
, google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec {
- version = "0.32.0";
+ version = "0.38.0";
name = "folly-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "0yviih6b220bv6d1rg4lx1hqprqapnzfv4rv64cwjxbmz49ckmzh";
+ sha256 = "0b273iwizy08r8lap367q79lai4l4aib2bvd827lkkdax5jpqf6b";
};
buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ];
diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix
deleted file mode 100644
index 84bea07602f..00000000000
--- a/pkgs/development/libraries/gtk+/3.16.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl
-, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
-, xlibs, x11, wayland, libxkbcommon, epoxy
-, xineramaSupport ? stdenv.isLinux
-, cupsSupport ? stdenv.isLinux, cups ? null
-}:
-
-assert xineramaSupport -> xlibs.libXinerama != null;
-assert cupsSupport -> cups != null;
-
-let
- ver_maj = "3.16";
- ver_min = "2";
- version = "${ver_maj}.${ver_min}";
-in
-stdenv.mkDerivation rec {
- name = "gtk+3-${version}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
- sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0";
- };
-
- nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
-
- buildInputs = [ libxkbcommon epoxy ];
- propagatedBuildInputs = with xlibs; with stdenv.lib;
- [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
- ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
- ++ optional stdenv.isDarwin x11
- ++ optional xineramaSupport libXinerama
- ++ optional cupsSupport cups;
-
- # demos fail to install, no idea where's the problem
- preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
-
- enableParallelBuilding = true;
-
- postInstall = "rm -rf $out/share/gtk-doc";
-
- passthru = {
- gtkExeEnvPostBuild = ''
- rm $out/lib/gtk-3.0/3.0.0/immodules.cache
- $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache
- ''; # workaround for bug of nix-mode for Emacs */ '';
- };
-
- meta = {
- description = "A multi-platform toolkit for creating graphical user interfaces";
-
- longDescription = ''
- GTK+ is a highly usable, feature rich toolkit for creating
- graphical user interfaces which boasts cross platform
- compatibility and an easy to use API. GTK+ it is written in C,
- but has bindings to many other popular programming languages
- such as C++, Python and C# among others. GTK+ is licensed
- under the GNU LGPL 2.1 allowing development of both free and
- proprietary software with GTK+ without any license fees or
- royalties.
- '';
-
- homepage = http://www.gtk.org/;
-
- license = stdenv.lib.licenses.lgpl2Plus;
-
- maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 35b40a507a8..84bea07602f 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl
, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
-, xlibs, x11, wayland, libxkbcommon
+, xlibs, x11, wayland, libxkbcommon, epoxy
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux, cups ? null
}:
@@ -9,7 +9,7 @@ assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
let
- ver_maj = "3.12";
+ ver_maj = "3.16";
ver_min = "2";
version = "${ver_maj}.${ver_min}";
in
@@ -18,17 +18,15 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
- sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1";
+ sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0";
};
- NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
- buildInputs = [ libxkbcommon ];
+ buildInputs = [ libxkbcommon epoxy ];
propagatedBuildInputs = with xlibs; with stdenv.lib;
- [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ]
- ++ optionals stdenv.isLinux [ wayland ]
+ [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
+ ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
++ optional stdenv.isDarwin x11
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;
@@ -65,7 +63,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.lgpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat];
+ maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
platforms = stdenv.lib.platforms.all;
};
}
diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix
deleted file mode 100644
index bc327468855..00000000000
--- a/pkgs/development/libraries/gtkmm/3.16.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
-
-let
- ver_maj = "3.16";
- ver_min = "0";
-in
-stdenv.mkDerivation rec {
- name = "gtkmm-${ver_maj}.${ver_min}";
-
- src = fetchurl {
- url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
- sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv";
- };
-
- nativeBuildInputs = [ pkgconfig ];
-
- propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
-
- enableParallelBuilding = true;
- doCheck = true;
-
- meta = {
- description = "C++ interface to the GTK+ graphical user interface library";
-
- longDescription = ''
- gtkmm is the official C++ interface for the popular GUI library
- GTK+. Highlights include typesafe callbacks, and a
- comprehensive set of widgets that are easily extensible via
- inheritance. You can create user interfaces either in code or
- with the Glade User Interface designer, using libglademm.
- There's extensive documentation, including API reference and a
- tutorial.
- '';
-
- homepage = http://gtkmm.org/;
-
- license = stdenv.lib.licenses.lgpl2Plus;
-
- maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ];
- platforms = stdenv.lib.platforms.unix;
- };
-}
diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix
index e158c64f73a..bc327468855 100644
--- a/pkgs/development/libraries/gtkmm/3.x.nix
+++ b/pkgs/development/libraries/gtkmm/3.x.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
let
- ver_maj = "3.12";
+ ver_maj = "3.16";
ver_min = "0";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
- sha256 = "86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1";
+ sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index 5350630dac4..fbba11c10c9 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, autoreconfHook }:
-let version = "9.15";
+let version = "9.16";
in
stdenv.mkDerivation {
name = "ijs-${version}";
src = fetchurl {
url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2";
- sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6";
+ sha256 = "0vdqbjkickb0109lk6397bb2zjmg1s46dac5p5j4gfxa4pwl8b9y";
};
prePatch = "cd ijs";
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index a682b3a6b82..8acd872fcb3 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -2,21 +2,16 @@
stdenv.mkDerivation rec {
- # Version 3843 is required for supertuxkart
- name = "irrlicht-1.8-svn-3843";
+ name = "irrlicht-${version}-svn-${revision}";
+ version = "1.8";
+ revision = "5104"; # newest revision as of 05-16-15
src = fetchsvn {
- url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
- rev = 3843;
- sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
+ url = "https://svn.code.sf.net/p/irrlicht/code/branches/releases/${version}"; # get 1.8 release (same regardless of rev)
+ rev = "${revision}";
+ sha256 = "18xvlrjf113mphf29iy24hmrkh7xff6j9cz0chrxjqbr9xk9h1yq";
};
- patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
-
- postPatch = ''
- sed -i /stdcall-alias/d source/Irrlicht/Makefile
- '';
-
preConfigure = ''
cd source/Irrlicht
'';
@@ -30,11 +25,6 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib
'';
- postInstall = ''
- ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
- ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
- '';
-
buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
meta = {
diff --git a/pkgs/development/libraries/irrlicht/irrlicht3843.nix b/pkgs/development/libraries/irrlicht/irrlicht3843.nix
new file mode 100644
index 00000000000..a682b3a6b82
--- /dev/null
+++ b/pkgs/development/libraries/irrlicht/irrlicht3843.nix
@@ -0,0 +1,45 @@
+{ fetchsvn, stdenv, mesa, unzip, libXrandr, libX11, libXxf86vm }:
+
+
+stdenv.mkDerivation rec {
+ # Version 3843 is required for supertuxkart
+ name = "irrlicht-1.8-svn-3843";
+
+ src = fetchsvn {
+ url = https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk;
+ rev = 3843;
+ sha256 = "0v31l3k0fzy7isdsx2sh0baaixzlml1m7vgz6cd0015d9f5n99vl";
+ };
+
+ patches = [ ./irrlicht-1.8.1-mesa-10.x.patch ];
+
+ postPatch = ''
+ sed -i /stdcall-alias/d source/Irrlicht/Makefile
+ '';
+
+ preConfigure = ''
+ cd source/Irrlicht
+ '';
+
+ buildPhase = ''
+ make sharedlib NDEBUG=1
+ '';
+
+ preInstall = ''
+ sed -i s,/usr/local/lib,$out/lib, Makefile
+ mkdir -p $out/lib
+ '';
+
+ postInstall = ''
+ ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so.1.8
+ ln -s libIrrlicht.so.1.8.0-SVN $out/lib/libIrrlicht.so
+ '';
+
+ buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ];
+
+ meta = {
+ homepage = http://irrlicht.sourceforge.net/;
+ license = stdenv.lib.licenses.zlib;
+ description = "Open source high performance realtime 3D engine written in C++";
+ };
+}
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 717dae8fb25..631c7c778ae 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, yacc, flex }:
+{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
# library that allows libbluray to play AACS protected bluray disks
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@@ -7,7 +7,6 @@
# http://vlc-bluray.whoknowsmy.name/
# https://wiki.archlinux.org/index.php/BluRay
-
let baseName = "libaacs";
version = "0.8.0";
in
@@ -20,13 +19,13 @@ stdenv.mkDerivation {
sha256 = "155sah8z4vbp6j3sq9b17mcn6rj1938ijszz97m8pd2cgif58i2y";
};
- buildInputs = [ libgcrypt ];
+ buildInputs = [ libgcrypt libgpgerror ];
nativeBuildInputs = [ yacc flex ];
meta = with stdenv.lib; {
homepage = http://www.videolan.org/developers/libbluray.html;
- description = "Library to access Blu-Ray disks for video playback";
+ description = "Library to access AACS protected Blu-Ray disks";
license = licenses.lgpl21;
maintainers = with maintainers; [ abbradar ];
};
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
new file mode 100644
index 00000000000..8cc2e806932
--- /dev/null
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
+
+# library that allows libbluray to play BDplus protected bluray disks
+# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
+
+# Info on how to use / obtain aacs keys:
+# http://vlc-bluray.whoknowsmy.name/
+# https://wiki.archlinux.org/index.php/BluRay
+
+
+let baseName = "libbdplus";
+ version = "0.1.2";
+in
+
+stdenv.mkDerivation {
+ name = "${baseName}-${version}";
+
+ src = fetchurl {
+ url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+ sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
+ };
+
+ buildInputs = [ libgcrypt libgpgerror ];
+
+ nativeBuildInputs = [ ];
+
+ meta = with stdenv.lib; {
+ homepage = http://www.videolan.org/developers/libbdplus.html;
+ description = "Library to access BD+ protected Blu-Ray disks";
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ abbradar ];
+ };
+}
diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
index 64f0e74084f..2680b1c6de5 100644
--- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
+++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
@@ -1,8 +1,7 @@
-diff --git a/configure.ac b/configure.ac
-index 3609d88..48c6bc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,6 +227,7 @@ if [[ $use_bdjava = "yes" ]]; then
+diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac
+--- libbluray-0.8.0/configure.ac 2015-04-10 09:48:23.000000000 +0300
++++ libbluray-0.8.0-new/configure.ac 2015-05-18 14:22:01.002075482 +0300
+@@ -231,6 +231,7 @@
AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
@@ -10,16 +9,14 @@ index 3609d88..48c6bc6 100644
fi
AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
-diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
-index c622801..f4aab9b 100644
---- a/src/libbluray/bdj/bdj.c
-+++ b/src/libbluray/bdj/bdj.c
-@@ -210,7 +210,7 @@ static const char *_find_libbluray_jar(void)
+diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c
+--- libbluray-0.8.0/src/libbluray/bdj/bdj.c 2015-04-06 19:25:09.000000000 +0300
++++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c 2015-05-18 14:22:59.241312808 +0300
+@@ -228,6 +228,7 @@
#ifdef _WIN32
"" BDJ_JARFILE,
#else
-- "/usr/share/java/" BDJ_JARFILE,
+ JARDIR "/" BDJ_JARFILE,
+ "/usr/share/java/" BDJ_JARFILE,
+ "/usr/share/libbluray/lib/" BDJ_JARFILE,
#endif
- };
-
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 170c4e46188..de0fa1a56d3 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, fontconfig
-, withAACS ? false, libaacs ? null, jdk ? null, ant ? null
+{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook
+, withJava ? true, jdk ? null, ant ? null
+, withAACS ? false, libaacs ? null
+, withBDplus ? false, libbdplus ? null
, withMetadata ? true, libxml2 ? null
, withFonts ? true, freetype ? null
-# Need to run autoreconf hook after BDJ jarfile patch
-, autoreconfHook ? null
}:
-assert withAACS -> jdk != null && ant != null && libaacs != null && autoreconfHook != null;
+with stdenv.lib;
+
+assert withJava -> jdk != null && ant != null;
+assert withAACS -> libaacs != null;
+assert withBDplus -> libbdplus != null;
assert withMetadata -> libxml2 != null;
assert withFonts -> freetype != null;
@@ -15,41 +19,40 @@ assert withFonts -> freetype != null;
stdenv.mkDerivation rec {
baseName = "libbluray";
- version = "0.7.0";
+ version = "0.8.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
- sha256 = "13dngs4b4cv29f6b825dq14n77mfhvk1kjb42axpq494pfgyp6zp";
+ sha256 = "027xbdbsjyp1spfiva2331pzixrzw6vm97xlvgz16hzm5a5j103v";
};
- nativeBuildInputs = with stdenv.lib;
- [pkgconfig]
- ++ optional withAACS ant
+ nativeBuildInputs = [ pkgconfig autoreconfHook ]
+ ++ optionals withJava [ ant ]
;
- buildInputs = with stdenv.lib;
- [fontconfig]
- ++ optionals withAACS [ jdk autoreconfHook ]
- ++ optional withMetadata libxml2
- ++ optional withFonts freetype
- ;
+ buildInputs = [ fontconfig ]
+ ++ optional withJava jdk
+ ++ optional withMetadata libxml2
+ ++ optional withFonts freetype
+ ;
propagatedBuildInputs = stdenv.lib.optional withAACS libaacs;
- preConfigure = stdenv.lib.optionalString withAACS ''
- export JDK_HOME=${jdk.home}
- export LIBS="$LIBS -L${libaacs} -laacs"
+ preConfigure = ''
+ ${optionalString withJava ''export JDK_HOME="${jdk.home}"''}
+ ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''}
+ ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''}
'';
configureFlags = with stdenv.lib;
- optional withAACS "--enable-bdjava"
+ optional (! withJava) "--disable-bdjava"
++ optional (! withMetadata) "--without-libxml2"
++ optional (! withFonts) "--without-freetype"
;
# Fix search path for BDJ jarfile
- patches = stdenv.lib.optional withAACS ./BDJ-JARFILE-path.patch;
+ patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch;
meta = with stdenv.lib; {
homepage = http://www.videolan.org/developers/libbluray.html;
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 6a650de8564..c9de127c905 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
homepage = http://libjpeg-turbo.virtualgl.org/;
description = "A faster (using SIMD) libjpeg implementation";
license = licenses.ijg; # and some parts under other BSD-style licenses
- platforms = platforms.all;
maintainers = [ maintainers.vcunat ];
+ # upstream supports darwin (and others), but it doesn't build currently
+ platforms = platforms.all;
+ hydraPlatforms = platforms.linux;
};
}
diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index 544ab215345..4dd1ca46e95 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip, blas, liblapack, gfortran }:
stdenv.mkDerivation rec {
- version = "3.12.1";
+ version = "3.12.3";
name = "ipopt-${version}";
src = fetchurl {
url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
- sha256 = "0x0wcc21d2bfs3zq8nvhva1nv7xi86wjbyixvvxvcrg2kqjlybdy";
+ sha256 = "0h8qx3hq2m21qrg4v3n26v2qbhl6saxrpa7rbhnmkkcfj5s942yr";
};
preConfigure = ''
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 55438e2c201..b135e49f52b 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, kerberos }:
+{ fetchurl, stdenv, krb5 }:
stdenv.mkDerivation rec {
- name = "libtirpc-0.2.5";
+ name = "libtirpc-0.3.0";
src = fetchurl {
url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
- sha256 = "1nq2w227j9nh8qsz7b3c1pha00k5yvzf2c3pfmlcb1l65iydxyb2";
+ sha256 = "07d1wlfzf3ia09mjn3f3ay8isk7yx4a6ckfkzx5khnqlc7amkzna";
};
- buildInputs = [ kerberos ];
+ propagatedBuildInputs = [ krb5 ];
# http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf
preConfigure = ''
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index d933b97d1c1..73b11508374 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -7,11 +7,11 @@
mkDerivation rec {
pname = "cabal2nix";
- version = "20150505";
+ version = "20150518";
src = fetchgit {
url = "http://github.com/NixOS/cabal2nix.git";
- rev = "db53ac3a644eebda581c9f036ccd55a19ff3c629";
- sha256 = "1bimja9qsq865dmpjpy5wxxz43rc8wk9yva58l7hydmm87a4ch8y";
+ rev = "bf850da9044b16efb9ef06a05c645fa981513444";
+ sha256 = "0kwiwakff1iaglf7mfvz096smqi73pgcfd975dvp5w1cd8yazd73";
deepClone = true;
};
isExecutable = true;
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 6c53bc3fdb3..79d75011ff0 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchgit, cmake, irrlicht3843, libpng, bzip2,
- libjpeg, libXxf86vm, mesa, openal, libvorbis, x11 }:
+{ stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp
+, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, sqlite }:
let
- version = "0.4.4";
+ version = "0.4.12";
sources = {
src = fetchgit {
- url = "https://github.com/celeron55/minetest.git";
- rev = "ab06fca4bed26f3dc97d5e5cff437d075d7acff8";
- sha256 = "033gajwxgs8dqxb8684waaav28s0qd6cd4rlzfldwgdbkwam9cb1";
+ url = "https://github.com/minetest/minetest.git";
+ rev = "7993a403f2c17a215e4895ba1848aaf69bb61980";
+ sha256 = "04v6fd9r9by8g47xbjzkhkgac5zpik01idngbbx2in4fxrg3ac7c";
};
data = fetchgit {
- url = "https://github.com/celeron55/minetest_game.git";
- rev = "3928eccf74af0288d12ffb14f8222fae479bc06b";
- sha256 = "1gw2267bnqwfpnm7iq014y1vkb1v3nhpg1dmg9vgm9z5yja2blif";
+ url = "https://github.com/minetest/minetest_game.git";
+ rev = "03c00a831d5c2fd37096449bee49557879068af1";
+ sha256 = "1qqhlfz296rmi3mmlvq1rwv7hq5w964w1scry095xaih7y11ycmk";
};
};
in stdenv.mkDerivation {
@@ -21,12 +21,12 @@ in stdenv.mkDerivation {
src = sources.src;
cmakeFlags = [
- "-DIRRLICHT_INCLUDE_DIR=${irrlicht3843}/include/irrlicht"
+ "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
];
buildInputs = [
- cmake irrlicht3843 libpng bzip2 libjpeg
- libXxf86vm mesa openal libvorbis x11
+ cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp
+ libXxf86vm mesa openal libvorbis x11 sqlite
];
postInstall = ''
@@ -34,9 +34,11 @@ in stdenv.mkDerivation {
cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/
'';
- meta = {
- homepage = "http://minetest.net/";
+ meta = with stdenv.lib; {
+ homepage = http://minetest.net/;
description = "Infinite-world block sandbox game";
- license = stdenv.lib.licenses.lgpl21Plus;
+ license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ jgeerds c0dehero ];
};
}
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix
index f3574d137d3..29e923108e1 100644
--- a/pkgs/games/super-tux-kart/default.nix
+++ b/pkgs/games/super-tux-kart/default.nix
@@ -1,30 +1,34 @@
-{ fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa
+{ fetchgit, fetchsvn, cmake, stdenv, plib, SDL, openal, freealut, mesa
, libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig
-, fribidi, autoconf, automake, libtool, bluez }:
+, fribidi, autoconf, automake, libtool, bluez, libjpeg }:
stdenv.mkDerivation rec {
- version = "0.8.1";
name = "supertuxkart-${version}";
- src = fetchurl {
- url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2";
- sha256 = "1mpqmi62a2kl6n58mw11fj0dr5xiwmjkqnfmd2z7ghdhc6p02lrk";
- };
-
+ version = "0.9";
+ srcs = [
+ (fetchgit {
+ url = "https://github.com/supertuxkart/stk-code";
+ rev = "28a525f6d4aba2667c41a549b027149fcceda97e";
+ sha256 = "0b5izr7j3clm6pcxanwwaas06f17wi454s6hwmgv1mg48aay2v97";
+ name = "stk-code";
+ })
+ (fetchsvn {
+ url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
+ rev = "16293";
+ sha256 = "07jdkli28xr3rcxvixyy5bwi26n5i7dkhd9q0j4wifgs4pymm8r5";
+ name = "stk-assets";
+ })
+ ];
+
buildInputs = [
plib SDL openal freealut mesa libvorbis libogg gettext
- libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez
+ libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez libjpeg
];
enableParallelBuilding = true;
- preConfigure = ''
- echo Building internal Irrlicht
- cd lib/irrlicht/source/Irrlicht/
- cp "${mesa}"/include/GL/{gl,glx,wgl}ext.h .
- NDEBUG=1 make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
- cd -
- '';
+ sourceRoot = "stk-code";
meta = {
description = "A Free 3D kart racing game";
@@ -35,6 +39,6 @@ stdenv.mkDerivation rec {
'';
homepage = http://supertuxkart.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ c0dehero fuuzetsu ];
};
}
diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
new file mode 100644
index 00000000000..b6bd54f779d
--- /dev/null
+++ b/pkgs/games/voxelands/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite
+, libjpeg, libXxf86vm, mesa, openal, libvorbis, x11, pkgconfig }:
+
+stdenv.mkDerivation rec {
+ name = "voxelands-${version}";
+ version = "1504.01";
+
+ src = fetchurl {
+ url = "http://voxelands.com/downloads/${name}-src.tar.bz2";
+ sha256 = "17jv2pz0mbkkf7jw3jcpix8hb46b382hc7vki42n9rrdynydq5zp";
+ };
+
+ cmakeFlags = [
+ "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
+ "-DCMAKE_C_FLAGS_RELEASE=-DNDEBUG"
+ "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG"
+ ];
+
+ buildInputs = [
+ cmake irrlicht libpng bzip2 libjpeg sqlite
+ libXxf86vm mesa openal libvorbis x11 pkgconfig
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = http://voxelands.com/;
+ description = "Infinite-world block sandbox game based on Minetest";
+ license = licenses.gpl3Plus;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ jgeerds c0dehero ];
+ };
+}
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index bb790be7c26..8558d1f7dee 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, automake, pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, saneBackends, dbus
-, polkit, qtSupport ? true, qt4, pythonDBus, pyqt4, net_snmp
-, withPlugin ? false, substituteAll
+, polkit, qtSupport ? true, qt4, pyqt4, net_snmp
+, withPlugin ? false, substituteAll, makeWrapper
}:
let
@@ -74,7 +74,21 @@ stdenv.mkDerivation {
postInstall =
''
- wrapPythonPrograms
+ # Wrap the user-facing Python scripts in /bin without turning the ones
+ # in /share into shell scripts (they need to be importable).
+ # Complicated by the fact that /bin contains just symlinks to /share.
+ for bin in $out/bin/*; do
+ py=`readlink -m $bin`
+ rm $bin
+ cp $py $bin
+ wrapPythonProgramsIn $bin "$out $pythonPath"
+ sed -i "s@$(dirname $bin)/[^ ]*@$py@g" $bin
+ done
+
+ # Remove originals. Knows a little too much about wrapPythonProgramsIn.
+ rm -f $out/bin/.*-wrapped
+
+ wrapPythonPrograms $out/lib "$out $pythonPath"
''
+ (stdenv.lib.optionalString withPlugin
(let hplip_arch =
@@ -130,8 +144,8 @@ stdenv.mkDerivation {
] ++ stdenv.lib.optional qtSupport qt4;
pythonPath = with pythonPackages; [
+ dbus
pillow
- pythonDBus
pygobject
recursivePthLoader
reportlab
@@ -144,6 +158,6 @@ stdenv.mkDerivation {
then licenses.unfree
else with licenses; [ mit bsd2 gpl2Plus ];
platforms = [ "i686-linux" "x86_64-linux" "armv6l-linux" "armv7l-linux" ];
- maintainers = with maintainers; [ ttuegel jgeerds ];
+ maintainers = with maintainers; [ ttuegel jgeerds nckx ];
};
}
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 6743d1d9550..b270f0852f6 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.10.78";
+ version = "3.10.79";
extraMeta.branch = "3.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "01cshlm8x8k2bbkh77w2r39kc0a3csrcxiv412j5ik608glzgx36";
+ sha256 = "0m30c9v4pvim72ha8ya8w6y691a8zkcrhxhj43kh668q1yqpqvkp";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 16e46bf65c0..52fa5eba109 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "3.14.42";
+ version = "3.14.43";
# Remember to update grsecurity!
extraMeta.branch = "3.14";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
- sha256 = "02k09ndhragz1p2mrq489fa7cgs2c2f3lwr1x0h1n94zqpsmpyip";
+ sha256 = "1m5gdzff46xm24p5x5ajxka99g0maf1y50nj59mbjccbqx3s7kvf";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
index b095db41bd5..9c7fb2c3bd8 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.0.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.0.3";
+ version = "4.0.4";
# Remember to update grsecurity!
extraMeta.branch = "4.0";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1djkbqrzi898qr2n0cd4m8casfj8pvgydc98l4ws3w8l9ikgwxw4";
+ sha256 = "1j5l87z6gd05cqzg680id0x1nk38kd6sjffd2lifl0fz5k6iqr9h";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 27162d50046..8e24763b169 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -65,17 +65,17 @@ rec {
};
grsecurity_stable = grsecPatch
- { kversion = "3.14.42";
- revision = "201505141745";
+ { kversion = "3.14.43";
+ revision = "201505171736";
branch = "stable";
- sha256 = "1565ggx42w0j038avz9d4pydf4j29rli2hz5wangf3vnjbhixh39";
+ sha256 = "1c3wjccinm8aqnqn6dr0rlmff2p4dwc4m383cs8bi9lfj5s1fyzn";
};
grsecurity_unstable = grsecPatch
- { kversion = "4.0.3";
- revision = "201505141746";
+ { kversion = "4.0.4";
+ revision = "201505171737";
branch = "test";
- sha256 = "0w65d5nmfir8kxgsxrq09mijjp09k193hyqmskia6a17n29943p1";
+ sha256 = "140c3qbv64q658vw9d4912rv0mjch217zkyz1qi9xn6bn1z5kvl5";
};
grsec_fix_path =
diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index ab0ba4fd934..a38a25c8a5c 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = https://github.com/atheme/charybdis;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.lassulus ];
- platforms = stdenv.lib.platforms.all;
+ platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 854a2ab94b7..6eb8a57cab4 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,13 +1,13 @@
{ fetchurl, stdenv, pkgconfig, libtirpc
, useSystemd ? true, systemd }:
-let version = "0.2.2";
+let version = "0.2.3";
in stdenv.mkDerivation rec {
name = "rpcbind-${version}";
src = fetchurl {
url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
- sha256 = "0acgl1c07ymnks692b90aq5ldj4h0km7n03kz26wxq6vjv3winqk";
+ sha256 = "0yyjzv4161rqxrgjcijkrawnk55rb96ha0pav48s03l2klx855wq";
};
patches = [ ./sunrpc.patch ];
@@ -23,6 +23,7 @@ in stdenv.mkDerivation rec {
description = "ONC RPC portmapper";
license = licenses.bsd3;
platforms = platforms.unix;
+ homepage = http://sourceforge.net/projects/rpcbind/;
maintainers = with maintainers; [ abbradar ];
longDescription = ''
Universal addresses to RPC program number mapper.
diff --git a/pkgs/servers/rpcbind/sunrpc.patch b/pkgs/servers/rpcbind/sunrpc.patch
index af9b3b71679..450d33aa1c4 100644
--- a/pkgs/servers/rpcbind/sunrpc.patch
+++ b/pkgs/servers/rpcbind/sunrpc.patch
@@ -3,9 +3,10 @@ http://projects.archlinux.org/svntogit/packages.git/tree/trunk/rpcbind-sunrpc.pa
Lookup "sunrpc" instead of "rpcbind" in /etc/services, since the former is the
official IANA name.
---- rpcbind-0.1.7/src/rpcbind.c.orig 2008-11-19 14:17:34.000000000 +0100
-+++ rpcbind-0.1.7/src/rpcbind.c 2010-01-07 13:03:37.416632894 +0100
-@@ -114,7 +114,7 @@
+diff -ru3 rpcbind-0.2.3/src/rpcbind.c rpcbind-0.2.3.new/src/rpcbind.c
+--- rpcbind-0.2.3/src/rpcbind.c 2015-04-27 17:07:43.000000000 +0300
++++ rpcbind-0.2.3.new/src/rpcbind.c 2015-05-18 16:29:24.938380694 +0300
+@@ -132,7 +132,7 @@
char *udp_uaddr; /* Universal UDP address */
char *tcp_uaddr; /* Universal TCP address */
#endif
@@ -14,14 +15,15 @@ official IANA name.
static char superuser[] = "superuser";
int main __P((int, char *[]));
---- rpcbind-0.1.7/src/rpcinfo.c~ 2010-01-08 16:14:24.592156602 +0000
-+++ rpcbind-0.1.7/src/rpcinfo.c 2010-01-08 16:14:31.578838609 +0000
-@@ -633,7 +633,7 @@
- {
- memset (&hints, 0, sizeof hints);
- hints.ai_family = AF_INET;
-- if ((error = getaddrinfo (host, "rpcbind", &hints, &res)) != 0 &&
-+ if ((error = getaddrinfo (host, "sunrpc", &hints, &res)) != 0 &&
- (error = getaddrinfo (host, "portmapper", &hints, &res)) != 0)
- {
- fprintf (stderr, "rpcinfo: %s: %s\n",
+diff -ru3 rpcbind-0.2.3/src/rpcinfo.c rpcbind-0.2.3.new/src/rpcinfo.c
+--- rpcbind-0.2.3/src/rpcinfo.c 2015-04-27 17:07:43.000000000 +0300
++++ rpcbind-0.2.3.new/src/rpcinfo.c 2015-05-18 16:30:14.197025336 +0300
+@@ -1842,7 +1842,7 @@
+
+ /* Get the address of the rpcbind */
+ memset (&hints, 0, sizeof hints);
+- if ((getaddrinfo (host, "rpcbind", &hints, &res) != 0) &&
++ if ((getaddrinfo (host, "sunrpc", &hints, &res) != 0) &&
+ (getaddrinfo (host, "portmapper",&hints, &res) != 0))
+ {
+ rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
new file mode 100644
index 00000000000..81e05a8790e
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -0,0 +1,39 @@
+{ lib, goPackages, fetchurl, callPackage }:
+
+with goPackages;
+
+buildGoPackage rec {
+ version = "r3.1.2";
+ name = "mongodb-tools";
+ goPackagePath = "github.com/mongodb/mongo-tools";
+
+ src = fetchurl {
+ name = "${name}.tar.gz";
+ url = "https://github.com/mongodb/mongo-tools/archive/${version}.tar.gz";
+ sha256 = "1dag8ar95jlfk6rm99y4p3dymcy2s2qnwd9jwqhw9fxr110mgf5s";
+ };
+
+ buildInputs = [ gopass go-flags crypto mgo openssl spacelog
+ oglematchers goconvey tomb ];
+
+ subPackages = [ "bsondump/main" "mongostat/main" "mongofiles/main"
+ "mongoexport/main" "mongoimport/main" "mongorestore/main"
+ "mongodump/main" "mongotop/main" "mongooplog/main" ];
+
+ buildPhase = ''
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongooplog; do
+ echo Building $i
+ go build -o go/bin/$i go/src/${goPackagePath}/$i/main/$i.go
+ done
+ '';
+
+ dontInstallSrc = true;
+
+ meta = with lib; {
+ description = "Tools for MongoDB";
+ homepage = https://github.com/mongodb/mongo-tools;
+ license = licenses.asl20;
+ maintainers = with maintainers; [ mschristiansen ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix
index a104f321c12..f415b4f3bed 100644
--- a/pkgs/tools/networking/network-manager/l2tp.nix
+++ b/pkgs/tools/networking/network-manager/l2tp.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "L2TP plugin for NetworkManager";
inherit (networkmanager.meta) platforms;
+ homepage = https://github.com/seriyps/NetworkManager-l2tp;
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar ];
};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdc4c643c04..4c429a3b238 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -873,6 +873,8 @@ let
mcrypt = callPackage ../tools/misc/mcrypt { };
+ mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
+
mstflint = callPackage ../tools/misc/mstflint { };
mcelog = callPackage ../os-specific/linux/mcelog { };
@@ -1014,6 +1016,8 @@ let
gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ];
};
+ clementineFree = clementine.free;
+
ciopfs = callPackage ../tools/filesystems/ciopfs { };
cmst = callPackage ../tools/networking/cmst { };
@@ -3409,6 +3413,8 @@ let
bigloo = callPackage ../development/compilers/bigloo { };
+ colm = callPackage ../development/compilers/colm { };
+
fetchegg = callPackage ../build-support/fetchegg { };
eggDerivation = callPackage ../development/compilers/chicken/eggDerivation.nix { };
@@ -5687,10 +5693,6 @@ let
clutter = callPackage ../development/libraries/clutter { };
- clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix {
- cogl = cogl_1_18;
- };
-
clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix {
cogl = cogl_1_20;
};
@@ -5709,8 +5711,6 @@ let
cogl = callPackage ../development/libraries/cogl { };
- cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
-
cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { };
coin3d = callPackage ../development/libraries/coin3d { };
@@ -6181,9 +6181,7 @@ let
cupsSupport = config.gtk2.cups or stdenv.isLinux;
};
- gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
-
- gtk3_16 = callPackage ../development/libraries/gtk+/3.16.nix {
+ gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
gettext = gettextWithExpat gettext_0_19;
};
@@ -6191,9 +6189,6 @@ let
gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
- gtkmm3_16 = callPackage ../development/libraries/gtkmm/3.16.nix {
- gtk3 = gtk3_16;
- };
gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
gtksharp = gtk-sharp;
@@ -6299,7 +6294,8 @@ let
intltool = callPackage ../development/tools/misc/intltool { };
- irrlicht3843 = callPackage ../development/libraries/irrlicht { };
+ irrlicht = callPackage ../development/libraries/irrlicht { };
+ irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { };
isocodes = callPackage ../development/libraries/iso-codes { };
@@ -6426,6 +6422,8 @@ let
libbluedevil = callPackage ../development/libraries/libbluedevil { };
+ libbdplus = callPackage ../development/libraries/libbdplus { };
+
libbluray = callPackage ../development/libraries/libbluray { };
libbs2b = callPackage ../development/libraries/audio/libbs2b { };
@@ -10213,6 +10211,8 @@ let
ucsFonts = callPackage ../data/fonts/ucs-fonts { };
+ uni-vga = callPackage ../data/fonts/uni-vga { };
+
unifont = callPackage ../data/fonts/unifont { };
vistafonts = callPackage ../data/fonts/vista-fonts { };
@@ -10473,7 +10473,7 @@ let
bomi = callPackage ../applications/video/bomi {
stdenv = overrideCC stdenv gcc49;
- pulseSupport = config.pulseaudio or false;
+ pulseSupport = config.pulseaudio or true;
};
cmus = callPackage ../applications/audio/cmus { };
@@ -11077,11 +11077,7 @@ let
goffice = goffice_0_8;
};
- goffice_0_8 = callPackage ../desktops/gnome-3/3.12/misc/goffice/0.8.nix {
- inherit (gnome2) libglade libgnomeui;
- gconf = gnome2.GConf;
- libart = gnome2.libart_lgpl;
- }; # latest version: gnome3.goffice
+ goffice_0_8 = gnome3.goffice_0_8;
idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
@@ -11560,9 +11556,7 @@ let
};
midoriWrapper = wrapFirefox
- { browser = midori; browserName = "midori"; desktopName = "Midori";
- icon = "${midori}/share/icons/hicolor/22x22/apps/midori.png";
- };
+ { browser = midori; browserName = "midori"; desktopName = "Midori"; };
mikmod = callPackage ../applications/audio/mikmod { };
@@ -12326,7 +12320,7 @@ let
termite = callPackage ../applications/misc/termite {
gtk = gtk3;
- vte = gnome3_16.vte-select-text;
+ vte = gnome3.vte-select-text;
};
tesseract = callPackage ../applications/graphics/tesseract { };
@@ -12626,7 +12620,7 @@ let
wrapFirefox =
{ browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? ""
- , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }:
+ , icon ? browserName }:
let
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false;
@@ -13272,6 +13266,10 @@ let
vessel = callPackage_i686 ../games/vessel { };
+ voxelands = callPackage ../games/voxelands {
+ libpng = libpng12;
+ };
+
warmux = callPackage ../games/warmux { };
warsow = callPackage ../games/warsow {
@@ -13355,16 +13353,12 @@ let
inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
};
- gnome3_12 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.12 {
- callPackage = pkgs.newScope pkgs.gnome3_12;
- });
-
gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 {
callPackage = pkgs.newScope pkgs.gnome3_16;
self = pkgs.gnome3_16;
});
- gnome3 = gnome3_12;
+ gnome3 = gnome3_16;
gnome = recurseIntoAttrs gnome2;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 035c152b6b1..7fd57bb74ef 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3,7 +3,10 @@
{ overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb
, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr, pkgs }:
-let self = _self // overrides; _self = with self; {
+let
+ isGo13 = go.meta.branch == "1.3";
+ isGo14 = go.meta.branch == "1.4";
+ self = _self // overrides; _self = with self; {
inherit go buildGoPackage;
@@ -11,9 +14,10 @@ let self = _self // overrides; _self = with self; {
crypto = buildGoPackage rec {
rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02";
- name = "go-crypto-${rev}";
+ name = "crypto-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "golang.org/x/crypto";
goPackageAliases = [ "code.google.com/p/go.crypto" ];
+ disabled = isGo13;
src = fetchFromGitHub {
inherit rev;
@@ -25,8 +29,9 @@ let self = _self // overrides; _self = with self; {
glog = buildGoPackage rec {
rev = "44145f04b68cf362d9c4df2182967c2275eaefed";
- name = "glog-${rev}";
+ name = "glog-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/golang/glog";
+
src = fetchFromGitHub {
inherit rev;
owner = "golang";
@@ -36,18 +41,20 @@ let self = _self // overrides; _self = with self; {
};
image = buildGoPackage rec {
- rev = "490b1ad139b3";
- name = "go.image-${rev}";
- goPackagePath = "code.google.com/p/go.image";
- src = fetchhg {
+ rev = "d8e202c6ce59fad0017414839b6648851d10767e";
+ name = "image-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "golang.org/x/image";
+
+ src = fetchFromGitHub {
inherit rev;
- url = "https://${goPackagePath}";
- sha256 = "02m6ifwby2fi88njarbbb6dimwg0pd2b6llkgyadh4b9wzp2vy4r";
+ owner = "golang";
+ repo = "image";
+ sha256 = "0cxymm28rgbzsk76d19wm8fwp40dkwxhzmmdjnbkw5541272339l";
};
};
net = buildGoPackage rec {
- rev = "e0403b4e005737430c05a57aac078479844f919c";
+ rev = "d1d694760b7a3a9fa32e4d1c49e08b2d672221d8";
name = "net-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "golang.org/x/net";
goPackageAliases = [ "code.google.com/p/go.net" ];
@@ -56,7 +63,7 @@ let self = _self // overrides; _self = with self; {
inherit rev;
owner = "golang";
repo = "net";
- sha256 = "1g7cjzw4g4301a3yqpbk8n1d4s97sfby2aysl275x04g0zh8jxqp";
+ sha256 = "1fk62vjxsyca8hmlpca9rkgy8wqg9zw920d56ib442sjn9ys3zic";
};
propagatedBuildInputs = [ text ];
@@ -83,8 +90,8 @@ let self = _self // overrides; _self = with self; {
protobuf = buildGoPackage rec {
- rev = "efd7476481382c195beb33acd8ec2f1527167fb4";
- name = "goprotobuf-${stdenv.lib.strings.substring 0 7 rev}";
+ rev = "39e27fc0f226450c58e11eda145b542bc5dff3fe";
+ name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}";
goPackagePath = "github.com/golang/protobuf";
goPackageAliases = [ "code.google.com/p/goprotobuf" ];
@@ -92,10 +99,8 @@ let self = _self // overrides; _self = with self; {
inherit rev;
owner = "golang";
repo = "protobuf";
- sha256 = "1wc3m4jpsdmmqdcf2isc9913mmwfyv791c0rd26kpjjwynh5dhdm";
+ sha256 = "12l036ix0dc8hg35xrqmdcr3bpwncrdkgqkhp3s90w6a3qpva3gs";
};
-
- subPackages = [ "proto" "protoc-gen-go" ];
};
text = buildGoPackage rec {
@@ -113,15 +118,30 @@ let self = _self // overrides; _self = with self; {
tools = buildGoPackage rec {
- rev = "140fcaadc5860b1a014ec69fdeec807fe3b787e8";
- name = "go.tools-${stdenv.lib.strings.substring 0 7 rev}";
- goPackagePath = "code.google.com/p/go.tools";
- src = fetchhg {
+ rev = "7d75e8b219c3efda2d08ae38acd6b42f8da4f5f9";
+ name = "tools-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "golang.org/x/tools";
+
+ preConfigure = ''
+ # Make the builtin tools available here
+ mkdir -p $out/bin
+ eval $(go env | grep GOTOOLDIR)
+ find $GOTOOLDIR -type f | while read x; do
+ ln -sv "$x" "$out/bin"
+ done
+ export GOTOOLDIR=$out/bin
+ '';
+
+ excludedPackages = "testdata";
+
+ src = fetchFromGitHub {
inherit rev;
- url = "http://code.google.com/p/go.tools";
- sha256 = "1vgz4kxy0p56qh6pfbs2c68156hakgx4cmrci9jbg7lnrdaz4y56";
+ owner = "golang";
+ repo = "tools";
+ sha256 = "0vq0l3pjhgsp97v6ndlr3jcs029r5zilwai30snwfq74s580sriq";
};
- subPackages = [ "go/vcs" ];
+
+ buildInputs = [ net ];
};
## THIRD PARTY
@@ -151,6 +171,21 @@ let self = _self // overrides; _self = with self; {
};
};
+ assertions = buildGoPackage rec {
+ version = "1.5.0";
+ name = "assertions-${version}";
+ goPackagePath = "github.com/smartystreets/assertions";
+ src = fetchurl {
+ name = "${name}.tar.gz";
+ url = "https://github.com/smartystreets/assertions/archive/${version}.tar.gz";
+ sha256 = "1s4b0v49yv7jmy4izn7grfqykjrg7zg79dg5hsqr3x40d5n7mk02";
+ };
+ buildInputs = [ oglematchers ];
+ propagatedBuildInputs = [ goconvey ];
+ # subPackages = [];
+ doCheck = false;
+ };
+
aws-sdk-go = buildGoPackage rec {
rev = "5e038f730cbb99b144eeb1dbf92cd06c2d00b503";
name = "aws-sdk-go-${stdenv.lib.strings.substring 0 7 rev}";
@@ -356,6 +391,18 @@ let self = _self // overrides; _self = with self; {
subPackages = [ "./" ]; # don't try to build test fixtures
};
+ gls = buildGoPackage rec {
+ rev = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690";
+ name = "gls-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "github.com/jtolds/gls";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "jtolds";
+ repo = "gls";
+ sha256 = "1gvgkx7llklz6plapb95fcql7d34i6j7anlvksqhdirpja465jnm";
+ };
+ };
+
goamz = buildGoPackage rec {
rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7";
name = "goamz-${rev}";
@@ -480,6 +527,19 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ net ];
};
+ gopass = buildGoPackage rec {
+ rev = "2c70fa70727c953c51695f800f25d6b44abb368e";
+ name = "gopass-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "github.com/howeyc/gopass";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "howeyc";
+ repo = "gopass";
+ sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8";
+ };
+ buildInputs = [ crypto ];
+ };
+
gosnappy = buildGoPackage rec {
rev = "ce8acff4829e0c2458a67ead32390ac0a381c862";
name = "gosnappy-${stdenv.lib.strings.substring 0 7 rev}";
@@ -576,6 +636,18 @@ let self = _self // overrides; _self = with self; {
buildInputs = [ pkgs.etcd ];
};
+ go-flags = buildGoPackage rec {
+ rev = "5e118789801496c93ba210d34ef1f2ce5a9173bd";
+ name = "go-flags-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "github.com/jessevdk/go-flags";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "jessevdk";
+ repo = "go-flags";
+ sha256 = "1davr5h936fhc8zy7digp5yqxr216d1mshksr7iiad5xb3r8r9ja";
+ };
+ };
+
go-fuse = buildGoPackage rec {
rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58";
name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}";
@@ -943,6 +1015,18 @@ let self = _self // overrides; _self = with self; {
};
};
+ flagfile = buildGoPackage rec {
+ rev = "871ce569c29360f95d7596f90aa54d5ecef75738";
+ name = "flagfile-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "github.com/spacemonkeygo/flagfile";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "spacemonkeygo";
+ repo = "flagfile";
+ sha256 = "1y6wf1s51c90qc1aki8qikkw1wqapzjzr690xrmnrngsfpdyvkrc";
+ };
+ };
+
iochan = buildGoPackage rec {
rev = "b584a329b193e206025682ae6c10cdbe03b0cd77";
name = "iochan-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1050,14 +1134,17 @@ let self = _self // overrides; _self = with self; {
};
mgo = buildGoPackage rec {
- rev = "2";
+ rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
name = "mgo-${rev}";
- goPackagePath = "launchpad.net/mgo";
- src = fetchbzr {
+ goPackagePath = "gopkg.in/mgo.v2";
+ src = fetchFromGitHub {
inherit rev;
- url = "https://${goPackagePath}";
- sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";
+ owner = "go-mgo";
+ repo = "mgo";
+ sha256 ="0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
};
+
+ buildInputs = [ pkgs.cyrus_sasl ];
};
mousetrap = buildGoPackage rec {
@@ -1162,6 +1249,19 @@ let self = _self // overrides; _self = with self; {
doCheck = false; # check this again
};
+ openssl = buildGoPackage rec {
+ rev = "84b5df477423634115e53fb171a66007cece19f5";
+ name = "openssl-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "github.com/spacemonkeygo/openssl";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "spacemonkeygo";
+ repo = "openssl";
+ sha256 = "1l0cyazxp8bwmi151djyr6pknj9jv8n53lgfhgj6l0zj32p5kh1v";
+ };
+ buildInputs = [ spacelog pkgconfig pkgs.openssl ];
+ };
+
osext = buildGoPackage rec {
rev = "10";
name = "osext-${rev}";
@@ -1357,6 +1457,19 @@ let self = _self // overrides; _self = with self; {
};
};
+ spacelog = buildGoPackage rec {
+ rev = "ae95ccc1eb0c8ce2496c43177430efd61930f7e4";
+ name = "spacelog-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "github.com/spacemonkeygo/spacelog";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "spacemonkeygo";
+ repo = "spacelog";
+ sha256 = "1i1awivsix0ch0vg6rwvx0536ziyw6phcx45b1rmrclp6b6dyacy";
+ };
+ buildInputs = [ flagfile ];
+ };
+
stathat = buildGoPackage rec {
rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77";
name = "stathat-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1411,6 +1524,18 @@ let self = _self // overrides; _self = with self; {
propagatedBuildInputs = [ pty ];
};
+ tomb = buildGoPackage rec {
+ rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
+ name = "tomb-${stdenv.lib.strings.substring 0 7 rev}";
+ goPackagePath = "gopkg.in/tomb.v2";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "go-tomb";
+ repo = "tomb";
+ sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
+ };
+ };
+
toml = buildGoPackage rec {
rev = "f87ce853111478914f0bcffa34d43a93643e6eda";
name = "toml-${stdenv.lib.strings.substring 0 7 rev}";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7f9ebee7a8c..47ec86b41ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10955,6 +10955,22 @@ let
});
+ rpy2 = buildPythonPackage rec {
+ name = "rpy2-2.5.6";
+ src = pkgs.fetchurl {
+ url = "https://pypi.python.org/packages/source/r/rpy2/${name}.tar.gz";
+ md5 = "a36e758b633ce6aec6a5f450bfee980f";
+ };
+ buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ];
+ propagatedBuildInputs = [ self.singledispatch ];
+ meta = {
+ homepage = http://rpy.sourceforge.net/rpy2;
+ description = "Python interface to R";
+ license = stdenv.lib.licenses.gpl2Plus;
+ maintainers = [ stdenv.lib.maintainers.joelmo ];
+ };
+ };
+
rpyc = buildPythonPackage rec {
name = "rpyc-${version}";
version = "3.3.0";