diff options
Diffstat (limited to 'pkgs')
211 files changed, 761 insertions, 5938 deletions
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 2663f5592f78..1a2b4b7cc879 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -12,6 +12,7 @@ , midiSupport ? false, wildmidi ? null , wavpackSupport ? false, wavpack ? null , ffmpegSupport ? false, ffmpeg ? null +, apeSupport ? true, yasm ? null # misc plugins , zipSupport ? true, libzip ? null , artworkSupport ? true, imlib2 ? null @@ -38,6 +39,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null); assert aacSupport -> faad2 != null; assert zipSupport -> libzip != null; assert ffmpegSupport -> ffmpeg != null; +assert apeSupport -> yasm != null; assert artworkSupport -> imlib2 != null; assert hotkeysSupport -> libX11 != null; assert osdSupport -> dbus != null; @@ -68,6 +70,7 @@ stdenv.mkDerivation rec { ++ optional aacSupport faad2 ++ optional zipSupport libzip ++ optional ffmpegSupport ffmpeg + ++ optional apeSupport yasm ++ optional artworkSupport imlib2 ++ optional hotkeysSupport libX11 ++ optional osdSupport dbus diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 211dba85c430..40aa6b8385ec 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -171,12 +171,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "6.11.1.201510102004"; + version = "6.14.0.201601142217"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.11.1/net.sf.eclipsecs-updatesite_${version}-bin.zip"; - sha256 = "0l9nfx7a3qdx1pvjgc6ck4rxh7yrvqsskr190yrxxwmpnyj9cjs4"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.14.0/net.sf.eclipsecs-updatesite_${version}-bin.zip"; + sha256 = "0ysxir1fv0mb9xnidc9hv6llnk48lkav0sryjbx7pw7vy1f8nd4c"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 6dbeff55063c..6bf5a1a9e6da 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib +{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf -, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev +, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev, libnotify }: let @@ -8,51 +8,58 @@ let stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes -]; + xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr + xorg.libXcursor + ]; + desktopItem = makeDesktopItem { + name = "LightTable"; + exec = "light"; + comment = "LightTable"; + desktopName = "LightTable"; + genericName = "the next generation code editor"; + }; in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; stdenv.mkDerivation rec { name = "lighttable-${version}"; - version = "0.7.2"; + version = "0.8.1"; - src = - if stdenv.system == "i686-linux" then - fetchurl { - name = "LightTableLinux.tar.gz"; - url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux.tar.gz"; - sha256 = "1q5m50r319xn9drfv3cyfja87b7dfhni9d9gmz9733idq3l5fl9i"; - } - else + src = fetchurl { name = "LightTableLinux64.tar.gz"; - url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux64.tar.gz"; - sha256 = "1jnn103v5qrplkb5ik9p8whfqclcq2r1qv666hp3jaiwb46vhf3c"; + url = "https://github.com/LightTable/LightTable/releases/download/${version}/${name}-linux.tar.gz"; + sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv"; }; - buildInputs = [ makeWrapper ]; phases = [ "installPhase" ]; installPhase = '' - tar xvf ${src} - mkdir -p $out/bin - mv LightTable $out/ + tar xf ${src} + mkdir -p $out/{bin,share/LightTable} + mv ./${name}-linux/* $out/share/LightTable patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ - $out/LightTable/ltbin + --set-rpath ${libPath}:${libPath}/lib64:$out/share/LightTable \ + $out/share/LightTable/LightTable + + mv $out/share/LightTable/light $out/bin/light - ln -sf ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 + ln -s ${udev}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 + substituteInPlace $out/bin/light \ + --replace "/usr/lib/x86_64-linux-gnu" "${udev}/lib" \ + --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \ + --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable" - makeWrapper $out/LightTable/ltbin $out/bin/lighttable \ - --prefix "LD_LIBRARY_PATH" : $out/LightTable + mkdir -p "$out"/share/applications + cp "${desktopItem}/share/applications/LightTable.desktop" "$out"/share/applications/ ''; meta = with stdenv.lib; { description = "the next generation code editor"; homepage = http://www.lighttable.com/; license = licenses.gpl3; + maintainers = [ maintainers.matejc ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 28e97a930674..010deb0b17e4 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.49.0"; + version = "2.50.1"; name = "calibre-${version}"; src = fetchurl { url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0jc476pg07c0nwccprhwgjdlvvb2fdzza9xrjqzc0c42c5v7qzxa"; + sha256 = "0fy5fwj53hl8bcl412d2y61xm1nmkry24dlanj07nn6dhmrs0cm9"; }; inherit python; diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix new file mode 100644 index 000000000000..f046ecc9bf2d --- /dev/null +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }: + +buildPythonPackage rec { + name = "electrum-dash-${version}"; + version = "2.4.1"; + + src = fetchurl { + url = "https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz"; + sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000"; + }; + + propagatedBuildInputs = with pythonPackages; [ + dns + ecdsa + pbkdf2 + protobuf + pyasn1 + pyasn1-modules + pycrypto + pyqt4 + qrcode + requests + slowaes + tlslite + x11_hash + mnemonic + + # plugins + trezor + ]; + + preInstall = '' + mkdir -p $out/share + sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py + ''; + + meta = with stdenv.lib; { + description = "Electrum DASH"; + homepage = https://github.com/dashpay/electrum-dash; + license = licenses.gpl3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index df997ad6e0b5..632ae689f31f 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -22,6 +22,14 @@ buildPythonPackage rec { requests slowaes tlslite + + # plugins + trezor + keepkey + # TODO plugins + # matplotlib + # btchip + # amodem ]; preInstall = '' @@ -40,6 +48,6 @@ buildPythonPackage rec { ''; homepage = https://electrum.org; license = licenses.gpl3; - maintainers = with maintainers; [ ehmry joachifm ]; + maintainers = with maintainers; [ ehmry joachifm np ]; }; } diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 940aa8eb4bf4..08e7f834d6bb 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, git, gnupg, makeWrapper, pass, qtbase, qttools }: +{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools }: stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz"; - sha256 = "ccad9a06e3efa23278fa3e958185bf24fb3800874d8165be4ae6649706a2ab1c"; + sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6"; }; - buildInputs = [ git gnupg makeWrapper pass qtbase qttools ]; + buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools ]; configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { mv $out/qtpass $out/bin ''; - postInstall = '' - wrapProgram $out/bin/qtpass \ - --suffix PATH : ${git}/bin \ - --suffix PATH : ${gnupg}/bin \ - --suffix PATH : ${pass}/bin + postFixup = '' + wrapQtProgram $out/bin/qtpass \ + --suffix PATH : ${git}/bin \ + --suffix PATH : ${gnupg}/bin \ + --suffix PATH : ${pass}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index db0798f64cff..9a199c7ee499 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,19 +1,14 @@ -{fetchurl, stdenv, makeWrapper, gtk3, python3Packages}: -let - version = "0.9.2"; -in -stdenv.mkDerivation { +{fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}: +python34Packages.buildPythonPackage rec { name = "solaar-${version}"; + version = "0.9.2"; + namePrefix = ""; src = fetchurl { sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j"; url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz"; }; - buildInputs = [gtk3 python3Packages.pygobject3 python3Packages.pyudev]; - enableParallelBuilding = true; - installPhase = '' - mkdir -p "$out"; - ''; + propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3]; postInstall = '' wrapProgram "$out/bin/solaar" \ --prefix PYTHONPATH : "$PYTHONPATH" \ @@ -22,6 +17,8 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" ''; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c0c5e485e59c..bf870e144e56 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -64,17 +64,20 @@ let in stdenv.mkDerivation { name = "chromium${suffix}-${chromium.browser.version}"; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] ++ chromium.plugins.enabledPlugins; buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; - getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; + mkEnvVar = key: val: "--set '${key}' '${val}'"; + envVars = chromium.plugins.settings.envVars or {}; + flags = chromium.plugins.settings.flags or []; in with stdenv.lib; '' mkdir -p "$out/bin" "$out/share/applications" ln -s "${chromium.browser}/share" "$out/share" - eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + makeWrapper "${browserBinary}" "$out/bin/chromium" \ + ${concatStrings (mapAttrsToList mkEnvVar envVars)} \ + --add-flags "${concatStringsSep " " flags}" ln -s "$out/bin/chromium" "$out/bin/chromium-browser" ln -s "${chromium.browser}/share/icons" "$out/share/icons" diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index dda976905610..0b0e5bd08382 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -8,34 +8,6 @@ with stdenv.lib; let - # Generate a shell fragment that emits flags appended to the - # final makeWrapper call for wrapping the browser's main binary. - # - # Note that this is shell-escaped so that only the variable specified - # by the "output" attribute is substituted. - mkPluginInfo = { output ? "out", allowedVars ? [ output ] - , flags ? [], envVars ? {} - }: let - shSearch = ["'"] ++ map (var: "\$${var}") allowedVars; - shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; - # We need to triple-escape "val": - # * First because makeWrapper doesn't do any quoting of its arguments by - # itself. - # * Second because it's passed to the makeWrapper call separated by IFS but - # not by the _real_ arguments, for example the Widevine plugin flags - # contain spaces, so they would end up as separate arguments. - # * Third in order to be correctly quoted for the "echo" call below. - shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; - mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; - mkFlag = flag: ["--add-flags" (shEsc flag)]; - mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; - envList = mapAttrsToList mkEnvVar envVars; - quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); - in '' - mkdir -p "''$${output}/nix-support" - echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" - ''; - plugins = stdenv.mkDerivation { name = "chromium-binary-plugins"; @@ -89,29 +61,40 @@ let install -vD PepperFlash/libpepflashplayer.so \ "$flash/lib/libpepflashplayer.so" - - ${mkPluginInfo { - output = "flash"; - allowedVars = [ "flash" "flashVersion" ]; - flags = [ - "--ppapi-flash-path=$flash/lib/libpepflashplayer.so" - "--ppapi-flash-version=$flashVersion" - ]; - }} + mkdir -p "$flash/nix-support" + cat > "$flash/nix-support/chromium-plugin.nix" <<NIXOUT + { flags = [ + "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'" + "--ppapi-flash-version=$flashVersion" + ]; + } + NIXOUT install -vD libwidevinecdm.so \ "$widevine/lib/libwidevinecdm.so" install -vD libwidevinecdmadapter.so \ "$widevine/lib/libwidevinecdmadapter.so" - - ${mkPluginInfo { - output = "widevine"; - flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ]; - envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib"; - }} + mkdir -p "$widevine/nix-support" + cat > "$widevine/nix-support/chromium-plugin.nix" <<NIXOUT + { flags = [ "--register-pepper-plugins='${wvModule}${wvInfo}'" ]; + envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib"; + } + NIXOUT ''; - passthru.enabled = optional enablePepperFlash plugins.flash + passthru = let + enabledPlugins = optional enablePepperFlash plugins.flash ++ optional enableWideVine plugins.widevine; + getNix = plugin: import "${plugin}/nix-support/chromium-plugin.nix"; + mergeAttrsets = let + f = v: if all isAttrs v then mergeAttrsets v + else if all isList v then concatLists v + else if tail v == [] then head v + else head (tail v); + in fold (l: r: zipAttrsWith (_: f) [ l r ]) {}; + in { + inherit enabledPlugins; + settings = mergeAttrsets (map getNix enabledPlugins); + }; }; in plugins diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index dc6f22434db9..1a19210fd3dc 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -7,15 +7,15 @@ sha256bin64 = "1l5s504mmr4v5y67fsla9hyrk7dm155yc790ld87s1ya03h455gr"; }; beta = { - version = "48.0.2564.48"; - sha256 = "1qasdz9rwdqa2if8y4kkk19fspgjpk3q782c8l1p5n2cm25lkfa9"; - sha256bin32 = "0pgc3iy4s7whmckc14r0cvgmk7pqgidd2w0xv53bfq2k504b5ykw"; - sha256bin64 = "1lx6l8s2wdgzldbm8licpf22l6z13mvq05xlbn8ybizhn159nykj"; + version = "49.0.2623.28"; + sha256 = "1cpgfcw6kgw70k14wa1m5qzj4rnvkzrw1am30d34516mbwlmmqc8"; + sha256bin32 = "0nwhjav1x325h1drqknrjl5glivn4fdpahs1nlaqfk8kbjh1q113"; + sha256bin64 = "0wj6j0v3rngsclzbb8rc8l90wdi98j2sb60r2ypfihaxq2gd138y"; }; stable = { - version = "47.0.2526.106"; - sha256 = "1rjqkawj7l127cd9s1wxwn4v7dfbrlahml98sam3fg8a6drm0lv4"; - sha256bin32 = "14svd5x8lzfyyigfirxx1q9pg2bsnnb0fdwa7vvh1awq3zzfd38n"; - sha256bin64 = "121289vwaz391b32hp2lihlpaql76y44gdpqkl9a3md0j1zk1nd9"; + version = "48.0.2564.97"; + sha256 = "1nsjn8zlqljizy5dmg2rxwkw4k5j4yi15ywxi9ca3acv68dbhd3p"; + sha256bin32 = "0gdd9krsfsixw5b03msm7nf7zl7xh4chzkh9srb19c1kzygl2j2l"; + sha256bin64 = "1wmw17gdq1j6vxfdc8s94jc8z30pza8nipk4dh590xnb7faihr52"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 566247fc0d43..7451297f8d20 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -133,8 +133,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "43.0.4"; - sha256 = "0xjs4j26h8fyy8izrcc482vfvgg4gqzap5kh17jfv7flhn9akkvn"; + version = "44.0"; + sha256 = "07ac1h6ib36nm4a0aykh1z36vgw6wqlblil0zsj0lchdhksb10pa"; }; firefox-esr-unwrapped = common { diff --git a/pkgs/applications/networking/browsers/links/default.nix b/pkgs/applications/networking/browsers/links/default.nix deleted file mode 100644 index 8e78a0bd89cb..000000000000 --- a/pkgs/applications/networking/browsers/links/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "links-1.00pre15"; - src = fetchurl { - url = http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-1.00pre15.tar.gz; - sha256 = "0yzgzc6jm9vhv7rgbj5s9zwxn9fnf4nyap9l6dzgpwsn7m18vprv"; - }; -} diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 518a4d667dda..4ea6e619b175 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.11"; + version = "2.12"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "0gqjdz1brdcx02mcwchi6bxy1i1ljbw5zpc6b321skrrsqkzkxw7"; + sha256 = "0knq15yrp60s4jh92aacw8yfc2pcv3bqsw7dba7h5s6ivq8ihhcq"; }; buildInputs = diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 952c763c5f4a..442240c2718f 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.17"; + version = "1.10.18"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0svgl50w3hai31n5sm42sl0cd86c32cka0xzfy4r8gi0lyjdjxyx"; + sha256 = "0wpinar2cxyzq2j7ff7lznc08f0n6qjdm9aavsarbgdpaf2s1xvq"; }; buildInputs = with gst_all_1; [ @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { makeWrapper ]; + patches = [ ./liferea-fix-notification-header-location.patch ]; + preFixup = '' for f in "$out"/bin/*; do wrapProgram "$f" \ diff --git a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch new file mode 100644 index 000000000000..3cd322460b08 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch @@ -0,0 +1,12 @@ +diff -Naur a/src/notification/libnotify.c b/src/notification/libnotify.c +--- a/src/notification/libnotify.c 2016-01-28 19:33:19.000000000 +0100 ++++ b/src/notification/libnotify.c 2016-02-01 19:20:39.167580131 +0100 +@@ -40,7 +40,7 @@ + #include "ui/feed_list_view.h" + #include "ui/ui_tray.h" + +-#include "notification/notification.h" ++#include "../notification.h" + + static gboolean supports_actions = FALSE; + static gboolean supports_append = FALSE; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 2b0d44e61c8a..29b215d06428 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -7,7 +7,7 @@ }: let - version = "3.5.7"; + version = "3.5.8"; in with luaPackages; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf"; + sha256 = "1iifcyphgibmh3cvsy8agjrl9zjl80scrg0bcgnwywmxaxncjc3w"; }; meta = with stdenv.lib; { diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index dc4ff03f9e78..efee43d852ea 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ]) */ -{ lib, makeWrapper, stdenv }: self: +{ lib, lndir, makeWrapper, stdenv }: self: with lib; let inherit (self) emacs; in @@ -47,11 +47,14 @@ in stdenv.mkDerivation { name = (appendToName "with-packages" emacs).name; - nativeBuildInputs = [ emacs makeWrapper ]; + nativeBuildInputs = [ emacs lndir makeWrapper ]; inherit emacs explicitRequires; phases = [ "installPhase" ]; installPhase = '' - requires="" + mkdir -p $out/bin + mkdir -p $out/share/emacs/site-lisp + + local requires for pkg in $explicitRequires; do findInputs $pkg requires propagated-user-env-packages done @@ -59,52 +62,47 @@ stdenv.mkDerivation { siteStart="$out/share/emacs/site-lisp/site-start.el" - addEmacsPath() { - local list=$1 + # Begin the new site-start.el by loading the original, which sets some + # NixOS-specific paths. Paths are searched in the reverse of the order + # they are specified in, so user and system profile paths are searched last. + cat >"$siteStart" <<EOF +(load-file "$emacs/share/emacs/site-lisp/site-start.el") +(add-to-list 'load-path "$out/share/emacs/site-lisp") +EOF + + linkPath() { + local pkg=$1 local path=$2 # Add the path to the search path list, but only if it exists - if [[ -d "$path" ]]; then - echo "(add-to-list '$list \"$path\")" >>"$siteStart" + if [[ -d "$pkg/$path" ]]; then + lndir -silent "$pkg/$path" "$out/$path" fi } - # Add a dependency's paths to site-start.el - addToEmacsPaths() { - addEmacsPath "exec-path" "$1/bin" - addEmacsPath "load-path" "$1/share/emacs/site-lisp" - addEmacsPath "package-directory-list" "$1/share/emacs/site-lisp/elpa" + # Add a package's paths to site-start.el + linkEmacsPackage() { + linkPath "$1" "bin" + linkPath "$1" "share/emacs/site-lisp" } - mkdir -p $out/share/emacs/site-lisp - # Begin the new site-start.el by loading the original, which sets some - # NixOS-specific paths. Paths are searched in the reverse of the order - # they are specified in, so user and system profile paths are searched last. - echo "(load-file \"$emacs/share/emacs/site-lisp/site-start.el\")" >"$siteStart" - echo "(require 'package)" >>"$siteStart" - - # Set paths for the dependencies of the requested packages. These paths are - # searched before the profile paths, but after the explicitly-required paths. - for pkg in $requires; do - # The explicitly-required packages are also in the list, but we will add - # those paths last. - if ! ( echo "$explicitRequires" | grep "$pkg" >/dev/null ) ; then - addToEmacsPaths $pkg - fi + # First, link all the explicitly-required packages. + for pkg in $explicitRequires; do + linkEmacsPackage $pkg done - # Finally, add paths for all the explicitly-required packages. These paths - # will be searched first. - for pkg in $explicitRequires; do - addToEmacsPaths $pkg + # Next, link all the dependencies. + for pkg in $requires; do + linkEmacsPackage $pkg done # Byte-compiling improves start-up time only slightly, but costs nothing. emacs --batch -f batch-byte-compile "$siteStart" - mkdir -p $out/bin # Wrap emacs and friends so they find our site-start.el before the original. for prog in $emacs/bin/*; do # */ - makeWrapper "$prog" $out/bin/$(basename "$prog") \ + local progname=$(basename "$prog") + rm -f "$out/bin/$progname" + makeWrapper "$prog" "$out/bin/$progname" \ --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:" done diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix index 60803ddcb1f8..7a25966e9fb5 100644 --- a/pkgs/build-support/fetchgitlocal/default.nix +++ b/pkgs/build-support/fetchgitlocal/default.nix @@ -34,7 +34,7 @@ let # dump tar of *current directory* at given revision git -C ${srcStr} archive --format=tar ${gitHash} \ - | tar xvf - -C $out + | tar xf - -C $out ''; in nixPath diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix index cad0c7a21f94..6ae844a62463 100644 --- a/pkgs/build-support/kernel/modules-closure.nix +++ b/pkgs/build-support/kernel/modules-closure.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = kernel.name + "-shrunk"; builder = ./modules-closure.sh; - buildInputs = [nukeReferences]; - inherit kernel rootModules kmod allowMissing; + buildInputs = [ nukeReferences kmod ]; + inherit kernel rootModules allowMissing; allowedReferences = ["out"]; } diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index d0ac88f69247..71d507b1e2b1 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -2,8 +2,6 @@ source $stdenv/setup set -o pipefail -PATH=$kmod/sbin:$PATH - version=$(cd $kernel/lib/modules && ls -d *) echo "kernel version is $version" diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix index df206fe13b5a..9cbe951cf4ae 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, liberation_ttf_from_source }: stdenv.mkDerivation rec { version = "2.00.1"; @@ -16,30 +16,5 @@ stdenv.mkDerivation rec { cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; - meta = { - description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' - The Liberation Fonts are intended to be replacements for the three most - commonly used fonts on Microsoft systems: Times New Roman, Arial, and - Courier New. - - There are three sets: Sans (a substitute for Arial, Albany, Helvetica, - Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times - New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono - (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and - Bitstream Vera Sans Mono). - - You are free to use these fonts on any system you would like. You are - free to redistribute them under the GPL+exception license found in the - download. Using these fonts does not subject your documents to the - GPL---it liberates them from any proprietary claim. - ''; - - # See `License.txt' for details. - license = stdenv.lib.licenses.gpl2Oss; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ - stdenv.lib.maintainers.raskin - ]; - }; + inherit (liberation_ttf_from_source) meta; } diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index cd5c50309412..80af5ab52d90 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -18,30 +18,24 @@ stdenv.mkDerivation rec { cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; - meta = { + meta = with stdenv.lib; { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; longDescription = '' The Liberation Fonts are intended to be replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and - Courier New. + Courier New. Since 2012 they are based on croscore fonts. There are three sets: Sans (a substitute for Arial, Albany, Helvetica, Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and Bitstream Vera Sans Mono). - - You are free to use these fonts on any system you would like. You are - free to redistribute them under the GPL+exception license found in the - download. Using these fonts does not subject your documents to the - GPL---it liberates them from any proprietary claim. ''; - # See `License.txt' for details. - license = stdenv.lib.licenses.gpl2Oss; + license = licenses.ofl; homepage = https://fedorahosted.org/liberation-fonts/; maintainers = [ - stdenv.lib.maintainers.raskin + maintainers.raskin ]; }; } diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index eab577888d11..f0bf2834bed8 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,7 +8,7 @@ let in stdenv.mkDerivation rec { name = "geolite-legacy-${version}"; - version = "2016-01-25"; + version = "2016-02-01"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "1n7zlmnaxvjljyih9yi9hns530by21h42j2kcszbcyvn7rd9rnyw"; + "1h47n8fn9dfjw672jbw67mn03bidaahwnkra464ggy1q4pwkvncs"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56"; + "0nnfp8xzrlcdvy8lvsw2mvfmxavj2gmm7bvr0l2pv07n863b873y"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix deleted file mode 100644 index a2813e0581b3..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core -, dbus, intltool, libwnck3 }: - -stdenv.mkDerivation rec { - name = "accerciser-3.14.0"; - - src = fetchurl { - url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz"; - sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi - python3Packages.pygobject3 python3Packages.ipython - at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme - ]; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Accerciser; - description = "Interactive Python accessibility explorer"; - maintainers = gnome3.maintainers; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix deleted file mode 100644 index 99ea481307e7..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, evolution_data_server, evolution, sqlite -, makeWrapper, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist -, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "bijiben-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/bijiben/${gnome3.version}/${name}.tar.xz"; - sha256 = "0ndb7bv03rqxh4an44xd4cwxxp5z1wywk9xazmab01jsa0a0zx7r"; - }; - - 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.defaultIconTheme librsvg - evolution_data_server evolution sqlite ]; - - 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 = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix deleted file mode 100644 index de61b73cf622..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 -, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool -, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libgudev }: - -stdenv.mkDerivation rec { - name = "cheese-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/cheese/${gnome3.version}/${name}.tar.xz"; - sha256 = "184hzwrjjn94ndivb54rrif4jnbr66p1j0nlqqi3nw6qsrm2yqj4"; - }; - - buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool - gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop - gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2 - libcanberra_gtk3 libgudev ]; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Cheese; - description = "Take photos and videos with your webcam, with fun graphical effects"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix deleted file mode 100644 index d77740d35075..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, libnotify, gtkspell3 -, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: - -let - majVer = gnome3.version; -in stdenv.mkDerivation rec { - name = "evolution-${majVer}.3"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution/${majVer}/${name}.tar.xz"; - sha256 = "1mh769adz40r22x0jw5z4carkcbhx36qy2j8kl2djjbp1jf5vhnd"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - propagatedBuildInputs = [ gnome3.gtkhtml ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 bogofilter gnome3.libgdata sqlite - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas makeWrapper ]; - - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" - "--disable-libcryptui" ]; - - 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 = gnome3.maintainers; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix deleted file mode 100644 index 88ced2b2b065..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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 }: - -stdenv.mkDerivation rec { - name = "file-roller-${version}"; - - majVersion = gnome3.version; - version = "${majVersion}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz"; - sha256 = "12c6lpvc3mi1q10nas64kfcjw2arv3z4955zdfgf4c5wy4dczqyh"; - }; - - # 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 - gnome3.defaultIconTheme 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 = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix deleted file mode 100644 index c046dd7dc9bf..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gedit-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gedit/${gnome3.version}/${name}.tar.xz"; - sha256 = "0bs0vf773l0k7f4zxqlyb8z772s5dcn7ww0073hs7z3hj0l3lzrc"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix deleted file mode 100644 index 3ead4de8bc48..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib -, 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.defaultIconTheme librsvg libxslt ]; - - 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 = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix deleted file mode 100644 index 2c670b00f8ab..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix +++ /dev/null @@ -1,47 +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 -, desktop_file_utils, mtools, cdrkit, libcdio, libgudev -, libusb, libarchive, acl, xen, numactl -}: - -# TODO: ovirt (optional) - -stdenv.mkDerivation rec { - name = "gnome-boxes-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/${gnome3.version}/${name}.tar.xz"; - sha256 = "03a8x1bnbchsh2bs86gnwvddnwbf643wp5nrhyvg9j86d57axvs1"; - }; - - 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.defaultIconTheme libusb libarchive - librsvg desktop_file_utils acl libgudev xen numactl - ]; - - 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.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix deleted file mode 100644 index 805c2482e9b5..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, evolution_data_server, sqlite, libxml2, libsoup -, glib }: - -stdenv.mkDerivation rec { - name = "gnome-calendar-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calendar/${gnome3.version}/${name}.tar.xz"; - sha256 = "0vqwps86whf8jgq7q4hdrbnmlaxppgrfa3j7n6ddpqzkb3gf2c5m"; - }; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server - sqlite libxml2 libsoup glib gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Calendar; - description = "Simple and beautiful calendar application for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix deleted file mode 100644 index 0c18f926e6d1..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, gjs, gdk_pixbuf, librsvg }: - -stdenv.mkDerivation rec { - name = "gnome-characters-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${gnome3.version}/${name}.tar.xz"; - sha256 = "1gs5k32lmjpi4scb2i7pfnbsy8pl0gb9w1aypyy83hy6ydinaqc4"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf - librsvg gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Design/Apps/CharacterMap; - description = "Simple utility application to find and insert unusual characters"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix deleted file mode 100644 index 2308dd90434f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, gsound -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "gnome-clocks-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${gnome3.version}/${name}.tar.xz"; - sha256 = "1k7khghaq7y3j0r3kn9q7dwgi1875bfn4iy0sr1ls14m1p2bl10q"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool gsound - wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; - description = "Clock application designed for GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix deleted file mode 100644 index fe6be2e8d4ec..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxslt, webkitgtk -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib, inkscape, poppler_utils -, gmp, desktop_file_utils, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "gnome-documents-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/${gnome3.version}/${name}.tar.xz"; - sha256 = "154ssnyq4lwq2rsy3l5kqk8x1qjvn2j5gqm23i0aiw7qsbx5phrs"; - }; - - doCheck = true; - - configureFlags = [ "--enable-getting-started" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils inkscape poppler_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - wrapGAppsHook ]; - - enableParallelBuilding = true; - - preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication" - - gappsWrapperArgs+=(--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') - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Documents; - description = "Document manager application designed to work with GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix deleted file mode 100644 index 7ab2ca89bc02..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-getting-started-docs-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.version}/${name}.tar.xz"; - sha256 = "07wz35r6p9nvlshwcyjvhjnzbaw3bzadlhwz51c8nky7m7pdgmyy"; - }; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://live.gnome.org/DocumentationProject; - description = "Help a new user get started in GNOME"; - maintainers = gnome3.maintainers; - license = licenses.cc-by-sa-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix deleted file mode 100644 index dbef0526b806..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libxml2, systemd }: - -stdenv.mkDerivation rec { - name = "gnome-logs-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${gnome3.version}/${name}.tar.xz"; - sha256 = "0732jbvih5d678idvhlgqik9j9y594agwdx6gwap80459k1a6fg1"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - systemd gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Logs; - description = "A log viewer for the systemd journal"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix deleted file mode 100644 index e7f6606b71e2..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 -, gobjectIntrospection, gdk_pixbuf, librsvg -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }: - -stdenv.mkDerivation rec { - name = "gnome-maps-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-maps/${gnome3.version}/${name}.tar.xz"; - sha256 = "15kwy2fy9v4zzjaqcifv4jaqcx1227bcdxgd6916ghrdzgj93mx7"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook - gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph - gnome3.geocode_glib libchamplain file libsoup - gdk_pixbuf librsvg - gnome3.gnome_online_accounts gnome3.defaultIconTheme ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Maps; - description = "A map application for GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix deleted file mode 100644 index 3a6de4bcf6f4..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, python3, libxml2, python3Packages, libnotify, wrapGAppsHook -, pkgconfig, gtk3, glib, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: - -stdenv.mkDerivation rec { - name = "gnome-music-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-music/${gnome3.version}/${name}.tar.xz"; - sha256 = "1pyj192kva0swad6w2kaj5shcwpgiflyda6zmsiaximsgzc4as8i"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg python3 - gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify - python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser - gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Music; - description = "Music player and management application for the GNOME desktop environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix deleted file mode 100644 index 4c152777f2cb..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libgtop, intltool, itstool, libxml2, nmap, inetutils }: - -stdenv.mkDerivation rec { - name = "gnome-nettool-3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz"; - sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - propagatedUserEnvPkgs = [ nmap inetutils ]; - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gnome-network; - description = "A collection of networking tools"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix deleted file mode 100644 index a89cde7a111a..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif }: - -stdenv.mkDerivation rec { - name = "gnome-photos-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-photos/${gnome3.version}/${name}.tar.xz"; - sha256 = "0jv3b5nd4sazyq2k132rdjizfg24sj6i63ls1m6x2qqqf8grxznj"; - }; - - # doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata - gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - wrapGAppsHook ]; - - enableParallelBuilding = true; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix deleted file mode 100644 index 5fff782a2e8c..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs -, libgweather, intltool, itstool }: - -stdenv.mkDerivation rec { - name = "gnome-weather-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${gnome3.version}/${name}.tar.xz"; - sha256 = "14dx5zj9200qpsb7byfrjkw3144s0q0nmaw5c6ni7vpa8kmvbrac"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook gjs intltool itstool - libgweather gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Weather; - description = "Access current weather conditions and forecasts"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix deleted file mode 100644 index 093900dcb7ab..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix deleted file mode 100644 index 21ba8db37d41..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme -, telepathy_glib, gjs, itstool, telepathy_idle -, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "polari-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/polari/${gnome3.version}/${name}.tar.xz"; - sha256 = "0w7hc5i78kq4dkyzpdb9byk4rhqa569cmbg09nh3qxn8ninscdqx"; - }; - - propagatedUserEnvPkgs = [ telepathy_idle ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook - telepathy_glib gjs gdk_pixbuf librsvg ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Polari; - description = "IRC chat client designed to integrate with the GNOME desktop"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix deleted file mode 100644 index 3a28507fac17..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, intltool, fetchurl, vala -, pkgconfig, gtk3, glib -, makeWrapper, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit, openssh }: - -let - majVer = gnome3.version; -in stdenv.mkDerivation rec { - name = "seahorse-${majVer}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/seahorse/${majVer}/${name}.tar.xz"; - sha256 = "0cg1grgpwbfkiny5148n17rzpc8kswyr5yff0kpm8l3lp01my2kp"; - }; - - 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.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala gnome3.gcr - openssh ]; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix deleted file mode 100644 index 1debc3646bc8..000000000000 --- a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool -, libsecret, itstool, makeWrapper, librsvg }: - -stdenv.mkDerivation rec { - name = "vinagre-${version}"; - - majVersion = gnome3.version; - version = "${majVersion}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/vinagre/${majVersion}/${name}.tar.xz"; - sha256 = "0gs8sqd4r6jlgxn1b7ggyfcisig50z79p0rmigpzwpjjx1bh0z6p"; - }; - - buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret - itstool makeWrapper gnome3.defaultIconTheme librsvg ]; - - preFixup = '' - wrapProgram "$out/bin/vinagre" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Vinagre; - description = "Remote desktop viewer for GNOME"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix deleted file mode 100644 index 6a594aa6a1ee..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - name = "adwaita-icon-theme-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.version}/${name}.tar.xz"; - sha256 = "a3c8ad3b099ca571b423811a20ee9a7a43498cfa04d299719ee43cd7af6f6eb1"; - }; - - # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor_icon_theme ]; - - buildInputs = [ gdk_pixbuf librsvg ]; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; - - # remove a tree of dirs with no files within - postInstall = '' rm -r "$out/locale" ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix deleted file mode 100644 index 54d2c065d94e..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "baobab-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/baobab/${gnome3.version}/${name}.tar.xz"; - sha256 = "1wnf3yd3qi0xsmm37s6pk23qh095pk1fv9nhqjya1p9svwrh9r0z"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix deleted file mode 100644 index c2cb6a661abe..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }: - -let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "caribou-${majorVersion}.18.1"; - - src = fetchurl { - url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz"; - sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf"; - }; - - buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x - pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ]; - - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - - preBuild = '' - patchShebangs . - substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix deleted file mode 100644 index 94be115e95ce..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/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 }: - -let - majorVersion = "3.16"; -in -stdenv.mkDerivation rec { - name = "dconf-editor-${version}"; - version = "${majorVersion}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/dconf-editor/${majorVersion}/${name}.tar.xz"; - sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88"; - }; - - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme - intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ]; - - preFixup = '' - wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix deleted file mode 100644 index 990e2007a23f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: - -let - majorVersion = "0.24"; -in -stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; - sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2"; - }; - - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix deleted file mode 100644 index 4c42c6c026d3..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, 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, libpulseaudio, 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 - -let - majorVersion = "3.12"; -in -stdenv.mkDerivation rec { - name = "empathy-${majorVersion}.8"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz"; - sha256 = "10z6ksia6yx7vg0wsdbk4w6vjgfg3cg3n04jf9bj2vr7kr5zvs7w"; - }; - - 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 libpulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.defaultIconTheme 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 = gnome3.maintainers; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix deleted file mode 100644 index fa1d41ef153e..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, makeWrapper, librsvg, libexif }: - - -stdenv.mkDerivation rec { - name = "eog-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/eog/${gnome3.version}/${name}.tar.xz"; - sha256 = "1ry10wvd2zq7vv4rf1qz0x1b77sdzaqlxyjbw3a0lccp4f2x2y99"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg - gsettings_desktop_schemas shared_mime_info adwaita-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.adwaita-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"; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix deleted file mode 100644 index 7dcba4173644..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common }: - -stdenv.mkDerivation rec { - name = "epiphany-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/epiphany/${gnome3.version}/${name}.tar.xz"; - sha256 = "1bicv1rfi697hk12p5n3jmcgjc81bwicjsmppdfjmvj94r4iniz8"; - }; - - # 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.defaultIconTheme librsvg which gnome_common - 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; - - patches = [ ./libxml_depend.patch ]; - - patchFlags = [ "-p0" ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ - --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/Epiphany; - description = "WebKit based web browser for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch deleted file mode 100644 index 89e3694a02d9..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-08 18:53:52.284580835 +0200 -+++ configure.ac 2015-04-08 18:55:55.697225280 +0200 -@@ -113,6 +113,7 @@ - PKG_CHECK_MODULES(WEB_EXTENSION, [ - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED -+ libxml-2.0 >= $LIBXML_REQUIRED - ]) - AC_SUBST(WEB_EXTENSION_CFLAGS) - AC_SUBST(WEB_EXTENSION_LIBS) diff --git a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix deleted file mode 100644 index aa75b55358b5..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix +++ /dev/null @@ -1,69 +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-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/evince/${gnome3.version}/${name}.tar.xz"; - sha256 = "016d9i83srv49saslmjl7v02n7sc6d7v6h68y06y9rfgbk8f4f2i"; - }; - - buildInputs = [ - pkgconfig intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.adwaita-icon-theme - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - makeWrapper libsecret librsvg gnome3.adwaita-icon-theme - ]; - - 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.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix deleted file mode 100644 index 81a64e9e1757..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python -, intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: - - -stdenv.mkDerivation rec { - name = "evolution-data-server-${gnome3.version}.3"; - - src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${gnome3.version}/${name}.tar.xz"; - sha256 = "19dcvhlqh25pkkd29hhm9yik8xxfy01hcakikrai0x1a04aa2s7f"; - }; - - buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts - gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] - ++ stdenv.lib.optional valaSupport vala; - - propagatedBuildInputs = [ libsecret nss nspr libical db ]; - - # uoa irrelevant for now - configureFlags = [ "--disable-uoa" ] - ++ 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 = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix deleted file mode 100644 index 6e200bdb3188..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix +++ /dev/null @@ -1,43 +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 - -let - majorVersion = "0.11"; -in -stdenv.mkDerivation rec { - name = "folks-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; - sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz"; - }; - - 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 = gnome3.maintainers; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix deleted file mode 100644 index a4cb3e8c1464..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix deleted file mode 100644 index c7b4cdd0ab2f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: - -stdenv.mkDerivation rec { - name = "gcr-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gcr/${gnome3.version}/${name}.tar.xz"; - sha256 = "0xfhi0w358lvca1jjx24x2gm67mif33dsnmi9cv5i0f83ks8vzpc"; - }; - - buildInputs = [ - pkgconfig intltool gnupg glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala - ]; - - propagatedBuildInputs = [ p11_kit ]; - - #doCheck = true; - - #enableParallelBuilding = true; issues on hydra - - preFixup = '' - wrapProgram "$out/bin/gcr-viewer" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix deleted file mode 100644 index 51b67afb01fd..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/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-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz"; - sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3"; - }; - - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" - 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' - substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' - sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in - ''; - - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-initial-vt=10" ]; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool - accountsservice gnome3.dconf systemd - gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool ]; - - #enableParallelBuilding = true; # problems compiling - - # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.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 = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch deleted file mode 100644 index 7691a9e86f0f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gdm-3.16.0/daemon/gdm-display.c.orig 2015-04-08 13:53:14.370274369 +0200 -+++ gdm-3.16.0/daemon/gdm-display.c 2015-04-08 13:53:36.287520435 +0200 -@@ -1706,9 +1706,10 @@ - - gdm_error_trap_push (); - -- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { -+ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { - XAddHost (self->priv->x11_display, &host_entries[i]); -- } -+ }*/ -+ XDisableAccessControl(self->priv->x11_display); - - XSync (self->priv->x11_display, False); - if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch deleted file mode 100644 index b8fbad4d731d..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/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.16/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch deleted file mode 100644 index b451d129391a..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch +++ /dev/null @@ -1,83 +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 ---- gdm-3.16.0/daemon/gdm-x-session.c.orig 2015-04-15 18:44:16.875743928 +0200 -+++ gdm-3.16.0/daemon/gdm-x-session.c 2015-04-16 13:34:02.335708638 +0200 -@@ -207,6 +207,8 @@ - char *display_fd_string = NULL; - char *vt_string = NULL; - char *display_number; -+ int nixos_argc = 0; -+ char **nixos_argv = NULL; - gsize display_number_size; - - auth_file = prepare_auth_file (); -@@ -236,7 +238,15 @@ - - display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); - -- g_ptr_array_add (arguments, X_SERVER); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ int i = 0; -+ g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL); -+ for (i = 0; i < nixos_argc; i++) { -+ g_ptr_array_add (arguments, nixos_argv[i]); -+ } -+ } else { -+ g_ptr_array_add (arguments, X_SERVER); -+ } - - if (vt_string != NULL) { - g_ptr_array_add (arguments, vt_string); -@@ -259,12 +269,12 @@ - g_ptr_array_add (arguments, "-noreset"); - g_ptr_array_add (arguments, "-keeptty"); - -- g_ptr_array_add (arguments, "-verbose"); -+ /*g_ptr_array_add (arguments, "-verbose"); - if (state->debug_enabled) { - g_ptr_array_add (arguments, "7"); - } else { - g_ptr_array_add (arguments, "3"); -- } -+ }*/ - - if (state->debug_enabled) { - g_ptr_array_add (arguments, "-core"); -@@ -275,6 +285,9 @@ - (const char * const *) arguments->pdata, - &error); - g_free (display_fd_string); -+ if (nixos_argv) { -+ g_strfreev (nixos_argv); -+ } - g_clear_object (&launcher); - g_ptr_array_free (arguments, TRUE); - ---- gdm-3.16.0/daemon/gdm-session.c.orig 2015-04-16 14:19:01.392802683 +0200 -+++ gdm-3.16.0/daemon/gdm-session.c 2015-04-16 14:20:36.012296764 +0200 -@@ -2359,6 +2359,12 @@ - gchar *desktop_names; - const char *locale; - -+ if (g_getenv ("GDM_X_SERVER") != NULL) { -+ gdm_session_set_environment_variable (self, -+ "GDM_X_SERVER", -+ g_getenv ("GDM_X_SERVER")); -+ } -+ - gdm_session_set_environment_variable (self, - "GDMSESSION", - get_session_name (self)); diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix deleted file mode 100644 index d3d6f4e471c4..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix +++ /dev/null @@ -1,46 +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.14.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/3.14/${name}.tar.xz"; - sha256 = "0c2rvgcrf4s0nkxb19hf9pgh9c5pm6pginsq21dxj6hnjqabc3p2"; - }; - - # Only needed to make it build - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" - ''; - - configureFlags = [ "--sysconfdir=/etc" - "--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' - ''; - - # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch - ./disable_x_access_control.patch ./no-dbus-launch.patch ]; - - installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; - - 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 = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch deleted file mode 100644 index e100e013b786..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gdm-3.14.2/daemon/gdm-slave.c.orig 2015-04-16 15:05:27.844353079 +0200 -+++ gdm-3.14.2/daemon/gdm-slave.c 2015-04-16 15:05:40.240417915 +0200 -@@ -369,8 +369,9 @@ - gdm_error_trap_push (); - - for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { -- XAddHost (slave->priv->server_display, &host_entries[i]); -+ //XAddHost (slave->priv->server_display, &host_entries[i]); - } -+ XDisableAccessControl(slave->priv->server_display); - - XSync (slave->priv->server_display, False); - if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch deleted file mode 100644 index c87554078c7c..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/daemon/gdm-launch-environment.c 2015-06-22 15:11:07.277474398 +0000 -+++ b/daemon/gdm-launch-environment.c 2015-06-22 15:12:31.301157665 +0000 -@@ -48,8 +48,6 @@ - #include "gdm-session-enum-types.h" - #include "gdm-launch-environment.h" - --#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session" -- - extern char **environ; - - #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate)) -@@ -512,7 +510,7 @@ - gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command); - } else { - /* wrap it in dbus-launch */ -- char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command); -+ char *command = g_strdup (launch_environment->priv->command); - - gdm_session_select_program (launch_environment->priv->session, command); - g_free (command); diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch deleted file mode 100644 index b8fbad4d731d..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch deleted file mode 100644 index 412daee9f270..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix deleted file mode 100644 index 97c5ce2a71ff..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: - - -stdenv.mkDerivation rec { - name = "geocode-glib-${gnome3.version}.0"; - - - src = fetchurl { - url = "mirror://gnome/sources/geocode-glib/${gnome3.version}/${name}.tar.xz"; - sha256 = "1cbfv0kds6b6k0cl7q47xpj3x1scwcd7m68zl1rf7i4hmhw4hpqj"; - }; - - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix deleted file mode 100644 index 792e34c7b148..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection -, spidermonkey_24, pango, readline, glib, libxml2 }: - -let - majorVersion = "1.43"; -in -stdenv.mkDerivation rec { - name = "gjs-${majorVersion}.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz"; - sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2"; - }; - - buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ]; - - propagatedBuildInputs = [ spidermonkey_24 ]; - - postInstall = '' - sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la - ''; - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix deleted file mode 100644 index 12b4561e6315..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool }: - -stdenv.mkDerivation rec { - name = "gnome-backgrounds-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.version}/${name}.tar.xz"; - sha256 = "0fx0pjz356v4w462i9a3z9r26khxqmj0zhp7wfl5scyq07fzkqvn"; - }; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix deleted file mode 100644 index e511cea941c8..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib -, udev, itstool, libxml2, makeWrapper }: - -stdenv.mkDerivation rec { - name = "gnome-bluetooth-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz"; - sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz"; - }; - - buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme - makeWrapper gsettings_desktop_schemas itstool ]; - - preFixup = '' - wrapProgram "$out/bin/bluetooth-sendto" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix deleted file mode 100644 index a13ca33fc81a..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }: - -stdenv.mkDerivation rec { - name = "gnome-calculator-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${gnome3.version}/${name}.tar.xz"; - sha256 = "068mnwkxliwafcfk70cz85fqna76vjj7kgsm4yqs4c1fd72gphmv"; - }; - - 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 mpfr gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix deleted file mode 100644 index 2762b3fa33bf..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, which, gnome3, autoconf, automake }: - -let - majVer = "3.14"; -in stdenv.mkDerivation rec { - name = "gnome-common-${majVer}.0"; - - src = fetchurl { - url = "https://download.gnome.org/sources/gnome-common/${majVer}/${name}.tar.xz"; - sha256 = "0b1676g4q44ah73c5gwl1kg88pc93pnq1pa9kwl43d0vg0pj802c"; - }; - - patches = [(fetchurl { - name = "gnome-common-3-patch"; - 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 - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix deleted file mode 100644 index 2e89210413f3..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, libsecret -, libchamplain, clutter_gtk, geocode_glib -, bash, makeWrapper, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake115x, autoconf }: - -stdenv.mkDerivation rec { - name = "gnome-contacts-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${gnome3.version}/${name}.tar.xz"; - sha256 = "09syi67ijdx9dhsx9c740mf3fhs6z3kaijdr3fyj8gd80h7a3hym"; - }; - - 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.defaultIconTheme librsvg - libchamplain clutter_gtk geocode_glib - vala automake115x 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 = [ ./gio_unix.patch ]; - - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch deleted file mode 100644 index f1b3d3c94ac2..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-09 18:45:50.581232289 +0200 -+++ configure.ac 2015-04-09 18:45:59.744280137 +0200 -@@ -54,6 +54,7 @@ - champlain-0.12 - clutter-gtk-1.0 - geocode-glib-1.0 >= 3.15.3 -+ gio-unix-2.0 - " - PKG_CHECK_MODULES(CONTACTS, [$pkg_modules]) - 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 deleted file mode 100644 index 0ca81f542993..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, librsvg, libxkbfile, libnotify -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, libkrb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev, libgudev -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk -, fontconfig, sound-theme-freedesktop }: - -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, printers - -stdenv.mkDerivation rec { - name = "gnome-control-center-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/${gnome3.version}/${name}.tar.xz"; - sha256 = "07vvmnqjjcc0cblpr6cdmg3693hihpjrq3q30mm3q68pdyfzbjgf"; - }; - - propagatedUserEnvPkgs = - [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - - # https://bugzilla.gnome.org/show_bug.cgi?id=752596 - enableParallelBuilding = false; - - 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 libpulseaudio fontconfig colord-gtk libpwquality - accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk - gnome3.vino udev libgudev libcanberra_gtk3 - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ]; - - 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/" - ''; - - patches = [ ./vpn_plugins_path.patch ]; - - 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:${sound-theme-freedesktop}/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 - ''; - - meta = with stdenv.lib; { - description = "Utilities to configure the GNOME desktop"; - license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch deleted file mode 100644 index e25105a303f4..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix deleted file mode 100644 index e9a853c56a1e..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix +++ /dev/null @@ -1,32 +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 = gnome3.version; - minorVersion = "1"; - 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 = "0v7md6csbnv55j4kns2q0zjl4040zwf3ld6lc3qvik40fkzzbrjb"; - }; - - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 - xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile - gobjectIntrospection ]; - - propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix deleted file mode 100644 index 9e3906dbed13..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "gnome-dictionary-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${gnome3.version}/${name}.tar.xz"; - sha256 = "17ha4pmnh9v98hxqy4pr3ri9wsck9njfjwd8qa0gycksmbyd1cag"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix deleted file mode 100644 index ea29cda29612..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, makeWrapper, cracklib, libnotify -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: - -stdenv.mkDerivation rec { - name = "gnome-disk-utility-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.version}/${name}.tar.xz"; - sha256 = "14h92bznizq0k4qz7hn41axhhfjyw2ncnmbkf8kldi9x909fvpml"; - }; - - 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.defaultIconTheme - librsvg udisks2 gnome3.gnome_settings_daemon - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix deleted file mode 100644 index 39d5e71a5a3e..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool -, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-font-viewer-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.version}/${name}.tar.xz"; - sha256 = "0dnkpg1d71dbzazi5chg3vj8bbia2w6k0ji4vh2f4s0b9rvybgzc"; - }; - - 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.defaultIconTheme librsvg - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix deleted file mode 100644 index c3f16db359e5..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix +++ /dev/null @@ -1,41 +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 }: - -let - majVer = gnome3.version; -in stdenv.mkDerivation rec { - name = "gnome-keyring-${majVer}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${majVer}/${name}.tar.xz"; - sha256 = "1xg1xha3x3hzlmvdq2zm90hc61pj7pnf9yxxvgq4ynl5af6bp8qm"; - }; - - 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-certificates.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; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix deleted file mode 100644 index 90209634fbf1..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix +++ /dev/null @@ -1,22 +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"; - - 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.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix deleted file mode 100644 index ac285819e8f4..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper -, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common -, telepathy_glib, intltool, dbus_libs, icu, autoreconfHook -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 -}: - -stdenv.mkDerivation rec { - name = "gnome-online-accounts-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.version}/${name}.tar.xz"; - sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c"; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0"; - - enableParallelBuilding = true; - - preAutoreconf = '' - sed '/disable-settings/d' -i configure.ac - sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am - ''; - - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper - libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook - docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; - - 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 = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix deleted file mode 100644 index 4c879b750980..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, makeWrapper }: - -let - majVer = "3.14"; -in stdenv.mkDerivation rec { - name = "gnome-online-miners-${majVer}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${majVer}/${name}.tar.xz"; - sha256 = "0bbak8srcrvnw18s4ls5mqaamx9nqdi93lij6yjs0a3q320k22xl"; - }; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix deleted file mode 100644 index 8b4e7be9c411..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-screenshot-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/${gnome3.version}/${name}.tar.xz"; - sha256 = "5dd4bafb3deb0967866726ba89dab62bbd6dc3bda3b190474281142aa3dee948"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix deleted file mode 100644 index bce31242dac0..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg }: - - -stdenv.mkDerivation rec { - name = "gnome-session-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${gnome3.version}/${name}.tar.xz"; - sha256 = "17d9zryq13ajmai6fqynpfgghms52sj9h756f086i7fxbr2nsm4v"; - }; - - configureFlags = "--enable-systemd"; - - buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-session" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix deleted file mode 100644 index c80d1101ac9f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: - -stdenv.mkDerivation rec { - name = "gnome-settings-daemon-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.version}/${name}.tar.xz"; - sha256 = "1l61h497v57g3iqfmyzjh15z4c4akky3xziymphswzigb1ssv3da"; - }; - - # 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 networkmanager - libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev 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; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix deleted file mode 100644 index d4e5d807e483..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, gnome3, file }: - -stdenv.mkDerivation rec { - name = "gnome-shell-extensions-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.version}/${name}.tar.xz"; - sha256 = "0hd7jskwhrki0s9lmx6vc6rw9y689zp2h7zhlxk90hghy4nkvkc8"; - }; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} 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 deleted file mode 100644 index 899efc5443bb..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ 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 -, sqlite, libgweather, libcanberra_gtk3 -, libpulseaudio, 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 { - inherit (import ./src.nix fetchurl) name src; - - # Needed to find /etc/NetworkManager/VPN - configureFlags = [ "--sysconfdir=/etc" ]; - - buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - 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 libpulseaudio caribou evolution_data_server - 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 ]; - - 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" \ - --suffix 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; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix deleted file mode 100644 index 782e18e4a9dd..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-3.16.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.16/gnome-shell-3.16.1.tar.xz; - sha256 = "9bd9fbb40fb003ae09bebfe29d5b6a569b1fbb4a81c92ac9bada5efb956bf201"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix deleted file mode 100644 index 716f92a072d4..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, 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.defaultIconTheme librsvg ]; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix deleted file mode 100644 index 353c8fcf4dbe..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: - -stdenv.mkDerivation rec { - name = "gnome-system-monitor-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.version}/${name}.tar.xz"; - sha256 = "14akcz4dwjnfx47gncyavjr82zc78a912v5gdp6h3z19bn5nx4q0"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix deleted file mode 100644 index 8be614f7397c..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, libuuid, vala -, desktop_file_utils, itstool, makeWrapper, appdata-tools }: - -stdenv.mkDerivation rec { - - versionMajor = gnome3.version; - versionMinor = "1"; - - name = "gnome-terminal-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz"; - sha256 = "0nxlsz9hwajqfrblvqzc09599dra3van2znmcknnhjcfv3slvkkx"; - }; - - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool makeWrapper gnome3.nautilus vala ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ]; - - # Silly ./configure, it looks for dbus file from gnome-shell in the - # installation tree of the package it is configuring. - preConfigure = '' - mkdir -p "$out/share/dbus-1/interfaces" - cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces" - ''; - - # FIXME: enable for gnome3 - configureFlags = [ "--disable-migration" ]; - - preFixup = '' - for f in "$out/libexec/gnome-terminal-server"; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix deleted file mode 100644 index 7bd689511d53..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk_pixbuf }: - -stdenv.mkDerivation rec { - name = "gnome-themes-standard-${gnome3.version}.0"; - src = fetchurl { - url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.version}/${name}.tar.xz"; - sha256 = "0kyrbfrgl6g6wm6zpllldz36fclvl8vwmn1snwk18kf7f6ncpsac"; - }; - - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf - gnome3.defaultIconTheme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix deleted file mode 100644 index 17ebc84ced8c..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${gnome3.version}/${name}.tar.xz"; - sha256 = "0cck9hnp9az6qan97cv2d5lxlnzfss38h73g1a6dbspl4bnghy4n"; - }; - - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; - - meta = with stdenv.lib; { - homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}"; - description = "User and system administration help for the GNOME desktop"; - maintainers = gnome3.maintainers; - license = licenses.cc-by-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix deleted file mode 100644 index 381f7d7c4168..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, libxml2, gnused -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: - -let - majVer = "3.14"; -in stdenv.mkDerivation rec { - name = "gnome-user-share-${majVer}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-user-share/${majVer}/${name}.tar.xz"; - sha256 = "1s9fjzr161hy53i9ibk6aamc9af0cg8s151zj2fb6fxg67pv61bb"; - }; - - 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.defaultIconTheme librsvg - 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-webdav" \ - --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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix deleted file mode 100644 index a236238c257f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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 = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix deleted file mode 100644 index 16dfb638a249..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib -, libxml2, gnome3, gobjectIntrospection, libsoup }: - -stdenv.mkDerivation rec { - name = "grilo-0.2.12"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; - sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m"; - }; - - setupHook = ./setup-hook.sh; - - 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 = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh deleted file mode 100644 index bc93dddec386..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -make_grilo_find_plugins() { - if [ -d "$1"/lib/grilo-0.2 ]; then - addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2" - fi -} - -envHooks+=(make_grilo_find_plugins) diff --git a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index 53522c130733..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection - # just for passthru -, gnome3, gtk3, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - - versionMajor = gnome3.version; - versionMinor = "1"; - moduleName = "gsettings-desktop-schemas"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0q9l9fr90pcb3s6crbxkj3wiwn7wp9zfpv7bdxkadj0hspd9zzkl"; - }; - - postPatch = '' - for file in "background" "screensaver"; do - substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \ - --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/" - done - ''; - - buildInputs = [ glib gobjectIntrospection ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix deleted file mode 100644 index 5f255743313e..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: - -let - majVer = "1.0"; -in stdenv.mkDerivation rec { - name = "gsound-${majVer}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; - sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; - }; - - buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GSound; - description = "Small library for playing system sounds"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix deleted file mode 100644 index 3aacdef9455e..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext, gnome3 }: - -stdenv.mkDerivation rec { - name = "gtksourceview-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/${gnome3.version}/${name}.tar.xz"; - sha256 = "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6"; - }; - - 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 = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch deleted file mode 100644 index c87350167c25..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix deleted file mode 100644 index 71a8dbf0ff84..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash, appdata-tools -, makeWrapper, gnome3, file, itstool, libxml2 }: - -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme - -stdenv.mkDerivation rec { - name = "gucharmap-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gucharmap/${gnome3.version}/${name}.tar.xz"; - sha256 = "1l26prbi5dmzxs62fz3vrhsif9jwqw4065qxp8hnc8bv34h59phw"; - }; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools - 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 = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix deleted file mode 100644 index e8ddf7096e62..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix +++ /dev/null @@ -1,20 +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"; - }; - - outputs = [ "out" "doc" ]; - - 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.16/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix deleted file mode 100644 index bedbbee2dfe5..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: - -let - majorVersion = "0.16"; -in -stdenv.mkDerivation rec { - name = "libgdata-${majorVersion}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; - sha256 = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827"; - }; - - # TODO: need libuhttpmock - configureFlags = "--disable-tests"; - - 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 ]; - - propagatedBuildInputs = [ json_glib ]; - - meta = with stdenv.lib; { - description = "GData API library"; - maintainers = with maintainers; [ raskin lethalman ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix deleted file mode 100644 index 4ff132950319..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: -let - ver_maj = "0.16"; - ver_min = "1"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5"; - }; - - 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; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f451645..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/libgee/libgee-1.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix deleted file mode 100644 index 1715e7eeb856..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: -let - ver_maj = "0.6"; - ver_min = "8"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6"; - }; - - 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; - maintainers = [ maintainers.spacefrogg ] ++ gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix deleted file mode 100644 index c6c9323c010a..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix deleted file mode 100644 index 4939a4ff7281..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: - -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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix deleted file mode 100644 index 8ba578bad2b8..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata, gnome3 }: - -stdenv.mkDerivation rec { - name = "libgweather-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/libgweather/${gnome3.version}/${name}.tar.xz"; - sha256 = "1zadscn3i86fy7xpqiyw14pvz4f5cdw50ir77wd0zfr72hk5a2fv"; - }; - - 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 gnome3.geocode_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix deleted file mode 100644 index 72d307f4f1a7..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix deleted file mode 100644 index cf3f06fef58a..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 -, glib, gtk3, gobjectIntrospection, python, pygobject3 -}: - -let - majorVersion = "1.12"; -in -stdenv.mkDerivation rec { - name = "libpeas-${version}"; - version = "${majorVersion}.1"; - - buildInputs = [ - intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3 - gnome3.defaultIconTheme - ]; - - src = fetchurl { - url = "mirror://gnome/sources/libpeas/${majorVersion}/${name}.tar.xz"; - sha256 = "e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6"; - }; - - preFixup = '' - ''; - - meta = with stdenv.lib; { - description = "A GObject-based plugins engine"; - homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix deleted file mode 100644 index 5a8117528b68..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix deleted file mode 100644 index a60db8f93f24..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 -, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }: - - -stdenv.mkDerivation rec { - name = "mutter-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz"; - sha256 = "0qq7gpkljn1z45sg2sxvmia52krj4ck2541iar89z99s1cppaasa"; - }; - - # 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 - gnome3.geocode_glib - libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; - - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - patches = [ ./x86.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch deleted file mode 100644 index bc8829de42f1..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mutter-3.16.2/src/core/window.c.orig 2015-05-26 10:52:41.382834963 +0200 -+++ mutter-3.16.2/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 -@@ -3499,7 +3499,7 @@ - - static MetaMonitorInfo * - find_monitor_by_winsys_id (MetaWindow *window, -- guint winsys_id) -+ gint winsys_id) - { - int i; - -@@ -3618,7 +3618,7 @@ - */ - - gboolean did_placement; -- guint old_output_winsys_id; -+ gint old_output_winsys_id; - MetaRectangle unconstrained_rect; - MetaRectangle constrained_rect; - MetaMoveResizeResultFlags result = 0; diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix deleted file mode 100644 index 0e732b607484..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix +++ /dev/null @@ -1,30 +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-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus/${gnome3.version}/${name}.tar.xz"; - sha256 = "13s785kzk68xf4gdj0inz9k2hy06ll598w42141svdj77bdcsziy"; - }; - - buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.adwaita-icon-theme - 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; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch deleted file mode 100644 index 317b82579924..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix deleted file mode 100644 index eada9ab19934..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }: - -stdenv.mkDerivation rec { - name = "rest-0.7.92"; - - src = fetchurl { - url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; - sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec"; - }; - - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix deleted file mode 100644 index 8e5a1e21f52b..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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, gtk3 }: - -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 gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf - librsvg gnome3.defaultIconTheme 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 = gnome3.maintainers; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix deleted file mode 100644 index 63f36004bcd6..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: - -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 = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix deleted file mode 100644 index 41f220ec38b8..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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 -, bash, makeWrapper, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - name = "totem-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/totem/${gnome3.version}/${name}.tar.xz"; - sha256 = "1qv6s7c06r6kdrd3jjqk8h79y8a7h8pjcx02rzp869jr7d9hkcb9"; - }; - - 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.defaultIconTheme librsvg gnome3.gnome_desktop - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix deleted file mode 100644 index 88e6da2ad2d0..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, vala, sqlite, libxslt -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 }: - -let - majorVersion = "1.4"; -in -stdenv.mkDerivation rec { - name = "tracker-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz"; - sha256 = "1ssisbix7ib3d6bgx9s675gx6ayy68jq2srhpzv038mkbaskaz68"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler"; - - enableParallelBuilding = true; - - buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme 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 ]; - - preConfigure = '' - substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" - ''; - - 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 = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix deleted file mode 100644 index dcfd7b08b08e..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, gnome3, libnotify, file, telepathy_glib, dbus_glib }: - -stdenv.mkDerivation rec { - name = "vino-${versionMajor}.${versionMinor}"; - versionMajor = gnome3.version; - versionMinor = "0"; - - src = fetchurl { - url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz"; - sha256 = "1icdc2y78xfg7czfiz05y9vsxkzzgrc0dpsrcxb41bg0sh9kd3b0"; - }; - - doCheck = true; - - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - gnome3.defaultIconTheme 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.16/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix deleted file mode 100644 index 5ccca36bcaad..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: - -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"; - }; - - 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.16/core/vte/default.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix deleted file mode 100644 index 89a1405f62b7..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2 -, gnutls, selectTextPatch ? false }: - -stdenv.mkDerivation rec { - versionMajor = "0.40"; - versionMinor = "0"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal"; - }; - - patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib - gnome3.gtk3 ncurses vala libxml2 ]; - - propagatedBuildInputs = [ gnutls ]; - - preConfigure = "patchShebangs ."; - - 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.16/core/vte/expose_select_text.0.40.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch deleted file mode 100644 index c18f1b76b410..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch +++ /dev/null @@ -1,226 +0,0 @@ -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); -- return _vte_terminal_get_selection (terminal); -+ return vte_terminal_get_selection (terminal); - } - - static gboolean -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); --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); - -@@ -3344,9 +3343,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; - } -@@ -3398,9 +3398,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); -@@ -6302,6 +6303,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->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); -+} -+ - static GtkClipboard * - vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) - { -@@ -6465,7 +6488,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 -@@ -6482,7 +6505,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; - } -@@ -6982,6 +7005,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) -@@ -8631,7 +8698,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); -@@ -12188,7 +12255,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) { -@@ -12243,7 +12310,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"); - -@@ -12276,7 +12343,7 @@ - } - - char * --_vte_terminal_get_selection(VteTerminal *terminal) -+vte_terminal_get_selection(VteTerminal *terminal) - { - g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); - -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 - - 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 --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); -+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); - - /* 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); -+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.16/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix deleted file mode 100644 index adf01c6df845..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: - -let - majVer = gnome3.version; -in stdenv.mkDerivation rec { - name = "yelp-tools-${majVer}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${majVer}/${name}.tar.xz"; - sha256 = "177qzvj5w019isdp41qxqcys2kc4sq2x6dqhqn6l9ipib8a6rxml"; - }; - - 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.16/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix deleted file mode 100644 index a76a2e3073ff..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash -, itstool, libxml2, libxslt, gnome3 }: - -stdenv.mkDerivation rec { - name = "yelp-xsl-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${gnome3.version}/${name}.tar.xz"; - sha256 = "0jhpni4mmfvj3xf57rjm61nc8d0x66hz9gd1ywws5lh39g6fx59j"; - }; - - 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 = gnome3.maintainers; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix deleted file mode 100644 index e48dcafb3cf8..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf, sqlite -, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 -, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "yelp-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/yelp/${gnome3.version}/${name}.tar.xz"; - sha256 = "1jk7aad1srykhgc3x0hd3q3dnlshmy1ak00alwjzaasxvy6hp0b0"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas wrapGAppsHook - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "The help viewer in Gnome"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix deleted file mode 100644 index 9ce2726e7042..000000000000 --- a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: - -stdenv.mkDerivation rec { - - versionMajor = "3.16"; - versionMinor = "3"; - - name = "zenity-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz"; - sha256 = "1fhyzcmhrzqi10ks1gy8cxyqnbdfsnmqw3bkixnzrcf5zcb81qkz"; - }; - - preBuild = '' - mkdir -p $out/include - ''; - - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix deleted file mode 100644 index 6899ed855c7d..000000000000 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ /dev/null @@ -1,399 +0,0 @@ -{ pkgs }: - -let - - pkgsFun = overrides: - let - self = self_ // overrides; - self_ = with self; { - - overridePackages = f: - let newself = pkgsFun (f newself self); - in newself; - - callPackage = pkgs.newScope self; - - corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database - glib # for gsettings - 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 gnome-shell-extensions - pkgs.hicolor_icon_theme - ]; - - 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-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 dconf-editor vinagre gnome-weather gnome-logs - gnome-characters gnome-calendar accerciser gnome-nettool - gnome-getting-started-docs - ]; - - gamesPackages = with gnome3; [ swell-foop lightsoff iagno - tali quadrapassel gnome-sudoku aisleriot five-or-more - four-in-a-row gnome-chess gnome-klotski gnome-mahjongg - gnome-mines gnome-nibbles gnome-robots gnome-tetravex - hitori gnome-taquin - ]; - - inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra; - inherit (pkgs.gnome2) ORBit2; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; - libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - orbit = ORBit2; - gnome3 = self // { recurseForDerivations = false; }; - clutter = pkgs.clutter_1_22; - clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; }; - clutter-gst_2 = pkgs.clutter-gst; - clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter; }; - cogl = pkgs.cogl_1_20; - gtk = gtk3; - gtkmm = gtkmm3; - gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; - vala = pkgs.vala_0_26; - gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - - version = "3.16"; - maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ]; - -# Simplify the nixos module and gnome packages - defaultIconTheme = adwaita-icon-theme; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; - - baobab = callPackage ./core/baobab { }; - - caribou = callPackage ./core/caribou { }; - - dconf = callPackage ./core/dconf { }; - dconf-editor = callPackage ./core/dconf-editor { }; - - empathy = callPackage ./core/empathy { - webkitgtk = webkitgtk24x; - clutter-gst = pkgs.clutter-gst; - }; - - epiphany = callPackage ./core/epiphany { }; - - 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-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 { }; - - 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 { }; - - gsound = callPackage ./core/gsound { }; - - 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 { }; - libgee_1 = callPackage ./core/libgee/libgee-1.nix { }; - - 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 = webkitgtk24x; - clutter-gst = pkgs.clutter-gst; - }; - - 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 { }; - - vte_290 = callPackage ./core/vte/2.90.nix { }; - - vte-select-text = vte.override { selectTextPatch = true; }; - - vino = callPackage ./core/vino { }; - - yelp = callPackage ./core/yelp { - webkitgtk = 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/) - - accerciser = callPackage ./apps/accerciser { }; - - bijiben = callPackage ./apps/bijiben { - webkitgtk = webkitgtk24x; - }; - - cheese = callPackage ./apps/cheese { }; - - evolution = callPackage ./apps/evolution { - webkitgtk = 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-calendar = callPackage ./apps/gnome-calendar { }; - - gnome-characters = callPackage ./apps/gnome-characters { }; - - gnome-clocks = callPackage ./apps/gnome-clocks { }; - - gnome-documents = callPackage ./apps/gnome-documents { }; - - gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { }; - - gnome-logs = callPackage ./apps/gnome-logs { }; - - gnome-maps = callPackage ./apps/gnome-maps { }; - - gnome-music = callPackage ./apps/gnome-music { }; - - gnome-nettool = callPackage ./apps/gnome-nettool { }; - - gnome-photos = callPackage ./apps/gnome-photos { - gegl = gegl_0_3; - }; - - gnome-weather = callPackage ./apps/gnome-weather { }; - - nautilus-sendto = callPackage ./apps/nautilus-sendto { }; - - polari = callPackage ./apps/polari { }; - - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - - seahorse = callPackage ./apps/seahorse { }; - - vinagre = callPackage ./apps/vinagre { }; - -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - anjuta = callPackage ./devtools/anjuta { }; - - devhelp = callPackage ./devtools/devhelp { - webkitgtk = webkitgtk24x; - }; - - gdl = callPackage ./devtools/gdl { }; - - gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; - -#### Games - - aisleriot = callPackage ./games/aisleriot { }; - - five-or-more = callPackage ./games/five-or-more { }; - - four-in-a-row = callPackage ./games/four-in-a-row { }; - - gnome-chess = callPackage ./games/gnome-chess { }; - - gnome-klotski = callPackage ./games/gnome-klotski { }; - - gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; - - gnome-mines = callPackage ./games/gnome-mines { }; - - gnome-nibbles = callPackage ./games/gnome-nibbles { }; - - gnome-robots = callPackage ./games/gnome-robots { }; - - gnome-sudoku = callPackage ./games/gnome-sudoku { }; - - gnome-taquin = callPackage ./games/gnome-taquin { }; - - gnome-tetravex = callPackage ./games/gnome-tetravex { }; - - hitori = callPackage ./games/hitori { }; - - iagno = callPackage ./games/iagno { }; - - lightsoff = callPackage ./games/lightsoff { }; - - swell-foop = callPackage ./games/swell-foop { }; - - tali = callPackage ./games/tali { }; - - quadrapassel = callPackage ./games/quadrapassel { }; - -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - california = callPackage ./misc/california { }; - - geary = callPackage ./misc/geary { - webkitgtk = webkitgtk24x; - }; - - gfbgraph = callPackage ./misc/gfbgraph { }; - - gitg = callPackage ./misc/gitg { - webkitgtk = webkitgtk24x; - libgit2 = pkgs.libgit2_0_21; - }; - - libgda = callPackage ./misc/libgda { }; - - libgit2-glib = callPackage ./misc/libgit2-glib { - libgit2 = pkgs.libgit2_0_21.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 { }; - - pomodoro = callPackage ./misc/pomodoro { }; - - gnome-video-effects = callPackage ./misc/gnome-video-effects { }; - - }; - in self; # pkgsFun - -in pkgsFun {} diff --git a/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix deleted file mode 100644 index a1b38b21869a..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix deleted file mode 100644 index e488ab640472..000000000000 --- a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python, makeWrapper }: - -let - major = gnome3.version; - minor = "0"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "anjuta-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz"; - sha256 = "0g4lv6rzkwfz2wp4fg97qlbvyfh2k9gl7k7lidazaikvnc0jlhvp"; - }; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/anjuta \ - --prefix XDG_DATA_DIRS : \ - "$GSETTINGS_SCHEMAS_PATH" - ''; - - 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.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix deleted file mode 100644 index d4dfb7f0a8c1..000000000000 --- a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool }: - -stdenv.mkDerivation rec { - name = "devhelp-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/devhelp/${gnome3.version}/${name}.tar.xz"; - sha256 = "0i8kyh86hzwxs8dm047ivghl2b92vigdxa3x4pk4ha0whpk38g37"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://live.gnome.org/devhelp; - description = "API documentation browser for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix deleted file mode 100644 index aa7aa8b469d0..000000000000 --- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: - -let - major = gnome3.version; - 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 = "107zwvs913jr5hb59a4a8hsk19yinsicr2ma4vm216nzyl2f3jrl"; - }; - - buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; - - meta = with stdenv.lib; { - description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix deleted file mode 100644 index 0daa0405b699..000000000000 --- a/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-devel-docs-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.version}/${name}.tar.xz"; - sha256 = "1jkh40ya5mqss57p27b1hv77x5qis4zc377pyvzqa5wkzrvd0nls"; - }; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/GNOME/gnome-devel-docs; - description = "Developer documentation for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.fdl12; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix deleted file mode 100644 index 94f4e5e4d04b..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils -, guile, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - name = "aisleriot-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/aisleriot/${gnome3.version}/${name}.tar.xz"; - sha256 = "0rncdg21ys7ik971yw75qbawq89mikbh4dq5mg2msmrl6xsgv0zl"; - }; - - configureFlags = [ "--with-card-theme-formats=svg" ]; - - buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Aisleriot; - description = "A collection of patience games written in guile scheme"; - maintainers = gnome3.maintainers; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix deleted file mode 100644 index 70e7184b3387..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "five-or-more-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${gnome3.version}/${name}.tar.xz"; - sha256 = "018723w2q0fijvxs1kafrxg39f6ank6x51nfbf3mhn9q7jz9k2g3"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Five_or_more; - description = "Remove colored balls from the board by forming lines"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix deleted file mode 100644 index 292a54bf1938..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: - -stdenv.mkDerivation rec { - name = "four-in-a-row-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${gnome3.version}/${name}.tar.xz"; - sha256 = "1bm5chsvpw0jg1xh9g2n1w5i0fvxs50aqkgmrla9cpawsvzfshmz"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg - libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Four-in-a-row; - description = "Make lines of the same color to win"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix deleted file mode 100644 index e80c6691e202..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, librsvg, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-chess-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${gnome3.version}/${name}.tar.xz"; - sha256 = "0j1vvf1myki3bafsqv52q59qk1nhf1636nrb15fpfvm88p3b8wwg"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Chess; - description = "Play the classic two-player boardgame of chess"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix deleted file mode 100644 index cab2f194d495..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libxml2, intltool, itstool }: - -stdenv.mkDerivation rec { - name = "gnome-klotski-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-klotski/${gnome3.version}/${name}.tar.xz"; - sha256 = "0a64935c7pp51jhaf29q9zlx3lamj7zrhyff7clvv0w8v1w6gpax"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Klotski; - description = "Slide blocks to solve the puzzle"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix deleted file mode 100644 index 73cb0cf6cebe..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-mahjongg-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.version}/${name}.tar.xz"; - sha256 = "1jbd3gbmxqf36as9xsiarad575l4rpcfv6w1pn192r02aj3hgipj"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mahjongg; - description = "Disassemble a pile of tiles by removing matching pairs"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix deleted file mode 100644 index 92aa5bd72196..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-mines-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-mines/${gnome3.version}/${name}.tar.xz"; - sha256 = "0f0496nhirvpw4zk8bcl24rb2v20cm3gw8d5ybmch42mscmjrb0p"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mines; - description = "Clear hidden mines from a minefield"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix deleted file mode 100644 index 673edff645dc..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool -, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-nibbles-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${gnome3.version}/${name}.tar.xz"; - sha256 = "1384hc7vx3i1jkmc1pw1cjh61jymq9441ci1k06vjz62r9as1nmx"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Nibbles; - description = "Guide a worm around a maze"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix deleted file mode 100644 index 306a9e40852a..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-robots-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${gnome3.version}/${name}.tar.xz"; - sha256 = "0dhzl1rhn4ysp3s3j0lxsiw64acz0w1n1bljrfln9s07x8nj17nx"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 - libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Robots; - description = "Avoid the robots and make them crash into each other"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix deleted file mode 100644 index eda3cf1f84e3..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook -, json_glib, qqwing, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-sudoku-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${gnome3.version}/${name}.tar.xz"; - sha256 = "1b9xwldzjjpkwb2na9cbs8z4gv8dlj9dm574gybdz466190lrsxv"; - }; - - buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee - json_glib qqwing itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Sudoku; - description = "Test your logic skills in this number grid puzzle"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix deleted file mode 100644 index 2a2f97d1e49d..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-taquin-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${gnome3.version}/${name}.tar.xz"; - sha256 = "024a1ing1iclmyhi5vlps6xna84vgy7s098h9yvzq43fsahmx8pi"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 - intltool itstool libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Taquin; - description = "Move tiles so that they reach their places"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix deleted file mode 100644 index 2b577799307c..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: - -stdenv.mkDerivation rec { - name = "gnome-tetravex-${gnome3.version}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${gnome3.version}/${name}.tar.xz"; - sha256 = "07cmcmrd5fj8vm682894gra2vj8jwx01n3ggjinl93yv4gwpplz9"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tetravex; - description = "Complete the puzzle by matching numbered tiles"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix deleted file mode 100644 index bd6be7d43c58..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: - -stdenv.mkDerivation rec { - name = "hitori-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz"; - sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Hitori; - description = "GTK+ application to generate and let you play games of Hitori"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix deleted file mode 100644 index b5fab4a0e6f7..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: - -stdenv.mkDerivation rec { - name = "iagno-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/iagno/${gnome3.version}/${name}.tar.xz"; - sha256 = "0pg4sx277idfab3qxxn8c7r6gpdsdw5br0x7fxhxqascvvx8my1k"; - }; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Iagno; - description = "Computer version of the game Reversi, more popularly called Othello"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix deleted file mode 100644 index 313614f1744d..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: - -stdenv.mkDerivation rec { - name = "lightsoff-${gnome3.version}.1.1"; - - src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${gnome3.version}/${name}.tar.xz"; - sha256 = "00a2jv7wr6fxrzk7avwa0wspz429ad7ri7v95jv31nqn5q73y4c0"; - }; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf - libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Lightsoff; - description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix deleted file mode 100644 index 98cfd55a31eb..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra_gtk3 -, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "quadrapassel-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/quadrapassel/${gnome3.version}/${name}.tar.xz"; - sha256 = "17c6ddjgmakj615ahnrmrzayjxc2ylr8dddfzi9py875q5vk7grx"; - }; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra_gtk3 itstool intltool clutter - libxml2 clutter_gtk wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Quadrapassel; - description = "Classic falling-block game, Tetris"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix deleted file mode 100644 index 510e6d6d1a89..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "swell-foop-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/swell-foop/${gnome3.version}/${name}.tar.xz"; - sha256 = "0bhjmjcjsqdb89shs0ygi6ps5hb3lk8nhrbjnsjk4clfqbw0jzwf"; - }; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; - description = "Puzzle game, previously known as Same GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix deleted file mode 100644 index a38d8845bef0..000000000000 --- a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, intltool, itstool, libxml2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - name = "tali-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/tali/${gnome3.version}/${name}.tar.xz"; - sha256 = "10cfgxiqg38z5ngkiznglxjgm1552mjvfw4bjhjic0yi5cvdr6dg"; - }; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libxml2 itstool intltool wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tali; - description = "Sort of poker with dice and less money"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch deleted file mode 100644 index c229cc96094f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8a94642..1ca6426 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS) - GLIB_REQUIRED=2.38.0 - GTK_REQUIRED=3.12.2 - GEE_REQUIRED=0.10.5 --ECAL_REQUIRED=3.8.5 -+ECAL_REQUIRED=3.13.90 - LIBSOUP_REQUIRED=2.44 - GDATA_REQUIRED=0.14.0 - GOA_REQUIRED=3.8.3 -diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala -index ee6a572..5009b5d 100644 ---- a/src/backing/eds/backing-eds-calendar-source.vala -+++ b/src/backing/eds/backing-eds-calendar-source.vala -@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource { - - // Invoked by EdsStore prior to making it available outside of unit - internal async void open_async(Cancellable? cancellable) throws Error { -- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, -+ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1, - cancellable); - - client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); -diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi -index 6ead3ec..46fd711 100644 ---- a/vapi/libecal-1.2.vapi -+++ b/vapi/libecal-1.2.vapi -@@ -23,7 +23,7 @@ namespace E { - public bool check_save_schedules (); - public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_connect_finish")] -- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; -+ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; - public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_create_object_finish")] - public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error; diff --git a/pkgs/desktops/gnome-3/3.16/misc/california/default.nix b/pkgs/desktops/gnome-3/3.16/misc/california/default.nix deleted file mode 100644 index 4bdeeb23a91e..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/california/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala, makeWrapper -, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }: - -let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "california-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz"; - sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ makeWrapper intltool pkgconfig vala glib gtk3 gnome3.libgee - libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server - sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/california" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" - ''; - - enableParallelBuilding = true; - - # Apply fedoras patch to build with evolution-data-server >3.13 - patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/California; - description = "Calendar application for GNOME 3"; - maintainers = with maintainers; [ pSub ]; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix deleted file mode 100644 index 9ed8494098d1..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala -, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra, libsecret, gmime -, libpthreadstubs, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: - -let - majorVersion = "0.10"; - minorVersion = "0"; -in -stdenv.mkDerivation rec { - name = "geary-${majorVersion}.${minorVersion}"; - - src = fetchurl { - url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; - sha256 = "46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5"; - }; - - 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 gnome3.gcr - gdk_pixbuf librsvg gnome3.defaultIconTheme ]; - - 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 = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch deleted file mode 100644 index e65c0dea7472..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix deleted file mode 100644 index 7cea9cd8d150..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: - -let - majorVersion = "0.10"; -in -stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "${majorVersion}.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988"; - }; - - 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; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix deleted file mode 100644 index e85b087fa41f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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 = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix deleted file mode 100644 index 998f1f5f735f..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix +++ /dev/null @@ -1,47 +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.adwaita-icon-theme - -let - majorVersion = "3.14"; -in -stdenv.mkDerivation rec { - name = "gitg-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gitg/${majorVersion}/${name}.tar.xz"; - sha256 = "8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b"; - }; - - 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.adwaita-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" - ''; - - 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.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch deleted file mode 100644 index d5a6f90e33db..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 175218579aa2b4f4974ff1cf4fd1ac93082a4714 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds <jg@ekby.de> -Date: Sat, 1 Aug 2015 21:01:11 +0200 -Subject: [PATCH 1/1] Search for themes and icons in system data dirs - ---- - gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- - gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- - gtweak/utils.py | 17 +++++++++++++++++ - 3 files changed, 23 insertions(+), 18 deletions(-) - -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index ed2ad5f..a319907 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -46,10 +46,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): - - def _get_valid_themes(self): - """ Only shows themes that have variations for gtk+-3 and gtk+-2 """ -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs('themes'), lambda d: - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - os.path.exists(os.path.join(d, "gtk-3.0"))) - return valid -@@ -64,10 +61,7 @@ class IconThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_icon_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) - return valid -@@ -82,10 +76,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_cursor_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) - return valid -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index b56a4f4..3486098 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -20,7 +20,7 @@ import os.path - from gi.repository import GLib - - import gtweak --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title - - class PrimaryPasteTweak(GetterSetterSwitchTweak): -@@ -47,10 +47,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_key_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) - return valid -diff --git a/gtweak/utils.py b/gtweak/utils.py -index 3d20425..0fcb51d 100644 ---- a/gtweak/utils.py -+++ b/gtweak/utils.py -@@ -21,6 +21,7 @@ import tempfile - import shutil - import subprocess - import glob -+import itertools - - import gtweak - from gtweak.gsettings import GSettingsSetting -@@ -114,6 +115,22 @@ def execute_subprocess(cmd_then_args, block=True): - stdout, stderr = p.communicate() - return stdout, stderr, p.returncode - -+def get_resource_dirs(resource): -+ """Returns a list of all known resource dirs for a given resource. -+ -+ :param str resource: -+ Name of the resource (e.g. "themes") -+ :return: -+ A list of resource dirs -+ """ -+ dirs = [os.path.join(dir, resource) -+ for dir in itertools.chain(GLib.get_system_data_dirs(), -+ (gtweak.DATA_DIR, -+ GLib.get_user_data_dir()))] -+ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))] -+ -+ return [dir for dir in dirs if os.path.isdir(dir)] -+ - @singleton - class AutostartManager: - --- -2.4.5 - diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch deleted file mode 100644 index 61ae27349795..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch +++ /dev/null @@ -1,103 +0,0 @@ -From edd3203c7b7d5ba596df9f148c443cdfc8a58d88 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds <jg@ekby.de> -Date: Sat, 1 Aug 2015 21:26:57 +0200 -Subject: [PATCH 1/1] Don't show multiple entries for a single theme - ---- - gtweak/tweaks/tweak_group_interface.py | 8 ++++---- - gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- - gtweak/utils.py | 16 ++++++++++++++++ - 3 files changed, 22 insertions(+), 6 deletions(-) - -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index a319907..82c0286 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -49,7 +49,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs('themes'), lambda d: - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - os.path.exists(os.path.join(d, "gtk-3.0"))) -- return valid -+ return get_unique_resources(valid) - - class IconThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -64,7 +64,7 @@ class IconThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) -- return valid -+ return get_unique_resources(valid) - - class CursorThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -79,7 +79,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) -- return valid -+ return get_unique_resources(valid) - - class ShellThemeTweak(Gtk.Box, Tweak): - -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index 3486098..9f53425 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -20,7 +20,7 @@ import os.path - from gi.repository import GLib - - import gtweak --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title - - class PrimaryPasteTweak(GetterSetterSwitchTweak): -@@ -50,7 +50,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) -- return valid -+ return get_unique_resources(valid) - - TWEAK_GROUPS = [ - ListBoxTweakGroup(_("Keyboard and Mouse"), -diff --git a/gtweak/utils.py b/gtweak/utils.py -index 0fcb51d..ce8e12e 100644 ---- a/gtweak/utils.py -+++ b/gtweak/utils.py -@@ -131,6 +131,22 @@ def get_resource_dirs(resource): - - return [dir for dir in dirs if os.path.isdir(dir)] - -+def get_unique_resources(dirs): -+ """Filter out duplicated resources. -+ -+ :param list dirs: -+ List of resource dirs (e.g. /usr/share/themes/Adwaita) -+ :return: -+ List of dirs without duplicated resources -+ """ -+ unique_dirs = {} -+ for dir in dirs: -+ basename = os.path.basename(dir) -+ if basename not in unique_dirs: -+ unique_dirs[basename] = dir -+ -+ return unique_dirs -+ - @singleton - class AutostartManager: - --- -2.4.5 - diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch deleted file mode 100644 index 840ebb82ec75..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dea8fc3c37c43f4fbbcc658ee995a95b93452b3c Mon Sep 17 00:00:00 2001 -From: Jascha Geerds <jg@ekby.de> -Date: Sun, 2 Aug 2015 12:01:20 +0200 -Subject: [PATCH 1/1] Create config dir if it doesn't exist - -Otherwise gnome-tweak-tool can't enable the dark theme and fails -without a clear error message. ---- - gtweak/gtksettings.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py -index bcec9f1..f39991b 100644 ---- a/gtweak/gtksettings.py -+++ b/gtweak/gtksettings.py -@@ -35,6 +35,10 @@ class GtkSettingsManager: - def _get_keyfile(self): - keyfile = None - try: -+ config_dir = os.path.dirname(self._path) -+ if not os.path.isdir(config_dir): -+ os.makedirs(config_dir) -+ - keyfile = GLib.KeyFile() - keyfile.load_from_file(self._path, 0) - except MemoryError: --- -2.4.5 - diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index 6600345060f9..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, intltool, fetchurl, python, pygobject3, atk -, pkgconfig, gtk3, glib, libsoup -, bash, makeWrapper, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify }: - -stdenv.mkDerivation rec { - name = "gnome-tweak-tool-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.version}/${name}.tar.xz"; - sha256 = "0r5x67aj79dsw2xl98q4harxv3hjs52g0m6pw43vx29lbir07r5i"; - }; - - 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.defaultIconTheme librsvg - 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" \ - --suffix 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 - ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch - ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch - ./0003-Create-config-dir-if-it-doesn-t-exist.patch - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3ab..000000000000 --- a/pkgs/desktops/gnome-3/3.16/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.16/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix deleted file mode 100644 index c0bd2fed3f2d..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-video-effects-${version}"; - version = "0.4.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; - sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; - }; - - buildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix deleted file mode 100644 index 6563f7979700..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib -, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: - -stdenv.mkDerivation rec { - version = "${gnome3.version}.3.1"; - name = "gpaste-${version}"; - - src = fetchurl { - url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "1m171r1d1jrv9d7ssj25ikrw7lc96gr41rgkxnsa2lsqrvv8i16l"; - }; - - buildInputs = [ intltool autoreconfHook pkgconfig vala glib - gtk3 gnome3.gnome_control_center dbus.libs - clutter pango appstream-glib 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; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix deleted file mode 100644 index d86e234e80f5..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: - -let - majorVersion = "4.8"; -in -stdenv.mkDerivation rec { - name = "gtkhtml-${majorVersion}.5"; - - src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${majorVersion}/${name}.tar.xz"; - sha256 = "2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d"; - }; - - buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; - - propagatedBuildInputs = [ enchant isocodes ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix deleted file mode 100644 index 1fcb411d120d..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: - -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 openssl ]; - - 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.16/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix deleted file mode 100644 index dbdd2cc7fd13..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala -, gtk_doc, gobjectIntrospection, libgit2, glib }: - -let - majorVersion = "0.0"; -in -stdenv.mkDerivation rec { - name = "libgit2-glib-${majorVersion}.24"; - - src = fetchurl { - url = "mirror://gnome/sources/libgit2-glib/0.0/${name}.tar.xz"; - sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8"; - }; - - 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.16/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix deleted file mode 100644 index b86480125730..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }: - -let - majorVersion = "1.9"; -in -stdenv.mkDerivation rec { - name = "libmediaart-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; - sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll"; - }; - - buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix deleted file mode 100644 index 0440af440fec..000000000000 --- a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base, - glib, gobjectIntrospection, telepathy_glib -}: - -stdenv.mkDerivation rec { - rev = "624945d"; - name = "gnome-shell-pomodoro-${gnome3.version}-${rev}"; - - src = fetchFromGitHub { - owner = "codito"; - repo = "gnome-pomodoro"; - rev = "${rev}"; - sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq"; - }; - - configureScript = ''./autogen.sh''; - - buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib - gnome3.defaultIconTheme - ]; - - preBuild = '' - sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ - 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 = "A time management utility for GNOME based on the pomodoro technique"; - longDescription = '' - This GNOME utility helps to manage time according to Pomodoro Technique. - It intends to improve productivity and focus by taking short breaks. - ''; - maintainers = with maintainers; [ DamienCassou jgeerds ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix index 516ef9ab92db..cbf21cb8f5bc 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix +++ b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix @@ -1,7 +1,7 @@ { fetchgit }: fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "3529c6ab61d5f786bdde449fd069520664330b30"; - sha256 = "0d33nmbwrdn7ai4lsrn3qzcfy71hbini0jl437387cxdh3z6sjqa"; + rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f"; + sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j"; fetchSubmodules = true; } diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch index 751f114ba43a..61bbb95b0a58 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/ghcjs.patch @@ -1,8 +1,8 @@ diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs -index 3c68dcf..64f3cf7 100644 +index db8b12e..7b815c5 100644 --- a/src-bin/Boot.hs +++ b/src-bin/Boot.hs -@@ -512,9 +512,7 @@ initPackageDB :: B () +@@ -526,9 +526,7 @@ initPackageDB :: B () initPackageDB = do msg info "creating package databases" initDB "--global" <^> beLocations . blGlobalDB @@ -12,7 +12,7 @@ index 3c68dcf..64f3cf7 100644 initDB dbName db = do rm_rf db >> mkdir_p db ghcjs_pkg_ ["init", toTextI db] `catchAny_` return () -@@ -538,29 +536,22 @@ installDevelopmentTree = subTop $ do +@@ -552,29 +550,22 @@ installDevelopmentTree = subTop $ do msgD info $ "preparing development boot tree" checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do testGit "ghcjs-boot" >>= \case @@ -46,7 +46,7 @@ index 3c68dcf..64f3cf7 100644 mapM_ patchPackage =<< allPackages preparePrimops buildGenPrim -@@ -1085,8 +1076,11 @@ cabalInstallFlags parmakeGhcjs = do +@@ -1110,14 +1101,14 @@ cabalInstallFlags parmakeGhcjs = do , "--avoid-reinstalls" , "--builddir", "dist" , "--with-compiler", ghcjs ^. pgmLocText @@ -58,13 +58,19 @@ index 3c68dcf..64f3cf7 100644 + , "--libsubdir", "$pkgid" , bool haddock "--enable-documentation" "--disable-documentation" , "--haddock-html" - -- workaround for hoogle support being broken in haddock for GHC 7.10RC1 +--- workaround for hoogle support being broken in haddock for GHC 7.10RC1 +-#if !(__GLASGOW_HASKELL__ >= 709) + , "--haddock-hoogle" +-#endif + , "--haddock-hyperlink-source" + -- don't slow down Windows builds too much, on other platforms we get this more + -- or less for free, thanks to dynamic-too diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs -index 33a401f..79833c5 100644 +index 33a401f..e2405a7 100644 --- a/src/Compiler/Info.hs +++ b/src/Compiler/Info.hs @@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do - + -- | the directory to use if started without -B flag getDefaultTopDir :: IO FilePath -getDefaultTopDir = do @@ -75,6 +81,6 @@ index 33a401f..79833c5 100644 - targetOS = os - subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion +getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@" - + getDefaultLibDir :: IO FilePath getDefaultLibDir = getDefaultTopDir diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 6e8c0be7d0d9..dd51b99bf930 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -12,7 +12,7 @@ self: super: { # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages; - inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy gtk2hs-buildtools; + inherit (pkgs.haskell.packages.ghc7103) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; # This is the list of packages that are built into a booted ghcjs installation # It can be generated with the command: @@ -85,6 +85,25 @@ self: super: { ''; }); + ghcjs-ffiqq = self.callPackage + ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim + }: + mkDerivation { + pname = "ghcjs-ffiqq"; + version = "0.1.0.0"; + src = pkgs.fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs-ffiqq"; + rev = "da31b18582542fcfceade5ef6b2aca66662b9e20"; + sha256 = "1mkp8p9hispyzvkb5v607ihjp912jfip61id8d42i19k554ssp8y"; + }; + libraryHaskellDepends = [ + base template-haskell ghcjs-base split containers text ghc-prim + ]; + description = "FFI QuasiQuoter for GHCJS"; + license = stdenv.lib.licenses.mit; + }) {}; + ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { libraryHaskellDepends = removeLibraryHaskellDepends [ diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 14464ceca80d..58db9737d32c 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -23,13 +23,34 @@ # This will build mmorph and monadControl, and have the hoogle installation # refer to their documentation via symlink so they are not garbage collected. -{ lib, stdenv, hoogle, rehoo +{ lib, stdenv, hoogle, rehoo, writeText , ghc, packages ? [ ghc.ghc ] }: let inherit (stdenv.lib) optional; wrapper = ./hoogle-local-wrapper.sh; + isGhcjs = ghc.isGhcjs or false; + opts = lib.optionalString; + haddockExe = + if !isGhcjs + then "haddock" + else "haddock-ghcjs"; + ghcName = + if !isGhcjs + then "ghc" + else "ghcjs"; + docLibGlob = + if !isGhcjs + then ''share/doc/ghc*/html/libraries'' + else ''doc/lib''; + # On GHCJS, use a stripped down version of GHC's prologue.txt + prologue = + if !isGhcjs + then "${ghc}/${docLibGlob}/prologue.txt" + else writeText "ghcjs-prologue.txt" '' + This index includes documentation for many Haskell modules. + ''; in stdenv.mkDerivation { name = "hoogle-local-0.1"; @@ -58,17 +79,19 @@ stdenv.mkDerivation { } echo importing builtin packages - for docdir in ${ghc}/share/doc/ghc*/html/libraries/*; do + for docdir in ${ghc}/${docLibGlob}/*; do + name="$(basename $docdir)" + ${opts isGhcjs ''docdir="$docdir/html"''} if [[ -d $docdir ]]; then import_dbs $docdir - ln -sfn $docdir $out/share/doc/hoogle + ln -sfn $docdir $out/share/doc/hoogle/$name fi done echo importing other packages for i in $docPackages; do if [[ ! $i == $out ]]; then - for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do + for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do name=`basename $docdir` docdir=$docdir/html if [[ -d $docdir ]]; then @@ -99,9 +122,9 @@ stdenv.mkDerivation { args="$args --read-interface=$name_version,$hdfile" done - ${ghc}/bin/haddock --gen-index --gen-contents -o . \ + ${ghc}/bin/${haddockExe} --gen-index --gen-contents -o . \ -t "Haskell Hierarchical Libraries" \ - -p ${ghc}/share/doc/ghc*/html/libraries/prologue.txt \ + -p ${prologue} \ $args echo finishing up diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index c1519ca5b830..40bb9a5a140d 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ]; - patchPhase = ''sed -e 's@1\.3\.21@@' -i configure''; + patches = [ ./disable_sslv3.patch ]; + + postPatch = ''sed -e 's@1\.3\.21@@' -i configure''; passthru.swig = libplist.swig; src = fetchurl { diff --git a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch new file mode 100644 index 000000000000..646b829496fa --- /dev/null +++ b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch @@ -0,0 +1,25 @@ +From e19de4f0d4cb70e30017edfc6b4ca1b89ffbd381 Mon Sep 17 00:00:00 2001 +From: Franz Pletz <fpletz@fnordicwalking.de> +Date: Thu, 14 Jan 2016 14:58:23 +0100 +Subject: [PATCH] Disable SSLv3 + +--- + src/idevice.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/idevice.c b/src/idevice.c +index ce27495..8f03094 100644 +--- a/src/idevice.c ++++ b/src/idevice.c +@@ -678,7 +678,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne + } + BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE); + +- SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method()); ++ SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method()); + if (ssl_ctx == NULL) { + debug_info("ERROR: Could not create SSL context."); + BIO_free(ssl_bio); +-- +2.7.0 + diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 53fce61a999e..934d032e4791 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -20,6 +20,28 @@ let security default-keychain -s login.keychain security delete-keychain $keychainName ''; + + # On Mac OS X, the java executable shows an -unoffical postfix in the version + # number. This confuses the build script's version detector. + # We fix this by creating a wrapper that strips it out of the output. + + javaVersionFixWrapper = stdenv.mkDerivation { + name = "javaVersionFixWrapper"; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/javac <<EOF + #! ${stdenv.shell} -e + + if [ "\$1" = "-version" ] + then + ${jdk}/bin/javac "\$@" 2>&1 | sed "s|-unofficial||" | sed "s|-u60|_60|" >&2 + else + exec ${jdk}/bin/javac "\$@" + fi + EOF + chmod +x $out/bin/javac + ''; + }; in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; @@ -49,6 +71,13 @@ stdenv.mkDerivation { ${if target == "android" then '' + ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # Hack to make version detection work with OpenJDK on Mac OS X + export PATH=${javaVersionFixWrapper}/bin:$PATH + export JAVA_HOME=${javaVersionFixWrapper} + javac -version + ''} + titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec/android-sdk-* titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.selectedVersion 23.0.1 diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 6dd80a216ded..ffeefdbbbcfa 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -5,17 +5,16 @@ , tiVersion ? "5.1.2.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2" -, allowUnfree ? false , enableWirelessDistribution ? false, installURL ? null }: let - pkgs = import nixpkgs { config.allowUnfree = allowUnfree; }; + pkgs = import nixpkgs {}; in rec { kitchensink_android_debug = pkgs.lib.genAttrs systems (system: let - pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; }; + pkgs = import nixpkgs { inherit system; }; in import ./kitchensink { inherit (pkgs) fetchgit; @@ -26,7 +25,7 @@ rec { kitchensink_android_release = pkgs.lib.genAttrs systems (system: let - pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; }; + pkgs = import nixpkgs { inherit system; }; in import ./kitchensink { inherit (pkgs) fetchgit; @@ -38,7 +37,7 @@ rec { emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system: let - pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; }; + pkgs = import nixpkgs { inherit system; }; in import ./emulate-kitchensink { inherit (pkgs) androidenv; @@ -47,7 +46,7 @@ rec { emulate_kitchensink_release = pkgs.lib.genAttrs systems (system: let - pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; }; + pkgs = import nixpkgs { inherit system; }; in import ./emulate-kitchensink { inherit (pkgs) androidenv; @@ -74,7 +73,7 @@ rec { }; } else {}) // (if rename then let - pkgs = import nixpkgs { system = "x86_64-darwin"; config.allowUnfree = allowUnfree; }; + pkgs = import nixpkgs { system = "x86_64-darwin"; }; in { kitchensink_ipa = import ./kitchensink { diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index 46571978a6d3..be1592f864fa 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4, -pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper, +{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook, +pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, gobjectIntrospection, pygobject3, gtk3, matplotlib }: stdenv.mkDerivation rec { - version = "2.2.42"; + version = "2.12"; name = "${python.libPrefix}-graph-tool-${version}"; meta = with stdenv.lib; { @@ -15,15 +15,16 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "124qmd0mgam7hm87gscp3836ymhhwwnlfm2c5pzpml06da1w0xg9"; + url = "https://github.com/count0/graph-tool/archive/release-${version}.tar.gz"; + sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl"; }; - preConfigure = '' - configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp" - ''; + configureFlags = [ + "--with-python-module-path=$(out)/${python.sitePackages}" + "--enable-openmp" + ]; - buildInputs = [ automake m4 pkgconfig makeWrapper ]; + buildInputs = [ pkgconfig autoreconfHook ]; propagatedBuildInputs = [ boost diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 4c945a7fbac7..d90d6faac396 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlags = "SHELL=${stdenv.shell}"; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)"; meta = { homepage = http://www.drbd.org/; diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 455088d8f5e9..61ea6c0c18cd 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-10-18"; + version = "2015-12-04"; # This repo is built by merging the latest versions of # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wkennington"; repo = "linux-firmware"; - rev = "f7694d34655a7f688033d0582f306b3f287b785d"; - sha256 = "0pb6pq48hfcny34l3anln9g4dy1f4n8gzmfib9pk4l64648sylnl"; + rev = "bbe4917c054eb0a73e250c6363341e3bf6725839"; + sha256 = "1p9c74p8j8zmddljaan5i29h8wsbz8911dv2sykpnahg9r939ykd"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 90b4a6a48244..fc54715ea7b8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -21,6 +21,12 @@ with stdenv.lib; '' + # Compress kernel modules for a sizable disk space savings. + ${optionalString (versionAtLeast version "3.18") '' + MODULE_COMPRESS y + MODULE_COMPRESS_XZ y + ''} + # Debugging. DEBUG_KERNEL y TIMER_STATS y @@ -355,6 +361,9 @@ with stdenv.lib; X86_CHECK_BIOS_CORRUPTION y X86_MCE y + # PCI-Expresscard hotplug support + HOTPLUG_PCI_PCIE y + # Linux containers. NAMESPACES? y # Required by 'unshare' used by 'nixos-install' RT_GROUP_SCHED? y diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 59d3642e6227..af14434b08f2 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -57,10 +57,6 @@ let autoModules = stdenv.platform.kernelAutoModules; arch = stdenv.platform.kernelArch; - preConfigure = '' - buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970") - ''; - crossAttrs = let cp = stdenv.cross.platform; in { diff --git a/pkgs/os-specific/linux/kernel/linux.upstream.template b/pkgs/os-specific/linux/kernel/linux.upstream.template deleted file mode 100644 index 624b83d45b33..000000000000 --- a/pkgs/os-specific/linux/kernel/linux.upstream.template +++ /dev/null @@ -1,13 +0,0 @@ -url "http://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_VERSION_RC:+testing/}" -version_link "linux-${LINUX_VERSION}.*tar[.]xz\$" -version '.*linux-([0-9.]+(-rc[0-9]+)?)[.]tar.*' '\1' -target "linux-${LINUX_VERSION}.nix" -name "linux_${LINUX_VERSION/./_}" - -do_overwrite() { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" - [ -n "$LINUX_VERSION_RC" ] && set_var_value testing true '' '' 1 - [ -z "$LINUX_VERSION_RC" ] && set_var_value testing false '' '' 1 -} diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 4a826ff7ae3d..2b1e55a880a0 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -102,7 +102,8 @@ let make $makeFlags "''${makeFlagsArray[@]}" oldconfig runHook postConfigure - buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970") + # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged. + buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)") ''; buildFlags = [ diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 1b12a0076b45..12449a0a7dda 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -8,11 +8,9 @@ stdenv.mkDerivation rec { sha256 = "10lzfkmnpq6a43a3gkx7x633njh216w0bjwz31rv8a1jlgg1sfxs"; }; - # Disable xz/zlib support to prevent needing them in the initrd. - - buildInputs = [ pkgconfig libxslt /* xz zlib */ ]; + buildInputs = [ pkgconfig libxslt xz /* zlib */ ]; - configureFlags = [ "--sysconfdir=/etc" /* "--with-xz" "--with-zlib" */ ]; + configureFlags = [ "--sysconfdir=/etc" "--with-xz" /* "--with-zlib" */ ]; patches = [ ./module-dir.patch ]; diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix index 3c94362b820c..dee92419cd1e 100644 --- a/pkgs/os-specific/linux/pagemon/default.nix +++ b/pkgs/os-specific/linux/pagemon/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "pagemon-${version}"; - version = "0.01.06"; + version = "0.01.07"; src = fetchFromGitHub { - sha256 = "0p6mzmyjn5dq1ma9ld47gnrszyf0yph76dd5k7hl60a5zq5741aa"; + sha256 = "041jqk11sq1qn3avsx4jbfqzvg6rfa5kmgn16q8jnwm5fqfaj037"; rev = "V${version}"; repo = "pagemon"; owner = "ColinIanKing"; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index ef1dbf00b52c..59083a8b040e 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" + substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" ''; meta = { diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 153611e05874..7b0cbc16e11a 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "vips-8.1.1"; + name = "vips-8.2.2"; src = fetchurl { url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "014sgpqj832vl5k212jv25sjakrsifnspjfclywpmn7cwaqwjlvx"; + sha256 = "12b319aicr129cpi5sixwd3q91y97vwwva6b044zy54px4s8ls0g"; }; buildInputs = diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix new file mode 100644 index 000000000000..fa1b78acd1bb --- /dev/null +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, gettext}: +stdenv.mkDerivation rec { + name = "m17n-db-1.7.0"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + sha256 = "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2"; + }; + + buildInputs = [ gettext ]; + + configureFlags = [ + "--with-charmaps=${stdenv.glibc}/share/i18n/charmaps" + ]; + + meta = { + homepage = http://www.nongnu.org/m17n/; + description = "Multilingual text processing library (database)"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + }; +} diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix new file mode 100644 index 000000000000..982f35a9fe68 --- /dev/null +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, m17n_db}: +stdenv.mkDerivation rec { + name = "m17n-lib-1.7.0"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + sha256 = "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f"; + }; + + buildInputs = [ m17n_db ]; + + meta = { + homepage = http://www.nongnu.org/m17n/; + description = "Multilingual text processing library (runtime)"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + }; +} diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 160efe2ded8f..19de302e7b1f 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy}: +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, + cmake, anthy, automoc4, m17n_lib, m17n_db}: stdenv.mkDerivation rec { version = "1.8.6"; @@ -13,6 +14,9 @@ stdenv.mkDerivation rec { kdelibs cmake anthy + automoc4 + m17n_lib + m17n_db ]; patches = [ ./immodules_cache.patch ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 77ef86baec36..5829dc9d5509 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -3,12 +3,12 @@ , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: stdenv.mkDerivation rec { - version = "0.9.13"; + version = "0.9.16"; name = "mu-${version}"; src = fetchurl { url = "https://github.com/djcb/mu/archive/v${version}.tar.gz"; - sha256 = "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51"; + sha256 = "0p7hqri1r1x6750x138cc29mh81kdav2dcim26y58s8an206h25g"; }; buildInputs = [ diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index fecaabe95f94..73e92aa4b8e5 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -23,11 +23,11 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "openssh-6.9p1"; + name = "openssh-7.1p2"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf"; + sha256 = "1gbbvszz74lkc7b2mqr3ccgpm65zj0k5h7a2ssh0c7pjvhjg0xfx"; }; prePatch = optionalString hpnSupport @@ -36,7 +36,16 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch ./disable-roaming.patch ] + patches = + [ ./locale_archive.patch + + # Fix "HostKeyAlgoritms +...", which we need to enable DSA + # host key support. + (fetchurl { + url = "https://pkgs.fedoraproject.org/cgit/rpms/openssh.git/plain/openssh-7.1p1-hostkeyalgorithms.patch?id=c98f5597250d6f9a8e8d96960beb6306d150ef0f"; + sha256 = "029lzp9qv1af8wdm0wwj7qwjj1nimgsjj214jqm3amwz0857qgvp"; + }) + ] ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] diff --git a/pkgs/tools/networking/openssh/disable-roaming.patch b/pkgs/tools/networking/openssh/disable-roaming.patch deleted file mode 100644 index cd81d52f6c18..000000000000 --- a/pkgs/tools/networking/openssh/disable-roaming.patch +++ /dev/null @@ -1,51 +0,0 @@ -From b842c1891b9979e30a6b53292a236ceb9231be79 Mon Sep 17 00:00:00 2001 -From: Franz Pletz <fpletz@fnordicwalking.de> -Date: Thu, 14 Jan 2016 16:25:50 +0100 -Subject: [PATCH] Disable roaming, fixes CVE-2016-0777 and CVE-0216-0778 - -Based on http://ftp.openbsd.org/pub/OpenBSD/patches/5.8/common/010_ssh.patch.sig ---- - readconf.c | 5 ++--- - ssh.c | 3 --- - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/readconf.c b/readconf.c -index db7d0bb..5b03f97 100644 ---- a/readconf.c -+++ b/readconf.c -@@ -1660,7 +1660,7 @@ initialize_options(Options * options) - options->tun_remote = -1; - options->local_command = NULL; - options->permit_local_command = -1; -- options->use_roaming = -1; -+ options->use_roaming = 0; - options->visual_host_key = -1; - options->ip_qos_interactive = -1; - options->ip_qos_bulk = -1; -@@ -1835,8 +1835,7 @@ fill_default_options(Options * options) - options->tun_remote = SSH_TUNID_ANY; - if (options->permit_local_command == -1) - options->permit_local_command = 0; -- if (options->use_roaming == -1) -- options->use_roaming = 1; -+ options->use_roaming = 0; - if (options->visual_host_key == -1) - options->visual_host_key = 0; - if (options->ip_qos_interactive == -1) -diff --git a/ssh.c b/ssh.c -index 3fd5a94..e8428b5 100644 ---- a/ssh.c -+++ b/ssh.c -@@ -1931,9 +1931,6 @@ ssh_session2(void) - fork_postauth(); - } - -- if (options.use_roaming) -- request_roaming(); -- - return client_loop(tty_flag, tty_flag ? - options.escape_char : SSH_ESCAPECHAR_NONE, id); - } --- -2.7.0 - diff --git a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch b/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch deleted file mode 100644 index 02e9eb3a9739..000000000000 --- a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch +++ /dev/null @@ -1,65 +0,0 @@ -http://pkgs.fedoraproject.org/cgit/openssh.git/commit/openssh-6.9p1-security-7.0.patch?h=f22&id=4776fad91e7e1f626f33e8c240d0ccecd663554d - -diff --git a/sshpty.c b/sshpty.c -index 7bb7641..15da8c6 100644 ---- a/sshpty.c -+++ b/sshpty.c -@@ -1,4 +1,4 @@ --/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */ -+/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */ - /* - * Author: Tatu Ylonen <ylo@cs.hut.fi> - * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland -@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty) - /* Determine the group to make the owner of the tty. */ - grp = getgrnam("tty"); - gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid; -- mode = (grp != NULL) ? 0622 : 0600; -+ mode = (grp != NULL) ? 0620 : 0600; - - /* - * Change owner and mode of the tty as required. -diff --git a/monitor.c b/monitor.c -index b410965..f1b873d 100644 ---- a/monitor.c -+++ b/monitor.c -@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device; - int - mm_answer_pam_init_ctx(int sock, Buffer *m) - { -- - debug3("%s", __func__); -- authctxt->user = buffer_get_string(m, NULL); - sshpam_ctxt = (sshpam_device.init_ctx)(authctxt); - sshpam_authok = NULL; - buffer_clear(m); -@@ -1166,14 +1166,16 @@ mm_answer_pam_respond(int sock, Buffer *m) - int - mm_answer_pam_free_ctx(int sock, Buffer *m) - { -+ int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt; - - debug3("%s", __func__); - (sshpam_device.free_ctx)(sshpam_ctxt); -+ sshpam_ctxt = sshpam_authok = NULL; - buffer_clear(m); - mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m); - auth_method = "keyboard-interactive"; - auth_submethod = "pam"; -- return (sshpam_authok == sshpam_ctxt); -+ return r; - } - #endif - -diff --git a/monitor_wrap.c b/monitor_wrap.c -index e6217b3..eac421b 100644 ---- a/monitor_wrap.c -+++ b/monitor_wrap.c -@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt) - - debug3("%s", __func__); - buffer_init(&m); -- buffer_put_cstring(&m, authctxt->user); - mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m); - debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__); - mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m); diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix new file mode 100644 index 000000000000..3491feccc45c --- /dev/null +++ b/pkgs/tools/security/rarcrack/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}: + +stdenv.mkDerivation rec { + name = "rarcrack-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "jaredsburrows"; + repo = "Rarcrack"; + rev = "35ead64cd2b967eec3e3e3a4c328b89b11ff32a0"; + sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn"; + }; + + buildInputs = [ libxml2 file p7zip unrar unzip ]; + buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null; + installFlags = "PREFIX=\${out}"; + + patchPhase = '' + substituteInPlace rarcrack.c --replace "file -i" "${file}/bin/file -i" + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with stdenv.lib; { + description = "This program can crack zip,7z and rar file passwords"; + longDescription = '' + If you forget your password for compressed archive (rar, 7z, zip), this program is the solution. + This program uses bruteforce algorithm to find correct password. You can specify wich characters will be used in password generations. + Warning: Please don't use this program for any illegal things! + ''; + homepage = https://github.com/jaredsburrows/Rarcrack; + license = licenses.gpl2; + maintainers = with maintainers; [ davidak ]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12cbf401466a..d8acd2a44c3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1136,6 +1136,10 @@ let anthy = callPackage ../tools/inputmethods/anthy { }; + m17n_db = callPackage ../tools/inputmethods/m17n-db { }; + + m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; + mozc = callPackage ../tools/inputmethods/mozc { inherit (pythonPackages) gyp; }; @@ -2914,6 +2918,8 @@ let ranger = callPackage ../applications/misc/ranger { }; + rarcrack = callPackage ../tools/security/rarcrack { }; + rawdog = callPackage ../applications/networking/feedreaders/rawdog { }; read-edid = callPackage ../os-specific/linux/read-edid { }; @@ -11573,6 +11579,8 @@ let electrum = callPackage ../applications/misc/electrum { }; + electrum-dash = callPackage ../applications/misc/electrum-dash { }; + elinks = callPackage ../applications/networking/browsers/elinks { }; elvis = callPackage ../applications/editors/elvis { }; @@ -11785,6 +11793,7 @@ let inherit lib newScope stdenv; inherit fetchFromGitHub fetchgit fetchhg fetchurl; inherit emacs texinfo makeWrapper; + inherit (xorg) lndir; trivialBuild = callPackage ../build-support/emacs/trivial.nix { inherit emacs; @@ -11795,7 +11804,7 @@ let }; external = { - inherit (haskellPackages) ghc-mod structured-haskell-mode Agda; + inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit (pythonPackages) elpy; inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig; }; @@ -12489,8 +12498,6 @@ let inherit (gnome) libglade; }; - links = callPackage ../applications/networking/browsers/links { }; - ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger { boost = boost155; @@ -14584,8 +14591,6 @@ let inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { }); - gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); gnome3 = gnome3_18; @@ -15926,6 +15931,7 @@ aliases = with self; rec { jquery_ui = jquery-ui; # added 2014-09-07 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 libtidy = html-tidy; # added 2014-12-21 + links = links2; # added 2016-01-31 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 midoriWrapper = midori; # added 2015-01 diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 0bd7b0efad39..ea4a2d4a4291 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -36,7 +36,7 @@ , lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg -, emacs, texinfo, makeWrapper +, emacs, texinfo, lndir, makeWrapper , trivialBuild , melpaBuild @@ -60,7 +60,7 @@ let }; emacsWithPackages = import ../build-support/emacs/wrapper.nix { - inherit lib makeWrapper stdenv; + inherit lib lndir makeWrapper stdenv; }; packagesFun = self: with self; { @@ -711,54 +711,6 @@ let }; }; - flycheck = melpaBuild rec { - pname = "flycheck"; - version = "0.25.1"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi"; - }; - packageRequires = [ dash let-alist pkg-info seq ]; - meta = { - description = "On-the-fly syntax checking, intended as replacement for the older Flymake which is part of Emacs"; - license = gpl3Plus; - }; - }; - - flycheck-haskell = melpaBuild rec { - pname = "flycheck-haskell"; - version = "0.7.2"; - src = fetchFromGitHub { - owner = "flycheck"; - repo = pname; - rev = version; - sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj"; - }; - packageRequires = [ dash flycheck haskell-mode let-alist pkg-info ]; - meta = { - description = "Improved Haskell support for Flycheck"; - license = gpl3Plus; - }; - }; - - flycheck-pos-tip = melpaBuild rec { - pname = "flycheck-pos-tip"; - version = "20140813"; - src = fetchFromGitHub { - owner = "flycheck"; - repo = pname; - rev = "5b3a203bbdb03e4f48d1654efecd71f44376e199"; - sha256 = "0b4x24aq0jh4j4bjv0fqyaz6hzh3gqf57k9763jj9rl32cc3dpnp"; - }; - packageRequires = [ flycheck popup ]; - meta = { - description = "Flycheck errors display in tooltip"; - license = gpl3Plus; - }; - }; - ghc-mod = melpaBuild rec { pname = "ghc"; version = external.ghc-mod.version; @@ -772,6 +724,19 @@ let }; }; + hindent = melpaBuild rec { + pname = "hindent"; + version = external.hindent.version; + src = external.hindent.src; + packageRequires = [ haskell-mode ]; + propagatedUserEnvPkgs = [ external.hindent ]; + fileSpecs = [ "elisp/*.el" ]; + meta = { + description = "Indent haskell code using the \"hindent\" program"; + license = bsd3; + }; + }; + rtags = melpaBuild rec { pname = "rtags"; version = "2.0"; # really, it's some arbitrary git hash diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 14bb80ebf04d..00b8f9ba9285 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -50,8 +50,8 @@ rec { inherit (packages.ghc784) ghc alex happy; }; - ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs { - ghc = compiler.ghc7102; + ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { + ghc = compiler.ghc7103; }; jhc = callPackage ../development/compilers/jhc { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1e8dfa91d2d2..2c187e965d8b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1415,17 +1415,19 @@ let self = _self // overrides; _self = with self; { }; }; - CGI = buildPerlPackage { - name = "CGI-4.21"; + "CGI" = buildPerlPackage rec { + name = "CGI-4.25"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.21.tar.gz; - sha256 = "340d20a2b67211752d7c270c589e463d71aea8b8d75d9417250618219d3cf884"; + url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz"; + sha256 = "efb3e5235ada6a91f97ca2905399a686bedea60f6b525e52f4a147baff4f131a"; }; - propagatedBuildInputs = [ HTMLParser if_ ]; - doCheck = false; + buildInputs = [ TestDeep TestWarn ]; + propagatedBuildInputs = [ HTMLParser self."if" ]; meta = { homepage = https://metacpan.org/module/CGI; description = "Handle Common Gateway Interface requests and responses"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -3511,19 +3513,18 @@ let self = _self // overrides; _self = with self; { }; }; - DevelDeclare = buildPerlPackage { - name = "Devel-Declare-0.006011"; + "DevelDeclare" = buildPerlPackage rec { + name = "Devel-Declare-0.006018"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Devel-Declare-0.006011.tar.gz; - sha256 = "0wqa9n4mdlsld4cmhy2mg8ncqr5gsra1913x0kypisgdqvviin2k"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "bb3607bc7546bcf8d9ac57acd8de4e4ca5567ace836ab823d5f5b450216f466a"; }; - buildInputs = [ BHooksOPCheck ExtUtilsDepends ]; + buildInputs = [ BHooksOPCheck ExtUtilsDepends TestRequires ]; propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ]; meta = { description = "Adding keywords to perl, in perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ ocharles rycee ]; }; }; @@ -5899,14 +5900,22 @@ let self = _self // overrides; _self = with self; { }; }; - if_ = buildPerlPackage { - name = "if-0.0601"; + "if" = buildPerlPackage rec { + name = "if-0.0606"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.0601.tar.gz; - sha256 = "fb2b7329aa111a673cd22dc2889167e52058aead0de2fe0855b32dd658d5c1b7"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "63d69282d6c4c9e76370b78d770ca720cea88cfe5ee5b612709240fc6078d50e"; + }; + meta = { + description = "C<use> a Perl module if a condition holds (also can C<no> a module)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; + # For backwards compatibility. + if_ = self."if"; + ImageSize = buildPerlPackage rec { name = "Image-Size-3.232"; src = fetchurl { @@ -8224,32 +8233,35 @@ let self = _self // overrides; _self = with self; { [ ClassMOP Moose namespaceautoclean ListMoreUtils ]; }; - MooseXTypes = buildPerlPackage { - name = "MooseX-Types-0.45"; + "MooseXTypes" = buildPerlPackage rec { + name = "MooseX-Types-0.46"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.45.tar.gz; - sha256 = "d01ff4a3db78e1150101b4b63569e4bce3ced3b5b0024c52c87575e0820609c7"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires if_ ]; - propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubName namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires self."if" ]; + propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; - MooseXTypesCommon = buildPerlPackage rec { - name = "MooseX-Types-Common-0.001008"; + "MooseXTypesCommon" = buildPerlPackage rec { + name = "MooseX-Types-Common-0.001013"; src = fetchurl { - url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz"; - sha256 = "0s0z6v32vyykni8an6jzyvl0icr5d5b8kbi4qqp4vwc5438jrpdz"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2"; }; - buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ Moose MooseXTypes ]; + buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ]; + propagatedBuildInputs = [ MooseXTypes self."if" ]; meta = { - maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; + homepage = https://github.com/moose/MooseX-Types-Common; + description = "A library of commonly used type constraints"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = with maintainers; [ ocharles rycee ]; }; }; @@ -10245,10 +10257,10 @@ let self = _self // overrides; _self = with self; { }; SoftwareLicense = buildPerlPackage rec { - name = "Software-License-0.103010"; + name = "Software-License-0.103011"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "929fbace96f69a0977a0380000820c93fc1af4e973a422c73e6cd254405fa47c"; + sha256 = "03dyc5sx0asq1m3276l224q5776ng24fw5llf3gr9mbgklkgj05s"; }; propagatedBuildInputs = [ DataSection TextTemplate TryTiny ]; meta = { @@ -10697,16 +10709,19 @@ let self = _self // overrides; _self = with self; { }; }; - SubExporterForMethods = buildPerlPackage { - name = "Sub-Exporter-ForMethods-0.100051"; + "SubExporterForMethods" = buildPerlPackage rec { + name = "Sub-Exporter-ForMethods-0.100052"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100051.tar.gz; - sha256 = "127wniw53p7pp7r2vazicply3v1gmnhw4w7jl6p74i0grnsixipm"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "421fbba4f6ffcf13c4335f2c20630d709e6fa659c07545d094dbc5a558ad3006"; }; + buildInputs = [ namespaceautoclean ]; propagatedBuildInputs = [ SubExporter SubName ]; meta = { + homepage = https://github.com/rjbs/Sub-Exporter-ForMethods; description = "Helper routines for using Sub::Exporter to build methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -11953,17 +11968,18 @@ let self = _self // overrides; _self = with self; { }; }; - TestWarnings = buildPerlPackage rec { - name = "Test-Warnings-0.021"; + "TestWarnings" = buildPerlPackage rec { + name = "Test-Warnings-0.026"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "0i1crkhqfl5gs55i5nrvsw3xy946ajgnvp4gqrzvsn1x6cp1i2nr"; + sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08"; }; - buildInputs = [ TestTester if_ CPANMetaCheck ModuleMetadata ]; + buildInputs = [ TestTester CPANMetaCheck ModuleMetadata self."if" ]; meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b5a3dfd485be..916ac7126487 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -341,13 +341,13 @@ in modules // { }; afew = buildPythonPackage rec { - rev = "9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47"; - name = "afew-1.0_${rev}"; + rev = "3f1e5e93119788984c2193292c988ac81ecb0a45"; + name = "afew-git-2016-01-04"; src = pkgs.fetchurl { url = "https://github.com/teythoon/afew/tarball/${rev}"; name = "${name}.tar.bz"; - sha256 = "1qyban022aji2hl91dh0j3xa6ikkxl5argc6w71yp2x8b02kp3mf"; + sha256 = "1fi19g2j1qilh7ikp7pzn6sagkn76g740zdxgnsqmmvl2zk2yhrw"; }; buildInputs = with self; [ pkgs.dbacl ]; @@ -2282,10 +2282,15 @@ in modules // { }; propagatedBuildInputs = [ self.botocore - self.futures_2_2 self.jmespath - ]; - buildInputs = [ self.docutils ]; + ] ++ (if isPy3k then [] else [self.futures_2_2]); + buildInputs = [ self.docutils self.nose self.mock ]; + + # Tests are failing with `botocore.exceptions.NoCredentialsError: + # Unable to locate credentials`. There also seems to be some mock + # issues (`assert_called_once` doesn't exist in mock but boto + # seems to think it is?). + doCheck = false; meta = { homepage = https://github.com/boto3/boto; @@ -8249,11 +8254,11 @@ in modules // { ecdsa = buildPythonPackage rec { name = "ecdsa-${version}"; - version = "0.11"; + version = "0.13"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz"; - md5 = "8ef586fe4dbb156697d756900cb41d7c"; + sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4"; }; # Only needed for tests @@ -12520,7 +12525,7 @@ in modules // { # Disable failing test_f2py test. # f2py couldn't be found by test, # even though it was used successfully to build numpy - + # The large file support test is disabled because it takes forever # and can cause the machine to run out of disk space when run. prePatch = '' @@ -16324,7 +16329,7 @@ in modules // { }; pyjwt = buildPythonPackage rec { - version = "0.3.2"; + version = "1.4.0"; name = "pyjwt-${version}"; src = pkgs.fetchurl { @@ -19949,6 +19954,25 @@ in modules // { }; }; + svgwrite = buildPythonPackage rec { + name = "svgwrite-${version}"; + version = "1.1.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/svgwrite/${name}.tar.gz"; + sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8"; + }; + + buildInputs = with self; [ setuptools ]; + propagatedBuildInputs = with self; [ pyparsing ]; + + meta = { + description = "A Python library to create SVG drawings."; + homepage = http://bitbucket.org/mozman/svgwrite; + license = licenses.mit; + }; + }; + freezegun = buildPythonPackage rec { name = "freezegun-${version}"; version = "0.3.5"; @@ -24940,4 +24964,169 @@ in modules // { }; }; + hidapi = buildPythonPackage rec{ + version = "0.7.99.post12"; + name = "hidapi-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/h/hidapi/${name}.tar.gz"; + sha256 = "1jaj0y5vn5yk033q01wacsz379mf3sy66d6gz072ycfr5rahcp59"; + }; + + propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ]; + + # Fix the USB backend library lookup + postPatch = '' + libusb=${pkgs.libusb1}/include/libusb-1.0 + test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } + sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py + ''; + + meta = { + description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi"; + homepage = https://github.com/trezor/cython-hidapi; + # license can actually be either bsd3 or gpl3 + # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt + license = licenses.bsd3; + maintainer = with maintainers; [ np ]; + }; + }; + + mnemonic = buildPythonPackage rec{ + version = "0.12"; + name = "mnemonic-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/mnemonic/${name}.tar.gz"; + sha256 = "0j5jm4v54135qqw455fw4ix2mhxhzjqvxji9gqkpxagk31cvbnj4"; + }; + + propagatedBuildInputs = with self; [ pbkdf2 ]; + + meta = { + description = "Implementation of Bitcoin BIP-0039"; + homepage = https://github.com/trezor/python-mnemonic; + license = licenses.mit; + maintainer = with maintainers; [ np ]; + }; + }; + + trezor = buildPythonPackage rec{ + version = "0.6.11"; + name = "trezor-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/trezor/${name}.tar.gz"; + sha256 = "0nqbjj0mvkp314hpq36px12hxbyidmhsdflq3121l4g9y3scfbnx"; + }; + + propagatedBuildInputs = with self; [ protobuf2_6 hidapi ]; + + buildInputs = with self; [ ecdsa mnemonic ]; + + # There are no actual tests: "ImportError: No module named tests" + doCheck = false; + + meta = { + description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; + homepage = https://github.com/trezor/python-trezor; + license = licenses.gpl3; + maintainer = with maintainers; [ np ]; + }; + }; + + keepkey = buildPythonPackage rec{ + version = "0.7.0"; + name = "keepkey-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/k/keepkey/${name}.tar.gz"; + sha256 = "1ikyp4jpydskznsrlwmxh9sn7b64aldwj2lf0phmb19r5kk06qmp"; + }; + + propagatedBuildInputs = with self; [ protobuf2_6 hidapi ]; + + buildInputs = with self; [ ecdsa mnemonic ]; + + # There are no actual tests: "ImportError: No module named tests" + doCheck = false; + + meta = { + description = "KeepKey Python client"; + homepage = https://github.com/keepkey/python-keepkey; + license = licenses.gpl3; + maintainer = with maintainers; [ np ]; + }; + }; + + semver = buildPythonPackage rec { + name = "semver-${version}"; + version = "2.2.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/s/semver/${name}.tar.gz"; + sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m"; + }; + + meta = { + description = "Python package to work with Semantic Versioning (http://semver.org/)"; + homepage = "https://github.com/k-bx/python-semver"; + license = licenses.bsd3; + maintainers = with maintainers; [ np ]; + }; + }; + + ed25519 = buildPythonPackage rec { + name = "ed25519-${version}"; + version = "1.4"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/e/ed25519/${name}.tar.gz"; + sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499"; + }; + + meta = { + description = "Ed25519 public-key signatures"; + homepage = "https://github.com/warner/python-ed25519"; + license = licenses.mit; + maintainers = with maintainers; [ np ]; + }; + }; + + trezor_agent = buildPythonPackage rec{ + version = "0.6.1"; + name = "trezor_agent-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/trezor_agent/${name}.tar.gz"; + sha256 = "0wpppxzld7kqqxdvy80qc8629n047vm3m3nk171i7hijfw285p0b"; + }; + + propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ]; + + meta = { + description = "Using Trezor as hardware SSH agent"; + homepage = https://github.com/romanz/trezor-agent; + license = licenses.gpl3; + maintainer = with maintainers; [ np ]; + }; + }; + + x11_hash = buildPythonPackage rec{ + version = "1.4"; + name = "x11_hash-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/x/x11_hash/${name}.tar.gz"; + sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22"; + }; + + meta = { + description = "Binding for X11 proof of work hashing"; + homepage = https://github.com/mazaclub/x11_hash; + license = licenses.mit; + maintainer = with maintainers; [ np ]; + }; + }; + } |