diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7d3e9192339e..e84a16fdd2a7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -13,8 +13,8 @@ aboseley = "Adam Boseley "; adev = "Adrien Devresse "; Adjective-Object = "Maxwell Huang-Hobbs "; - aespinosa = "Allan Espinosa "; adnelson = "Allen Nelson "; + aespinosa = "Allan Espinosa "; aflatter = "Alexander Flatter "; aforemny = "Alexander Foremny "; afranchuk = "Alex Franchuk "; @@ -147,9 +147,9 @@ giogadi = "Luis G. Torres "; gleber = "Gleb Peregud "; globin = "Robin Gloster "; - gpyh = "Yacine Hmito "; goibhniu = "Cillian de Róiste "; Gonzih = "Max Gonzih "; + gpyh = "Yacine Hmito "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; havvy = "Ryan Scheel "; @@ -179,6 +179,7 @@ joelteon = "Joel Taylor "; jpbernardy = "Jean-Philippe Bernardy "; jraygauthier = "Raymond Gauthier "; + juliendehos = "Julien Dehos "; jwiegley = "John Wiegley "; jwilberding = "Jordan Wilberding "; jzellner = "Jeff Zellner "; @@ -225,9 +226,9 @@ matejc = "Matej Cotman "; mathnerd314 = "Mathnerd314 "; matthiasbeyer = "Matthias Beyer "; - mbauer = "Matthew Bauer "; maurer = "Matthew Maurer "; mbakke = "Marius Bakke "; + mbauer = "Matthew Bauer "; mbe = "Brandon Edens "; mboes = "Mathieu Boespflug "; mcmtroffaes = "Matthias C. M. Troffaes "; @@ -260,7 +261,7 @@ notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; - obadz = "obadz "; + obadz = "obadz "; ocharles = "Oliver Charles "; odi = "Oliver Dunkl "; offline = "Jaka Hudoklin "; @@ -276,6 +277,7 @@ pashev = "Igor Pashev "; pesterhazy = "Paulus Esterhazy "; peterhoeg = "Peter Hoeg "; + peti = "Peter Simons "; philandstuff = "Philip Potter "; phile314 = "Philipp Hausmann "; Phlogistique = "Noé Rubinstein "; @@ -328,11 +330,11 @@ schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; sepi = "Raffael Mancini "; + seppeljordan = "Sebastian Jordan "; sheenobu = "Sheena Artrip "; sheganinans = "Aistis Raulinaitis "; shell = "Shell Turner "; shlevy = "Shea Levy "; - simons = "Peter Simons "; simonvandel = "Simon Vandel Sillesen "; sjagoe = "Simon Jagoe "; sjmackenzie = "Stewart Mackenzie "; diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index e9ca22117aa4..db0f449c92af 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -23,12 +23,12 @@ elif [[ $1 == nox ]]; then elif [[ $1 == build ]]; then source $HOME/.nix-profile/etc/profile.d/nix.sh + echo "=== Checking NixOS options" + nix-build nixos/release.nix -A options + echo "=== Checking tarball creation" nix-build pkgs/top-level/release.nix -A tarball - echo "=== Checking NixOS options" - nix-build --show-trace nixos/release.nix -A options - if [[ $TRAVIS_PULL_REQUEST == false ]]; then echo "=== Not a pull request" else diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 8ee13fea7790..b2cb121d1d63 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -266,6 +266,7 @@ emby = 242; graylog = 243; sniproxy = 244; + nzbget = 245; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -502,6 +503,7 @@ factorio = 241; emby = 242; sniproxy = 244; + nzbget = 245; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index df720e86f5b7..bd6552f74a4f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -239,6 +239,7 @@ ./services/misc/nix-gc.nix ./services/misc/nixos-manual.nix ./services/misc/nix-ssh-serve.nix + ./services/misc/nzbget.nix ./services/misc/octoprint.nix ./services/misc/parsoid.nix ./services/misc/phd.nix diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 021c561af759..231a1890e0c0 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -471,6 +471,7 @@ in cups = {}; ftp = {}; i3lock = {}; + i3lock-color = {}; screen = {}; vlock = {}; xlock = {}; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 996e313386fe..58b73ac4f6bf 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -97,7 +97,7 @@ in script = '' cd /var/lib/minetest - exec ${pkgs.minetest}/bin/minetestserver ${concatStrings flags} + exec ${pkgs.minetest}/bin/minetest --server ${concatStrings flags} ''; }; }; diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix new file mode 100644 index 000000000000..b39511624c80 --- /dev/null +++ b/nixos/modules/services/misc/nzbget.nix @@ -0,0 +1,85 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.nzbget; + nzbget = pkgs.nzbget; +in +{ + options = { + services.nzbget = { + enable = mkEnableOption "NZBGet"; + + package = mkOption { + type = types.package; + default = pkgs.nzbget; + defaultText = "pkgs.nzbget"; + description = "The NZBGet package to use"; + }; + + user = mkOption { + type = types.str; + default = "nzbget"; + description = "User account under which NZBGet runs"; + }; + + group = mkOption { + type = types.str; + default = "nzbget"; + description = "Group under which NZBGet runs"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.nzbget = { + description = "NZBGet Daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ + unrar + p7zip + ]; + preStart = '' + test -d /var/lib/nzbget || { + echo "Creating nzbget state directoy in /var/lib/" + mkdir -p /var/lib/nzbget + } + test -f /var/lib/nzbget/nzbget.conf || { + echo "nzbget.conf not found. Copying default config to /var/lib/nzbget/nzbget.conf" + cp ${cfg.package}/share/nzbget/nzbget.conf /var/lib/nzbget/nzbget.conf + echo "Setting file mode of nzbget.conf to 0700 (needs to be written and contains plaintext credentials)" + chmod 0700 /var/lib/nzbget/nzbget.conf + echo "Setting temporary \$MAINDIR variable in default config required in order to allow nzbget to complete initial start" + echo "Remember to change this to a proper value once NZBGet startup has been completed" + sed -i -e 's/MainDir=.*/MainDir=\/tmp/g' /var/lib/nzbget/nzbget.conf + } + echo "Ensuring proper ownership of /var/lib/nzbget (${cfg.user}:${cfg.group})." + chown -R ${cfg.user}:${cfg.group} /var/lib/nzbget + ''; + + serviceConfig = { + Type = "forking"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = "true"; + ExecStart = "${cfg.package}/bin/nzbget --daemon --configfile /var/lib/nzbget/nzbget.conf"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = mkIf (cfg.user == "nzbget") { + nzbget = { + group = cfg.group; + uid = config.ids.uids.nzbget; + }; + }; + + users.extraGroups = mkIf (cfg.group == "nzbget") { + nzbget = { + gid = config.ids.gids.nzbget; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index eb43e83c95f0..bb0dc756ba47 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -162,7 +162,7 @@ in /etc/group r, ${config.environment.etc."nsswitch.conf".source} r, - ${pkgs.glibc.out}/lib/*.so mr, + ${getLib pkgs.glibc}/lib/*.so mr, ${pkgs.tzdata}/share/zoneinfo/** r, network inet stream, @@ -170,15 +170,15 @@ in network inet dgram, network inet6 dgram, - ${pkgs.gcc.cc.lib}/lib/libssp.so.* mr, - ${pkgs.libsodium.out}/lib/libsodium.so.* mr, - ${pkgs.systemd}/lib/libsystemd.so.* mr, - ${pkgs.xz.out}/lib/liblzma.so.* mr, - ${pkgs.libgcrypt.out}/lib/libgcrypt.so.* mr, - ${pkgs.libgpgerror.out}/lib/libgpg-error.so.* mr, - ${pkgs.libcap.lib}/lib/libcap.so.* mr, - ${pkgs.lz4}/lib/liblz4.so.* mr, - ${pkgs.attr.out}/lib/libattr.so.* mr, + ${getLib pkgs.gcc.cc}/lib/libssp.so.* mr, + ${getLib pkgs.libsodium}/lib/libsodium.so.* mr, + ${getLib pkgs.systemd}/lib/libsystemd.so.* mr, + ${getLib pkgs.xz}/lib/liblzma.so.* mr, + ${getLib pkgs.libgcrypt}/lib/libgcrypt.so.* mr, + ${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr, + ${getLib pkgs.libcap}/lib/libcap.so.* mr, + ${getLib pkgs.lz4}/lib/liblz4.so.* mr, + ${getLib pkgs.attr}/lib/libattr.so.* mr, ${cfg.resolverList} r, } diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 9500988f2be3..4c4e3d967988 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -75,7 +75,7 @@ in pkgs.xfce.xfce4settings pkgs.xfce.xfce4mixer pkgs.xfce.xfce4volumed - pkgs.xfce.xfce4screenshooter + pkgs.xfce.xfce4-screenshooter pkgs.xfce.xfconf pkgs.xfce.xfwm4 # This supplies some "abstract" icons such as diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 9476fbaf3359..4046d839f7d8 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { meta = { description = "Audio player"; homepage = http://audacious-media-player.org/; - maintainers = with stdenv.lib.maintainers; [ eelco simons ]; + maintainers = with stdenv.lib.maintainers; [ eelco ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 56ec04611023..5aaa3195c458 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -11,8 +11,7 @@ let version = "2.6.3"; in buildPythonApplication { # call the package quodlibet and just quodlibet - name = "quodlibet-${version}" - + stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"; + name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}"; namePrefix = ""; # XXX, tests fail diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 9a392b90dc1c..e3dc6b4406ae 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.6.2"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1kl2pc0smacn4lgk5wwlaiw03rm8b0763vaisgp843p35zzsbc9n"; + sha256 = "1fd6j05czir2z3bvkf0mixkfncp73jw8kgqgaqxjjg546381yb7a"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 1bff18185f1e..03ed4276df94 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ed-1.12"; + name = "ed-1.13"; src = fetchurl { # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { # When updating, please make sure the sources pulled match those upstream by # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum` # in the resulting directory - url = "http://fossies.org/linux/privat/${name}.tar.gz"; - sha256 = "111ci6x43bcmylqhrzr32l0q8pplmpb4kiq5pb6cyp0yxkb2dhgj"; + url = "http://fossies.org/linux/privat/${name}.tar.bz2"; + sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j"; }; /* FIXME: Tests currently fail on Darwin: diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 6359bd7bde18..7f765b9afc85 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { description = "GNU Emacs 24, the extensible, customizable text editor"; homepage = http://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ]; + maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix index 993436241291..f798843639cb 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { description = "GNU Emacs 25 (pre), the extensible, customizable text editor"; homepage = http://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ]; + maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 67d1d71c5ee0..df34a47a6b3c 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { description = "Haskell mode for Emacs"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 1a145e1b6486..d70b9955c982 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -36,7 +36,5 @@ stdenv.mkDerivation { homepage = "http://www.emacswiki.org/emacs/Icicles"; description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ simons ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix index 863e9f95d95e..e90d6cf210d7 100644 --- a/pkgs/applications/editors/emacs-modes/let-alist/default.nix +++ b/pkgs/applications/editors/emacs-modes/let-alist/default.nix @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { homepage = "http://elpa.gnu.org/packages/let-alist.html"; description = "Easily let-bind values of an assoc-list by their names"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ simons ]; }; } diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index 57c2b2890be7..70693d039c58 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { description = "Emacs mode for the programming language Maude"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index b08f98a054c2..4ca4819787b4 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "4.1"; + version = "4.2"; name = "joe-${version}"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; - sha256 = "1nznzr9h0rh8g15c56yxzwpn2labx9sgsak0wcnpj7wmpnr12ql1"; + sha256 = "0x39x0qrwdbhl45wd8r8cpzigsip6m5j2crajsrbffk8qm5scpdw"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 919b9fcc4c3c..0a1059c6a47c 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index e457ba29d975..33470ea0c00e 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ nckx simons ]; + maintainers = with maintainers; [ nckx peti ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index d7b066220559..7e9e6fc0099b 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Scanner Access Now Easy"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 751f31f73f29..b3a432c96dfd 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.sane-project.org/; description = "Graphical scanning frontend for sane"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric simons]; + maintainers = with stdenv.lib.maintainers; [viric peti]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 28a264af965c..ea0d2338252a 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig -, imagemagick, intltool, autoreconfHook, which +, imagemagick, intltool, autoreconfHook, which, defaultIconTheme }: let @@ -56,12 +56,53 @@ stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/"; + postPatch = '' + for i in \ + brushlib/brushlib.hpp \ + gui/canvasview.cpp \ + gui/compview.cpp \ + gui/docks/dock_canvasspecific.cpp \ + gui/docks/dock_children.cpp \ + gui/docks/dock_curves.cpp \ + gui/docks/dock_history.cpp \ + gui/docks/dock_keyframes.cpp \ + gui/docks/dock_layergroups.cpp \ + gui/docks/dock_layers.cpp \ + gui/docks/dock_metadata.cpp \ + gui/docks/dock_params.cpp \ + gui/docks/dock_timetrack.cpp \ + gui/docks/dock_toolbox.cpp \ + gui/docks/dockable.cpp \ + gui/docks/dockdialog.cpp \ + gui/docks/dockmanager.h \ + gui/duck.h \ + gui/duckmatic.cpp \ + gui/duckmatic.h \ + gui/instance.cpp \ + gui/instance.h \ + gui/states/state_stroke.h \ + gui/states/state_zoom.cpp \ + gui/widgets/widget_curves.cpp \ + gui/workarea.cpp \ + gui/workarearenderer/workarearenderer.h \ + synfigapp/action_system.h \ + synfigapp/canvasinterface.h \ + synfigapp/instance.h \ + synfigapp/main.h \ + synfigapp/uimanager.h + do + substituteInPlace src/"$i" --replace '#include ' '#include ' + substituteInPlace src/"$i" --replace '#include ' '#include ' + substituteInPlace src/"$i" --replace '#include ' '#include ' + done + ''; + preConfigure = "./bootstrap.sh"; buildInputs = [ ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig - synfig autoreconfHook which + synfig autoreconfHook which defaultIconTheme ]; postInstall = '' diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 57d677395b41..2c9aaeda98fe 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 39621536e688..dc180adde65a 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "http://nostatic.org/grip"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber peti ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 3e35b7bde4b8..810c7f2586ff 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index f204a9fc0ef9..e4b362ec25d4 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -45,6 +45,5 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 29d434c53af0..391410628bad 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.32"; + version = "2.33"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "11bkflmqrpfk95v2j7pjcm78nilx2s611mn2x7kxwn77ilnbcjbw"; + sha256 = "0n4rkx2awyq1gbqiby1lkf2zw82brji96s4fkjsahmci528a882i"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index a2fdd33747b4..b7e4e1966c9a 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "mupdf-${version}"; src = fetchurl { - url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; + url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; sha256 = "01n26cy41lc2fjri63s4js23ixxb4nd37aafry3hz4i4id6wd8x2"; }; diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix new file mode 100644 index 000000000000..9b1b01577697 --- /dev/null +++ b/pkgs/applications/misc/rofi-menugen/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rofi, gnused }: + +stdenv.mkDerivation rec { + rev = "168efd2608fdb88b1aff3e0244bda8402169f207"; + name = "rofi-menugen-2015-12-28-${builtins.substring 0 7 rev}"; + src = fetchFromGitHub { + owner = "octotep"; + repo = "menugen"; + inherit rev; + sha256 = "09fk9i6crw772qlc5zld35pcff1jq4jcag0syial2q000fbpjx5m"; + }; + patchPhase = '' + sed -i -e "s|menugenbase|$out/bin/rofi-menugenbase|" menugen + sed -i -e "s|rofi |${rofi}/bin/rofi |" menugen + sed -i -e "s|sed |${gnused}/bin/sed |" menugenbase + ''; + installPhase = '' + mkdir -p $out/bin + cp menugen $out/bin/rofi-menugen + cp menugenbase $out/bin/rofi-menugenbase + ''; + meta = with stdenv.lib; { + description = "Generates menu based applications using rofi"; + homepage = https://github.com/octotep/menugen; + maintainers = with maintainers; [ garbas ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index e1ee9b2d145d..ee068e2045e0 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,16 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig -, libX11, libxkbcommon, pango, cairo, glib -, libxcb, xcbutil, xcbutilwm, which, git -, libstartup_notification, i3Support ? false, i3 +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libX11, libxkbcommon, pango +, cairo, glib, libxcb, xcbutil, xcbutilwm, which, git, libstartup_notification +, i3Support ? false, i3 }: stdenv.mkDerivation rec { + version = "1.0.1"; name = "rofi-${version}"; - version = "1.0.0"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.xz"; - sha256 = "0ard95pjgykafm5ga8lfy7x206f07lrc6kara5s9irlhdgblq2m5"; + sha256 = "01jxml9vk4cw7pngpan7dipmb98s6ibh6f0023lw3hbgxy650637"; }; preConfigure = '' @@ -20,16 +19,13 @@ stdenv.mkDerivation rec { ''; buildInputs = [ autoreconfHook pkgconfig libX11 libxkbcommon pango - cairo libstartup_notification libxcb xcbutil xcbutilwm - which git - ] ++ stdenv.lib.optional i3Support i3; + cairo libstartup_notification libxcb xcbutil xcbutilwm which git + ] ++ stdenv.lib.optional i3Support i3; - doCheck = true; - - meta = { - description = "Window switcher, run dialog and dmenu replacement"; - homepage = https://davedavenport.github.io/rofi; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.mbakke ]; + meta = with stdenv.lib; { + description = "Window switcher, run dialog and dmenu replacement"; + homepage = https://davedavenport.github.io/rofi; + license = licenses.mit; + maintainers = with maintainers; [ mbakke garbas ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix new file mode 100644 index 000000000000..1289679832b3 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; + name = "urxvt-theme-switch-2014-12-21_rev${builtins.substring 0 1 rev}"; + dontPatchShebangs = true; + + src = fetchFromGitHub { + owner = "felixr"; + repo = "urxvt-theme-switch"; + inherit rev; + sha256 = "0x27m1vdqprn3lqpwgxvffill7prmaj6j9rhgvkvi13mzl5wmlli"; + }; + + installPhase = '' + mkdir -p $out/lib/urxvt/perl + sed -i -e "s|/usr/bin/env||" color-themes + cp color-themes $out/lib/urxvt/perl + ''; + + meta = with stdenv.lib; { + description = ""; + homepage = ""; + license = "CCBYNC"; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 8f195555cf1a..5d1eda5ec063 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -3,14 +3,13 @@ unicode3Support }: let - name = "rxvt-unicode"; + pname = "rxvt-unicode"; version = "9.22"; - n = "${name}-${version}"; in stdenv.mkDerivation (rec { - name = "${n}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}"; + name = "${pname}${if perlSupport then "-with-perl" else ""}${if unicode3Support then "-with-unicode3" else ""}-${version}"; src = fetchurl { url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2"; diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix index c9b0823fb51f..de37327fbead 100644 --- a/pkgs/applications/misc/rxvt_unicode/wrapper.nix +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -4,9 +4,10 @@ let rxvt = rxvt_unicode.override { perlSupport = true; }; + rxvt_name = builtins.parseDrvName rxvt.name; in symlinkJoin { - name = "${rxvt.name}-with-plugins"; + name = "${rxvt_name.name}-with-plugins-${rxvt_name.version}"; paths = [ rxvt ] ++ plugins; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 683e5db2d13e..849e746f4d9f 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,34 +1,47 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses }: +{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper +, configFile ? null +}: -stdenv.mkDerivation rec { - name = "termite-${version}"; +let version = "11"; + termite = stdenv.mkDerivation { + name = "termite-${version}"; - src = fetchgit { - url = "https://github.com/thestinger/termite"; - rev = "refs/tags/v${version}"; - sha256 = "1k91nw19c0p5ghqhs00mn9npa91idfkyiwik3ng6hb4jbnblp5ph"; + src = fetchgit { + url = "https://github.com/thestinger/termite"; + rev = "refs/tags/v${version}"; + sha256 = "1k91nw19c0p5ghqhs00mn9npa91idfkyiwik3ng6hb4jbnblp5ph"; + }; + + makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; + + buildInputs = [ pkgconfig vte gtk3 ncurses ]; + + outputs = [ "out" "terminfo" ]; + + postInstall = '' + mkdir -p $terminfo/share + mv $out/share/terminfo $terminfo/share/terminfo + + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + + meta = with stdenv.lib; { + description = "A simple VTE-based terminal"; + license = licenses.lgpl2Plus; + homepage = https://github.com/thestinger/termite/; + maintainers = with maintainers; [ koral garbas ]; + platforms = platforms.all; + }; }; - - makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - - buildInputs = [ pkgconfig vte gtk3 ncurses ]; - - outputs = [ "out" "terminfo" ]; - - postInstall = '' - mkdir -p $terminfo/share - mv $out/share/terminfo $terminfo/share/terminfo - - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages +in if configFile == null then termite else stdenv.mkDerivation { + name = "termite-with-config-${version}"; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' + mkdir -p $out/etc/xdg/termite/ $out/bin + ln -s ${termite}/bin/termite $out/bin/termite + wrapProgram $out/bin/termite --add-flags "--config ${configFile}" ''; - - meta = with stdenv.lib; { - description = "A simple VTE-based terminal"; - license = licenses.lgpl2Plus; - homepage = https://github.com/thestinger/termite/; - maintainers = [ maintainers.koral ]; - platforms = platforms.all; - }; + passthru.terminfo = termite.terminfo; } diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 7b55f39c1191..9f84189e94b7 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "thinkingrock-2.2.1-binary"; + name = "thinkingrock-binary-2.2.1"; src = fetchurl { url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index e677164ecf48..f11d5e6d7009 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { description = "viewer for Portable Document Format (PDF) files"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 8e5a5d4c90d9..4cc459397d3e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1jwk0x5hjpah0bl4dpirxwyfxv0d0wnkvfgyja91kkbh8471gzmk"; - sha256bin64 = "10sl3ddd77i1gl3l4yvhkpavfq2bygv7gwql0jnhchmrvyax1cjh"; - version = "50.0.2661.49"; + sha256 = "0l1434wqhi6c24qyb5ysg1wnd0s9l9i1k6kh6wr3s4acrsbb7p12"; + sha256bin64 = "1ssw92l8zwj8x0zs5h6vxl7d7gj0lqb0x71vsazgd4d0p23nglb1"; + version = "51.0.2704.47"; }; dev = { - sha256 = "042h6klyijnhkb4m9lsnfi3qss6pbs4p4981rm4cbc86rsyppkhl"; - sha256bin64 = "1p6lhd3n9q93fkydxksgfv68vz26yj8i2zx1kqby2z9yc0pdcniq"; - version = "51.0.2693.2"; + sha256 = "0czp4p434yqr5rv3w2vypkyis13x8lc4xph8yh84r9big1ga6fqs"; + sha256bin64 = "0hahamx9k14czswqdh8iwh69lsml0acca5kxvp2kw471g3s55n78"; + version = "52.0.2729.3"; }; stable = { - sha256 = "1lmv6nmbqhxmr4340s5i4ypgz2b7vkh0wy5x9v75b5bnscjhk121"; - sha256bin64 = "1djd2i9phym1d8afv4vfajb7l1bz0ny2wmihwi6jaz712vil4a13"; - version = "49.0.2623.110"; + sha256 = "1ijpbmn38znjjb3h8579x5gsclgjx122lvm0afv17gf2j3w5w4qj"; + sha256bin64 = "17vqvxmy6llg7dpc3pxi0qhwpm9qc9rsq8lgknhwwygvkl8g14sb"; + version = "50.0.2661.102"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix new file mode 100644 index 000000000000..c1bf01044370 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -0,0 +1,192 @@ +# This file is generated from generate_sources.rb. DO NOT EDIT. +# Execute the following command to update the file. +# +# ruby generate_sources.rb 46.0.1 > sources.nix + +{ + version = "47.0b5"; + sources = [ + { locale = "ach"; arch = "linux-i686"; sha512 = "98b283db66cd5d66a8fb74cab768526af7751eb3a2353791dbc8c40100be43753cf977262f5257fe55d7e42160600055209fc77b0ab5ce6893e393e273f0a961"; } + { locale = "ach"; arch = "linux-x86_64"; sha512 = "f931442f88a1d624e194732b4e8b0ce09cae2648a70cad658fa9439f0f69f66d1303236a110e8a9bd64f0034eb6adcc89313ec116624fb3e8d557ee387d2e5ef"; } + { locale = "af"; arch = "linux-i686"; sha512 = "f45f3644c0e6f51e5f88747e6f4c9b6123a40f112dd3768471838c68f8fdb42c729351d6eaa6768b5a7dcb30c1145545bee03c981eb7f271cd42ad7d526b7d74"; } + { locale = "af"; arch = "linux-x86_64"; sha512 = "a48c2e8de38c0f06d51b701eeb8dd4e68973e9601acdb879bc63bf375fdd08412408abd98bface2651dd86a86812ede0fb5ae9981de484afc0657f622428d720"; } + { locale = "an"; arch = "linux-i686"; sha512 = "d0de5de0d84f30b9b4a7e0aaf697bb543a2c0d3e7118a4f963b059a99433fe72d3497526c66102a64600585e3a97243918f91ea08f9e1c189670ac2cb5f7f695"; } + { locale = "an"; arch = "linux-x86_64"; sha512 = "4ad8f425043259bb1ead7c5cf2bafda8d87dfb8e544e6335c9a36c9096f32919e65a28c2f33e87584d53cccaf26c22ebc45657b7e9055876bb19698fb3fe4bd2"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "b34739502ee0e18a8d2e97f4af694cb5aa71bba530915bf18a7488260163d720cb8df07197e46a75081f34a956e586e64fa7b999505a6b32c47010e2b5c6bb8b"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "4ded69d272fbebac790dc16b7ebec5d9ee42a71a852f069141d95b423ee3d544839b9b852ede8c2a70e1a90aaf991821f2f51107c749af14e5197aaa747d9657"; } + { locale = "as"; arch = "linux-i686"; sha512 = "54d09a607b608fb1983ad9990a870f422d90d626f91d691a420ce691a904abda0e3539d156fa218a8d0259144a5d6c4da2b4d855f4103bde996bc887b40b6847"; } + { locale = "as"; arch = "linux-x86_64"; sha512 = "19d425bbf52a4c621a61c2fc6dfb88693b90d0705707ae40804c93871f12b22e67dcca0400cb65565e3f4e135c29de14eb581ede6cf204cc8384381267767d56"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "bfdadb27f446b63fa5679731f188bf1a9c59d3efa5371cbc9944ee50de13e2d9ee741faf32a2d340568d6537067b394248245bc0fa426e08c5cfa91b788332fd"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "0a4563494a2bfee6aba79a1212c011dc223f0567c5baa106b7af057e697eddbf90fb418cbe2f42d7df6ed183481375a33604275ed256802960f81992851a6354"; } + { locale = "az"; arch = "linux-i686"; sha512 = "d5311c69962d07fb3a2d95dcc0edefe74d59c484d5b61df5efeee46a40afa19a1f2707345f0834c7510e82e8f3f09dfda2fd1c1dad8980fbf02a177bbd58ec7a"; } + { locale = "az"; arch = "linux-x86_64"; sha512 = "071e8a37ca66c113d152f676da4e39de17bd2d28339d036d300b31f7ff8b09f052adac376f858bfe74976c905ab685fa3fa14387359af7456738727d51efc6cb"; } + { locale = "be"; arch = "linux-i686"; sha512 = "fc073297a8363776a6db25b9ea197d5732010c4c9d26726bb655256caae902b7fde05003c28e727cb1728282c7ba22151b554862d0c2aedc4ba483e1291159aa"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "e2cd3d493dea9e97523dcfb3dedee7ba0c9f6fe6c21e484ac673922090a56a1725eeb278d2c5186a544af4502a74a6d26a02ecad43e39038a7bed5fa0776151a"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "02a0bb4e22d70fc6ffd26cbd1633c7834cc47e0b6b6ac48ca315440e93a8a1eea88fbce0e9f21053da2d65ea715270a84790db597857627b742134929df493c9"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "e7c23fca63fda9cfba5c3c70d48a39f7517e0852df213c122db0f2b9ddb5546633f0ad1d8ecf57832cd4396f7f36f0a2b95c44a53ddfa42cee9502de36a27405"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "fcb750a8f297b611b5885f074285644d38a7ffd5cc44e34a9f416edcb7bfad1cb61c58947815ccc882adb349862c8de6a7c67637c257598e9aec2700c34ef4f1"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "8c08859d299ced430dcaf3ce2070608f0384ac2fabb42f3acb55e0015a7179906317f0fba051953207021087fb2fbef38e89d1b924d1bb8fc8a32933354353f6"; } + { locale = "bn-IN"; arch = "linux-i686"; sha512 = "e9b0a786571711d278e94e94887b7064f5168b3e57b177d519b847014792fdaafbacf5cfde6d4340309beabede605b719b9a1a58f30ae7f1d11fefbfcd56f6d3"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "64e9aa733c14eb31ae8e60b01975c6605b8a01fcdfe2018ec8b395472aff13135a40fb1b664fad6a159eaa809fa56f087d81139b622e58e4d879ae1b7800cf7b"; } + { locale = "br"; arch = "linux-i686"; sha512 = "34423736e3fd774da60984ffd9a99254bc5bb1ce49ce2f88e299e11aa8c7b7d5e8789b76222300d9e87a50cb25764f4705b1664b178149edaecd5f1d25abb3c4"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "3ccc90fc5118aac8b89194298e376ce90013dd9b4155ef604ac0e39c6fd886dc7397eb332c8370d79a85775b5224c98edd83df2f4bd8f18d0c22e26e307a3f00"; } + { locale = "bs"; arch = "linux-i686"; sha512 = "040c5b200f17f9f1c36b6395e99b531e6509569b8aeaaabe326813a08a19c2d7e911d8cf977eeab3c660738e45a5d56a0d16bb1f0085c72fde95984c8f965e8b"; } + { locale = "bs"; arch = "linux-x86_64"; sha512 = "d0f808f888dd83cc9811f0a85a062fe4ed8b3ba26d2c9819fdb1c91124ad35a00425a92439a91da2b94dda253dccbcd6be51a620e8a1ad0a2b485e14a96db6b7"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "8c8bfb8b2c1c280eacc4653edbaa713c3516ea0ea02df2aefc74ac4b0b920a19e14ccfb559ecce3b9c4b744629c741e6c9a2efd6da1888fab63e545bb8534272"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "e68cb49fef941ffdedea5054a4c7cf223c794d261ab8c5526bb4384001a2263d6018097d737ddf6210c3e73175902fb3773f263beced13faed8f697c52dfd479"; } + { locale = "cak"; arch = "linux-i686"; sha512 = "4cf074c30ed3360f92a523dcd54ffc6f18516452f56620d444cf1fc76a669387aa70687e2dec97a19fffeeae5cb413ed2dc62390de77bf2ef609e758521de647"; } + { locale = "cak"; arch = "linux-x86_64"; sha512 = "c66cf417086b3faae42a089fff4847f2c925c2f1e4fa6324888faf231f909ad95c51b1ebb844598e8172bc6b3b08cba8f89b9890b722a6915e1baceda319b91c"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "627abef27cecd1d4801d1d370254f2a68560091dc337f2780ce585566b522d6c75e370177cd0dfdc9e38e96db52d5c54e201c780086fd769e53d6e24149c2988"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "4dd222795547eb14ad0d9f66193b9ad139f66f5a1730bbed3a4213b29cd4717a18ccd095e910071d8642602404bd2732bd377dbc3fdf931cdd8c51862fd43295"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "10eccf20af40d4f1e74d1fcd740a0be0da539a2997a7e403e3830ae6d797ae97fa17f573255a6bf414635fe48809c98f0ef2088c6dcb6e730a3d8bbf2a6e88fa"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "e5fefa0248b7b594dba6c7e25a069d0f73a5ba3016c557f5866923ca062fa5ba172206c6396bbc595ce76540a9dd23308db23fe1a6a5b10c81dbd4db252ff865"; } + { locale = "da"; arch = "linux-i686"; sha512 = "909ed57b9745cd124bd16821f08aa578aaea79aa452ccd88c2f3cf5d8441ea5969b5f5bf29cce7ed9b46e0117c1ef278a9b34493a347e934a327afe3bc6a5f2a"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "2188776b00c04c76ca754ae65e1a8c4897fb24ab1fec5afdfbda5d76e71dd68e3e98e44cedd3d4659c92f7b490b888a1e680446428c3b1bbfa6aeed092cb61eb"; } + { locale = "de"; arch = "linux-i686"; sha512 = "67b26a3eac785f893d19f6fddc955c9aeedcd7ad8e4ec40a5f57d14dd1d3c742e3613faf5860c845aa31b9533fafed47b9342e422f1e74e94192a82490634ec7"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "8385f21ffa8e35e8a475a1795026d4f91660c5b68a219dcfabbf06a5bf41d6d3711c23e810a2df6a8665878930d71e94a398e563caa60bd2e000dc7e74c735af"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "4aa529f48d6a039952bcb50d91c402b8d85c5def54be9fc4e571e1065e9732c2a7d7c95ecd37963cea9735e30043207b53ec10285fc3988c91b2527dc848c1e7"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "96ebcb4941137c1e07753ed20bd6a53a7ef80d191eaf7c2b949663026f03160ff30d4e085f79710766d3b937753f038f429ea8da33fea49c1472afe7e1a14d10"; } + { locale = "el"; arch = "linux-i686"; sha512 = "df48924718d78d9c39003c65c363301f0009487c6db79f73e1121f7f1f871c43f485050d0a1fd7086ee71830c0de121a0aca8aa6c4cccebdbdbb21603ab35afc"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "a72a4becb87932795002063809481ec3167c16995d64d18c5a0e9e9acbe094491f8e6e1f35628a1fd99d3c7fa95b541e7b87ecc9b61da46eebf41468edd9e6bb"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "a8a35b2420dd581ba61ea01ae1f38b6c3d0c21d26ae5cfc561aac10d7fb7ab9069ee0a488675e0910909f4179fa003800bbcddca1696fbf4d51e98a1030d9032"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "7a81e63466cfe6340553cd75794804b5f2fc53a975d4ca64be5fdba4915993cebb8b5b45c26940e669938d878627433005ef916ea16a703fc9024a776217ca51"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "def0f98752e1ba92e3154b7275fdce2c63688369fd26d743c9157a8afb37202caed49a96ac4b580764b39e22b6b1e1dfd3c417d3ae4e8c508f24d181dbec4003"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "8267845b8956245ec961d22a7538db7370e0a484adf4117ecc8824228a2035711538b9676e5673dea8f133e3bc935e9639b896a1a384650b03843233875ff872"; } + { locale = "en-ZA"; arch = "linux-i686"; sha512 = "bea9951b6f1b3665d380f81c5777af4dc87e8616ff222d06c7018438d04c2c310652357d5fe13237f5567e8b223308746bd96dfad73e20d7869e7a7897402bdb"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "371d20607fb9570409bef79374485915b279be3ff93c573b4d8a6471d7f551e774839371d857079cdcdd671df384a8cba93ccde71b9ad49a5d813f9b092ac0db"; } + { locale = "eo"; arch = "linux-i686"; sha512 = "36435cb8204873243bf2f7286d8f8a148892fc3f8d47940722214639230546fb87e941b4c449cbfb642a17bc2d12be1586444cb2146a773774b2486c424dfd6c"; } + { locale = "eo"; arch = "linux-x86_64"; sha512 = "c1ca2aadbec3dbc46e72c05a36d01a3973a61239fd57e3493258129532c45b0a2cf76b1877f98167c836065f25071cda89e3636b6f8ca61c2925e8d359f4aef9"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "9bb812c5f2d623d8f9688867ac2a159e2edcbfbe9c883eba713451ebcfb7ad4716fcd10e022d988a6854921266ffeaec5a8ee7780196eed4c2ec32f424b3d423"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1559ca934349aa4583609a64ec5ec4f9b3fc7c7ba0d55344e2853774736adc118599b48e3aea42ab376a393bc31b3f798d406fc79fd7f4acab6ed4be1ea5d649"; } + { locale = "es-CL"; arch = "linux-i686"; sha512 = "c4b7fc14c455fcb007406ce648b329d664caca0739187600191837cafd7f835024f4636bd1622708fca8315d8808f2e0721934cc028349507454092298520315"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha512 = "c380341e32a153c504a1b72bc6ecd2a4b907b854dde42e91230d2d3679866f4c01c5a09a29373f0e580f992469e2448e8c3a1c448083c0416c7f14ebd3afabe5"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "c3b8dd9909cda43d4227ee2cf4a747f3d4774dab3b8e38463464843286e86e5bd25edd026943ee8ded649ec4504f3c41a2ffe70deb3f33d9c54a2bcfebc8d697"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "8e0dfc6380b71230bb4b3153bb682f71b759755e5acd8efc727f61769a701dd1e61d6895a9a82d6481335ea1fb82192febdb9e3810a61fe7d209f741e2ab3741"; } + { locale = "es-MX"; arch = "linux-i686"; sha512 = "0491052cbd95b439537d03909459b22754717fe581f6c33aff218def471a164c3ea2c44d1db1ebbdc2be592cbb1e87a8cba8f9bcdc0360a18ebe7e3f0e559003"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha512 = "26b5d89429c5fb26fd2179f74c789ae023beb4d90cfaff47e044dd388525120a8dc42bc0d52442847249d86c6f5be88fa347f7ded1edd9485bca4df6fbd6b0c8"; } + { locale = "et"; arch = "linux-i686"; sha512 = "0311dde01390a778f5a043ddc64654697245f60d325e0d189fb79ea50df7b5cfcfd5e72403f349cc2f92282a93dad9ad7efec23bacabd695c74e809234cfd484"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "64ac04e96cffb54a35a9f2a2c41b55d66e0d7d4f218ea71ed590f1c62b83e4b426609473f0cae5c65bc382b298b670f5295354f5151c65eb93170607a39ab125"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "8fde0bdaea215428b77c586846b647d1ae8423ee80f35d61dd400a4c732e1cacd1c65d77f95a8584e60ed26a90d3c92d2510fee62ba20c0135cb94245136d2a2"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "8304ca1172dccbabcd88c39955213bf3d57b9622f3f387a748db26310974d9b82de1dee01a4b34a0abcb4d6789f7c2fd4ecc17ce4d8090a5e271729c80494736"; } + { locale = "fa"; arch = "linux-i686"; sha512 = "d54bdbdd1bff08d7bd3f45a5a40f893f269b219fee009184f76eebcc5e9908430c57f7770f26de2ce6c343744046cca8368c2ec5a5e36e860f975ab24783ac63"; } + { locale = "fa"; arch = "linux-x86_64"; sha512 = "5ccf346b56925f02f1261981830a40c25a33ca38d2214bb528c4df9c8f389ac97c27bba0236b80c07152978705a02485e3c8e5151d1f1ac4cd62958d2d49143d"; } + { locale = "ff"; arch = "linux-i686"; sha512 = "b7cfc0598678ebdb2b6d5f3e555067684d4d059179ac4bf63c9852579f8153f649e356eb4d88f483f6a79b26c8788723e83f273a2de900baa99e95bacdf11202"; } + { locale = "ff"; arch = "linux-x86_64"; sha512 = "ff1b6479190b1b784595beccfeaa842d5f66da934909cc1c92a5d34a5aa7fd448708068057e3a07f7f86c28608289ce78f754326f228bbdfc96993a81a88963c"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "09f42f06e9c9b98f250a2df5864aa3e0aecd5eacf851d55c2f005ce7420d30c0ca5c1fc0a50a64cb90cf95628cf1be1ddebfa82c37f1a128f4a122bdf581ca9c"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "711058109e442cca3e127dbf3a487db2aa89ca7859d6d9872d219dd21b729ad98dc4812c590689583a628e3b118a366cad9b0801b994217f2f971fad9e83ebd4"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "9ce0946cf7aa588476cb2be42020b5087e98dbd8cf8983a48b38bf9b9472756bf0cbe0295324c8d706df72f35c57266c882ce5722bbff02e59ca1b16114bf73a"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "304df64f3b914168f92195a7cc39e7368ba1633d75acb9cac6ebc5c90c126d40d78211458da4a2cb1eb1e9cbc3b7346e815ba36c09bb672eecc7e2805835989d"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "d920a93e27e9f6bdb5d0390157f913696c5755a5a07cd15df4baa5589b93cd71e4b4fc11da9c2453ebfd453d1774d1b2238ecb56326bc8f5c7aeab77b86e6641"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "488d2e6d02ffc5695ad476cc835f451bcb6e42bc197da256ca0ce8ade7baec50fd818d3658269c6f2e6f372ab9b4893d90f7dbbd9e4f08c8376a59638d8c6b23"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "dea5e1b24420e958f4275ea9d3d646d99c16022f8086ee8cc207b6d7ab5bf7d7ba2d715d50f8f6ebd633544bba692d34134034c0ecfd0c85a466425c97a6300a"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "aa6e55e3aa56aa61a13b1270e812058a513baf3d82759dfce6eb79c8ae87d18b634704a4c8aadbdcab289b2c501bddef2997e82b3872a8d5f485aef70182ac4f"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "4dc9c3a6159eed67e391c002adc8eee467bea21b7a0166132a13891134802332acb4cd11764383beeef44528a29eeaf19f30ca8985228097c79278403cd309df"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "fdbfdd04846e37271c4565f3e6ccf2936b5bdcce5ef92ecbe5be13c5a1ca547ad4c1fca9e8d87c14147f2fcaa815778bb4d5e17a4f04eef4be1659636f39468b"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "ee8e7ddb91856c0caaecc376e4a835ae04e1081e07341ada4d49b543796c98d07aece0837b887dc7780c935cd30c813cb22eed485dc57bb68a94aacefb368e7b"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "906d16f7a10f1e5f548c744d520e27f7bd9fdd4668287992d5d8af50c9b389d3af882eeed859a64c97b88e94de8fcc93dbcadf41caae36a3442eb3da131de81d"; } + { locale = "gn"; arch = "linux-i686"; sha512 = "69167c749ecafac6b7fc610dff05122907b152f0c6c5fef2966c41252b94a3e5853264d8254a3aa5d72f2e11e07397a8b192b1d8e7e0c5654ab1ae7467e2b9bf"; } + { locale = "gn"; arch = "linux-x86_64"; sha512 = "efb6d111e97bb49312537fd0517a8e48ffb58fede9031c90880a8ac4ae909acbd21140e56f9f82151e27b3f1ea014e9c9a3204b35a1c6fed6794dcd282c523d7"; } + { locale = "gu-IN"; arch = "linux-i686"; sha512 = "d57f0091a765f80493e95493a2f82a408754205942109858656cab840db3573f58d48f00cb799b9f5ce6a2e5147299a1f636c9af81fe55a91624d2c8a73a4dae"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "96c38bf77f37fa791b04f6f63004caaae6bde4423733620bc7aa095d887f497da12414028c1ff250c5efe811ec3828e9214788bc85e7d73f885c433379da4bb9"; } + { locale = "he"; arch = "linux-i686"; sha512 = "ca812d1008cce0b8314e5a0a50c8b2de8b0153e99eb7c493ca828159c78fd9a02e15e3926b865698fb0822b995d9a757282d32c8c13d2f9f1c42896280c0048f"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "4bf246c12753f70c8a0d084738fd992966430bc0cc2a6d363e09715dcfd9099f5ecef5b110f5c79bdcf9eca3c029ad0b7b04574eb172421c252dd850926f3b67"; } + { locale = "hi-IN"; arch = "linux-i686"; sha512 = "63727a991fa87d2fb675ee10d2759a42fcbbf50794af4d7d96cec26a02fb07f0c221d069ce762555595b6ad5b713379c5969273e87034a1cbeb886ceb7e68bad"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d190f4d39e485bd212547b39ce72dc9f02b87436313d7a449cef6f3c8594357534867b635d21d3914faa4f6eb89668cf29a2499ad166b0feb3a7f232de3599fe"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "508e6c6f55c5ea5ed65180467e682071c0804e499392835f53c06516d09d8f40c209c6b252406599bbbbaa3300679ae1002c436a5c638c79559ac5747e69812a"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "0fcc0ce95c5765563a3c090087854fec969e2eb7c936fd26bdda15c39087c24eb4dbc1748cdd0eda9f4a8922b62af0f3ef51d176d44d75b00c0e8604d7d09426"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "40c941ea0f08ef6b81ebcd001bbcf7d1d5bd6b43f67cdb9b9669148221c5157d4e9a3dbd02bd377ae23805ce20f7e8e097bb96b26be15ffb724e4636ee8f69b6"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "f2452ff5d06af892f7b33fe62cadb18444e7199f956b7a9afd8f5804f59999683e80b92f8193ba99bba7677c505f6cb9cc7f5e2ab11066bad3b4c5230168c15d"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "7b33b356cc463e21fbc0eb8e79c68622f0a5c9080a077428b29664bb6a2e627f36dc19588577fde8bf0dd47b92a68c5642111d55dc4f9593d103cb59404dc94a"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "7d96f273f258141fcb7438f4c4a940b8351261f5b72e7c9bcad23edfa4c8bb4dbc3867264e8af9d81be926c177adc5b1e872a8b6b4796ef2e057e322f5d8f7a2"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "1124c892d9e5d0f134eb02cda33aaf823c099e9fe7ed875df994af8b99abb992cab28e3de1227b71d61048285078d0c0bc9104f28a78330649d098a516e96a9e"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "e85c7be731bfc4ae5ae0dbfe10c611ecfb815ad3749cb0cfd0b7b9b31d24c6a949c80f5bc5f698932c4420f9819e97069667a21fd99b77e2b4c2ed1164cf861c"; } + { locale = "id"; arch = "linux-i686"; sha512 = "5c509dc4ad9e07ec1bbd7235f9b05dd97cfac2d9d6b18897192f9863719d3b2509ed1fa6bec528ccf57a0c96414325fb9d74e3db8ef3bfb880685eb96e7a8beb"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "6aabb3f1b0eacc7f6203c77492683f37814fcf71595c8b01d4c4304f00c17fae89c0b2a681d59612c676d889516663ecc6c12cfa8d42a804d734995a861d971e"; } + { locale = "is"; arch = "linux-i686"; sha512 = "bd87b3c76104b1436be92ae86bc9e1040258334f7b79484a5ce94bddcd0473d8cf28ffe615cf46c0d92698e90885de66627688dd8485cf75acbdde84f5d414d1"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "d542a1eb114f917f7f0652933f9378428e58169b91fa691d05589390a13918bd0d2109aa59ce8ade43dbfeebd49deea8feb110e24c54f1c90d0fb1314e2be8a9"; } + { locale = "it"; arch = "linux-i686"; sha512 = "3ae512498e1bfd6ea249b7693fa4da77c209e6747745eede733528504465cc090f17524e57edac99789781e5bbe831f21c68eb34aa4f6f294cf66ba04f37d375"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "f53816f745d6a5c6ed74bf23f0e48a0171d79719f21c262657b6402e54b416563e38c215e9fc33179ef82051747025c642757ddf650ae7cfb601af33fb46eaba"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "22d6416182f3766751e7f0aa647c0f4b658cf32321287550dda1885711ecf6725cb85c1e75f9656661b33d8ee4b3e0fe6b62399848d668b5ac3922d53922a370"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "70f390611d41bfd5e0eff0f2a32afa38abdc41ca3ee2d50b0242cae7b5003d0b6e4430cebb949185ba00e711b46c2bdc410aeb2180e52f2884785617da04e696"; } + { locale = "kk"; arch = "linux-i686"; sha512 = "322032a5bfe60e135ea430596989db85df3cc1c7d39061b8606c86b01f0fa3523e197b0e0a2dd7eed6667dc01bc3df3b7b8c5c9f1254305c4afb9a247c647a9f"; } + { locale = "kk"; arch = "linux-x86_64"; sha512 = "d92cf7c83e19733a66955a7351aff90debb6057fc7f3277ccc196e0f0f72b43dc261ad34ec600a5862784dcd6bfc71bae5c7d3f5ffdbb06c2ea8c632ab320a38"; } + { locale = "km"; arch = "linux-i686"; sha512 = "bb482b0ea1d09e624095e5cecb7327321ac5a6895d7a522da9a1aef081d93ed090e7ee743487afbeab125f660179c7e65ad767918724f7eed84ecbaaa28ed9e9"; } + { locale = "km"; arch = "linux-x86_64"; sha512 = "0f1ce557998ecd2fc698c091b95f8669ca32ff0a27b415bfb122f9c5e37a25abf4baf62ea3e3ac63c649c4d1510d2bd71e8bcbad399e8ac423eee7bdc240f0cd"; } + { locale = "kn"; arch = "linux-i686"; sha512 = "68a55c9712a1eab6677ba9577326211aa4c3f6122690da540eb44dddef2d5f6b1a34fc026ddc2e3d005af41149f9e8ccc8eff2bfab952a688b25ab48464dd2e7"; } + { locale = "kn"; arch = "linux-x86_64"; sha512 = "ed7285ea39f41820dd38677d0dda05c0193e2bfbb2149b6ac12b3611b67a154cc76a0e75a23badaf813cbc0f24dd2be78707ecf2962d5582777cfeb8fb59d042"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "c20fd881febb57ed2012e654338a24e24277b6c0ff71b86e190c80afbf5caa8bd6408b2b265ac7aebbc5233c942761beffb4252cac6a5bef41d6f18d13cf6884"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "27eb552c9e88088191becf75e3ab0b789a76a5423e84451ddc74ce5ded95b0f98a2fdb0a7552e95752ee4ae41ca9e83bbef3f6ebc8ab089903a63d7d9b558213"; } + { locale = "lij"; arch = "linux-i686"; sha512 = "d0f697f29c8008344e5ebfa4325046837720e5061e309f530db3de4eb066ffa7f3bdce3e97abfc388569664af46f60e73fa9018998f8c42af0ab1b8c44a751c8"; } + { locale = "lij"; arch = "linux-x86_64"; sha512 = "3da427ccb0a138d40af0ed0139adba64accccdc02c2d3abbed04c7ed51bd5cca675b2a39d765406a607b76050bac11fc90ded3b84491066920a8387e490ce3a1"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "c9c779d3f9902248ade70fdec78ea282e021d857a7594ee9fc52eb39c65c142c5278694f6f9621f7f98075a3e9f44e4765493b88a1bf9108bd91fe8522d73319"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "ac53cab92414f0c28cd1cd6a722e59889b0f8ef5d842f93c5ab775b8c857ce1c266522ab119b655c5800e1e0fa370791f4c545c00e35d64e8e6c0f6e2a7bd7d5"; } + { locale = "lv"; arch = "linux-i686"; sha512 = "a8cc63ad51e11bb98c8b1e7d0b4673ac198eaa73083ffec491e2b4d333ad6b9908d734da53ad70306717bee4de7c48c9f7ed08cc5647b3d494eca001bf80bb22"; } + { locale = "lv"; arch = "linux-x86_64"; sha512 = "8b229439f9ddead6b965f5e14626e159a6d94774b2f9e57898b86c39f77adc08a6e93b33be050e053bbc1a660f27da66a81f3d1e3222001e52e5463716ee370d"; } + { locale = "mai"; arch = "linux-i686"; sha512 = "b39472c32581b9977cb5701a398d83b8d4abaf2943c99035d57404610b3ccb016b99f4d89618451701434320dd6a83ecb3d927fcbab2999c273b3e7df32e0428"; } + { locale = "mai"; arch = "linux-x86_64"; sha512 = "d8e7f74ef1d4e70da44bfd12a2b93e66df40e7ead86f6d1f33eed0f3bafd72b39c43b4cce086c8b27d9d8d297469a5c5238ca48f46bacaf7b850c57c067702f7"; } + { locale = "mk"; arch = "linux-i686"; sha512 = "99267203937be5687b638f44ccdd9610d0b4804035f6681aa6924f07064e6f26d6dc2900cf39bbdfc2abbb0a72e3cc3b194a20a804e0052b704032e057e469c9"; } + { locale = "mk"; arch = "linux-x86_64"; sha512 = "e656d150a4a49d9d9f0c619450b9a1bea4a14f7f63d40684c29b247efba83de4a4238d247bb2e62fc77bf4251c5199188d1c1e8498b2e85b9c9be351e9dd3cd2"; } + { locale = "ml"; arch = "linux-i686"; sha512 = "4a25b6677772dfe7c7e61910fe0c3edc74d42b1a87468ca9315231c983e8cd9db56ffc02d02345c6e76408c5d40ee655dc5e75d7add173a88f1f3a2b4e922c56"; } + { locale = "ml"; arch = "linux-x86_64"; sha512 = "dec2789ab8d4ed76e642d9bbbab740fd260e8c159568bfb560623e6d774f8ff0692789e1bab26ae759bc864f8e7bd9ebae04e591589bb6fd5a9598b22d28fa52"; } + { locale = "mr"; arch = "linux-i686"; sha512 = "ac74407da2b53417edee5e0286964d4e6ee1019d40995e7b4a2f545b4689b6eef65e46dfb59892ce27a06a79c8f6e6b73e29738544377d33b8d6ed7bb6eb0cf2"; } + { locale = "mr"; arch = "linux-x86_64"; sha512 = "e8c492e12556421385150c3ab1387c857a2b6fdecace7277d9a71d614a12f0905662ed838824ab09aded7c7b01d3da891ac60969bcad57a130bc6bb280cc4a27"; } + { locale = "ms"; arch = "linux-i686"; sha512 = "b0da250f5f73dd3a9ef7e0c7eec1ff4a67247f74e4b3afd12f8ff025ada35b737d3d948eb75ce1b0abf48a5553ecd4f464214e85e70b2a8e0478b2b27905ca93"; } + { locale = "ms"; arch = "linux-x86_64"; sha512 = "88e28245914f5cdcf745e85c102e2365b017637f1b08048d74a92a5671dd99d605fea1448e6ae1b1ac19346762be63cc3786b79e0399c9966b915f4d1b2bbd51"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "ec8f67a63cf22401f99c8c1724ddbf18c281780cd6b8b4b872941ec932150c532e04e39f49531e8fed05a3ef29228292b957e05abec99a348d1e91f4b30d1fc9"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "72cb3b2cc2da91ea8b8222f332f4115f87455913abd99fe3b8ca0a290881ad35c5d9e08e5352e380550c6f6775e6e03269f65498887e03c349ab63369101f3a2"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "0cfa7d042bc73e1027a2ac51b87d1f62730b04dad8f87dbd93252c3a11ac3082bbf837cd6b98b1b85a032f638d9d9a400599c9fbd17b565ecff5adaf8ee5b443"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "03456fbfb93971264e75ea2a5db9511610a26269e2d3d31bd25e57133a605d7dc12a8a779f2dd215beaea8a1c93d4f7e6642eed0968d4a99e2b6ace5a1a95b50"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "97951fc2eb41eb89740bf1512db62d26e6ff7b2244e68fde834d2818dc8fea61557f12f6a18f871b509e4d3c1f4f1db2fae53b8da5b87cb0ee93ab44b9e2555e"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "f0b9aa2f67ddced02ebc4e90e91777799f8fa455313132d3e686c26705446321515caa0ca148f0969c1a5e0ee8b7b005630ba76d4bbd6437eacfcdf581e0c0cd"; } + { locale = "or"; arch = "linux-i686"; sha512 = "97333fecf4097ad57c117bd7228037c7b4ef4c5e7d713801f468c951994d3c1ee65c58351ee4dcb7f3ffd193ce05e67d6502b560f8d39f92b9da185dbd322fd9"; } + { locale = "or"; arch = "linux-x86_64"; sha512 = "4714229f654ec610d0ed3ec88f4d55f60de72e67524e6e572279bfa2dd433bf68486f0d0498ee4227bd687d55ac38914ae8b595cae676aab2508ef4790f4fbe7"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "4ee507e28cc5069824a1386fd7d28b7f65a634f1ebd8f3c3387c2753c193fd8059221923504a4032ec07c3fecdcb5a15ac1b2dcdb73307fed357c0d9af8b4437"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "9f1cb5dc4128547bff4bdbc1dc48ca505f1b16dc3e6b42afe5685b9b3659d7e540801a1e71a46a0bdaf2c3476b75b898f6a0ac907cb0f99e425b517b08cdaab0"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "692eca157eccad4392f241d56644806abd2a183dc809480db7d5aa1482d6034b2e367ee382984fb7621cb4ed794c200b3db55c052e1a0f6f01306fd02f3efc14"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "635ffa536d4309da36beee2829d665a9bbef2e2ced5003632c982c0cfca776eae1b2b5be03ae6b59cdb8b22966b2866c8346acb75c49fb47e6ea39c576530817"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "18b8c00f31dd3af18f9aa8ee5ebd28a533830844484ecc373c6477c7d862e8e512b52c5de80c6cfdfd70ff9942593b2d9ee13e03d17f7e2088e550e519e216a6"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "70e01c566b9344a51f2c893e3fa437d65a7930b571a87213fc4371af818c036612f79ad687fc6e0e52397529a5b173aedbccbcc948c7a816786d4ebdefd4438a"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "e5628b348f9aa98bb831628016360b15cb265b749451017fe0e0c09b10355be80a4358442d53e4e18972ea426f8fc90350587859bdcab9c987a1a633abbbdb9d"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "f5ec3e50559608c77f0f96db27e7b32ed26965599489cccd8e49a15665b1d33d3628f2220e9af6d22969183a50d8c7d7cfb7cef208a277d74386bb284413ac87"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "e1c64a105a4a44e8de276cf5d4e7592f4558663981f57277702b112caf0c1f212325932d048dbaba4c593caee52b7932377bd9024bdaa1615107e8b5546d8ea1"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "0e06044ea7869f0e00e0a6bf99c1f2c6bd04a9d87823dbfa8387defa11d479f44e225ee839cbfaf93fa1d45680bd6803620bb7256574ed94522a319a8f1ba5e4"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "9a514be28ac95c17b6694bdcb0243ba772363d9b333420af82be70b947b200177f500e2e3ddb9f010932b9ee0b7271568a6f3ed0bbcadaa904d650e0001f1b96"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "06e10fbdf4ad4c9c13e62c817bc94b9b3522d8b625c65d273f77cf44658b74419ed37ec84453158f136a1597445bbbaaa7cd8d6bda3ed21ddb7c1ceb2420a17e"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "a443e644552326a85895dc6368f91365163342fca8bf6a467496c41bbc2d0934476a5b0be9ae079e7d260a1930a53595f054b1778563b20557de300db383b100"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "f85745244798c0eff4f603a72fdf44d20812614793b7697add27ef06f55a57eb21ec21ec8a7a6ee3228228d6d0ea52f43d6bdac8f88ea310f1561af0381b3ba1"; } + { locale = "si"; arch = "linux-i686"; sha512 = "00d3c6f0fd87ea63ba2bd1870ad422d41a9d984674bb00b07e1c2b60dbe0c24585cc095af68f0728f2bd24af3fc00d5308aa4181d1f4b0460866b26c35b0a187"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "aad8a7b45871e8633a85a0a40adc231d9f57315fc93b683c498699f8549c6d14d097922d7b79e96892fbe4e3454be55845994d826f2cf37d877e3445a049a578"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "c290d2d481e39a2780362b420130b5638e4fc832c09d49e0892f25dc420dea6a3f087a76ed89a5650a8efc7d82d3ec80d0ae3d3ae2e012fe5eb58c18f025bdbc"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "0e64a924486d8c0efb8bed4271a3ef6731f76fc0a7b7e1909215ed2b9635963659427a57342a26b825ce11aa57c2aa54fd75928d27e63dc5bffbce2bc3af75df"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "2cf452873a756785e1468eeb2f9b2e90567c22895bddfdff40b23e69025abd38e1634358a47bc943335e8516fc2f55b939dd2f3ffcbdddeacd3b1c3d39811c46"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "c89b76f586190b2f3d5141c066691652a193d25841e87ae0e5ff5dd938164b95032e50239354e7842960a4a4e8a3a917c0061717acd9fd36e74e739676935736"; } + { locale = "son"; arch = "linux-i686"; sha512 = "ff56f55c9716ec5d7af6b1f22da2b3105d62c821010f95333412befed11146e95abf7952b2fa998b444d6b9ec9777e747b139bbfbf79e16c881cb55e0c49f335"; } + { locale = "son"; arch = "linux-x86_64"; sha512 = "284585a534cb65ef2c3dfb46afd1ab3ff0d9695a553aa4c04caf9487a4f6418b461c872aba2f2e15e6c00010934a7f44424a18ffcafaa76e35d3d2a0d61a7551"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "3a2cb298bef66314afa54b94205de0c9fae75f6f063462060d3381939f2359255492adfae51f8215807723912d94ad55a99be7ec7fb023b39f79a951ffa19bdc"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "62cbbe10959edb18824fd22729bb7d0615441377a546b745ca287b9c2398d6b4e8c4f6f80eda48efe5e808f1f5327862e7a364f1d837901341317536f952bb69"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "c367d4b46752b0574d8842ef211e9f9bdbd68a2f14785740f4cbf785ba82b42c33d6092f3abae2c730be12345d629864b719d534a4c07d5cbec311fbf92df19b"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "16263f6414ecc92e4c7cd0e41457f42217c86d9d373c6f5459b4ddf4b0842d20bdf1b7446a80ba59bb9513f745ab7433c504dd0174ff516c34adbcdc4861b5a9"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "fef1978d41a13c485ca24fcd1358c8421aa6be06730100e66567e6a7021424ffd2c94debd96f6e25cc8d429d7460399e10e346251223b36ee924174bb63aa9b5"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "1c8a7506109569c0298b20fb00f2463d4e78ff04d5b41661c5cd758a6bebf63fc2abec6f1cafa89acaab679764897dbe10e5647c3a32efe2b748a06e6d5af342"; } + { locale = "ta"; arch = "linux-i686"; sha512 = "7060ea65a9a4556bf7b7d438de3a516ca4c20531cc5f3c97d8695f3fbbc94c37060273551a0e04382df84812e170512c143e7f835699e99ca8ef21c50fd47437"; } + { locale = "ta"; arch = "linux-x86_64"; sha512 = "beca8cf5594e6865510c2873c6f2b8a9fcf68440d9fb75979e72ddaa994ea789e9cc5d5829982abfff5932ca4d1a491da53ccc34b7dee38c3114982fcda169b0"; } + { locale = "te"; arch = "linux-i686"; sha512 = "e99f01f99eee95ce73af2b818ebedb05414764cf02f3928bbcde6fe3bf03c71a2043b99088af4912b4033453d6a70adee70a7ca583ab5279d9b5ea194137a156"; } + { locale = "te"; arch = "linux-x86_64"; sha512 = "077e1246824e5ef9b08f83c4589216b9d91e79a6cd8fa7b6da0de9f35807076bf9b29d9e514c58e1437d1a39d32c2ec09eb39176461daec35734d327fddb8a90"; } + { locale = "th"; arch = "linux-i686"; sha512 = "a1eb5970b00c0472a96fcfba4c1a30d3ea7d383b5547cd8156a547a5725e7ca7b42c45a4c3ee749221af8bec65764498cc0693f778b6fe3e186de0580f8187a1"; } + { locale = "th"; arch = "linux-x86_64"; sha512 = "73bace49382ba38af87d77a0ec180e0bc2e9c308208dc0ef8d789ba529d7d4c4d97815924279eded4f7438f4f12bb6e7f92c6474b00d1336bd15d5b48ae87935"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "23ce428ae503c2a9a5471ae84d79b110317d17d59eadbc39aedf3c219285c7c20af7eead04a2de7cb6bd97dea3b9834bf97341f3fe68c79d31a029e547c2d7e6"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "e8a640a5e1dfcb2e118cc20f26ec0bdaca3fde5a9b94cb62b6170a8f0a161ed7d1492cfafd0a5ddbb7f82810c96b589979c31cb98983a9ff26a7f131fc186b99"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "6f6c3ba54d22f90869a9d045ffcec89ccfef7f80745ad89c8200e0cf3d76bd09d379680440f27aaf50ee5eb7c09d29dafb37416a5d939d6f1b44cd9dcd542b03"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "e41efe76cf15b1b3bb51dd3ec1c4c571ad80dac69962c604ed8b717cb442626c76a5ebb078dba5d2e94cf7381461803504c9a3e313401a1d25addba46b46810a"; } + { locale = "uz"; arch = "linux-i686"; sha512 = "c5037d8f96f0b1c98c7e93557872f02506abf78dbec0d3041dd69baac73f6928622d4131d3387d79c5e4edc4b37a9c9f29c5c06d891e3ddd8c78ba3b1c3e8a58"; } + { locale = "uz"; arch = "linux-x86_64"; sha512 = "ee727853b1323a12aebedaae543e18833f1167832baa76c8dc7341d1c50f48751e10c5d3d35c69cf2837cb1cf6fea6162839be045afee22c06ca25833dfc419f"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "463ef27d81df3f7d3d5cf2362e3d8d5144db2bc7c57b0ccec75bbebdae7ed5e366242bd9202adb47bf785dacf161699fbb619d6c35a8bc6eefdfb15af9c9d257"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "efc8bc04e117ce791d5bf491cb5feb78bd6a9c112221590073ce5a801384049e1279f5e051d8475b960c9f7149175345742dce02fd593a95f1ec83724a1b5fb9"; } + { locale = "xh"; arch = "linux-i686"; sha512 = "0283091ad6f61f1d6ed547ec841271d6c222bd02ada832bacae0d5b75019e788043abc97ce90bb94ab30b3ec5414911ae45a86a79b4c1e17efb78ec309103fd5"; } + { locale = "xh"; arch = "linux-x86_64"; sha512 = "1fefd81b65e80705d09612e2fa3996d0a11fbf01c1a49d4ea7769a31b6f89827e1c7acba85c7c5d109387afca5d108f2f2e3f6db36032298c260093687aaf54f"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "f22c920f0959995c3b0985044e364ff3edf191227f70c339ab6a64e2c02e4d0c11064439cd8a9d04917619f0128585cd46c64d12f4109170ff8b2fec51ba8e3d"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "801e25e24fb66d46e650aa5af7ee95999a8410bdac5e8a067192fbef24690f1f0c273ce4836d8cabea637d165cc0a16b2c2f39f4604bf098e3d6cc8e4ea3df07"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "ee2ca9b3bbae6a889d51d0922932e8bf7f523f8ad28b14647cebe19b5526580271ee87a124977089009ab1ca68d70120363bae76127c90e024567fa3cd9cbef1"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "6c53b22c8bf8320a397a4703e9b4568dc955e11e592b216c50e4382bb3dcfdf8810283afc7fe79039d83d5d5ce272d386ba0441472445afdd784a3da9ed61f5d"; } + ]; +} diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d284296d3d93..90d1d7a15026 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -35,14 +35,23 @@ , libheimdal , libpulseaudio , systemd +, channel ? "stable" }: assert stdenv.isLinux; -# imports `version` and `sources` -with (import ./sources.nix); - let + + generated = if channel == "stable" then (import ./sources.nix) + else if channel == "beta" then (import ./beta_sources.nix) + else if channel == "developer" then { version = "48.0a2"; sources = [ + { locale = "en-US"; arch = "linux-i686"; sha512 = "3xa9lmq4phx7vfd74ha1bq108la96m4jyq11h2m070rbcjv5pg6ck2pxphr2im55lym7h6saw2l4lpzcr5xvnfmj1a7fdhszswjl3s4"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "1vndwja68xbn3rfq15ffksagr7fm2ns84cib4bhx654425hp5ghfpiszl7qwyxg8s28srqdfsl9w8hp7qxsz5gmmiznf05zxfv487w7"; } + ]; } + else builtins.abort "Wrong channel! Channel must be one of `stable`, `beta` or `developer`"; + + inherit (generated) version sources; + arch = if stdenv.system == "i686-linux" then "linux-i686" else "linux-x86_64"; @@ -65,7 +74,9 @@ stdenv.mkDerivation { name = "firefox-bin-unwrapped-${version}"; src = fetchurl { - url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; + url = if channel == "developer" + then "http://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-aurora/firefox-${version}.${source.locale}.${source.arch}.tar.bz2" + else "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; inherit (source) sha512; }; @@ -130,8 +141,10 @@ stdenv.mkDerivation { firefox firefox-bin plugin-container \ updater crashreporter webapprt-stub do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/firefox-bin-${version}/$executable" + if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/usr/lib/firefox-bin-${version}/$executable" + fi done find . -executable -type f -exec \ @@ -167,5 +180,6 @@ stdenv.mkDerivation { url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; }; platforms = platforms.linux; + maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index a3c8183fff22..0ab5fbb7c5b6 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio +, cairo, icu, libpng, jemalloc, libpulseaudio , enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead @@ -35,8 +35,8 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { alsaLib nspr nss libnotify xorg.pixman yasm mesa xorg.libXScrnSaver xorg.scrnsaverproto pysqlite xorg.libXext xorg.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification /* libvpx */ /* cairo */ - gstreamer gst_plugins_base icu libpng jemalloc + hunspell libevent libstartup_notification libvpx /* cairo */ + icu libpng jemalloc libpulseaudio # only headers are needed ] ++ lib.optional enableGTK3 gtk3; @@ -50,7 +50,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { "--with-system-nspr" "--with-system-nss" "--with-system-libevent" - #"--with-system-libvpx" # needs 1.5.0 + "--with-system-libvpx" "--with-system-png" # needs APNG support "--with-system-icu" "--enable-system-ffi" @@ -58,7 +58,6 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { "--enable-system-pixman" "--enable-system-sqlite" #"--enable-system-cairo" - "--enable-gstreamer" "--enable-startup-notification" "--enable-content-sandbox" # available since 26.0, but not much info available "--disable-content-sandbox-reporter" # keeping disabled for now diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 64b5b6f44b1f..3372a3891e44 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , gnash, flashplayer, hal-flash -, MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra +, MPlayerPlugin, gecko_mediaplayer, ffmpeg, xorg, libpulseaudio, libcanberra , supportsJDK, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ @@ -45,12 +45,11 @@ let ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin ); - libs = [ gst_all.gstreamer gst_all.gst-plugins-base ] + libs = [ ffmpeg ] ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; - gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; gtk_modules = [ libcanberra ]; in @@ -76,7 +75,7 @@ stdenv.mkDerivation { ]; }; - buildInputs = [makeWrapper] ++ gst-plugins; + buildInputs = [makeWrapper]; buildCommand = '' if [ ! -x "${browser}/bin/${browserName}" ] @@ -91,7 +90,6 @@ stdenv.mkDerivation { --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index baa13254f234..96d263a525e2 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -46,6 +46,5 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index cf895ac5cf42..cc66976b3bad 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Simple, lightweight tool for sniping eBay auctions"; homepage = http://esniper.sourceforge.net; license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 simons ]; + maintainers = with maintainers; [ lovek323 peti ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix new file mode 100644 index 000000000000..b2cc30b6f1f3 --- /dev/null +++ b/pkgs/applications/networking/mpop/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }: + +stdenv.mkDerivation rec { + version = "1.2.4"; + name = "mpop-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/mpop/${name}.tar.xz"; + sha256 = "158zl6clxrl2id4kvdig2lvdvm0vg2byqcgn1dnxfjg5mw16ngwk"; + }; + + buildInputs = [ openssl pkgconfig gnutls gsasl libidn ] + ++ stdenv.lib.optional stdenv.isDarwin Security; + + configureFlags = + stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; + + meta = { + description = "POP3 mail retrieval agent"; + homepage = "http://mpop.sourceforge.net/"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 9813393c4b50..f2c17199f2a6 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng }: +{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: stdenv.mkDerivation (rec { name = "mldonkey-3.1.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl2; }; - buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; + buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ]; configureFlags = [ "--disable-gui" ]; } // (if !ocaml.nativeCompilers then { diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix new file mode 100644 index 000000000000..e9770da63907 --- /dev/null +++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pythonPackages }: + +stdenv.mkDerivation rec { + name = "transmission-remote-cli-${version}"; + version = "1.7.1"; + + src = fetchurl { + url = "https://github.com/fagga/transmission-remote-cli/archive/v${version}.tar.gz"; + sha256 = "1y0hkpcjf6jw9xig8yf484hbhy63nip0pkchx401yxj81m25l4z9"; + }; + + buildInputs = with pythonPackages; [ python wrapPython ]; + pythonPath = [ pythonPackages.curses ]; + + installPhase = '' + install -D transmission-remote-cli $out/bin/transmission-remote-cli + install -D transmission-remote-cli.1 $out/share/man/man1/transmission-remote-cli.1 + wrapPythonPrograms + ''; + + meta = { + description = "Curses interface for the Transmission BitTorrent daemon"; + homepage = https://github.com/fagga/transmission-remote-cli; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 9f810e2c5c65..59ded4b3b9a4 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ simons bjornfor fpletz ]; + maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index b65eb43351ef..53b723f5ec2a 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = base.meta // { description = "A fast incremental file transfer utility"; - maintainers = with stdenv.lib.maintainers; [ simons ehmry kampfschlaefer ]; + maintainers = with stdenv.lib.maintainers; [ peti ehmry kampfschlaefer ]; }; } diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index ea36d59eea7c..4ec939a01290 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Convert MS Word documents to plain text or PostScript"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 844ef9277089..2bc073300e6c 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; - maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ]; + maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.iElectric ]; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index ead347e483ff..8dbb70b00884 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnucash.org/; - maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ]; + maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.iElectric ]; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index 69015dfb2d7b..7b15ec347a92 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 350bb4d713cf..205b502a17f1 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons the-kenny jwiegley ]; + maintainers = with stdenv.lib.maintainers; [ peti the-kenny jwiegley ]; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c2ad0929f016..745dd7cc01ca 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -23,7 +23,7 @@ let langsSpaces = lib.concatStringsSep " " langs; major = "5"; minor = "1"; - patch = "2"; + patch = "3"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -50,14 +50,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1w2m4hfrxb706p8bjfgklqv0j5hnivbvif3vav7sbngp5ms0vgvz"; + sha256 = "039gjg4295x9f3hj0bh32csp63gbfns1sj7wk5mv51szdz50a8zi"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0lr90z5fdg157lcid5w4p0zxi72c4xziiw51kh38kbbqrbb9ykfw"; + sha256 = "0fq9wqzvbs6x003ljvhwbnq7vglzcq3yylndv0kp1mj00dkyz3gm"; }; }; @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "108p8jg22lg3g9wypqv5d71j4vkcpmg2x2w9l2v4z9h10agdrv2l"; + sha256 = "1i077hz24kz1wmnvw9xicmm1mrr9msdxq4lg3y0hy47ar6kiqnnd"; }; # Openoffice will open libcups dynamically, so we link it directly diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index e6296bb045bb..e42c4f1a0a4a 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -23,8 +23,8 @@ let langsSpaces = lib.concatStringsSep " " langs; major = "5"; minor = "0"; - patch = "5"; - tweak = "2"; + patch = "6"; + tweak = "3"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -50,14 +50,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "13cbfiqaycy8cxji5jfwfbgar8l4fzhg3aaggavsrwsmbvrqpbb7"; + sha256 = "0ir97k91p3dxxs85ld1vyxcx7s63w678h9njbmw4y3mpp9f28y8c"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0an081aj63hfhxv0k8h92vly0rnglbcpqax2pinybryk4dnljr36"; + sha256 = "06qwdmdb086852qs6fzb3mm1wixkkkkg39njpvqsrfbdrr2amdjc"; }; }; @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "120vcxpxzs0za76fyfry281ysv6d1ianb37d1yq8py8chkdjkrqy"; + sha256 = "1izc1ynfzg36jyi1ms5lmz9rl5lhlxa8qfa4bg7j2qlf65wdf0a6"; }; # Openoffice will open libcups dynamically, so we link it directly @@ -251,5 +251,6 @@ in stdenv.mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index f2407e1a8333..971c19e9c3d1 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 85339a86733e..19fa277341a5 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 7798b1bef6c1..618a594c8cc5 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index c62ecdcd1e2a..61d03173e0ba 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; homepage = "http://www.tkgate.org/"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 2ca2cab3afd8..430c6629df2a 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.all; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index fdf5c1bd8315..879ad96a9367 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 4497356a29f8..21d3c656d304 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix index 6a8f9e590003..4a126797d697 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pssp/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 8af49621dd98..2000a1e51170 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; homepage = http://wxmaxima.sourceforge.net; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index e9de202a8092..b0e0f334e4d0 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation { meta = { homepage = "http://cvs.nongnu.org"; description = "Concurrent Versions System - a source control system"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 84af1a2fcbb2..93a59228411d 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -165,6 +165,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons the-kenny wmertens ]; + maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index f6966f92eb2f..f572dbcf9238 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "A patch manager implemented on top of Git"; license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ simons the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 6ffcad27dc7f..441c28bd45be 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "TopGit manages large amount of interdependent topic branches"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ marcweber simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 44f72c3f0fe7..ed69f4a42202 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ eelco simons ]; + maintainers = with stdenv.lib.maintainers; [ eelco ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 93a52578db3a..935c37d127e6 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -10,6 +10,8 @@ , x264 , curl +, alsaSupport ? false +, alsaLib , pulseaudioSupport ? false , libpulseaudio }: @@ -18,13 +20,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "0.13.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "00dx8lksj10n0qhyar41y5q0bdrz7jdjwmhj8bdyz7jfkijjr44i"; + sha256 = "05yjm58d6daya1x6v8d73gx8fb20l0icay74nx0v4si2c898vm1j"; }; nativeBuildInputs = [ cmake @@ -39,6 +41,7 @@ in stdenv.mkDerivation rec { qtx11extras x264 ] + ++ optional alsaSupport alsaLib ++ optional pulseaudioSupport libpulseaudio; # obs attempts to dlopen libobs-opengl, it fails unless we make sure diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 371acbed5e60..a5decf213604 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,7 +18,7 @@ let # revision/hash as well. See # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS # for hashes. - version = "5.0.14"; + version = "5.0.20"; forEachModule = action: '' for mod in \ @@ -39,12 +39,12 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "105127"; + extpackRevision = "106931"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! - sha256 = "4a404b0d09dfd3952107e314ab63262293b2fb0a4dc6837b57fb7274bd016865"; + sha256 = "11f40842a56ebb17da1bbc82a21543e66108a5330ebd54ded68038a990aa071b"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -63,7 +63,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "69abac7255b2251a18fd73c0b7c200d5f8ce72a59fa019b53a5cdbf7f2843002"; + sha256 = "0asc5n9an2dzvrd4isjz3vac2h0sm6dbzvrc36hn8ag2ma3hg75g"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ba32ff98b0da..1a1134e84a41 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "cec0df18671adfe62a34d3810543f76f76206b212b2b61791fe026214c77507c"; + sha256 = "1rh1dw0fqz1zhdbpnwxclh1bfj889xh27dm2m23v5wg54bymkfvg"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix new file mode 100644 index 000000000000..8a02e82994ad --- /dev/null +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, which, pkgconfig, libxcb, xcbutilkeysyms +, xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: + +stdenv.mkDerivation rec { + rev = "63a4c23ec6f0b3f62144122a4277d51caf023e4f"; + name = "i3lock-color-2.7_rev${builtins.substring 0 7 rev}"; + src = fetchFromGitHub { + owner = "Arcaena"; + repo = "i3lock-color"; + inherit rev; + sha256 = "1wfp0p85h45l50l6zfk5cr9ynka60vhjlgnyk8mqd5fp0w4ibxip"; + }; + buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 + libev cairo libxkbcommon libxkbfile ]; + makeFlags = "all"; + preInstall = '' + mkdir -p $out/share/man/man1 + ''; + installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man"; + meta = with stdenv.lib; { + description = "A simple screen locker like slock"; + homepage = http://i3wm.org/i3lock/; + maintainers = with maintainers; [ garbas malyn iElectric ]; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix new file mode 100644 index 000000000000..ecf08a529d17 --- /dev/null +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, coreutils, scrot, imagemagick, gawk +, i3lock-color +}: + +stdenv.mkDerivation rec { + rev = "b7196aaff72b90bb6ea0464a9f7b37d140db3230"; + name = "i3lock-fancy-2016-05-05_rev${builtins.substring 0 7 rev}"; + src = fetchFromGitHub { + owner = "meskarune"; + repo = "i3lock-fancy"; + inherit rev; + sha256 = "0az43nqhmbniih3yw9kz5lnky0n7mxylvklsib76s4l2alf6i3ps"; + }; + patchPhase = '' + sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" lock + sed -i -e "s|\`pwd\`|$out/share/i3lock-fancy|" lock + sed -i -e "s|dirname|${coreutils}/bin/dirname|" lock + sed -i -e "s|rm |${coreutils}/bin/rm |" lock + sed -i -e "s|scrot |${scrot}/bin/scrot |" lock + sed -i -e "s|convert |${imagemagick}/bin/convert |" lock + sed -i -e "s|awk |${gawk}/bin/awk|" lock + sed -i -e "s|i3lock |${i3lock-color}/bin/i3lock-color |" lock + ''; + installPhase = '' + mkdir -p $out/bin $out/share/i3lock-fancy + cp lock $out/bin/i3lock-fancy + cp lock*.png $out/share/i3lock-fancy + ''; + meta = with stdenv.lib; { + description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; + homepage = https://github.com/meskarune/i3lock-fancy; + maintainers = with maintainers; [ garbas ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 291f5dbe9d94..8754a14d4a43 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -14,7 +14,8 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++ [ libpulseaudio ] ++ extraLibs; - ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudio}/lib\""; + libpulseaudioPath = stdenv.lib.makeLibraryPath [ libpulseaudio ]; + ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudioPath}\""; makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually postInstall = '' diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 80544b745177..21359e060eca 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -286,7 +286,7 @@ _clone_user_rev() { eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" if test -z "$leaveDotGit"; then echo "removing \`.git'..." >&2 - find "$dir" -name .git\* -print0 | xargs -0 rm -rf + find "$dir" -name .git -print0 | xargs -0 rm -rf else find "$dir" -name .git | while read gitdir; do make_deterministic_repo "$(readlink -f "$gitdir/..")" diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 47b721b030d5..d97ecb32be5d 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -54,9 +54,9 @@ rec { https://gnupg.org/ftp/gcrypt/ http://www.ring.gr.jp/pub/net/ http://gd.tuwien.ac.at/privacy/ - http://mirrors.dotsrc.org/ - http://ftp.heanet.ie/mirrors/ftp.gnupg.org/ - http://www.mirrorservice.org/sites/ftp.gnupg.org/ + http://mirrors.dotsrc.org/gcrypt/ + http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ + http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/ ]; # kernel.org's /pub (/pub/{linux,software}) tree. diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index decfaf63aef9..08888767c771 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -1,31 +1,28 @@ -{stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale}: +{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - version = "1.4.0"; name = "dosemu-fonts-${version}"; + version = "1.4.0"; src = fetchurl { url = "mirror://sourceforge/dosemu/dosemu-${version}.tgz"; sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw"; }; - dontBuild = true; - - buildInputs = [bdftopcf mkfontdir mkfontscale]; - - installPhase = '' + buildCommand = '' + tar xf "$src" --anchored --wildcards '*/etc/*.bdf' '*/etc/dosemu.alias' fontPath="$out/share/fonts/X11/misc/dosemu" mkdir -p "$fontPath" - for i in etc/*.bdf; do + for i in */etc/*.bdf; do fontOut="$out/share/fonts/X11/misc/dosemu/$(basename "$i" .bdf).pcf.gz" echo -n "Installing font $fontOut..." >&2 - bdftopcf $i | gzip -c -9 > "$fontOut" + ${bdftopcf}/bin/bdftopcf $i | gzip -c -9 > "$fontOut" echo " done." >&2 done - cp etc/dosemu.alias "$fontPath/fonts.alias" + cp */etc/dosemu.alias "$fontPath/fonts.alias" cd "$fontPath" - mkfontdir - mkfontscale + ${mkfontdir}/bin/mkfontdir + ${mkfontscale}/bin/mkfontscale ''; meta = { diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index 930c0a22520b..a87c89d1df9f 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fantasque-sans-mono-${version}"; - version = "1.6.5"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono.zip"; - sha256 = "19a82xlbcnd7dxqmpp03b62gjvi33bh635r0bjw2l09lgir6alym"; + sha256 = "0lkky7mmpq6igpjh7lsv30xjx62mwlx27gd9zwcyv3mp2d2b5cvb"; }; buildInputs = [unzip]; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix new file mode 100644 index 000000000000..e719676564af --- /dev/null +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, bash, which }: + +stdenv.mkDerivation rec { + version = "0.7.0"; + name = "nerdfonts-${version}"; + src = fetchFromGitHub { + owner = "ryanoasis"; + repo = "nerd-fonts"; + rev = version; + sha256 = "0q2h8hpkbid8idi2kvzx5bnhyh65y51k02g7xpv3drjqj08cz7y0"; + }; + dontPatchShebangs = true; + buildInputs = [ which ]; + patchPhase = '' + sed -i -e 's|/bin/bash|${bash}/bin/bash|g' install.sh + sed -i -e 's|font_dir="\$HOME/.local/share/fonts|font_dir="$out/share/fonts/truetype|g' install.sh + ''; + installPhase = '' + mkdir -p $out/share/fonts/truetype + ./install.sh + ''; + meta = with stdenv.lib; { + description = "Nerd Fonts is a project that attempts to patch as many developer targeted and/or used fonts as possible. The patch is to specifically add a high number of additional glyphs from popular 'iconic fonts' such as Font Awesome, Devicons, Octicons, and others."; + homepage = "https://github.com/ryanoasis/nerd-fonts"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index cf1c5301ea0d..617ad8e9099b 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-05-09"; + version = "2016-05-16"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { "1v8wdqh6yjicb7bdcxp7v5dimlrny1fiynf4wr6wh65vr738csy2"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "0a8m521r1b4q88d7zffnkgvn9hjxcr7jzwd9qmnzjxfl5r7iiwzr"; + "1nplklc88jn0iqla9ar5vgcq4wvkqkd5pbgvn89757466dl1igiw"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "079a88ybfbbhqslm2hf72lpl2rjr6s6nz3cahay6m8ahaga9y75s"; + "06wmjr4frc83v68abpnad8z9xy4fsjsvwild6bw7816w9rdvdqzw"; meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; diff --git a/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh index 2b130c7e3aff..dc4a4a434b40 100755 --- a/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh +++ b/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -WGET_ARGS='http://download.kde.org/stable/applications/16.04.0/ -A *.tar.xz' +WGET_ARGS='http://download.kde.org/stable/applications/16.04.1/ -A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/kde-5/applications-16.04/srcs.nix b/pkgs/desktops/kde-5/applications-16.04/srcs.nix index 0185465e156c..bf08cda44d5f 100644 --- a/pkgs/desktops/kde-5/applications-16.04/srcs.nix +++ b/pkgs/desktops/kde-5/applications-16.04/srcs.nix @@ -3,2091 +3,2091 @@ { akonadi = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/akonadi-16.04.0.tar.xz"; - sha256 = "01m032iwy3yylxxfmznhn0aly20yc07h8z0ppzgx9gz8smn8351k"; - name = "akonadi-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/akonadi-16.04.1.tar.xz"; + sha256 = "1ik65izkcphc2wvb7hf8qw38fdfxd015hba8kv5ksmyydd01c6qf"; + name = "akonadi-16.04.1.tar.xz"; }; }; akonadi-calendar = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/akonadi-calendar-16.04.0.tar.xz"; - sha256 = "1n06d0m2m553agn95b75sgqaijaaxdrdb6gnv4zizwjxr37cgnwm"; - name = "akonadi-calendar-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/akonadi-calendar-16.04.1.tar.xz"; + sha256 = "0v7mhv4sdxnv2kcmkln0dnjw33f9y82h65wigfs7dv017jcy0ija"; + name = "akonadi-calendar-16.04.1.tar.xz"; }; }; akonadi-search = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/akonadi-search-16.04.0.tar.xz"; - sha256 = "101cbms0mlv86g8ld027ras5bkzfil9avbpvfh2rnlfpm2yp3jgq"; - name = "akonadi-search-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/akonadi-search-16.04.1.tar.xz"; + sha256 = "06gzs0844df0v9x8nmd3ssxg7z2zrdpcfzwjpylis55a93689rxs"; + name = "akonadi-search-16.04.1.tar.xz"; }; }; analitza = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/analitza-16.04.0.tar.xz"; - sha256 = "0ir7siwxp6fi9gwri9ynp497ppg72vrbqnwaq3fk3rf9i4brib3s"; - name = "analitza-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/analitza-16.04.1.tar.xz"; + sha256 = "01kakqh021qk9irf6jl0kk4lph4w8q7xb8y7jxc09abl1cbx8p0w"; + name = "analitza-16.04.1.tar.xz"; }; }; ark = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ark-16.04.0.tar.xz"; - sha256 = "07zvnslnxjz0rq90cvba6lh7gcym4z7817fdz56pjdffpcd0j9xa"; - name = "ark-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ark-16.04.1.tar.xz"; + sha256 = "0qlyl37crqw8rg1wpak0xcmnlwx1n0s8mhsd8xm1rsi2lq11sf64"; + name = "ark-16.04.1.tar.xz"; }; }; artikulate = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/artikulate-16.04.0.tar.xz"; - sha256 = "00y47nzlqlhrv3xx0g0h9is2v7v2vch9vk0hmjb4sgmmri21r47i"; - name = "artikulate-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/artikulate-16.04.1.tar.xz"; + sha256 = "0lpqsf11dw2gcvj51j47cpr3aj9shgnmqgkfd1qsy92d7hp83355"; + name = "artikulate-16.04.1.tar.xz"; }; }; audiocd-kio = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/audiocd-kio-16.04.0.tar.xz"; - sha256 = "1r1x1igihd4bvvjjf8c5xi341y7jn43ba0jh724x82ljhwjjivnh"; - name = "audiocd-kio-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/audiocd-kio-16.04.1.tar.xz"; + sha256 = "0s5hx0yzzz1y3a39ibwsspqgdmcw7921bh2fq8k1xpcy4cdkiavx"; + name = "audiocd-kio-16.04.1.tar.xz"; }; }; baloo-widgets = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/baloo-widgets-16.04.0.tar.xz"; - sha256 = "0j8l34q0nmprw0y7hcsy5rxisv19zjf757dhy7rwlbvs72a8fyn2"; - name = "baloo-widgets-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/baloo-widgets-16.04.1.tar.xz"; + sha256 = "1j5c70xi13c7drc2ndlzkz0nznbxlw0rrlgqpp7yxdprlp2x84g4"; + name = "baloo-widgets-16.04.1.tar.xz"; }; }; blinken = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/blinken-16.04.0.tar.xz"; - sha256 = "1fi0vnxc31nd2hk7yx4gbxlmwsxsrw7yidblv3ly6j3q65ra4cgp"; - name = "blinken-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/blinken-16.04.1.tar.xz"; + sha256 = "0sj3ih0izm9vgy2k40qh5x9navcg2rhh6sn7nxnwwj9gh16g4q0a"; + name = "blinken-16.04.1.tar.xz"; }; }; bomber = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/bomber-16.04.0.tar.xz"; - sha256 = "0rv2mfn8l78zfb0apxpgqfw2zp0zvgrjx5fdqn7mhah6w2wr421i"; - name = "bomber-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/bomber-16.04.1.tar.xz"; + sha256 = "04flkvlmmsx8l5r4mcsp36b1b4rfbsw1108k7mcfd98bzx8af6r6"; + name = "bomber-16.04.1.tar.xz"; }; }; bovo = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/bovo-16.04.0.tar.xz"; - sha256 = "1z0wkmlvx052drdjkc3scmbqd299vq26l15qdykf7k7i69abpa91"; - name = "bovo-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/bovo-16.04.1.tar.xz"; + sha256 = "1wynbs4p20awn5ssik36205xswlvpk17x9wmvpf6yhrpwdsyac1l"; + name = "bovo-16.04.1.tar.xz"; }; }; calendarsupport = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/calendarsupport-16.04.0.tar.xz"; - sha256 = "1l4hr59r5ns5lhvr4622i8lm99933j72v6fhjv4hmw1yvy0d97kf"; - name = "calendarsupport-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/calendarsupport-16.04.1.tar.xz"; + sha256 = "0djmr6anfwcvxq6sqg4zwvvjcpak6x16m1wnbfbr2d8b8b2hbv2h"; + name = "calendarsupport-16.04.1.tar.xz"; }; }; cantor = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/cantor-16.04.0.tar.xz"; - sha256 = "195b974swl1aw9g9l2d4si7zvhb6jahrvkkgjyyzqrkgqj10qjgh"; - name = "cantor-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/cantor-16.04.1.tar.xz"; + sha256 = "0296jj14mygx5v0q8byyks87q6gx04w6k2k6gqqfbnalimfrxyh2"; + name = "cantor-16.04.1.tar.xz"; }; }; cervisia = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/cervisia-16.04.0.tar.xz"; - sha256 = "049df86n0mj0jcxlwi64cf1ijm5bilgq0dn0b1av3ivb53c2k8c1"; - name = "cervisia-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/cervisia-16.04.1.tar.xz"; + sha256 = "1w2qdbdgjmm8gavwg5r9law86s3mayqbwa8y22bika2ffgikb6aw"; + name = "cervisia-16.04.1.tar.xz"; }; }; dolphin = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/dolphin-16.04.0.tar.xz"; - sha256 = "1cnvlcn5cgy1paxrcv9x8dnjvnivn86pr93gmscwl83p9dg3ly37"; - name = "dolphin-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/dolphin-16.04.1.tar.xz"; + sha256 = "19g053y6icazq58zh450qhnxy60j787qgvfaic389czcvbf0rn9i"; + name = "dolphin-16.04.1.tar.xz"; }; }; dolphin-plugins = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/dolphin-plugins-16.04.0.tar.xz"; - sha256 = "0r58i2w7jiznh190jqvdb7rdgyk3rnwb34hxbid02w042hsf06gp"; - name = "dolphin-plugins-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/dolphin-plugins-16.04.1.tar.xz"; + sha256 = "0kbypywyk7v13bnvsdaa6g7ln3q19v3hsymakxm3gylghn6ii0ac"; + name = "dolphin-plugins-16.04.1.tar.xz"; }; }; dragon = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/dragon-16.04.0.tar.xz"; - sha256 = "0b81wfpxzx4wnawvkhsj16ijvdajq528m24iswxdss1ya7hcszm2"; - name = "dragon-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/dragon-16.04.1.tar.xz"; + sha256 = "063ylb10y1v9ml6lgycn5f1qrdda00147s35b3d3vslw8l1xcwj8"; + name = "dragon-16.04.1.tar.xz"; }; }; eventviews = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/eventviews-16.04.0.tar.xz"; - sha256 = "1gyslz02y0i9fcrxg7xxcag7h7qd1g9amn2ry2rygpxcl98bzcz7"; - name = "eventviews-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/eventviews-16.04.1.tar.xz"; + sha256 = "1yrlr5xa21vsbl0by706plknzi2mkg9zi9w0702lyvj1y2bm3yw3"; + name = "eventviews-16.04.1.tar.xz"; }; }; ffmpegthumbs = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ffmpegthumbs-16.04.0.tar.xz"; - sha256 = "0jjq5gm4avi2lli3r6zd1m4v6nzc4dxd2msm6lr35nkhadamihjj"; - name = "ffmpegthumbs-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ffmpegthumbs-16.04.1.tar.xz"; + sha256 = "1694bxkmgzb5qsibl3dcc510xz96gjb8mrzdsmi84gbwhrnhaahw"; + name = "ffmpegthumbs-16.04.1.tar.xz"; }; }; filelight = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/filelight-16.04.0.tar.xz"; - sha256 = "07k1fkb5nangzzxl00jkz9jqrlzi8g9dvp1qm8s5vbpfww6gaq4a"; - name = "filelight-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/filelight-16.04.1.tar.xz"; + sha256 = "1gvk9y2iy48c63bgq1d38iix70jz429d0fsgqk9k1h6c5lmywf3w"; + name = "filelight-16.04.1.tar.xz"; }; }; gpgmepp = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/gpgmepp-16.04.0.tar.xz"; - sha256 = "0k5wawmqmpsjg3q4wcg54xvs0rlkv26398gkvfhvw5kixcd71kys"; - name = "gpgmepp-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/gpgmepp-16.04.1.tar.xz"; + sha256 = "09cqnqqwh0lzfcip09pdwa6k0pf4hhl978jiry4dsvjmiymlzhac"; + name = "gpgmepp-16.04.1.tar.xz"; }; }; granatier = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/granatier-16.04.0.tar.xz"; - sha256 = "1j5jzhyfp7jy3nzj6y2s8gy4hm1q8z3vwlx7cd7j936vk27r4vw2"; - name = "granatier-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/granatier-16.04.1.tar.xz"; + sha256 = "0350v1jkizybicl9qqkjks0sjvnpxc09jzjbz916ya1zakw48m7i"; + name = "granatier-16.04.1.tar.xz"; }; }; grantleetheme = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/grantleetheme-16.04.0.tar.xz"; - sha256 = "0dccrqa8nsjjljwi9z9yfx71cr6ds74k8kzkyc2bgw4zdcmw62kg"; - name = "grantleetheme-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/grantleetheme-16.04.1.tar.xz"; + sha256 = "1205fzj49yi5nw4k28njn52jxzq12lpgdb9dz5f6g3c0zgzxdfbf"; + name = "grantleetheme-16.04.1.tar.xz"; }; }; gwenview = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/gwenview-16.04.0.tar.xz"; - sha256 = "16viz9z4r3mllc4yfw7rirq9hjaxsbfv0vgckrc4mvwbpjhhbl88"; - name = "gwenview-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/gwenview-16.04.1.tar.xz"; + sha256 = "1piw2crfhxig5smscz1ch6ifbadma7fylwxa98kp9p0srslmagx7"; + name = "gwenview-16.04.1.tar.xz"; }; }; incidenceeditor = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/incidenceeditor-16.04.0.tar.xz"; - sha256 = "08fvqpr12295dinarcfrh2m95591h1hiqyllc36asc8pwzisfb9f"; - name = "incidenceeditor-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/incidenceeditor-16.04.1.tar.xz"; + sha256 = "16bzxsw09spk75zpgj9q49yvl4302zi78syi0g521gln4jjc730q"; + name = "incidenceeditor-16.04.1.tar.xz"; }; }; jovie = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/jovie-16.04.0.tar.xz"; - sha256 = "0xvwgpqzh7h2vl2dpzninz4r93z18giwwij4yffl8740k4fk5id5"; - name = "jovie-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/jovie-16.04.1.tar.xz"; + sha256 = "10d5w5z2fgbfr263m6jvq6li7q3fxr03h4s51j2vspniyy8rq6v8"; + name = "jovie-16.04.1.tar.xz"; }; }; juk = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/juk-16.04.0.tar.xz"; - sha256 = "0y4bfq6qza84s0nk6fajwg1bmn0kzjnjj2zjglas322fh8vbdz4n"; - name = "juk-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/juk-16.04.1.tar.xz"; + sha256 = "1amxykyc97iw5ldflk9h97jnkm6zm1v48il0sm5xknlhiv7qma0v"; + name = "juk-16.04.1.tar.xz"; }; }; kaccessible = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kaccessible-16.04.0.tar.xz"; - sha256 = "1glwmqaafvcm6gjvs2m0d2iaglqz3y1mj3g0jqips4sx32zbsgxf"; - name = "kaccessible-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kaccessible-16.04.1.tar.xz"; + sha256 = "0l3xrkgmfnd5pfa9jfx65f1iy4ynrx266ga6if24nkk8mp1l6hqk"; + name = "kaccessible-16.04.1.tar.xz"; }; }; kaccounts-integration = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kaccounts-integration-16.04.0.tar.xz"; - sha256 = "0h84nbibzzlxs0vpklij0yczs2c53gqwdx5yvfhnipbi285wy7km"; - name = "kaccounts-integration-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kaccounts-integration-16.04.1.tar.xz"; + sha256 = "02is41d5zchqri8v767rzb6bp2apq8z1wwgqs2v4iaylh49fbnrf"; + name = "kaccounts-integration-16.04.1.tar.xz"; }; }; kaccounts-providers = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kaccounts-providers-16.04.0.tar.xz"; - sha256 = "1bmc5kycmw7r84jy7si0dap6lq011lbq050ldhba6ix5dnx0nsws"; - name = "kaccounts-providers-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kaccounts-providers-16.04.1.tar.xz"; + sha256 = "1f3r48kzhnrs6af6zql1gcj5vhzs4kcmp5zj97bkh0kp5d9sqrqk"; + name = "kaccounts-providers-16.04.1.tar.xz"; }; }; kajongg = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kajongg-16.04.0.tar.xz"; - sha256 = "0fasvm8x3cgw0gv1ac38xp12ncms2nf9b5r8hprjxmb5485p7mh6"; - name = "kajongg-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kajongg-16.04.1.tar.xz"; + sha256 = "0sakgaaq99s1rfrrlpi81rpxrcdyhqpigczsxjw79amm368yw2va"; + name = "kajongg-16.04.1.tar.xz"; }; }; kalarmcal = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kalarmcal-16.04.0.tar.xz"; - sha256 = "03ylk2kaidqi54zmz84alqhzkiq87kw5a0f7qfj76r8mf7lmnlki"; - name = "kalarmcal-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kalarmcal-16.04.1.tar.xz"; + sha256 = "1qg2hdybcss86l92xnzcgc60rdzgg8cp07rk59lrskipj12fzpp5"; + name = "kalarmcal-16.04.1.tar.xz"; }; }; kalgebra = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kalgebra-16.04.0.tar.xz"; - sha256 = "0clcgq89wh451dj7nib7pbbppncslnzkn3532hyw347ckisphyvc"; - name = "kalgebra-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kalgebra-16.04.1.tar.xz"; + sha256 = "1mbbsi193vwig65xbk4c865xqbs3mxm16x7d8fxdq1j6glwa6l2j"; + name = "kalgebra-16.04.1.tar.xz"; }; }; kalzium = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kalzium-16.04.0.tar.xz"; - sha256 = "1cqkgkc5m8fz7l18x0ybh85ldif15mc9gzdak8g2mdjcacxsm9nz"; - name = "kalzium-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kalzium-16.04.1.tar.xz"; + sha256 = "1rx57fsyc66gpsvzcig6mymhlxc4nf3cjg8bkmq89avhbpkzhzri"; + name = "kalzium-16.04.1.tar.xz"; }; }; kamera = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kamera-16.04.0.tar.xz"; - sha256 = "0n6h7z9dzv2fhwmk41smzv6l1db61334drcgivjmkblmglbdi473"; - name = "kamera-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kamera-16.04.1.tar.xz"; + sha256 = "1s6fpzna6pvbqzcvd799r87d92l460b4zws84yik811dfqrcpf3s"; + name = "kamera-16.04.1.tar.xz"; }; }; kanagram = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kanagram-16.04.0.tar.xz"; - sha256 = "0g2d7zcb76a01hgbk0aid64xp8qym64a76k3vixwqzjdwf3jbcfr"; - name = "kanagram-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kanagram-16.04.1.tar.xz"; + sha256 = "0y80gpdq17cbiwih3gndhb8qyfa84f305hisgslrdqx39nai0fmf"; + name = "kanagram-16.04.1.tar.xz"; }; }; kapman = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kapman-16.04.0.tar.xz"; - sha256 = "1arb6jiy1ikn96rsvmd87fj35kxnpdq7s0nxn747psc3wvms43wr"; - name = "kapman-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kapman-16.04.1.tar.xz"; + sha256 = "0im0gszmsvxfcjmlcpqxc5ik8kr890b7kd83lnydkm50xxmyk9x0"; + name = "kapman-16.04.1.tar.xz"; }; }; kapptemplate = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kapptemplate-16.04.0.tar.xz"; - sha256 = "0bqrhzl0w499m8370idv76yz1f8n5wv418y82abd2f9qip0xk1sc"; - name = "kapptemplate-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kapptemplate-16.04.1.tar.xz"; + sha256 = "14jq6q1bsmqp7vz7lwi4h7hqc8zyghl2mbyl1yyhv5hbvr00b2w3"; + name = "kapptemplate-16.04.1.tar.xz"; }; }; kate = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kate-16.04.0.tar.xz"; - sha256 = "13v8a4p3fnymgi682kfhfvd2h71xmhb5i1739cbf9baixsggcbnh"; - name = "kate-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kate-16.04.1.tar.xz"; + sha256 = "0192dqf22rkr3v5ywxadjx7nmwrih336dxlma3nxprw8ng3ppacm"; + name = "kate-16.04.1.tar.xz"; }; }; katomic = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/katomic-16.04.0.tar.xz"; - sha256 = "1g47gxxxy52mdf3lra98fibg93s302vavp0fi73gdy09wvm4nfk1"; - name = "katomic-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/katomic-16.04.1.tar.xz"; + sha256 = "1flg9kkrv8z49amiay88010aj76s0x6f14w8701zlinl238jrp08"; + name = "katomic-16.04.1.tar.xz"; }; }; kblackbox = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kblackbox-16.04.0.tar.xz"; - sha256 = "0jjyffs1aijvqan9cva6d9cfnskqp4ynvpqkx1rw2mqnvadm59g3"; - name = "kblackbox-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kblackbox-16.04.1.tar.xz"; + sha256 = "0a6bdyqla3ip981lpmj81q3wbr6ca2slpwzfs599hadzmrwxmlxw"; + name = "kblackbox-16.04.1.tar.xz"; }; }; kblocks = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kblocks-16.04.0.tar.xz"; - sha256 = "1c16s7lq4j6ixq8rvqf5cadag8cabzjgyw9hiwqix9k3csbnh5br"; - name = "kblocks-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kblocks-16.04.1.tar.xz"; + sha256 = "00q70ja45g38n3l62iivyi9pzb124cvsiyszsb4b2qcvi3akzabz"; + name = "kblocks-16.04.1.tar.xz"; }; }; kblog = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kblog-16.04.0.tar.xz"; - sha256 = "1hhh2f8rj0nfzm1imckhk3iczzda6q1nxnd3v6bp0dnxh14yanwk"; - name = "kblog-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kblog-16.04.1.tar.xz"; + sha256 = "0yib39p27xxbsdwazq5jwb2jaqsnf7c456y4js61hm2qh415nlkk"; + name = "kblog-16.04.1.tar.xz"; }; }; kbounce = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kbounce-16.04.0.tar.xz"; - sha256 = "0sfrlyqkig089kn1d8fvfhl18hwrc3jygbl9sx0r87wg25w8niv7"; - name = "kbounce-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kbounce-16.04.1.tar.xz"; + sha256 = "0h615ijxm7rj1m89aaz8g7ikcysv10mm2w4r1x5qdf7ihq1nxn4a"; + name = "kbounce-16.04.1.tar.xz"; }; }; kbreakout = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kbreakout-16.04.0.tar.xz"; - sha256 = "05rbxhifx8nwma1nm0ji28d3jyg6kadgb90ma573xj9i4b97ak74"; - name = "kbreakout-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kbreakout-16.04.1.tar.xz"; + sha256 = "18yb93jfy74ybmwd6fp2xca15zgzk0hiqzaan89a0fd02ldd4aw9"; + name = "kbreakout-16.04.1.tar.xz"; }; }; kbruch = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kbruch-16.04.0.tar.xz"; - sha256 = "1ncfcdcdvxd992q1brqqfq107x8q2y0235dx7z2hxvclf94npigj"; - name = "kbruch-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kbruch-16.04.1.tar.xz"; + sha256 = "03dm0q0wifz0psj51r3dxgg2qrcpvj207mw036kvqzsxgn6fcdx5"; + name = "kbruch-16.04.1.tar.xz"; }; }; kcachegrind = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kcachegrind-16.04.0.tar.xz"; - sha256 = "0jks1gc03s2qc6x9klc6x2j8jcx05n13qn0l5qp4sny93mxxyxlv"; - name = "kcachegrind-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kcachegrind-16.04.1.tar.xz"; + sha256 = "11f6l8189vnw3brpzgd0vsv3hrra9ha1vdmzfk5haq092rxyw26s"; + name = "kcachegrind-16.04.1.tar.xz"; }; }; kcalc = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kcalc-16.04.0.tar.xz"; - sha256 = "15w0856jqh7vrg3a88b1mcqw63gmady3sdl1zish719jg5hjgw9i"; - name = "kcalc-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kcalc-16.04.1.tar.xz"; + sha256 = "1wldinbl4fkgw9idvbdr4gcmnsbjfgfakg2mn9axjs98iis1igyx"; + name = "kcalc-16.04.1.tar.xz"; }; }; kcalcore = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kcalcore-16.04.0.tar.xz"; - sha256 = "1cnp93sgh13aiycwfw9zayzhk6wcxawa8cnvliyfn05809cjffwq"; - name = "kcalcore-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kcalcore-16.04.1.tar.xz"; + sha256 = "0cp2pjfg34zg6s83dl5dkgn4ssdj1295vrzkidkcdxj5br1z767s"; + name = "kcalcore-16.04.1.tar.xz"; }; }; kcalutils = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kcalutils-16.04.0.tar.xz"; - sha256 = "0gz83k11idib66n9m02kql6blfv6h39slmqsx6fkbd6vlajz9wn7"; - name = "kcalutils-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kcalutils-16.04.1.tar.xz"; + sha256 = "1hlqpklni83b0vg53b8gpsirnn04q8hvk364kgq532czvkf50lyw"; + name = "kcalutils-16.04.1.tar.xz"; }; }; kcharselect = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kcharselect-16.04.0.tar.xz"; - sha256 = "07gnsdnxm84whi2syyj2h2n6sq99mhjx53dndcm3y8c1ry4d2qp5"; - name = "kcharselect-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kcharselect-16.04.1.tar.xz"; + sha256 = "05wb5is2srwy01v88nxbdvkkqw798wr8s1k8s9mwa7l5jsa97rvp"; + name = "kcharselect-16.04.1.tar.xz"; }; }; kcolorchooser = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kcolorchooser-16.04.0.tar.xz"; - sha256 = "0l2ahmqzrl1s3vsiwbgb05rsazqcg5zk8h5n2lg00q30glly24x3"; - name = "kcolorchooser-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kcolorchooser-16.04.1.tar.xz"; + sha256 = "0d9f8s5lg7j2l6sl4pivl01fmgal42frmx49cp5hhshqfxqc30kv"; + name = "kcolorchooser-16.04.1.tar.xz"; }; }; kcontacts = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kcontacts-16.04.0.tar.xz"; - sha256 = "1ysism44p2ql95q0fkypa3w1r0fps720yj539a61g60fvdij2nsn"; - name = "kcontacts-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kcontacts-16.04.1.tar.xz"; + sha256 = "007a02dwj71id5n3jmbj11hwqyfcy6zpygqh061s5symaqpswrw6"; + name = "kcontacts-16.04.1.tar.xz"; }; }; kcron = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kcron-16.04.0.tar.xz"; - sha256 = "0dkrb4h5fnzh81c1i38j62ik5lqfai0hhyjs3zrh9av6ylzmb9yc"; - name = "kcron-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kcron-16.04.1.tar.xz"; + sha256 = "0rfwg5ywgn242jfm85lvqirdxrazc4yw2nhkhvdylph9ngwqc2bn"; + name = "kcron-16.04.1.tar.xz"; }; }; kde-baseapps = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-baseapps-16.04.0.tar.xz"; - sha256 = "1py7j2j2nnxih0cyyyv27g6svrga80v4hqsi5gafk843zln5v836"; - name = "kde-baseapps-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-baseapps-16.04.1.tar.xz"; + sha256 = "10rfn5kc6kdsp9dw0n191h87p7z60vyfq0cal233x722lmzflsjj"; + name = "kde-baseapps-16.04.1.tar.xz"; }; }; kdebugsettings = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdebugsettings-16.04.0.tar.xz"; - sha256 = "0madfi735qas20dpfx92jfcl6mcl2sfr0z5wxby5k1p1xc0rmm32"; - name = "kdebugsettings-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdebugsettings-16.04.1.tar.xz"; + sha256 = "158p1mnb0mi8ka2nc5bkmz5cw6ki4mh67ry75dxxdgnnnfcqagrc"; + name = "kdebugsettings-16.04.1.tar.xz"; }; }; kde-dev-scripts = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-dev-scripts-16.04.0.tar.xz"; - sha256 = "1p4aklykn463f0h6kn0brhm81lli5rl5sh4d5fgaj6r3b5s0l2gf"; - name = "kde-dev-scripts-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-dev-scripts-16.04.1.tar.xz"; + sha256 = "10vxiz1h9lcd133sffrdillq9ssn2b49phmx66ll9c7iawsvgs4q"; + name = "kde-dev-scripts-16.04.1.tar.xz"; }; }; kde-dev-utils = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-dev-utils-16.04.0.tar.xz"; - sha256 = "0ldmmww497q2lmlj16jm6k2p89931bgn841rvaj7rb6pclms1l49"; - name = "kde-dev-utils-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-dev-utils-16.04.1.tar.xz"; + sha256 = "0ybd7kckxyc5an9kn6r31his87mvgc9cbadwd5jm9fh2v4vy8da3"; + name = "kde-dev-utils-16.04.1.tar.xz"; }; }; kdeedu-data = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdeedu-data-16.04.0.tar.xz"; - sha256 = "01ps6iqdc685q3xpyjfcjy98hz29max0gl9kfppzq4nzx3hiykj9"; - name = "kdeedu-data-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdeedu-data-16.04.1.tar.xz"; + sha256 = "0ns362vz424s4klrk9qllg0qmb41whrhv25xrb27il73nla27cn2"; + name = "kdeedu-data-16.04.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-mobipocket-16.04.0.tar.xz"; - sha256 = "0lzj4xyjs91404k7h0mcbg8vc2jd5h2r83w83iq76b4cy2gmqhhd"; - name = "kdegraphics-mobipocket-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdegraphics-mobipocket-16.04.1.tar.xz"; + sha256 = "0d4yd4zfkbpm7qixkiiz7lpg66afvdfsz621fby59n9i3nla5b8d"; + name = "kdegraphics-mobipocket-16.04.1.tar.xz"; }; }; kdegraphics-strigi-analyzer = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-strigi-analyzer-16.04.0.tar.xz"; - sha256 = "0ibkbr7z5lz42cz65hwx0j4sjqy7k8rzj304d8ra2732mazamapj"; - name = "kdegraphics-strigi-analyzer-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdegraphics-strigi-analyzer-16.04.1.tar.xz"; + sha256 = "01j4ymrvd82xzfpsdl76nr7xjiaji9ki8iv41qkp32frvxj0g48z"; + name = "kdegraphics-strigi-analyzer-16.04.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-thumbnailers-16.04.0.tar.xz"; - sha256 = "0qw0bq9gkasrkd4mxh30k15k50d28jkl7sc88akys91id1wn8mcb"; - name = "kdegraphics-thumbnailers-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdegraphics-thumbnailers-16.04.1.tar.xz"; + sha256 = "1fqj0kgq9cpq8bv4riwqfbczc6cjfv4s2han7jy267n2lgzi7kpa"; + name = "kdegraphics-thumbnailers-16.04.1.tar.xz"; }; }; kde-l10n-ar = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ar-16.04.0.tar.xz"; - sha256 = "1rb8vqq06f83w5q81d1r5qf76yzr85kf826a0a47hfly2plaw3lc"; - name = "kde-l10n-ar-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ar-16.04.1.tar.xz"; + sha256 = "0in3bzbhdalpyc366sngz2al5ycv5r3a3n1dmxzn5jw4gzr32rbg"; + name = "kde-l10n-ar-16.04.1.tar.xz"; }; }; kde-l10n-ast = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ast-16.04.0.tar.xz"; - sha256 = "1lzlwyxyi9dgds8sgghzjlhkbd18w9plbli4yqrglfbxl8yc60xl"; - name = "kde-l10n-ast-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ast-16.04.1.tar.xz"; + sha256 = "0xn1759ccm9kvvynjf9ndav0q7fg3k20hawdmfisyan6zdsnih7i"; + name = "kde-l10n-ast-16.04.1.tar.xz"; }; }; kde-l10n-bg = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-bg-16.04.0.tar.xz"; - sha256 = "026apn9qz3k29dvk1pvylh9ha1m637gjhnpjmj6i03frh2ai7fqs"; - name = "kde-l10n-bg-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-bg-16.04.1.tar.xz"; + sha256 = "1fvnlqljp0swx1k1lasy0k8bz4cpj8z0kwrnj5zagpys6bg5dlxh"; + name = "kde-l10n-bg-16.04.1.tar.xz"; }; }; kde-l10n-bs = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-bs-16.04.0.tar.xz"; - sha256 = "0j1i6794rvdpzzqmjqcig6wh1ljrnvygwm6zr0yin4didadm78xm"; - name = "kde-l10n-bs-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-bs-16.04.1.tar.xz"; + sha256 = "0cvqmh275j92mdc4wwrfpgds4lnzqdd8mzv2w317n7p351nklwfd"; + name = "kde-l10n-bs-16.04.1.tar.xz"; }; }; kde-l10n-ca = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ca-16.04.0.tar.xz"; - sha256 = "08wrdlrdqp0w7dg2ygk9pi78ynj6ipzlyxx2mqyplnj1hx2jgrw4"; - name = "kde-l10n-ca-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ca-16.04.1.tar.xz"; + sha256 = "1yzqvd3nvgvxlr49y143hs77pjrr2rb91mc3xyinrqls0awq4j4b"; + name = "kde-l10n-ca-16.04.1.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.04.0"; + version = "ca_valencia-16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ca@valencia-16.04.0.tar.xz"; - sha256 = "0a9dyvqng3gbn5kljq0av93b6wd7l04i57gmac0vz3qja9fyw7px"; - name = "kde-l10n-ca_valencia-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ca@valencia-16.04.1.tar.xz"; + sha256 = "0xv9akrnvlf983qjj9l63h9f0ppk61yi1lrhpp8ba9i57b2z0apy"; + name = "kde-l10n-ca_valencia-16.04.1.tar.xz"; }; }; kde-l10n-cs = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-cs-16.04.0.tar.xz"; - sha256 = "1ai2p9hg7l7s77k45gmxdn3lqnv4mh8gdsxhbjdpqcmwxyc2zgwf"; - name = "kde-l10n-cs-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-cs-16.04.1.tar.xz"; + sha256 = "0ig21rl11m9c73v3vkn3q13zw2xv39ymxdq4hnm96d323pp3lrhp"; + name = "kde-l10n-cs-16.04.1.tar.xz"; }; }; kde-l10n-da = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-da-16.04.0.tar.xz"; - sha256 = "05ncpim4fpyiv2cca4dvn7d8sd031xjc4f85p1yf9inwbsj4nf5x"; - name = "kde-l10n-da-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-da-16.04.1.tar.xz"; + sha256 = "0m6pgyib8nbmrvqm7asb9dj64552mkadh6wfxqz7k5ylahar82l5"; + name = "kde-l10n-da-16.04.1.tar.xz"; }; }; kde-l10n-de = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-de-16.04.0.tar.xz"; - sha256 = "17cbibk6lqiabyyinnj9by0jjhqzlkn09zr8m0h967704fkhnzjc"; - name = "kde-l10n-de-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-de-16.04.1.tar.xz"; + sha256 = "1jp6iqlrxpxr3xqibph505p9qn84m3s4sq2bbfk3sb256w1qzh88"; + name = "kde-l10n-de-16.04.1.tar.xz"; }; }; kde-l10n-el = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-el-16.04.0.tar.xz"; - sha256 = "15raxjj0cnnrqwr8cfdww5a93k7c17lakb88z65lpafvhnyf6mry"; - name = "kde-l10n-el-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-el-16.04.1.tar.xz"; + sha256 = "07m80cyi8nfk1ih05dhj22gg03wjb4zv12ywqamym4pl5k08wgls"; + name = "kde-l10n-el-16.04.1.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.04.0"; + version = "en_GB-16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-en_GB-16.04.0.tar.xz"; - sha256 = "17dbbwmwm5mqxc0wbc27ys9izfh8jkjbvc2vnw8gd1kxqgfqy49l"; - name = "kde-l10n-en_GB-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-en_GB-16.04.1.tar.xz"; + sha256 = "0936bai72v2fj84rnd7vr2ljwdy6x33m7iiall69cgkam4c26vyz"; + name = "kde-l10n-en_GB-16.04.1.tar.xz"; }; }; kde-l10n-eo = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-eo-16.04.0.tar.xz"; - sha256 = "03bz9hpm36lmh1g2560r2xy8fais0f7wdqj58z82kvxb2lqwr2jg"; - name = "kde-l10n-eo-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-eo-16.04.1.tar.xz"; + sha256 = "1rrhpfq24cgq0mgawmk5vz0v033gnfa68phlgsa1ynmm42cg6vn9"; + name = "kde-l10n-eo-16.04.1.tar.xz"; }; }; kde-l10n-es = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-es-16.04.0.tar.xz"; - sha256 = "0kqvw2a7lgp9qy3ph6f6kxl3mvqlq19r99821w0hbv7qk2p9frbs"; - name = "kde-l10n-es-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-es-16.04.1.tar.xz"; + sha256 = "07rzyhr4hha38vdl30fhb4slan7w4fwryg59vf9fj4pb8x97qisq"; + name = "kde-l10n-es-16.04.1.tar.xz"; }; }; kde-l10n-et = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-et-16.04.0.tar.xz"; - sha256 = "1x483l2a39da9kbhh8k20s84x6zjy27f760i7y9mmkah5ryxbn68"; - name = "kde-l10n-et-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-et-16.04.1.tar.xz"; + sha256 = "1nlnsw2z0iq9vxkclkrhkq6k3qzqq7xrg4yl4159fsdfvby11m1d"; + name = "kde-l10n-et-16.04.1.tar.xz"; }; }; kde-l10n-eu = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-eu-16.04.0.tar.xz"; - sha256 = "0z0bqnywx9crk829vdixg5kswf208qmcicvi72fiz2cwjwcqhbyg"; - name = "kde-l10n-eu-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-eu-16.04.1.tar.xz"; + sha256 = "0wjjq7gkmlnmwwbkqxpn3ddx335cn0g4443h1m7ddm823mqf5prv"; + name = "kde-l10n-eu-16.04.1.tar.xz"; }; }; kde-l10n-fa = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fa-16.04.0.tar.xz"; - sha256 = "1m4vdmzy94jg3rky8d8rbqrkyja6rv6jybfh1q0ydpihz9k5p5hk"; - name = "kde-l10n-fa-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-fa-16.04.1.tar.xz"; + sha256 = "1ikjkn8ikp959bzq32r05irxzb37mswhjps4244cgv2wzr79jinh"; + name = "kde-l10n-fa-16.04.1.tar.xz"; }; }; kde-l10n-fi = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fi-16.04.0.tar.xz"; - sha256 = "1bcblmd3dsx6slvia5x9ammw4054wsyjk6mdzgcabyi86xmm1xj8"; - name = "kde-l10n-fi-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-fi-16.04.1.tar.xz"; + sha256 = "039v26478iqk6z2j9z2mblvl9ypmnl69xp8fybyp8nhlmakmxffp"; + name = "kde-l10n-fi-16.04.1.tar.xz"; }; }; kde-l10n-fr = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fr-16.04.0.tar.xz"; - sha256 = "1311ymksp37l1yfz8921zvbrcd4g2pygfhilmmjrww0chizxjdjf"; - name = "kde-l10n-fr-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-fr-16.04.1.tar.xz"; + sha256 = "0cmw70kvzi365sj5rlkxjj69h5si8bygyl6c6nia1v9ykdi9yw1q"; + name = "kde-l10n-fr-16.04.1.tar.xz"; }; }; kde-l10n-ga = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ga-16.04.0.tar.xz"; - sha256 = "0iml1y2xdwchn2gqgbvcvs2fbq78drh2r6068jlrc3hixbf76wsy"; - name = "kde-l10n-ga-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ga-16.04.1.tar.xz"; + sha256 = "0wndnikw0pi4jib6y571zgf38ggk16d66izjwcwxrvminjc6wni1"; + name = "kde-l10n-ga-16.04.1.tar.xz"; }; }; kde-l10n-gl = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-gl-16.04.0.tar.xz"; - sha256 = "1v1hq61fwj2x8iiqjm9fwabzgc7m044narb1108cijl7d76lsn4m"; - name = "kde-l10n-gl-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-gl-16.04.1.tar.xz"; + sha256 = "1mmwhb75cpkfz9hp5y0ncv5vga7pv34ybdav30g1m99mjih9ld2j"; + name = "kde-l10n-gl-16.04.1.tar.xz"; }; }; kde-l10n-he = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-he-16.04.0.tar.xz"; - sha256 = "0q1gj3gffin7l0r7xlp395zj5kdil8bnrl6apk2jslg7pz929dhb"; - name = "kde-l10n-he-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-he-16.04.1.tar.xz"; + sha256 = "0jwi0z3mvz8r6cg9b6665qh327yyj7mb22627xavfbp0rb1a2c21"; + name = "kde-l10n-he-16.04.1.tar.xz"; }; }; kde-l10n-hi = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hi-16.04.0.tar.xz"; - sha256 = "19czqc6l4jn321zwygk7b46wgsimcbf8zvl30a0rkdvspwyvaqc5"; - name = "kde-l10n-hi-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-hi-16.04.1.tar.xz"; + sha256 = "1rv08lc6804ip81nvwy65zgxdb7q68sfx0v66xyckds9f2q2g9jv"; + name = "kde-l10n-hi-16.04.1.tar.xz"; }; }; kde-l10n-hr = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hr-16.04.0.tar.xz"; - sha256 = "0bbcjrxgm5yqjz1y4ngm133hcvrp3c2z8lrycpg76g7j50w3fsi5"; - name = "kde-l10n-hr-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-hr-16.04.1.tar.xz"; + sha256 = "1p7qa99x3bmbc41fmnsjbaimkjg89m44yxak7ka516w4r87aai5y"; + name = "kde-l10n-hr-16.04.1.tar.xz"; }; }; kde-l10n-hu = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hu-16.04.0.tar.xz"; - sha256 = "0iww0m45gdlmf0j1jw8qljqar0dsmax4sxkr6yd3kswwr6m75v2i"; - name = "kde-l10n-hu-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-hu-16.04.1.tar.xz"; + sha256 = "0a7pi8w2phn8523vv6zsvgzv6yk7iy4jixc9glxvqn4sy6cy8j1n"; + name = "kde-l10n-hu-16.04.1.tar.xz"; }; }; kde-l10n-ia = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ia-16.04.0.tar.xz"; - sha256 = "0ivgp1gjxshxq1fvn254k4gni30svyqfnlfz7d8niqp3msnfmc2b"; - name = "kde-l10n-ia-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ia-16.04.1.tar.xz"; + sha256 = "1cxqjrpj2pplwvdc9zg97w3nhhamzpi7a3h504r9i2wvlb76y0s2"; + name = "kde-l10n-ia-16.04.1.tar.xz"; }; }; kde-l10n-id = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-id-16.04.0.tar.xz"; - sha256 = "15fnm4isigmgpxsgpqhj6gbvcrlhi51491a6fnxiwa3xmrc2pva8"; - name = "kde-l10n-id-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-id-16.04.1.tar.xz"; + sha256 = "17dncrhwxp8glxcgphwfaqhnr8a8s9ad6g6gw6kd3pbd9a4jpi2v"; + name = "kde-l10n-id-16.04.1.tar.xz"; }; }; kde-l10n-is = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-is-16.04.0.tar.xz"; - sha256 = "14bl3j2kqwg6cln84k5kpm400mnm4r81xhgmjpfb3xy92ms3sycr"; - name = "kde-l10n-is-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-is-16.04.1.tar.xz"; + sha256 = "0xif4igmrcrngy0r1pbvhwhbj7pax2v7rzrh29j4rhnx3ilsk1gv"; + name = "kde-l10n-is-16.04.1.tar.xz"; }; }; kde-l10n-it = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-it-16.04.0.tar.xz"; - sha256 = "06akl5x2x0j50gyzw3m1yavxxw3jszyfyychsihn74fk8hslzp6m"; - name = "kde-l10n-it-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-it-16.04.1.tar.xz"; + sha256 = "0frylngivi26x9l9db010knmqpb1w9qixg08w7hkbqwrhic1asif"; + name = "kde-l10n-it-16.04.1.tar.xz"; }; }; kde-l10n-ja = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ja-16.04.0.tar.xz"; - sha256 = "1kcmryifsjripsxwa7qa7m3ky0wxaipz9smrfhhrnw41i62sfp9a"; - name = "kde-l10n-ja-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ja-16.04.1.tar.xz"; + sha256 = "1hgfismzp69br4g0kdjmb70v6a99yjnv5y2r25d2yfkik0layglf"; + name = "kde-l10n-ja-16.04.1.tar.xz"; }; }; kde-l10n-kk = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-kk-16.04.0.tar.xz"; - sha256 = "05c100727ydimn55jlvyynlgxzxncig2y4i4b53aslfi6h17fn0i"; - name = "kde-l10n-kk-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-kk-16.04.1.tar.xz"; + sha256 = "0iqf8sad1fcs8vffvk0h8ch5qs52djfy1lgzzqlhp2n24rmgh478"; + name = "kde-l10n-kk-16.04.1.tar.xz"; }; }; kde-l10n-km = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-km-16.04.0.tar.xz"; - sha256 = "1shbg5vbzbgx07lbgi6ddhphh5b2bm9qd1gavls8alcgpbqj221c"; - name = "kde-l10n-km-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-km-16.04.1.tar.xz"; + sha256 = "0c00k11nqsrvw0sy7n2zc0jdrjxd43ajbqpam7153cs00k2ff1im"; + name = "kde-l10n-km-16.04.1.tar.xz"; }; }; kde-l10n-ko = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ko-16.04.0.tar.xz"; - sha256 = "1fjavkaivv6zspagqcbdhy7gdkmv38z20bv7fs45qf4470ffmwz5"; - name = "kde-l10n-ko-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ko-16.04.1.tar.xz"; + sha256 = "0z99i1426fd4vxr64m4lssbrpp6gxdqbh7107vbpcscvn5zzjika"; + name = "kde-l10n-ko-16.04.1.tar.xz"; }; }; kde-l10n-lt = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-lt-16.04.0.tar.xz"; - sha256 = "09n4yc9grd7g3yqkgxj9x6hkygcqbx6dxi0jj6v98a5p50b78a5d"; - name = "kde-l10n-lt-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-lt-16.04.1.tar.xz"; + sha256 = "1qkx6ca7i5d4qlp91j0sspd89jhxw2q468yf4pvkmlv5ry4ahfnd"; + name = "kde-l10n-lt-16.04.1.tar.xz"; }; }; kde-l10n-lv = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-lv-16.04.0.tar.xz"; - sha256 = "1c86bhsq0j0r2bmc6524g4sxc0bsw5sx6d4fxs6sxzx3bpdml5bq"; - name = "kde-l10n-lv-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-lv-16.04.1.tar.xz"; + sha256 = "068ka9agb4iwayrm1j4rbs83zznx3cil2ja47id20hwf2diqcjjx"; + name = "kde-l10n-lv-16.04.1.tar.xz"; }; }; kde-l10n-mr = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-mr-16.04.0.tar.xz"; - sha256 = "1xp3fb99crsvf1xl45iy9q31nbs2735hxai1wlfn5h0q9scz2nin"; - name = "kde-l10n-mr-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-mr-16.04.1.tar.xz"; + sha256 = "0vh6pawbpmnfc7kvrqi9rm4b16zndfwvsy8xny1jjj443i58fyfh"; + name = "kde-l10n-mr-16.04.1.tar.xz"; }; }; kde-l10n-nb = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nb-16.04.0.tar.xz"; - sha256 = "1dkfwqvbh6dxfxg4gznchpkwscc4g6rgwndxzjj53lvfz69611dj"; - name = "kde-l10n-nb-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-nb-16.04.1.tar.xz"; + sha256 = "0xn35j38fcnb6q1p6wimvr96s3rf4fs8s3jw92qcqa7n7zy866k0"; + name = "kde-l10n-nb-16.04.1.tar.xz"; }; }; kde-l10n-nds = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nds-16.04.0.tar.xz"; - sha256 = "1pma4pn7h1r9y6dxs86xqh0ahvl04rhw8qad3cbyil2r1s7j80ac"; - name = "kde-l10n-nds-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-nds-16.04.1.tar.xz"; + sha256 = "0a3wsarls6g12aa2av444rkg7r8x78j7zdy9q46qh3rvsp3habh9"; + name = "kde-l10n-nds-16.04.1.tar.xz"; }; }; kde-l10n-nl = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nl-16.04.0.tar.xz"; - sha256 = "0bd49aylsklgp9rqs6nk72n0za9kcp7fjzr5myfavcxliwv8lhqp"; - name = "kde-l10n-nl-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-nl-16.04.1.tar.xz"; + sha256 = "161y9417bynvhl6rsl6x1ncrwcgdxrzgivlf9gs9q7bii81ywcli"; + name = "kde-l10n-nl-16.04.1.tar.xz"; }; }; kde-l10n-nn = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nn-16.04.0.tar.xz"; - sha256 = "14acr8pchds4ib246fz6ml65qjkiifcxfs6r5hqh99l72im30hx1"; - name = "kde-l10n-nn-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-nn-16.04.1.tar.xz"; + sha256 = "11kh5ld024b7ls1jgm26r7jwacbgddn78cgfg6s5rn8m1v71z3j0"; + name = "kde-l10n-nn-16.04.1.tar.xz"; }; }; kde-l10n-pa = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pa-16.04.0.tar.xz"; - sha256 = "116dssrchp0yf173m3n8hkcfyr0k02bjlda24ikknjbh50y5kqfk"; - name = "kde-l10n-pa-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-pa-16.04.1.tar.xz"; + sha256 = "052rxwah1q8zpz1ga8lw46hzmj311bqwghrlsy01qx1w1gf0b374"; + name = "kde-l10n-pa-16.04.1.tar.xz"; }; }; kde-l10n-pl = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pl-16.04.0.tar.xz"; - sha256 = "1gibqcmgqvq9f1573jfchh7nhkd8czdi183n2smld4irsd750la8"; - name = "kde-l10n-pl-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-pl-16.04.1.tar.xz"; + sha256 = "1j5claq1dwss2ffmdgxzsf7lnswrkvb6nzzwzs8ffa4kfl35jwks"; + name = "kde-l10n-pl-16.04.1.tar.xz"; }; }; kde-l10n-pt = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pt-16.04.0.tar.xz"; - sha256 = "1yrjhqcl93fdch9nvzc2yk30rbzxsrya3xsj54xgxv2anggbr3wr"; - name = "kde-l10n-pt-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-pt-16.04.1.tar.xz"; + sha256 = "0qjc04kkj3lp5ds0d2p1g6hsq09b4wsf2ppks0kcrv5clgj5vyg5"; + name = "kde-l10n-pt-16.04.1.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.04.0"; + version = "pt_BR-16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pt_BR-16.04.0.tar.xz"; - sha256 = "0sbg767ddcknzs4k4v76ys00jxgqlxlggf5i9fw3dvaggs78azj7"; - name = "kde-l10n-pt_BR-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-pt_BR-16.04.1.tar.xz"; + sha256 = "1jp0srhqj2yziasbibij6ks11hgi994cvpc9yyn8dadjmpv091r7"; + name = "kde-l10n-pt_BR-16.04.1.tar.xz"; }; }; kde-l10n-ro = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ro-16.04.0.tar.xz"; - sha256 = "0bz25pg9xj2n4vl2aadaj02p0jx37j3i37p7bvafsb499qpgprk2"; - name = "kde-l10n-ro-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ro-16.04.1.tar.xz"; + sha256 = "09yixhqh41591kri0c6j79ikn2flcs1hvm0lcil3jfkhsas0j9mg"; + name = "kde-l10n-ro-16.04.1.tar.xz"; }; }; kde-l10n-ru = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ru-16.04.0.tar.xz"; - sha256 = "0jkljdc5i3hq7kkkq4gl7rh92ia4vv6m2vd74bsilibgxgb1kmah"; - name = "kde-l10n-ru-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ru-16.04.1.tar.xz"; + sha256 = "1x3rc8hcz8bhfyir02rq92wll0qx4rb5rgjhqwfshrq5x1qmx8g0"; + name = "kde-l10n-ru-16.04.1.tar.xz"; }; }; kde-l10n-sk = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sk-16.04.0.tar.xz"; - sha256 = "06lnlky47xq6fcjj70msc28q97cymsh0g4z06pbc0cyyby85521m"; - name = "kde-l10n-sk-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-sk-16.04.1.tar.xz"; + sha256 = "0qcylh5zj3258pfi0gvxsrvycc1f1b521nn00r664xhlm8akgs5g"; + name = "kde-l10n-sk-16.04.1.tar.xz"; }; }; kde-l10n-sl = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sl-16.04.0.tar.xz"; - sha256 = "0z2d8jx117prr35malcp0ca93ipbjj55s4dm3iad2iy2q728hkmv"; - name = "kde-l10n-sl-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-sl-16.04.1.tar.xz"; + sha256 = "0m0r4m8anxpmkn76rq3xkxk99xla978qd1106gi5rpadsk6id2ql"; + name = "kde-l10n-sl-16.04.1.tar.xz"; }; }; kde-l10n-sr = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sr-16.04.0.tar.xz"; - sha256 = "0w24mrb48qyc7diw40hwzplxb2rqlrrymvwnxbdy2d6x35hha0j4"; - name = "kde-l10n-sr-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-sr-16.04.1.tar.xz"; + sha256 = "0k5s1hzdzq7k0fjmslk63bkhz87qj0dkk0i82yyfizinshyb8wiw"; + name = "kde-l10n-sr-16.04.1.tar.xz"; }; }; kde-l10n-sv = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sv-16.04.0.tar.xz"; - sha256 = "039q4d2y3vwxnpz6rwgf9s1ivhrlz26gp5kx3y9cz8fhcsa4jk8j"; - name = "kde-l10n-sv-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-sv-16.04.1.tar.xz"; + sha256 = "0i0p610a1vg6l2qh15abbvr1dgiadff0yf6j0xa51iljvjijl44i"; + name = "kde-l10n-sv-16.04.1.tar.xz"; }; }; kde-l10n-tr = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-tr-16.04.0.tar.xz"; - sha256 = "1sr5xxxzs29sah0azfc71w01nbm5njhgygpzll3lfx3padsvfz49"; - name = "kde-l10n-tr-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-tr-16.04.1.tar.xz"; + sha256 = "1py52clbklvkrrydm5jc4sdcf9xqwnfw3b0cn3dj34qs2zfi4d93"; + name = "kde-l10n-tr-16.04.1.tar.xz"; }; }; kde-l10n-ug = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ug-16.04.0.tar.xz"; - sha256 = "16jpax5k3z8anhsf61wsi93n8ail8ybjpi31dnk859g0y50a4nr5"; - name = "kde-l10n-ug-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-ug-16.04.1.tar.xz"; + sha256 = "1k57q3zww146sh5rbab48dj4lpkipld2xl2zicspammq21bjy1yy"; + name = "kde-l10n-ug-16.04.1.tar.xz"; }; }; kde-l10n-uk = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-uk-16.04.0.tar.xz"; - sha256 = "1275347grzcdm0jd9mzm1ww8dsh3g2ws5ppfxs3ip7jdsxgmcqh0"; - name = "kde-l10n-uk-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-uk-16.04.1.tar.xz"; + sha256 = "1y6n97287vs2dhavdql50i8nby766b9ragrxbdlxdfmz2m7b0azp"; + name = "kde-l10n-uk-16.04.1.tar.xz"; }; }; kde-l10n-wa = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-wa-16.04.0.tar.xz"; - sha256 = "1gz918hj908308fd49pdbw1z8252shjbng5qgfzmdgfp9nvfhc14"; - name = "kde-l10n-wa-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-wa-16.04.1.tar.xz"; + sha256 = "097jnd3qrs7p1bym1b2h5672pfm39y4wk5dga18l9gf8vkh6vxx4"; + name = "kde-l10n-wa-16.04.1.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.04.0"; + version = "zh_CN-16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-zh_CN-16.04.0.tar.xz"; - sha256 = "1kyakzig301vylmib9wjb46llllw0jjiq18wys017hzjxykx170f"; - name = "kde-l10n-zh_CN-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-zh_CN-16.04.1.tar.xz"; + sha256 = "17askly6wn8wm9piskhvr5q7q9cg30bbnn0r4n56rbfpzhjhwwdj"; + name = "kde-l10n-zh_CN-16.04.1.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.04.0"; + version = "zh_TW-16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-zh_TW-16.04.0.tar.xz"; - sha256 = "0s2m1f4ylm6l3vp67h6v41n06pmk6762lk32wqy0l2fgg4zxrrzl"; - name = "kde-l10n-zh_TW-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-l10n/kde-l10n-zh_TW-16.04.1.tar.xz"; + sha256 = "11cqq7nba322mgqplll4l7rkpmhxj8n1aswhdib10zifqm9ni121"; + name = "kde-l10n-zh_TW-16.04.1.tar.xz"; }; }; kdelibs = { - version = "4.14.19"; + version = "4.14.20"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdelibs-4.14.19.tar.xz"; - sha256 = "0dfmhivd41y8c9pnag496rc8qlj78dg62liap5zdphgvi2baf8p6"; - name = "kdelibs-4.14.19.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdelibs-4.14.20.tar.xz"; + sha256 = "1d1wijg8nn5jvprc48pfk9h4i0a39xwidn1g1sq3smk3a0y9nzmp"; + name = "kdelibs-4.14.20.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdenetwork-filesharing-16.04.0.tar.xz"; - sha256 = "08rlg7ppqbi2xvq6ixjjw1xdr17n7bhzi2ymssxv8q1fmznfqhvp"; - name = "kdenetwork-filesharing-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdenetwork-filesharing-16.04.1.tar.xz"; + sha256 = "17m9bl01xdxsfhchw1fzmxxnc08pj3062cnzri1d2alg9iwngn63"; + name = "kdenetwork-filesharing-16.04.1.tar.xz"; }; }; kdenetwork-strigi-analyzers = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdenetwork-strigi-analyzers-16.04.0.tar.xz"; - sha256 = "0i08niv87jn6bh6c1fknpqr7mkbg5csd8lgm39bwq551zgn7n6sw"; - name = "kdenetwork-strigi-analyzers-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdenetwork-strigi-analyzers-16.04.1.tar.xz"; + sha256 = "0vy3dvrzwzf60smjsp85jyi36j3lkgni2qv5vlpn611bk59wy0kl"; + name = "kdenetwork-strigi-analyzers-16.04.1.tar.xz"; }; }; kdenlive = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdenlive-16.04.0.tar.xz"; - sha256 = "0ks30as7cnr9jcacj97c720pf2dn1wv8xg9mgxsin7c2lhbz8i5f"; - name = "kdenlive-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdenlive-16.04.1.tar.xz"; + sha256 = "1b1sr4pvvcpfp4lgg3y34gnw5ljf4d12np4r7mp7ybzh6nvk3pbj"; + name = "kdenlive-16.04.1.tar.xz"; }; }; kdepim = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdepim-16.04.0.tar.xz"; - sha256 = "0cd39hgr7gvv78mf5rypj7yjpfrnapd1pxad1aanlsr6ms5qdzyg"; - name = "kdepim-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdepim-16.04.1.tar.xz"; + sha256 = "15p12288yksmr1i3779bz20v499yyqb3srpadbk7nrkywnj9py52"; + name = "kdepim-16.04.1.tar.xz"; }; }; kdepim-addons = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdepim-addons-16.04.0.tar.xz"; - sha256 = "1dfvl0pd9269ghpjwydyws40flvw7clq2hq830m4jk6myqjccd4i"; - name = "kdepim-addons-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdepim-addons-16.04.1.tar.xz"; + sha256 = "09h7pvhw4hknd62cvqk2n7zggixdzaighdy3v4fp7mfb3gkfkccj"; + name = "kdepim-addons-16.04.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdepim-apps-libs-16.04.0.tar.xz"; - sha256 = "1slnsssd242wzk0pga4l6i8q83gdca1vgmqixz82x4pvfj62bw7w"; - name = "kdepim-apps-libs-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdepim-apps-libs-16.04.1.tar.xz"; + sha256 = "0yf1gr8zq5cjijmpp82ddi7q8f0lcawmz4kqlc7dri0rjc4y8x3w"; + name = "kdepim-apps-libs-16.04.1.tar.xz"; }; }; kdepimlibs = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdepimlibs-16.04.0.tar.xz"; - sha256 = "1mk8rjf918c5dfglv1sdrs6wjyf31dry4070ip3fx6kdph2x5akr"; - name = "kdepimlibs-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdepimlibs-16.04.1.tar.xz"; + sha256 = "0ych4xkzx6d1kb6fw3br82h4a3hv2anh0qfd2aawm0fzs9m52afp"; + name = "kdepimlibs-16.04.1.tar.xz"; }; }; kdepim-runtime = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdepim-runtime-16.04.0.tar.xz"; - sha256 = "0siwplwdbrsaikzfxbz9w00wk3xfg4a6y124nlwqx7588ni8brs3"; - name = "kdepim-runtime-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdepim-runtime-16.04.1.tar.xz"; + sha256 = "1l4iqhyvvcz3f8zy5gvv5gd6ir39iini2b8zczw70j1frdqiah9p"; + name = "kdepim-runtime-16.04.1.tar.xz"; }; }; kde-runtime = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kde-runtime-16.04.0.tar.xz"; - sha256 = "0sr06v4z6lbkacqgk8a35m3ldal1fcpvp6n2s8bfa226yck8sdq6"; - name = "kde-runtime-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kde-runtime-16.04.1.tar.xz"; + sha256 = "1197w24v37ghhmh36n2g2lzs7k9nvp9y13098c82dbck58xyja1m"; + name = "kde-runtime-16.04.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdesdk-kioslaves-16.04.0.tar.xz"; - sha256 = "0lwdy4l48id0p3vkpk92n3ja6ymzxx9zl7iwwszb1rxbr48q4v7l"; - name = "kdesdk-kioslaves-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdesdk-kioslaves-16.04.1.tar.xz"; + sha256 = "11dvh0rk20qx0ckfb1aw2s01h41a3zwgi1n9wsc09qzdyix5f422"; + name = "kdesdk-kioslaves-16.04.1.tar.xz"; }; }; kdesdk-strigi-analyzers = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdesdk-strigi-analyzers-16.04.0.tar.xz"; - sha256 = "1bn12pqqq9bgr6y916wd54i0dsw30ab9xhz99mqyjw2fcxpz4mf8"; - name = "kdesdk-strigi-analyzers-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdesdk-strigi-analyzers-16.04.1.tar.xz"; + sha256 = "1vylfy4nsavfxxf36yfmlad02igdqix2jns24fc0nd3z8r8la4k3"; + name = "kdesdk-strigi-analyzers-16.04.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdesdk-thumbnailers-16.04.0.tar.xz"; - sha256 = "1wqlrkgix2nnpvlqqqdja4j5iws4vjglds94ra5s0wmyfk0y9yc2"; - name = "kdesdk-thumbnailers-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdesdk-thumbnailers-16.04.1.tar.xz"; + sha256 = "1r6c2almxa92917vi3pdzcqfb93gw4l16k4xbasn10qmn3wmyrvh"; + name = "kdesdk-thumbnailers-16.04.1.tar.xz"; }; }; kdewebdev = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdewebdev-16.04.0.tar.xz"; - sha256 = "1xmibm0hi0mdwsvp8h48qph4mjwb1k3q58i9y8s1c7vqczl1q09n"; - name = "kdewebdev-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdewebdev-16.04.1.tar.xz"; + sha256 = "12jjhbifigvq8r6bn4940wmc50kfbn3v2wzvi2h2nrfpvkq7j4kf"; + name = "kdewebdev-16.04.1.tar.xz"; }; }; kdf = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdf-16.04.0.tar.xz"; - sha256 = "12bcvy6x8wkizjykrc3wmd3lbsj2zmiizxknic5jiwin6zqjrzh4"; - name = "kdf-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdf-16.04.1.tar.xz"; + sha256 = "0f8vqsn5cjg6hf2djhpdwm7prz36gkr1qlk1s15fnnk850dyq610"; + name = "kdf-16.04.1.tar.xz"; }; }; kdgantt2 = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdgantt2-16.04.0.tar.xz"; - sha256 = "0j9b2f5zkvasv5w4paazyc47iph27nqd4l4nrwr3plvdirivdidf"; - name = "kdgantt2-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdgantt2-16.04.1.tar.xz"; + sha256 = "0xfgdrycldijyhg9q400s6ajzm3apbyam3g5n2fivsaa6s68hgdh"; + name = "kdgantt2-16.04.1.tar.xz"; }; }; kdiamond = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kdiamond-16.04.0.tar.xz"; - sha256 = "1alb6hv95whdy15kmc0kzx4758wjni6q2k3dxxpdhw0hq657v508"; - name = "kdiamond-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kdiamond-16.04.1.tar.xz"; + sha256 = "1yxy2412xl5gq59s1kpd213vsrhbf20ci528qvz6y9yz3b3safxq"; + name = "kdiamond-16.04.1.tar.xz"; }; }; kfloppy = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kfloppy-16.04.0.tar.xz"; - sha256 = "09jwqbfs0ayswlzih90bq439c8ljhay12jfv73gdnkvf23qiq5vw"; - name = "kfloppy-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kfloppy-16.04.1.tar.xz"; + sha256 = "1pgr3kng88cprkp4prhg351k6pnbzqrpw4ihjfcdfa5mqirq64im"; + name = "kfloppy-16.04.1.tar.xz"; }; }; kfourinline = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kfourinline-16.04.0.tar.xz"; - sha256 = "13hgwn3gzyhvh4xw7ym80vsbnqbvhlvn3jwzjrxlj377q9q1h6i6"; - name = "kfourinline-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kfourinline-16.04.1.tar.xz"; + sha256 = "0712fcg20jm1dq2slrk3nlgz3rqaw22fzvv2vzk4b763b6ha5xh0"; + name = "kfourinline-16.04.1.tar.xz"; }; }; kgeography = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kgeography-16.04.0.tar.xz"; - sha256 = "1pk76akkd5ykh9p1l757cqj8niwwavxdxwinkz51w0dz0n62zb4x"; - name = "kgeography-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kgeography-16.04.1.tar.xz"; + sha256 = "1cf6jaw25d1z1k7abm268qn86cvwlzvx7m7xkg8a1ipynr0zhgzi"; + name = "kgeography-16.04.1.tar.xz"; }; }; kget = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kget-16.04.0.tar.xz"; - sha256 = "17z2n0bgj1dm4d4abprnx8crw30flxxk95w8sv3483zqbk0k3p4i"; - name = "kget-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kget-16.04.1.tar.xz"; + sha256 = "1h0fc3w9s8lvcij7agin6gpbgq4i825b8jw9lvra6r4hpmsg4s8g"; + name = "kget-16.04.1.tar.xz"; }; }; kgoldrunner = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kgoldrunner-16.04.0.tar.xz"; - sha256 = "019dk1nq1jmk7w3lklxlsy667m7vahspjd0w5rrpas54czl975w8"; - name = "kgoldrunner-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kgoldrunner-16.04.1.tar.xz"; + sha256 = "18vbyjxli5r2c9lgpvr92aqqprmybk197nff7wd5bk9qaxf0zxgr"; + name = "kgoldrunner-16.04.1.tar.xz"; }; }; kgpg = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kgpg-16.04.0.tar.xz"; - sha256 = "0qrijbwnrg61kwmv7l5k6796lbr9ry4grmk9jc38cq2g7bi64wz2"; - name = "kgpg-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kgpg-16.04.1.tar.xz"; + sha256 = "0w8ac7352vy2p2n0aribrc93la5hcmcvr4m53x13q29di7czf5qp"; + name = "kgpg-16.04.1.tar.xz"; }; }; khangman = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/khangman-16.04.0.tar.xz"; - sha256 = "0ljrap9ybccmwymkay7760rgmpp51cssnvn4lwmd3mig5cfqlavs"; - name = "khangman-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/khangman-16.04.1.tar.xz"; + sha256 = "08hwiprzr12i7dlrza5rfbgpfzx8rpbx62rl6w09fcmr5sv1mbmh"; + name = "khangman-16.04.1.tar.xz"; }; }; khelpcenter = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/khelpcenter-16.04.0.tar.xz"; - sha256 = "1r6aysdnc0qdg9lbzy1zb6pirfyfah3sbjsqkmrnf63kqsyjvapy"; - name = "khelpcenter-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/khelpcenter-16.04.1.tar.xz"; + sha256 = "0h1fg09y95v3q8fx6z3bnjcx99vwc706pm15qkbn80wcyif3hv5n"; + name = "khelpcenter-16.04.1.tar.xz"; }; }; kholidays = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kholidays-16.04.0.tar.xz"; - sha256 = "04gfy3f5fip79ra08m3f098cbgp0k7v76lam3513r0zvl0h53gad"; - name = "kholidays-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kholidays-16.04.1.tar.xz"; + sha256 = "0x7plfjmaa6ca6w35ibrparwrz3q5sydi0ci7cfsra2cizcyh5l8"; + name = "kholidays-16.04.1.tar.xz"; }; }; kidentitymanagement = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kidentitymanagement-16.04.0.tar.xz"; - sha256 = "0dhpjgmz7ndbk77syp1zvk5g7sn991wjx5cllk6dx0q9ylfl1895"; - name = "kidentitymanagement-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kidentitymanagement-16.04.1.tar.xz"; + sha256 = "1dbchsr6j0ll7b4mvbv5yw1jyzvs9y68gaylybsqfzdzj9yiq3np"; + name = "kidentitymanagement-16.04.1.tar.xz"; }; }; kig = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kig-16.04.0.tar.xz"; - sha256 = "0rlx7cm41z8zm4v4rdwmwicam2g2ibd0gmzlsnh77s4cv8xhmd7y"; - name = "kig-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kig-16.04.1.tar.xz"; + sha256 = "1jwd66accr4xi771chv8a0lm6g6mrcksad3c28b8l0sv39l1jr3n"; + name = "kig-16.04.1.tar.xz"; }; }; kigo = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kigo-16.04.0.tar.xz"; - sha256 = "1cw8hyhayn650j73kqr8aqzj6wd6bq21l5c4ibl2qm90p1byj6zz"; - name = "kigo-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kigo-16.04.1.tar.xz"; + sha256 = "0660qd9h2ifmy13xccy7najna6zag2rziw7xf91hrgmkszzyn8l1"; + name = "kigo-16.04.1.tar.xz"; }; }; killbots = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/killbots-16.04.0.tar.xz"; - sha256 = "1qnrwj1shy7ah2x0nh03r0zf3h8535qxxg62wgyg675n80ndl6wh"; - name = "killbots-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/killbots-16.04.1.tar.xz"; + sha256 = "1gdbk2403jvn2grx42vixlf3bj50a556inicg06qkgg3cf17xypr"; + name = "killbots-16.04.1.tar.xz"; }; }; kimap = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kimap-16.04.0.tar.xz"; - sha256 = "028xpqdxgylab6sznzxdd7pyfm7l27mzj13zzxhd7lc7fqd3xgx9"; - name = "kimap-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kimap-16.04.1.tar.xz"; + sha256 = "1x4s88dk62sdnlidgk3vb706ppn0acfc4iiis4srvjn1sr0xl5yb"; + name = "kimap-16.04.1.tar.xz"; }; }; kio-extras = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kio-extras-16.04.0.tar.xz"; - sha256 = "0iims3vk5mqz8lnpimwc3kjlvkmfh10287zy4sm5p8kxxfgz88fj"; - name = "kio-extras-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kio-extras-16.04.1.tar.xz"; + sha256 = "1187p0jzwhr7lixlswjjjlf367rp04pdzjyw7qw1brwj60jqz09m"; + name = "kio-extras-16.04.1.tar.xz"; }; }; kiriki = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kiriki-16.04.0.tar.xz"; - sha256 = "0bywgx8j1kx5x5j4h5bv8zrf73pkdzd96wharrgia0x55kmnzgn2"; - name = "kiriki-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kiriki-16.04.1.tar.xz"; + sha256 = "028r7hxqyfd029z4cbx3vdzrn9d0s8d06f4p5clx97vr2lrii26v"; + name = "kiriki-16.04.1.tar.xz"; }; }; kiten = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kiten-16.04.0.tar.xz"; - sha256 = "12d0p468439llj5jyxyd7qhr2zavdkbl8s87qcfhw7lngsnssq34"; - name = "kiten-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kiten-16.04.1.tar.xz"; + sha256 = "18c41dxn2sx64xih37n5v6vjmmw0kwv26na9cd6y5jd70yczcjzj"; + name = "kiten-16.04.1.tar.xz"; }; }; kjumpingcube = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kjumpingcube-16.04.0.tar.xz"; - sha256 = "1grrcfblnfr2p6a72n38r6awkfm662brnv1r2k4kqbiz0qmwmvyd"; - name = "kjumpingcube-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kjumpingcube-16.04.1.tar.xz"; + sha256 = "001nvs1cppppsgr6x8vd16fzkgi6axac4k42xw7rpibcbwxvws27"; + name = "kjumpingcube-16.04.1.tar.xz"; }; }; kldap = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kldap-16.04.0.tar.xz"; - sha256 = "1gbm7rgf2llxdnckzlnsjii9jd8s59hym96hf9v87svbphbm1738"; - name = "kldap-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kldap-16.04.1.tar.xz"; + sha256 = "0r150fg9zhl2gkl9w5dlxlzz3lrg1an690if0l1rpl2kzhrpdpyp"; + name = "kldap-16.04.1.tar.xz"; }; }; kleopatra = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kleopatra-16.04.0.tar.xz"; - sha256 = "0rmzsqvp0xwyjr25d2vnslgg6cvni9km8hkijyhz8zrmnmpdm97z"; - name = "kleopatra-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kleopatra-16.04.1.tar.xz"; + sha256 = "0p13ff91q6033v16rh114viqhcl383s9fzdxi69wk657kqsn5fsi"; + name = "kleopatra-16.04.1.tar.xz"; }; }; klettres = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/klettres-16.04.0.tar.xz"; - sha256 = "17m30hkjjrk5h4a5z1c96sgl8i0729537q11v9ndj8kh1699sfxs"; - name = "klettres-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/klettres-16.04.1.tar.xz"; + sha256 = "0mqplal91q2k9jkr5ksn9lmwncdi4rvrsz1sy3lfpjrwmm74rp24"; + name = "klettres-16.04.1.tar.xz"; }; }; klickety = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/klickety-16.04.0.tar.xz"; - sha256 = "0ggj585vki81ds94k9i7b1sawzxz24k582zm5d3lngipcb1x808l"; - name = "klickety-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/klickety-16.04.1.tar.xz"; + sha256 = "1ykrsqwvyw73s6hnkn2k0xw8gs9v7znhzp0fykqcdprix2wb7qzm"; + name = "klickety-16.04.1.tar.xz"; }; }; klines = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/klines-16.04.0.tar.xz"; - sha256 = "1000j5n9hzr3ffpi7mj5aicflr5gvbbd02s4l2qy9ghgxf5ghfzw"; - name = "klines-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/klines-16.04.1.tar.xz"; + sha256 = "07dmfnfpp8bg907kyj3jidgyicxgsbs8jmiximdky1n8hmqa6sm3"; + name = "klines-16.04.1.tar.xz"; }; }; kmag = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmag-16.04.0.tar.xz"; - sha256 = "0z9jrd9a9xmxsbk6xckiqvidd6f9dcj1lfav818fm1wf5jr04v40"; - name = "kmag-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmag-16.04.1.tar.xz"; + sha256 = "0a89mhr048p7xpl8ah9p236yxx1k1jnbw8ybcgjfw6n0s7xzaf59"; + name = "kmag-16.04.1.tar.xz"; }; }; kmahjongg = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmahjongg-16.04.0.tar.xz"; - sha256 = "0wl7mv20zal3nx3y1cdc8xq0vhkvb8rb8sag8kb66a1ch8zdzw9s"; - name = "kmahjongg-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmahjongg-16.04.1.tar.xz"; + sha256 = "10z6rfdhnv19x3sqspgz2wz7dr6yd000vlkg6wr0hsy6kqg7si8b"; + name = "kmahjongg-16.04.1.tar.xz"; }; }; kmailtransport = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmailtransport-16.04.0.tar.xz"; - sha256 = "0imw47nlfnd1qq2c91ig7cmwrcm1c9jcqfxvi1svllbwy9bgab3i"; - name = "kmailtransport-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmailtransport-16.04.1.tar.xz"; + sha256 = "0h57s0wxc0xfym60i69y6lbh7cchf4clpar9f1b9x461vfcnd432"; + name = "kmailtransport-16.04.1.tar.xz"; }; }; kmbox = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmbox-16.04.0.tar.xz"; - sha256 = "1w2y6nda7p5wfl76rmirpglgar8qxhyynx66k5qnvfpvk8xa02wk"; - name = "kmbox-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmbox-16.04.1.tar.xz"; + sha256 = "1sm5k1qsn2maa08hyxidrcapfzqwrs5i63wwlpnj8xbgfy61nr5p"; + name = "kmbox-16.04.1.tar.xz"; }; }; kmime = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmime-16.04.0.tar.xz"; - sha256 = "04hqdl1kbqv3xm0qvdsrvjs1fnsymqfw2yn286rh7ynlix4p09zz"; - name = "kmime-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmime-16.04.1.tar.xz"; + sha256 = "01r267bf6ps5x8q1ia3jv2zi07dbcv120nq9pq3wqixk64gr7gh5"; + name = "kmime-16.04.1.tar.xz"; }; }; kmines = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmines-16.04.0.tar.xz"; - sha256 = "0q8jqycwsjadi10a1ycxn09507j85lh0zwxq1b374cdb01m7ajzw"; - name = "kmines-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmines-16.04.1.tar.xz"; + sha256 = "12mfsrx32g46kg3s98xali2lhq1gcydmyn7j0ldgi9ksj4zhvc9p"; + name = "kmines-16.04.1.tar.xz"; }; }; kmix = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmix-16.04.0.tar.xz"; - sha256 = "0nmfjrxdxpkvxrsp06w6ddcyhfasmzvn8hk44n4wd9v86vgi29cz"; - name = "kmix-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmix-16.04.1.tar.xz"; + sha256 = "1k51s1r16zk5qgzyg6y4z24qlabgnnf6s4a5rc4pjwm734yh28g6"; + name = "kmix-16.04.1.tar.xz"; }; }; kmousetool = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmousetool-16.04.0.tar.xz"; - sha256 = "1g2lgmimkq9yb8s1lypwh4cz5zxih4fppcqcjlgwcpg0n4ia2hh7"; - name = "kmousetool-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmousetool-16.04.1.tar.xz"; + sha256 = "0zn3hxy5p7fq6v617pbxcbbi3zvk3k07dx98d5pjlgzns7jjsmmf"; + name = "kmousetool-16.04.1.tar.xz"; }; }; kmouth = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmouth-16.04.0.tar.xz"; - sha256 = "0bqqjs2khdhqgd3apk7bd8sayb9dg6mwc8f211z7zb03xvgb95nd"; - name = "kmouth-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmouth-16.04.1.tar.xz"; + sha256 = "1pgyc3x2gixlw2zlh293mpisb2asblbamsbv8565pbf0rz0p84xg"; + name = "kmouth-16.04.1.tar.xz"; }; }; kmplot = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kmplot-16.04.0.tar.xz"; - sha256 = "1q76bl3604qcp67w754qsncsg0mw5vm9c5jp8hj6i9vksdl8i3n8"; - name = "kmplot-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kmplot-16.04.1.tar.xz"; + sha256 = "1a4i0lj6k8fw8s34vnbiphd1xrfjlk12dbv359gnxjdqalvir9ib"; + name = "kmplot-16.04.1.tar.xz"; }; }; knavalbattle = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/knavalbattle-16.04.0.tar.xz"; - sha256 = "0q0k37dvw8pajxcmsv25if726ml9mzdm6am2q22x64hblsgmva0h"; - name = "knavalbattle-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/knavalbattle-16.04.1.tar.xz"; + sha256 = "1l7x76b0jn1vssxaxvskp62h33sk2b35n60zih36lscgpv0ldq8w"; + name = "knavalbattle-16.04.1.tar.xz"; }; }; knetwalk = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/knetwalk-16.04.0.tar.xz"; - sha256 = "0i00lnw31jb7lb18r6r8k4k61syjak7pglwxwbah96wxrrmdnvpk"; - name = "knetwalk-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/knetwalk-16.04.1.tar.xz"; + sha256 = "1rkarsvmmfi0cax7cy71g0mzcwhjcfpiq8xxdnmsn7gwdwf9mlyd"; + name = "knetwalk-16.04.1.tar.xz"; }; }; kolf = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kolf-16.04.0.tar.xz"; - sha256 = "1b0247wpnzm9lz82d5v3wv28cacj3b7r5rirdg8plri5y2gks8ql"; - name = "kolf-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kolf-16.04.1.tar.xz"; + sha256 = "0azkm74br2xpxg3mvnmi61d5a438igw98a5vk0jycc1y0xfbsfzf"; + name = "kolf-16.04.1.tar.xz"; }; }; kollision = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kollision-16.04.0.tar.xz"; - sha256 = "1hmgw5410xznjddv1x2jg6v1rv6hkksr281ylhdb2ca8zh2wdwqi"; - name = "kollision-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kollision-16.04.1.tar.xz"; + sha256 = "0kb5ykaayh26f2nwghdwc5vxnr2ik5b4s9k5x0sbz9p933l1wy9z"; + name = "kollision-16.04.1.tar.xz"; }; }; kolourpaint = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kolourpaint-16.04.0.tar.xz"; - sha256 = "13x7r8k60q0nnip37xadqdypm88c2zrfk2nhlllhqb41d23hbbsw"; - name = "kolourpaint-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kolourpaint-16.04.1.tar.xz"; + sha256 = "1d07yjkxx82czpg57bnzkn5887lhn6rilgyy08zn1739avk589n7"; + name = "kolourpaint-16.04.1.tar.xz"; }; }; kompare = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kompare-16.04.0.tar.xz"; - sha256 = "1yd06ykjbi5kvas9vrnhy9svpsvlk4y8xvs963vvi0jdw7x5ylzj"; - name = "kompare-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kompare-16.04.1.tar.xz"; + sha256 = "1cysz9qg93jddb20hxgi29c6rm6x3nmi70ji32r8mzpv3r27217n"; + name = "kompare-16.04.1.tar.xz"; }; }; konquest = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/konquest-16.04.0.tar.xz"; - sha256 = "198s495slqi7fffmsnn6pj90mi51bjw3grkr033l4z0lmxhqljmb"; - name = "konquest-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/konquest-16.04.1.tar.xz"; + sha256 = "1w8axkl0gsvbs7xhmy188xl1h2xkd80w0gdvskykdmcri4mrhldl"; + name = "konquest-16.04.1.tar.xz"; }; }; konsole = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/konsole-16.04.0.tar.xz"; - sha256 = "06c3d01h658g00yi4vhc8rk6ndxs4ha0pj6y0w4d10g78zcnjmd4"; - name = "konsole-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/konsole-16.04.1.tar.xz"; + sha256 = "15h38zydnlkchsdjhax15gv6507nqqgql5ykw81fqp2byibxl25s"; + name = "konsole-16.04.1.tar.xz"; }; }; kontactinterface = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kontactinterface-16.04.0.tar.xz"; - sha256 = "1plhya2xpvvsx2japbiq8v5a2c1rbw77jf3q278kqwracrkgsiax"; - name = "kontactinterface-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kontactinterface-16.04.1.tar.xz"; + sha256 = "0qvkrpx9p3hmwqja3iv6n80j1j0b46jvbimfgjs183xlwhqy90l2"; + name = "kontactinterface-16.04.1.tar.xz"; }; }; kopete = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kopete-16.04.0.tar.xz"; - sha256 = "1xcaz0f6cmjxy7sifxhlm7jvndj238azx59xg4glrk4mhrnac5m7"; - name = "kopete-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kopete-16.04.1.tar.xz"; + sha256 = "1i406hr0r1lfv9awy0fvlg4kh8lljc14hrg9da83nnf07njxb0gh"; + name = "kopete-16.04.1.tar.xz"; }; }; kpat = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kpat-16.04.0.tar.xz"; - sha256 = "06xsisy0sv8rldpc2fw3hc4dr66wmxbw006x3p9gi1xxwqlp8j3w"; - name = "kpat-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kpat-16.04.1.tar.xz"; + sha256 = "0axm2390bjj57mkykaw196gycjvcx303l0aq3capv971ailx8mxs"; + name = "kpat-16.04.1.tar.xz"; }; }; kpimtextedit = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kpimtextedit-16.04.0.tar.xz"; - sha256 = "0wkxqqyifvgd1h2i2q3958diwybff8m2wc7g9grl6wagj0rbr6y8"; - name = "kpimtextedit-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kpimtextedit-16.04.1.tar.xz"; + sha256 = "0bsviwk4nfy0b632xz29mdl5x9p9c3774l0ghi292rr6891ysz56"; + name = "kpimtextedit-16.04.1.tar.xz"; }; }; kppp = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kppp-16.04.0.tar.xz"; - sha256 = "0z53n7cppr79z7k8siaadrspl1134gw5a7wx02jigl0kihm9sykf"; - name = "kppp-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kppp-16.04.1.tar.xz"; + sha256 = "1j86kcxx5wrqv72wqbcn50gysp5ddh2i0b6dbaw2qydhv56h1c50"; + name = "kppp-16.04.1.tar.xz"; }; }; kqtquickcharts = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kqtquickcharts-16.04.0.tar.xz"; - sha256 = "12x3mgxba4bfi7imli22a8m3af3hkq3fkx192ij3wx8ils7b6in7"; - name = "kqtquickcharts-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kqtquickcharts-16.04.1.tar.xz"; + sha256 = "0yqw8l6l7k2a50djm64lrcvl8rwkkvjiaa51mwcvj34cqfg8i55k"; + name = "kqtquickcharts-16.04.1.tar.xz"; }; }; krdc = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/krdc-16.04.0.tar.xz"; - sha256 = "0azlvqai97ki33dc448zw76hqbsqzd6a5k7gj9fsj8pg11m06kn4"; - name = "krdc-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/krdc-16.04.1.tar.xz"; + sha256 = "1zij88q4x48kpww22g4p9dbz9f78s2s50m0bpxcrz5aqdvsijgfq"; + name = "krdc-16.04.1.tar.xz"; }; }; kremotecontrol = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kremotecontrol-16.04.0.tar.xz"; - sha256 = "027ljqfxl9gsn6q5rld0azqzg3a1ky96045i809dzhdwknrz014a"; - name = "kremotecontrol-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kremotecontrol-16.04.1.tar.xz"; + sha256 = "1xxfggy6nx3ncq5h72x1mlnyw7hhi7m15kwfnsg2nhzc86mxg5k5"; + name = "kremotecontrol-16.04.1.tar.xz"; }; }; kreversi = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kreversi-16.04.0.tar.xz"; - sha256 = "193vj6qdshh0k7jn7ca63yfkb99sbb0xn3fhyd65iimwcyziz6yj"; - name = "kreversi-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kreversi-16.04.1.tar.xz"; + sha256 = "091m8p6z3xw86pn71zz691s4g11jx83ja06bdcpyjwmmwdz4asmb"; + name = "kreversi-16.04.1.tar.xz"; }; }; krfb = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/krfb-16.04.0.tar.xz"; - sha256 = "1xcnvs9l2w5awfkxzq2yi0chpljip8nkc3zqlzlqnchkzpxy568j"; - name = "krfb-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/krfb-16.04.1.tar.xz"; + sha256 = "16xdzczf9jg22crbymsmij4gjzgbijx9sk7vblprhaqls4gnh55q"; + name = "krfb-16.04.1.tar.xz"; }; }; kross-interpreters = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kross-interpreters-16.04.0.tar.xz"; - sha256 = "18sc600x5yki1rngxa9ng6zrw5yam824sf05filwa6m22kxi91y8"; - name = "kross-interpreters-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kross-interpreters-16.04.1.tar.xz"; + sha256 = "1hz31lkdmkilc2rbfffjx57dwfscr5f4h406346a9qryjk4n466s"; + name = "kross-interpreters-16.04.1.tar.xz"; }; }; kruler = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kruler-16.04.0.tar.xz"; - sha256 = "07p85apr7rvgwphnd7vwpmyn8i26m1px4ssq54wk9kindxcs2awg"; - name = "kruler-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kruler-16.04.1.tar.xz"; + sha256 = "1xjc1k82xvfk3ad4937v663dhn6b4d3r8gp2aqgzbjnms88sqxsm"; + name = "kruler-16.04.1.tar.xz"; }; }; ksaneplugin = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ksaneplugin-16.04.0.tar.xz"; - sha256 = "0ldgj3pna0y7ayyw8nz2ybj8g6i1i7axd96sgpgx11708jqphy91"; - name = "ksaneplugin-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ksaneplugin-16.04.1.tar.xz"; + sha256 = "162s931ygfzdiq4l0zcfz75mhm5r4j1mz0730jchfzcpahan3cgl"; + name = "ksaneplugin-16.04.1.tar.xz"; }; }; kscd = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kscd-16.04.0.tar.xz"; - sha256 = "0k1dxi6gimy41d8mjcb371fkv8z64cdjhyisdgsyfqq6klhy93ss"; - name = "kscd-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kscd-16.04.1.tar.xz"; + sha256 = "1nb5y4q17vg8zy7kzhadhbd0pp1n3z1kgix898is2fhain2har85"; + name = "kscd-16.04.1.tar.xz"; }; }; kshisen = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kshisen-16.04.0.tar.xz"; - sha256 = "1k75l3y89hv0gs08kfczb1avy5i5h964xf4b976hslzhpvwi8w1q"; - name = "kshisen-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kshisen-16.04.1.tar.xz"; + sha256 = "1cdmawq2z2avl4fkwc9pb7s7m4pqcrm8zhhwkp2gqz8b0vsgz40f"; + name = "kshisen-16.04.1.tar.xz"; }; }; ksirk = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ksirk-16.04.0.tar.xz"; - sha256 = "0hswi5f0r10yjm9rdiffaw96d5wwjwcnv2g07hh7lc1w6irmq7v7"; - name = "ksirk-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ksirk-16.04.1.tar.xz"; + sha256 = "1jmrbmdbpy0cpakzyh3nqaf8alv05v0i70m1a2b5yw7iiy1jjh0l"; + name = "ksirk-16.04.1.tar.xz"; }; }; ksnakeduel = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ksnakeduel-16.04.0.tar.xz"; - sha256 = "1666k9q065xrij07fbwv1b1xa23p02qk3b366cfhd38kf1shp9fg"; - name = "ksnakeduel-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ksnakeduel-16.04.1.tar.xz"; + sha256 = "1l01rwg8lis624jncj07x9cdvp7g6sb4v75yp3bz8a12s14ayl6h"; + name = "ksnakeduel-16.04.1.tar.xz"; }; }; kspaceduel = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kspaceduel-16.04.0.tar.xz"; - sha256 = "03jqb8yn5jgdc9pd92bpbkvr8vwr91cpvmzgmmrqi4llj3cjpp9x"; - name = "kspaceduel-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kspaceduel-16.04.1.tar.xz"; + sha256 = "0bzaq2alfkclk5496g9zf53lih52hray14nfnif49acnccs7g1a3"; + name = "kspaceduel-16.04.1.tar.xz"; }; }; ksquares = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ksquares-16.04.0.tar.xz"; - sha256 = "11fqvpkghvy54zrvyvwk9kasx3i1clw8rj4bjphif2nr6sc5wdi7"; - name = "ksquares-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ksquares-16.04.1.tar.xz"; + sha256 = "1law2s9wdhpzp1zd1q476afscbaxcdi023n0q9j73w1l8jais2p9"; + name = "ksquares-16.04.1.tar.xz"; }; }; kstars = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kstars-16.04.0.tar.xz"; - sha256 = "0h648mnp6l5msv56pmwrm5197hdx20jmw2wzdflx09lj3iir6d1y"; - name = "kstars-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kstars-16.04.1.tar.xz"; + sha256 = "0sss1d6k89wsjqnywmklnb3ywyws50d1vfz1lfcsmhcgc37w6cm7"; + name = "kstars-16.04.1.tar.xz"; }; }; ksudoku = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ksudoku-16.04.0.tar.xz"; - sha256 = "1d6mwhcsa09yrrd43a842xzyf87hpqwlhp1x82f9kx31hkq1hs6m"; - name = "ksudoku-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ksudoku-16.04.1.tar.xz"; + sha256 = "0bb7hv8m68qhjh7z3g7qkcnyn41wacby6kaq0qhrr4x37dx96r3i"; + name = "ksudoku-16.04.1.tar.xz"; }; }; ksystemlog = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ksystemlog-16.04.0.tar.xz"; - sha256 = "0qcycfyj1wk730hcnzjn75wf6vcxd6svmvqz6q3q85rrjjs3am6s"; - name = "ksystemlog-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ksystemlog-16.04.1.tar.xz"; + sha256 = "0ws9vln9gz8r3m1pk1x3fk6b05h1fx070d5ln3g9vxwbkfh3g73d"; + name = "ksystemlog-16.04.1.tar.xz"; }; }; kteatime = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kteatime-16.04.0.tar.xz"; - sha256 = "0yhldn2d2kz0kf5s1s8wkmmg73v620mf2h5prf59hqygkdzmxq1n"; - name = "kteatime-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kteatime-16.04.1.tar.xz"; + sha256 = "0ap8nc265kylb7idgdbymln6pz4xw3pmgqp1dpqix6pskz64wn7p"; + name = "kteatime-16.04.1.tar.xz"; }; }; ktimer = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktimer-16.04.0.tar.xz"; - sha256 = "0p925v4h944vsp8br581wdlnfvp51yq92kf8xfsgc8d7r85h28w4"; - name = "ktimer-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktimer-16.04.1.tar.xz"; + sha256 = "1kkga4mcgn2zzsardcvk0r4y75ip1kbdiyp9qhpsdsf1r68m7h6i"; + name = "ktimer-16.04.1.tar.xz"; }; }; ktnef = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktnef-16.04.0.tar.xz"; - sha256 = "1n1hi22l1cgjq989dhglm1m47f8bg3zdpsyh506qa3j7fg2y3rs6"; - name = "ktnef-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktnef-16.04.1.tar.xz"; + sha256 = "1f0m75n4wxqyjiwr13znk4yhr6852mfns5n5v40yxnjhlvi1zq88"; + name = "ktnef-16.04.1.tar.xz"; }; }; ktouch = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktouch-16.04.0.tar.xz"; - sha256 = "19n33p2yirxh21i7ij2bncqksz1i2k57c2cwrzzq40a3b9dndimc"; - name = "ktouch-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktouch-16.04.1.tar.xz"; + sha256 = "1hzri668q3d8q0s8n9362hm53jmrmzbil2am0naa3gkr16nj4rjd"; + name = "ktouch-16.04.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-accounts-kcm-16.04.0.tar.xz"; - sha256 = "1mr7f481dcgg3gyyzycs92n7s2ap5kyv7xy2dmf7rypz1xkp2sya"; - name = "ktp-accounts-kcm-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-accounts-kcm-16.04.1.tar.xz"; + sha256 = "0q06lk8agqqgs5hlmyl8pmwdcp95zys2psnzm3s6pvs3lyq9zkkd"; + name = "ktp-accounts-kcm-16.04.1.tar.xz"; }; }; ktp-approver = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-approver-16.04.0.tar.xz"; - sha256 = "1mqbvb797mms4mwk5v5xkh2z67fkh1ayhkjq0hgj0wi3a2x65zx8"; - name = "ktp-approver-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-approver-16.04.1.tar.xz"; + sha256 = "0wf24dvvxx9cvhihjgfpp78yymnll1bn1zbwi5lg2by75hqzvvi7"; + name = "ktp-approver-16.04.1.tar.xz"; }; }; ktp-auth-handler = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-auth-handler-16.04.0.tar.xz"; - sha256 = "1l7rlqiaaffcdpplznkbhhrn41q7f1vx4ripjizj0q8a62fivbr6"; - name = "ktp-auth-handler-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-auth-handler-16.04.1.tar.xz"; + sha256 = "1p4jsnvhc6g6r1pdhhbq0b38vhi93v1715naxl5vbdfgk11q72bq"; + name = "ktp-auth-handler-16.04.1.tar.xz"; }; }; ktp-call-ui = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-call-ui-16.04.0.tar.xz"; - sha256 = "0ndknp2c3qyd894cavxbp7kfc8rxgz7pcd3gvsrwdgk31k4jajyx"; - name = "ktp-call-ui-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-call-ui-16.04.1.tar.xz"; + sha256 = "01bly8lbk1mg86vjqfq8vz9ym36w4hz2gsizqs616prpxyrfgk0s"; + name = "ktp-call-ui-16.04.1.tar.xz"; }; }; ktp-common-internals = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-common-internals-16.04.0.tar.xz"; - sha256 = "1q0bwnsna9h7lj8pva1kzmn8qnlgyynbvldgcr85g713jr2lnmr8"; - name = "ktp-common-internals-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-common-internals-16.04.1.tar.xz"; + sha256 = "0jdmsg1vdvkvx9fb10l0qpwrp5i5w64qfx94231kz4gv1xci0zcb"; + name = "ktp-common-internals-16.04.1.tar.xz"; }; }; ktp-contact-list = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-contact-list-16.04.0.tar.xz"; - sha256 = "07ffzrzm5y8kgz6cxjsj8kkgsnvprrjkl4ck8y0san47gk2p5rb7"; - name = "ktp-contact-list-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-contact-list-16.04.1.tar.xz"; + sha256 = "1mjn4if6r7z5smnxac4mr7smh616pd7hm5jmnfgxic9dlvqbxy2x"; + name = "ktp-contact-list-16.04.1.tar.xz"; }; }; ktp-contact-runner = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-contact-runner-16.04.0.tar.xz"; - sha256 = "0rcpci13hz9xdc51p364rvyi50vkjjgmf74wkwmaxc57sclf5bwi"; - name = "ktp-contact-runner-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-contact-runner-16.04.1.tar.xz"; + sha256 = "08ch3b7pq17ah1xahvbcb8zcizj81vpbqxv0zwmnd55byx3i3nsz"; + name = "ktp-contact-runner-16.04.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-desktop-applets-16.04.0.tar.xz"; - sha256 = "01w3cdbrii14211wgn9vl3l108za5bw22f39pyznf1bqjimdz4nh"; - name = "ktp-desktop-applets-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-desktop-applets-16.04.1.tar.xz"; + sha256 = "0n0v3q1x33z1ck1rlj5jhbsywvjlv8hr878bkv0ppgyndcjv4hwx"; + name = "ktp-desktop-applets-16.04.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-filetransfer-handler-16.04.0.tar.xz"; - sha256 = "1sf7xg317dgcdvnj2j9hq63633d6iyl7rgn22xryawpq2iw3wz9n"; - name = "ktp-filetransfer-handler-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-filetransfer-handler-16.04.1.tar.xz"; + sha256 = "0d34blakmqp3qc80dpakpsk3xdzncy4q8nfg0jjjw9s5qldw0gjx"; + name = "ktp-filetransfer-handler-16.04.1.tar.xz"; }; }; ktp-kded-module = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-kded-module-16.04.0.tar.xz"; - sha256 = "13zsgzipmkn15h83ziwa3wg1dcin4lqawmhapkhlf4xxs8wm1mb6"; - name = "ktp-kded-module-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-kded-module-16.04.1.tar.xz"; + sha256 = "19fcc53bwlgdm3gvyiyzp9hdfk9hps5ng9cdqlx1agdx9ap9sbi8"; + name = "ktp-kded-module-16.04.1.tar.xz"; }; }; ktp-send-file = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-send-file-16.04.0.tar.xz"; - sha256 = "0sdwrj644n80xnx8syycpiwwn432ww2i3vvx1v6sj696gcrkv7i4"; - name = "ktp-send-file-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-send-file-16.04.1.tar.xz"; + sha256 = "0svm1ij82zgnkczhrhkmzpy2w1p2khv8wzkj4584zwfjafy3y8yj"; + name = "ktp-send-file-16.04.1.tar.xz"; }; }; ktp-text-ui = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktp-text-ui-16.04.0.tar.xz"; - sha256 = "1pgz1hzrkmx6k88cghgacgjykmkbjvvm1hhyr377hgvdhrfc6scy"; - name = "ktp-text-ui-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktp-text-ui-16.04.1.tar.xz"; + sha256 = "1s5kw9yk9m2rj48l5c54m8zsa247hv9ajq9zp2gqrvv3sz7y1bsf"; + name = "ktp-text-ui-16.04.1.tar.xz"; }; }; ktuberling = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/ktuberling-16.04.0.tar.xz"; - sha256 = "1w7qv0iacjhr9yphm3kxxiwh2c17x6ky4i2yzb178nb5sh6dgdig"; - name = "ktuberling-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/ktuberling-16.04.1.tar.xz"; + sha256 = "05p3jiy7cykpxrjlvhnz5jc3x1mqbdyq6i2h15h315sd39wra5bx"; + name = "ktuberling-16.04.1.tar.xz"; }; }; kturtle = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kturtle-16.04.0.tar.xz"; - sha256 = "1as62h92dx4f1n1fb1lhsyvx90msl2392b595hfsgkhgqb4spn3y"; - name = "kturtle-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kturtle-16.04.1.tar.xz"; + sha256 = "0cs7k2jv9s89sbh0ig2zvm31v906jvwjrjfdw223zl105c99xshr"; + name = "kturtle-16.04.1.tar.xz"; }; }; kubrick = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kubrick-16.04.0.tar.xz"; - sha256 = "1vvh3yzpcri1yyc3z4djkr8sjs03pbrwinrz0f4iwah8diyrdpy0"; - name = "kubrick-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kubrick-16.04.1.tar.xz"; + sha256 = "1pxb357bmh4r4g92zxr3x6w65z9lsd34vkvbg7s250q3a7358y4n"; + name = "kubrick-16.04.1.tar.xz"; }; }; kuser = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kuser-16.04.0.tar.xz"; - sha256 = "11fradjslci2znglh24wcljhpld4zp206r0wrp392hjc4i6ck069"; - name = "kuser-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kuser-16.04.1.tar.xz"; + sha256 = "0b0wjsbj4hin3g4dgijxvm99idzl57i65f1k6hq4mjypnd19ccwv"; + name = "kuser-16.04.1.tar.xz"; }; }; kwalletmanager = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kwalletmanager-16.04.0.tar.xz"; - sha256 = "1wqdhwvkxky0c4lnm9b3akjvb2ydx3qx3hr08959za7kkk976nmb"; - name = "kwalletmanager-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kwalletmanager-16.04.1.tar.xz"; + sha256 = "1w6y55zk7gs7fp0qz5zgmmh3mz8d6ii5g948pwg18415x4ydbrx1"; + name = "kwalletmanager-16.04.1.tar.xz"; }; }; kwordquiz = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/kwordquiz-16.04.0.tar.xz"; - sha256 = "0yk95l6gl57hs62l8xvi9xfrzmkcch0v3ijasqhg20i4w33309z0"; - name = "kwordquiz-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/kwordquiz-16.04.1.tar.xz"; + sha256 = "0v3snpljvc8zf34jpwbchrqsdajd14k3g4jd3xaz9waa62kbc2m7"; + name = "kwordquiz-16.04.1.tar.xz"; }; }; libgravatar = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libgravatar-16.04.0.tar.xz"; - sha256 = "0kbvy90r5x1s1s3h680cqiqj221gicvy8j0pwid5vr2pxjkdih0l"; - name = "libgravatar-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libgravatar-16.04.1.tar.xz"; + sha256 = "0wqp5p16jn2qnsndill5ccfk8nirx5j4iyhjny0ri19lkdkcz010"; + name = "libgravatar-16.04.1.tar.xz"; }; }; libkcddb = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkcddb-16.04.0.tar.xz"; - sha256 = "1wylsqij5l3w4pvw3g2jkypqpn3a8fg72x7q5dp22l0n9ihrhn8j"; - name = "libkcddb-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkcddb-16.04.1.tar.xz"; + sha256 = "1dpmynbb1cyin8f0hd9r1gn432pzj7lck86nbhz38w0w8x2m6b81"; + name = "libkcddb-16.04.1.tar.xz"; }; }; libkcompactdisc = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkcompactdisc-16.04.0.tar.xz"; - sha256 = "0zf3bry65jak3z4kjhnszjy05h4pvnzzz7nh954cmigv369iwsz8"; - name = "libkcompactdisc-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkcompactdisc-16.04.1.tar.xz"; + sha256 = "15zm5jmybvh8q2sbwx4203yq6lgj6nm9jgqk3yh8ikbh5ml24bfr"; + name = "libkcompactdisc-16.04.1.tar.xz"; }; }; libkdcraw = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkdcraw-16.04.0.tar.xz"; - sha256 = "0l6aa2458apxbz1hm300w3s32ywxjhy80vnm3sxnk3313ba38cml"; - name = "libkdcraw-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkdcraw-16.04.1.tar.xz"; + sha256 = "13agxmqqfz38sz0vmqy2rk7xj4bmcffpn84i9a5s1191l13kj0ks"; + name = "libkdcraw-16.04.1.tar.xz"; }; }; libkdeedu = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkdeedu-16.04.0.tar.xz"; - sha256 = "16aabzc57qjjzmfmsnb4rjw28w4014l66dsy528rfj5i0wyw40vy"; - name = "libkdeedu-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkdeedu-16.04.1.tar.xz"; + sha256 = "1i20ib710cn77y8q9aqwlh4rvyfv8r8w03mwnl45jn27c0rmxmrz"; + name = "libkdeedu-16.04.1.tar.xz"; }; }; libkdegames = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkdegames-16.04.0.tar.xz"; - sha256 = "0nr3z1plcinx0hw9q1gac32czgy6079q36v57qk76l6531cssk73"; - name = "libkdegames-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkdegames-16.04.1.tar.xz"; + sha256 = "0sx09sm19s8n2imf267sazymwpx1ry68n7ahwj4mczhi3wgvs72w"; + name = "libkdegames-16.04.1.tar.xz"; }; }; libkdepim = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkdepim-16.04.0.tar.xz"; - sha256 = "0197r1hdx6cpakmvcp1195bm1vn71y8sprbx23n4m9ak92ak9z6x"; - name = "libkdepim-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkdepim-16.04.1.tar.xz"; + sha256 = "03wks48jzj0p6vvqbf5nq14ipln6lcahsi88d7q082yckgkgbjqr"; + name = "libkdepim-16.04.1.tar.xz"; }; }; libkeduvocdocument = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkeduvocdocument-16.04.0.tar.xz"; - sha256 = "0j92kjhj143z4g9702ir4xs0hdpkk74ydi9347cvb1vh8mq7wqn0"; - name = "libkeduvocdocument-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkeduvocdocument-16.04.1.tar.xz"; + sha256 = "0gw0m31aa4px8ag2nh1ysm1bqlhr2b6gzlqxgjipgi4hlaw72nzs"; + name = "libkeduvocdocument-16.04.1.tar.xz"; }; }; libkexiv2 = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkexiv2-16.04.0.tar.xz"; - sha256 = "1n3bhzlw729vka1lc00sw75m7cfg5ibqh2lliv6lv9g9aqb7xk0z"; - name = "libkexiv2-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkexiv2-16.04.1.tar.xz"; + sha256 = "0h0iw9sgmaascv60yzxyap6mrj7jrr2fh1dcbnfvw7162qq2ldyq"; + name = "libkexiv2-16.04.1.tar.xz"; }; }; libkface = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkface-16.04.0.tar.xz"; - sha256 = "1vykpj8yws1sd4x3zcpjlrlq9ygybia4wi34qcakx5016fym2qxb"; - name = "libkface-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkface-16.04.1.tar.xz"; + sha256 = "16bb1mpls2wxmpr5vkaapj140c2dxk4rl6cijw2gym7sm1njy98n"; + name = "libkface-16.04.1.tar.xz"; }; }; libkgeomap = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkgeomap-16.04.0.tar.xz"; - sha256 = "0kl2wzxmy25398amk3631vql0vh66vd2j9qdxzjb9lvlw7gvn55s"; - name = "libkgeomap-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkgeomap-16.04.1.tar.xz"; + sha256 = "0m5cg1pdzldxbv62g2vv048g5dfbkhsjj8zsli1l6arcy38anpwv"; + name = "libkgeomap-16.04.1.tar.xz"; }; }; libkipi = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkipi-16.04.0.tar.xz"; - sha256 = "0ffa57f1p86sdqq1spf5bvzh2vfa9wfhm8lrhs6mfrr0nr65v85x"; - name = "libkipi-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkipi-16.04.1.tar.xz"; + sha256 = "100hrb52ab2b2rgqsbk9d1hz77ch33cn60sy3zc473p8pfgsp1is"; + name = "libkipi-16.04.1.tar.xz"; }; }; libkleo = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkleo-16.04.0.tar.xz"; - sha256 = "0yw36vxscwh10bnn20lbas06j1pcwdgd08qhd8hfdl9yajg9jg0w"; - name = "libkleo-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkleo-16.04.1.tar.xz"; + sha256 = "1s16vhv8p7ir532q122zfwibjzv08dbhbxvg0xz83hz87lyr27mj"; + name = "libkleo-16.04.1.tar.xz"; }; }; libkmahjongg = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkmahjongg-16.04.0.tar.xz"; - sha256 = "08vh9mpxy4i9lnd8a57i443lr77b5am50w4xnpssi0jfy0jjsxkr"; - name = "libkmahjongg-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkmahjongg-16.04.1.tar.xz"; + sha256 = "1zrbbfrzbwlgja8n093g797aiws4nc0icp5fsxv6ryfpxxzzawsv"; + name = "libkmahjongg-16.04.1.tar.xz"; }; }; libkomparediff2 = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libkomparediff2-16.04.0.tar.xz"; - sha256 = "137p3c07f7ni5khwbnb9fm9i8vprn0y0wzqmlfa2rhc78bn0czsl"; - name = "libkomparediff2-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libkomparediff2-16.04.1.tar.xz"; + sha256 = "0zhx3bsklbj3mwj22x8svqza0z4m4wvj0dysj731kjkmg9i75g8m"; + name = "libkomparediff2-16.04.1.tar.xz"; }; }; libksane = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libksane-16.04.0.tar.xz"; - sha256 = "07944vywdm13swqh5psw6jv36f6hdxqhrb718wicjlr57lbg65mb"; - name = "libksane-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libksane-16.04.1.tar.xz"; + sha256 = "16jpq7ip8pjl9vglm1m5c9gpfy4p50fa2d5dmlxlr67fbjs35831"; + name = "libksane-16.04.1.tar.xz"; }; }; libksieve = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/libksieve-16.04.0.tar.xz"; - sha256 = "15gwg02sand97khvdl22zhqq734n4xdbndldzla0jh2jxixa2ihn"; - name = "libksieve-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/libksieve-16.04.1.tar.xz"; + sha256 = "0hdm4z30czxzdf19gwva03q3zgc3qapb4fawakcrgdr1z9k24jg6"; + name = "libksieve-16.04.1.tar.xz"; }; }; lokalize = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/lokalize-16.04.0.tar.xz"; - sha256 = "1r77pmy2dxnbxh1dgcmrpz2d6kpnj6z31yan1lkr8wf0fgh7355i"; - name = "lokalize-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/lokalize-16.04.1.tar.xz"; + sha256 = "1h2harrdpx1zdvgw21g9y2q93c9n9g3dansb63j6s8g4kv9skgs0"; + name = "lokalize-16.04.1.tar.xz"; }; }; lskat = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/lskat-16.04.0.tar.xz"; - sha256 = "1px4wv9kxqqvrdmk9v4bw212mdjwl0v7qbh8mmyq8j06axf3a6jm"; - name = "lskat-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/lskat-16.04.1.tar.xz"; + sha256 = "1a6n954sy4yq4f289y2ziv649fbcfbyiinx9w3rffa3mi9lxw690"; + name = "lskat-16.04.1.tar.xz"; }; }; mailcommon = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/mailcommon-16.04.0.tar.xz"; - sha256 = "0s62kzjas1zs9cm06lfk37d3nx4h0h0m75i3wlj87spd7hg8p2i1"; - name = "mailcommon-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/mailcommon-16.04.1.tar.xz"; + sha256 = "0n3vzgk3iaqja43aidg08yf1g1k78xf5fp02wrsvndi4spad5hv2"; + name = "mailcommon-16.04.1.tar.xz"; }; }; mailimporter = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/mailimporter-16.04.0.tar.xz"; - sha256 = "0ij07frw0bf3h8hlkdacdv8a2czsaipkjqwlscbsl5vcplfxpsxv"; - name = "mailimporter-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/mailimporter-16.04.1.tar.xz"; + sha256 = "00jgiplwmwdhaq0s4chan21hk6hqkgnfjhvjcn5hv8lsfmdigkkh"; + name = "mailimporter-16.04.1.tar.xz"; }; }; marble = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/marble-16.04.0.tar.xz"; - sha256 = "05idh1011njasxr24r2cd16i07720af1qqvba3anfx20nav1sxgr"; - name = "marble-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/marble-16.04.1.tar.xz"; + sha256 = "185hcl6fg90blmik72pd32pzkfcaxhv42mmlnwbpwbb4wfxajys7"; + name = "marble-16.04.1.tar.xz"; }; }; messagelib = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/messagelib-16.04.0.tar.xz"; - sha256 = "0zh4fxs33yvvn9wgfs47d016bhzss1mr7qjyq023mrlmsl7jnpr8"; - name = "messagelib-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/messagelib-16.04.1.tar.xz"; + sha256 = "0flphkm18fbma2sb490lhnk4p01cmc4ri90gqb2ys4mfc22x1yy0"; + name = "messagelib-16.04.1.tar.xz"; }; }; minuet = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/minuet-16.04.0.tar.xz"; - sha256 = "0jyrl2rxl1dllv2d99vrga7jn3dqqkrkvhg3bv7a80w766j9hq8g"; - name = "minuet-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/minuet-16.04.1.tar.xz"; + sha256 = "10s5fqkk98nzd0w22pcwxqqlyy49is72wbhcqsy0hf90j8qyzah5"; + name = "minuet-16.04.1.tar.xz"; }; }; mplayerthumbs = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/mplayerthumbs-16.04.0.tar.xz"; - sha256 = "0mkgnxli1pysrzqbcxky6hsmcvjww7zly82ya2p4nsjr71g8laid"; - name = "mplayerthumbs-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/mplayerthumbs-16.04.1.tar.xz"; + sha256 = "1r7iqlb1ik3k21frwn62552fkdxgl29sf44qc9gxi9q254cnw7nq"; + name = "mplayerthumbs-16.04.1.tar.xz"; }; }; okteta = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/okteta-16.04.0.tar.xz"; - sha256 = "01p4sqd1j75nyg3aax15b5z3dnppnzc27ci61yzsa3jhd0470n3c"; - name = "okteta-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/okteta-16.04.1.tar.xz"; + sha256 = "066p6iw5ci909pvklx900lawcyjiazl6ch3y8yrys97x498qn7pl"; + name = "okteta-16.04.1.tar.xz"; }; }; okular = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/okular-16.04.0.tar.xz"; - sha256 = "0dn9vm22hc30v1fhly52fmbvjd6my2zxvl08f44jwimbh7wh9rw0"; - name = "okular-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/okular-16.04.1.tar.xz"; + sha256 = "11fx4a4bcrl89zi2z2wvfcinmlmq7cfnxga1x35hkk5rc6vyl3vl"; + name = "okular-16.04.1.tar.xz"; }; }; palapeli = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/palapeli-16.04.0.tar.xz"; - sha256 = "1yrph8a07jm69cg5gj0rgc4mgqfvqg024wald724yyydbcx5i8br"; - name = "palapeli-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/palapeli-16.04.1.tar.xz"; + sha256 = "1iixmx4nrjdbkhwd0wl5zv4bgvss9zkcz2a85790q3x0hcd9fshb"; + name = "palapeli-16.04.1.tar.xz"; }; }; parley = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/parley-16.04.0.tar.xz"; - sha256 = "17lwb2vy36hrpgz3f9hrfikp7kz36xq013ym4cijh26xysha2gsx"; - name = "parley-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/parley-16.04.1.tar.xz"; + sha256 = "0ynvbfilfh6rw4fw7ajl4nz4j1n5ip1pcf39r4ql1qghdgz3hr9c"; + name = "parley-16.04.1.tar.xz"; }; }; picmi = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/picmi-16.04.0.tar.xz"; - sha256 = "0w2x9c0bd26b34ckmyzcfn980kbsq0y5zw3kfw3dsh5q8n0c627f"; - name = "picmi-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/picmi-16.04.1.tar.xz"; + sha256 = "18048amjd4l9agnj0d7q4109ik76568065q6dn6p8xbnczvlanqq"; + name = "picmi-16.04.1.tar.xz"; }; }; pimcommon = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/pimcommon-16.04.0.tar.xz"; - sha256 = "0c0xkg2vd5jps0nfy661z2np17gygpyvkdc6cp5ir41b5sk2fz4h"; - name = "pimcommon-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/pimcommon-16.04.1.tar.xz"; + sha256 = "19lxgzy8a9ixljpjbxgj8gp0l88cs0rgvgyhzdw9b6nm8m0lr79a"; + name = "pimcommon-16.04.1.tar.xz"; }; }; poxml = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/poxml-16.04.0.tar.xz"; - sha256 = "1zwg7b4j5ijs9sry8hl7fnnli8hsw3gy685cdgpairgj46yyryx8"; - name = "poxml-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/poxml-16.04.1.tar.xz"; + sha256 = "14ar7hr35sgfqk8scdbrmnkdfzns1a8pwldn1pz46yssshm0yx6b"; + name = "poxml-16.04.1.tar.xz"; }; }; print-manager = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/print-manager-16.04.0.tar.xz"; - sha256 = "1kl68fz52zjwfs9kprihar0i6n6sg6s40slblfhvi60s1g5krf4m"; - name = "print-manager-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/print-manager-16.04.1.tar.xz"; + sha256 = "0mfafxnvak8svksld0ddrbsrajn7d959dr7arw0j7djj5fbwrind"; + name = "print-manager-16.04.1.tar.xz"; }; }; rocs = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/rocs-16.04.0.tar.xz"; - sha256 = "05wc9b93csf7bsbmy99jcnml7n0mgfql1rvrs3z8jcz17jnfcx9s"; - name = "rocs-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/rocs-16.04.1.tar.xz"; + sha256 = "0hb8bahr3gfkc41bqnk4dzw91smk4gi97vvlacirdj3wqps3phjk"; + name = "rocs-16.04.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/signon-kwallet-extension-16.04.0.tar.xz"; - sha256 = "0a36gklixkkwgnhs3w3z3l14p6x6r0xgzcqw344g36v1x3imvspf"; - name = "signon-kwallet-extension-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/signon-kwallet-extension-16.04.1.tar.xz"; + sha256 = "0qzgsifx6zscn8wc06wy2gi7xz0hlnvwcpgac85nf1zz7fngjq7i"; + name = "signon-kwallet-extension-16.04.1.tar.xz"; }; }; spectacle = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/spectacle-16.04.0.tar.xz"; - sha256 = "0c0qmgjd32iam0zd4n08kmajfqpfsa0zphxvgq2rh7plxw3npfga"; - name = "spectacle-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/spectacle-16.04.1.tar.xz"; + sha256 = "1df3hp9swcy00dvfjx34a7z9naz8mpaprxigv87f3jzg9jwbppg6"; + name = "spectacle-16.04.1.tar.xz"; }; }; step = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/step-16.04.0.tar.xz"; - sha256 = "18imzm9v2gbf64f3p08a3l7r7axyjsmi2xvbqvg0ir2ly3pabrx0"; - name = "step-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/step-16.04.1.tar.xz"; + sha256 = "0nr4maqy067d4jb25h4akljn2vqg33rdxyb619lzr9sksw04ii5k"; + name = "step-16.04.1.tar.xz"; }; }; svgpart = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/svgpart-16.04.0.tar.xz"; - sha256 = "11793djb9v499b11kwr1312p9j9hhrjk7i67035s64lblrnbb9yw"; - name = "svgpart-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/svgpart-16.04.1.tar.xz"; + sha256 = "0kklmb4vq6pnf9i088n14zbzg9iz80arl8igb815zdl2bx7yqjjj"; + name = "svgpart-16.04.1.tar.xz"; }; }; sweeper = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/sweeper-16.04.0.tar.xz"; - sha256 = "0hahwmiziiwraahssxzsxfzvyli4lmj7fdskqnv9q7b39hai88j7"; - name = "sweeper-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/sweeper-16.04.1.tar.xz"; + sha256 = "1lhspwgajja6fnd1nm4gnhvyi3ynnx0dicwd8ks81imvkz3kz7yc"; + name = "sweeper-16.04.1.tar.xz"; }; }; syndication = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/syndication-16.04.0.tar.xz"; - sha256 = "0m8dacbqdg9vya2c8gknckx8xjp6m9s93vxd4j6a78jz28j6yvcc"; - name = "syndication-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/syndication-16.04.1.tar.xz"; + sha256 = "19pqz7q02axr129wcrwr27lkr4qiv542gck4h2rlj21p9amw46kq"; + name = "syndication-16.04.1.tar.xz"; }; }; umbrello = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/umbrello-16.04.0.tar.xz"; - sha256 = "11b7a7bg9v2gdl4hjpfz06k5ks2v36ai70iri6rcp0lw9bcspig2"; - name = "umbrello-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/umbrello-16.04.1.tar.xz"; + sha256 = "04ql21kl633nxbhjbv2j9wsi7l8pqpp49x737014mz037a58ppvw"; + name = "umbrello-16.04.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.04.0"; + version = "16.04.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.04.0/src/zeroconf-ioslave-16.04.0.tar.xz"; - sha256 = "0ablccfi3kq18rcx79jwn9z317qyflb05ck9kalqpr7f8xnmhzn3"; - name = "zeroconf-ioslave-16.04.0.tar.xz"; + url = "${mirror}/stable/applications/16.04.1/src/zeroconf-ioslave-16.04.1.tar.xz"; + sha256 = "0pg7q6lh5i0yhjw9qbralzjxg6f38if57s1lk57bvh0gnmj5zj9b"; + name = "zeroconf-ioslave-16.04.1.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch deleted file mode 100644 index e65d4505ed26..000000000000 --- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: kservice-5.21.0/src/sycoca/ksycocautils.cpp -=================================================================== ---- kservice-5.21.0.orig/src/sycoca/ksycocautils.cpp -+++ kservice-5.21.0/src/sycoca/ksycocautils.cpp -@@ -24,9 +24,10 @@ - - void KSycocaUtilsPrivate::read(QDataStream &s, QString &str) - { -+ const qint32 bufferSize = 65528; - quint32 bytes; - s >> bytes; // read size of string -- if (bytes > 8192) { // null string or too big -+ if (bytes > bufferSize) { // null string or too big - if (bytes != 0xffffffff) { - KSycoca::flagError(); - } -@@ -35,7 +36,7 @@ void KSycocaUtilsPrivate::read(QDataStre - int bt = bytes / 2; - str.resize(bt); - QChar *ch = str.data(); -- char t[8192]; -+ char t[bufferSize]; - char *b = t; - s.readRawData(b, bytes); - while (bt--) { diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/series b/pkgs/desktops/kde-5/frameworks-5.21/kservice/series deleted file mode 100644 index c1655f686064..000000000000 --- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/series +++ /dev/null @@ -1,3 +0,0 @@ -qdiriterator-follow-symlinks.patch -no-canonicalize-path.patch -ksycoca-buffer-size.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix deleted file mode 100644 index a4a1f95c52ce..000000000000 --- a/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix +++ /dev/null @@ -1,573 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/attica-5.21.0.tar.xz"; - sha256 = "1aqfw73g424f60qmpx1lky3qfqrsl1id02388pnlmpa8fnpp940c"; - name = "attica-5.21.0.tar.xz"; - }; - }; - baloo = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/baloo-5.21.0.tar.xz"; - sha256 = "1a5sl2bkrs90mfks93q2hrijp6dpapp2l0fhq7km36mvsrc78yqn"; - name = "baloo-5.21.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/bluez-qt-5.21.0.tar.xz"; - sha256 = "0nsnxa4k31l69fapxn49g112948zprc5xr7v3ggxwnxkb1pll60a"; - name = "bluez-qt-5.21.0.tar.xz"; - }; - }; - breeze-icons = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/breeze-icons-5.21.0.tar.xz"; - sha256 = "1a7ikdq8a44n42i6swf29aqyfwjh05ir3ym0lzjzdb6133fzlb01"; - name = "breeze-icons-5.21.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/extra-cmake-modules-5.21.0.tar.xz"; - sha256 = "1kbc5fkcbz9vkg0jpz10vsfgwajlrsmbl0vrbls5qvrdgbgrwlm3"; - name = "extra-cmake-modules-5.21.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/frameworkintegration-5.21.0.tar.xz"; - sha256 = "0mbpn18cjzd8xznk73slvals86lv77ram09px4l44xgyf019xll8"; - name = "frameworkintegration-5.21.0.tar.xz"; - }; - }; - kactivities = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kactivities-5.21.0.tar.xz"; - sha256 = "09jr7m6vaffdb879jph1ckgri0b9pdyh5q39i7fyi6s277rybcyk"; - name = "kactivities-5.21.0.tar.xz"; - }; - }; - kactivities-stats = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kactivities-stats-5.21.0.tar.xz"; - sha256 = "0vd01b812r0ggbnqsq3y6ik68v0668rzx6npl3h11wdrvlidhyqf"; - name = "kactivities-stats-5.21.0.tar.xz"; - }; - }; - kapidox = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kapidox-5.21.0.tar.xz"; - sha256 = "0w3jch93d8vdqd0g4yl2fxmamrg9hnx1lypnpgw7615wlsb02qyx"; - name = "kapidox-5.21.0.tar.xz"; - }; - }; - karchive = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/karchive-5.21.0.tar.xz"; - sha256 = "042ww21wmm3sf87zqgr2qiyg2j5mjf1mmqpqhpcax4gnjpck5nvc"; - name = "karchive-5.21.0.tar.xz"; - }; - }; - kauth = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kauth-5.21.0.tar.xz"; - sha256 = "03dy36g9y04p3533l2y0m0jlr91m94y0i4wpnlr5ndgccif2a63r"; - name = "kauth-5.21.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kbookmarks-5.21.0.tar.xz"; - sha256 = "0qxq5wbddaj1cpjd34q8k65brfbb677gs0y5zh24mqbwcr0rfs6g"; - name = "kbookmarks-5.21.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kcmutils-5.21.0.tar.xz"; - sha256 = "01ch3y43r4cb1sj0gy5a8wq3c6wpx2brn96d7rjm3r3hh5n5xdlj"; - name = "kcmutils-5.21.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kcodecs-5.21.0.tar.xz"; - sha256 = "0wng7kqqxrsz7b4w163j6m2zdhb5pvgbd9n6bn7ggyldn4zl86w7"; - name = "kcodecs-5.21.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kcompletion-5.21.0.tar.xz"; - sha256 = "0r6gsnsjkfvwhrpkch7y44m2yqyxb42bdkc35jxrm8y7xaa8nwi4"; - name = "kcompletion-5.21.0.tar.xz"; - }; - }; - kconfig = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kconfig-5.21.0.tar.xz"; - sha256 = "0w5wvy3yhgh64k8jghyv5fkx9jr828yl11jlihg24hfplnmihkxw"; - name = "kconfig-5.21.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kconfigwidgets-5.21.0.tar.xz"; - sha256 = "030iq46bwiaixn2wf6285y2gg7h1y5xqf6d6bg3xcz0v1xjd3n0f"; - name = "kconfigwidgets-5.21.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kcoreaddons-5.21.0.tar.xz"; - sha256 = "16226z60simxgfriwsm6srx39f7wm64mdl39qxaa77wn07i8xmsi"; - name = "kcoreaddons-5.21.0.tar.xz"; - }; - }; - kcrash = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kcrash-5.21.0.tar.xz"; - sha256 = "1mrbmfkzd0dy42ppq8gl1z9liprq722w4f3a499iamqnlsdwq2w8"; - name = "kcrash-5.21.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kdbusaddons-5.21.0.tar.xz"; - sha256 = "1yvpan0plm80sw0wai39ffvpswyzy7xiqra69cb8mfxcdl8acjjw"; - name = "kdbusaddons-5.21.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kdeclarative-5.21.0.tar.xz"; - sha256 = "1m61js8kdnif1106vxs5bv830hyj8j2whv5mlshkj9jbpp9v5qkj"; - name = "kdeclarative-5.21.0.tar.xz"; - }; - }; - kded = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kded-5.21.0.tar.xz"; - sha256 = "138svq07zgabn6razkqp5zxdlw9ajr1966icd82mxsxq1cjgfl4g"; - name = "kded-5.21.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/portingAids/kdelibs4support-5.21.0.tar.xz"; - sha256 = "1q1wyfry2ypa1mk01rabva0cq1ai9lmq8ygsji413p6c1avfrywc"; - name = "kdelibs4support-5.21.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kdesignerplugin-5.21.0.tar.xz"; - sha256 = "0rj79mdgdcm0wlramx5s53ba0jkhravcgkl570ds7s3wwa1aa62j"; - name = "kdesignerplugin-5.21.0.tar.xz"; - }; - }; - kdesu = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kdesu-5.21.0.tar.xz"; - sha256 = "13daljcjgrvybj7hbv6l9cwc6cdh45d2zz2ch7cbar46z2zxh5qb"; - name = "kdesu-5.21.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kdewebkit-5.21.0.tar.xz"; - sha256 = "1rc5i265sagvbqwy96i4dnksc4vnrq864z3rkxqlrx2blwq08550"; - name = "kdewebkit-5.21.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kdnssd-5.21.0.tar.xz"; - sha256 = "0k3qia322cd2h9pcf7k0fg7w91jxc503digjv93vhsfzfhbadf9l"; - name = "kdnssd-5.21.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kdoctools-5.21.0.tar.xz"; - sha256 = "16ysqwvwmxas56rhg68rzkipszqqahh787ww9rkq9ak2r6d29r6c"; - name = "kdoctools-5.21.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kemoticons-5.21.0.tar.xz"; - sha256 = "1paddfylh1xb4g4h939lzvy7f67syyfsx76gz7w5mdbnqk5xc7fc"; - name = "kemoticons-5.21.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kfilemetadata-5.21.0.tar.xz"; - sha256 = "1jmcvzazcw5klmnzd17a7x6rcwjb6xdrxrn1jjiq8kibdbghx7l0"; - name = "kfilemetadata-5.21.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kglobalaccel-5.21.0.tar.xz"; - sha256 = "1bdd613ybz1cl25sx3ihdfzsjwlxyjx9blidmzbnvv0lb2304hwp"; - name = "kglobalaccel-5.21.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kguiaddons-5.21.0.tar.xz"; - sha256 = "01hdrcdsiq3qs620jprv65kk4pvldlm70aghjsi9wk7j3x6qid2x"; - name = "kguiaddons-5.21.0.tar.xz"; - }; - }; - khtml = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/portingAids/khtml-5.21.0.tar.xz"; - sha256 = "17xvzklhhp6k9wi94s7agc8qnb7gwvx3aa5jbq6d76qn0rsqbzhv"; - name = "khtml-5.21.0.tar.xz"; - }; - }; - ki18n = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/ki18n-5.21.0.tar.xz"; - sha256 = "0qm9p77zqz2jy0j5yfv5v6pqska25p790yy1b6wg1gd67561q5bn"; - name = "ki18n-5.21.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kiconthemes-5.21.0.tar.xz"; - sha256 = "14a43jca1cyh45dbz5c9lc5yqc376qg3q2c420bk5s44ynpnhp4i"; - name = "kiconthemes-5.21.0.tar.xz"; - }; - }; - kidletime = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kidletime-5.21.0.tar.xz"; - sha256 = "10vdx2sp3hjp20saqlyqdz83jbqhsqyk7gl063lhz00mnk7nk1mn"; - name = "kidletime-5.21.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kimageformats-5.21.0.tar.xz"; - sha256 = "09m0w5f39y9gq0g00iapay3v09kk24lqwiyjq4y487il865p22ph"; - name = "kimageformats-5.21.0.tar.xz"; - }; - }; - kinit = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kinit-5.21.0.tar.xz"; - sha256 = "19avsq0bi2ys574n0dcn65chd7wrpyp354xfsw45gig28skjiir5"; - name = "kinit-5.21.0.tar.xz"; - }; - }; - kio = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kio-5.21.0.tar.xz"; - sha256 = "08wrjimkv255gbc9y7pxilwxi9nikg3196rzs0fbw4vqdlzl0gjq"; - name = "kio-5.21.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kitemmodels-5.21.0.tar.xz"; - sha256 = "1bp02vp08bwsd64wnrr3ivy4k8g1vzv1s5iyiqj99d1gk0fxvv7d"; - name = "kitemmodels-5.21.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kitemviews-5.21.0.tar.xz"; - sha256 = "16yzcyrg8wa8fvz749x8dbixyga1ggls1fvjns6gdbz5aqm6ib4d"; - name = "kitemviews-5.21.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kjobwidgets-5.21.0.tar.xz"; - sha256 = "0y8zmz6wx4igbpc0jlsxrr1yxgyq8hsmynl9fqy3lc2bzmwr9wcp"; - name = "kjobwidgets-5.21.0.tar.xz"; - }; - }; - kjs = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/portingAids/kjs-5.21.0.tar.xz"; - sha256 = "0vsgmz0yn1if11xfbw3f9p0kg2dv1rb26ging4fc860wv2j5gyln"; - name = "kjs-5.21.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/portingAids/kjsembed-5.21.0.tar.xz"; - sha256 = "1nbc12m86s90y8f5gp62l4f9v4hqy8cmzw4sh0655sczd5vbkvki"; - name = "kjsembed-5.21.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/portingAids/kmediaplayer-5.21.0.tar.xz"; - sha256 = "1hz7l95w57z73wg9ypbqpkxvkw42wgbymv67lg4vdxppplnkqriz"; - name = "kmediaplayer-5.21.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/knewstuff-5.21.0.tar.xz"; - sha256 = "05r11r9r789686i36y0x770f1pc7dwvqzdzclrx22r3lbz708pga"; - name = "knewstuff-5.21.0.tar.xz"; - }; - }; - knotifications = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/knotifications-5.21.0.tar.xz"; - sha256 = "0iia73ai2s5w8c3j1kmc8bb7yp1d2cv0yd2k3ilaxf3y9wgsp4x8"; - name = "knotifications-5.21.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/knotifyconfig-5.21.0.tar.xz"; - sha256 = "1mqal5ndr3v54lp7a9a2fm0c0hsiqb7kziw56rz0xd659328k9ix"; - name = "knotifyconfig-5.21.0.tar.xz"; - }; - }; - kpackage = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kpackage-5.21.0.tar.xz"; - sha256 = "024k15v0b24hivkjpn3gwn2wdfsng9ralz414i858qj0lm688xk5"; - name = "kpackage-5.21.0.tar.xz"; - }; - }; - kparts = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kparts-5.21.0.tar.xz"; - sha256 = "1s1nk1vdnb3g0ilv2b1m783h8g52yr9hpqz0vscj56m9cn2sf8rv"; - name = "kparts-5.21.0.tar.xz"; - }; - }; - kpeople = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kpeople-5.21.0.tar.xz"; - sha256 = "0nfpv4g9zvja9sv3zbpyksbvz1xa8lmncg48awrwbrmf83bxvcjq"; - name = "kpeople-5.21.0.tar.xz"; - }; - }; - kplotting = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kplotting-5.21.0.tar.xz"; - sha256 = "1hrpv1qg6qx4y4wvyq0rxfi0ngq1lgd5l3vwi00ri86xm1qbs4hk"; - name = "kplotting-5.21.0.tar.xz"; - }; - }; - kpty = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kpty-5.21.0.tar.xz"; - sha256 = "1vzgpmagjggssva6r57hd094dv3vxf3gpsr3xpvspa9l1mk4d35c"; - name = "kpty-5.21.0.tar.xz"; - }; - }; - kross = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/portingAids/kross-5.21.0.tar.xz"; - sha256 = "0c1gbaifzswz4dcdwzka5mnlm07i463dpwc2fihmzn67skm4ybix"; - name = "kross-5.21.0.tar.xz"; - }; - }; - krunner = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/portingAids/krunner-5.21.0.tar.xz"; - sha256 = "1jn8fr83c71kz25yzd1qay9as6dvzl1xvlg1vyspdifxg43vqzq4"; - name = "krunner-5.21.0.tar.xz"; - }; - }; - kservice = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kservice-5.21.0.tar.xz"; - sha256 = "19cnapz23ji5p01r9rgj91rzph3mqqrmnfwprmi9p3h2w68njhv6"; - name = "kservice-5.21.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/ktexteditor-5.21.0.tar.xz"; - sha256 = "1m9zipx5kisxsy037py709c2ri5qvix6n362l981kbbvcgkpiaq2"; - name = "ktexteditor-5.21.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/ktextwidgets-5.21.0.tar.xz"; - sha256 = "11nsi6j9b2678bqaa0ykp8as5lw1v9421b73dd1qxqrpdqfkxyzn"; - name = "ktextwidgets-5.21.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kunitconversion-5.21.0.tar.xz"; - sha256 = "03vnls5df0c2bqyw9a04hlc3cn34y6xwx693klh27jmm37r776yh"; - name = "kunitconversion-5.21.0.tar.xz"; - }; - }; - kwallet = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kwallet-5.21.0.tar.xz"; - sha256 = "1rmfy21r2p79gwg1kq26g2fqnclbsww9rz3py368pk4s1lrzafii"; - name = "kwallet-5.21.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kwidgetsaddons-5.21.0.tar.xz"; - sha256 = "1gqyc0j77sm6i2511qnz0sllmfxjgjb9qpi8551np16zviqa52k7"; - name = "kwidgetsaddons-5.21.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kwindowsystem-5.21.0.tar.xz"; - sha256 = "13lfwpw5a4in0mp5y8d15jg6xhhrka2qmw73wrdzcvj22n6ldzzi"; - name = "kwindowsystem-5.21.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kxmlgui-5.21.0.tar.xz"; - sha256 = "1cb6n016ffvxy8dbbhc3dwlzdqpq0pbvly416qlvlc1lv70lxyfj"; - name = "kxmlgui-5.21.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/kxmlrpcclient-5.21.0.tar.xz"; - sha256 = "082qpnvgm9r81iip9akakbf5rqmxb0r8y6gp7jk49q29lvkrx1kh"; - name = "kxmlrpcclient-5.21.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/modemmanager-qt-5.21.0.tar.xz"; - sha256 = "1w0kjp2pmgss45g63930lbn1c018ld2snng6h40saxi76n8cv57n"; - name = "modemmanager-qt-5.21.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/networkmanager-qt-5.21.0.tar.xz"; - sha256 = "0iy4a4qb1am2y7w03jg6n7q69c46y4gdpb72r6qjrnm9d4c2xsg1"; - name = "networkmanager-qt-5.21.0.tar.xz"; - }; - }; - oxygen-icons5 = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/oxygen-icons5-5.21.0.tar.xz"; - sha256 = "00qh1h3xx392hh73zdlknc1j9i2sck9ys74a9ffkf6an4rl0hws5"; - name = "oxygen-icons5-5.21.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/plasma-framework-5.21.0.tar.xz"; - sha256 = "006k8y8dnar371b5qhikny6rda3vg810jy53sl9yps695j0y39c0"; - name = "plasma-framework-5.21.0.tar.xz"; - }; - }; - solid = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/solid-5.21.0.tar.xz"; - sha256 = "13r9zcf7sr6vg5wlqjms2q7vl4g8gpzqghp3y25ldglhj0z7252r"; - name = "solid-5.21.0.tar.xz"; - }; - }; - sonnet = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/sonnet-5.21.0.tar.xz"; - sha256 = "088b87r80lds6jr0lnqxv0bd4isy2mkcgrq7hxfni7r2h6vn3xcd"; - name = "sonnet-5.21.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.21.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.21/threadweaver-5.21.0.tar.xz"; - sha256 = "17l23jj9bsixhg3gpv5sjrlc6w1kmjwlfb0z17drdkyzs5ak80ry"; - name = "threadweaver-5.21.0.tar.xz"; - }; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks-5.21/attica.nix b/pkgs/desktops/kde-5/frameworks-5.22/attica.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/attica.nix rename to pkgs/desktops/kde-5/frameworks-5.22/attica.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.22/baloo.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/baloo.nix rename to pkgs/desktops/kde-5/frameworks-5.22/baloo.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.22/bluez-qt.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix rename to pkgs/desktops/kde-5/frameworks-5.22/bluez-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.22/breeze-icons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix rename to pkgs/desktops/kde-5/frameworks-5.22/breeze-icons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/nix-lib-path.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/nix-lib-path.patch rename to pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/nix-lib-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/series rename to pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh similarity index 96% rename from pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh rename to pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh index dde749b218c0..64b3ddf9abc0 100755 --- a/pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh +++ b/pkgs/desktops/kde-5/frameworks-5.22/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.21/" +RELEASE_URL="http://download.kde.org/stable/frameworks/5.22/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.22/frameworkintegration.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix rename to pkgs/desktops/kde-5/frameworks-5.22/frameworkintegration.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix b/pkgs/desktops/kde-5/frameworks-5.22/kactivities-stats.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kactivities-stats.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.22/kactivities.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kactivities.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.22/kapidox.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kapidox.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.22/karchive.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/karchive.nix rename to pkgs/desktops/kde-5/frameworks-5.22/karchive.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.22/kauth/cmake-install-paths.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kauth/cmake-install-paths.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kauth/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kauth/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kauth/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/kauth-policy-install.patch b/pkgs/desktops/kde-5/frameworks-5.22/kauth/kauth-policy-install.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kauth/kauth-policy-install.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kauth/kauth-policy-install.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/series b/pkgs/desktops/kde-5/frameworks-5.22/kauth/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kauth/series rename to pkgs/desktops/kde-5/frameworks-5.22/kauth/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.22/kbookmarks.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kbookmarks.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.22/kcmutils/0001-qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kcmutils/0001-qdiriterator-follow-symlinks.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kcmutils/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kcmutils/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kcmutils/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.22/kcodecs.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kcodecs.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kcodecs.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.22/kcompletion.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kcompletion.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.22/kconfig.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kconfig.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kconfig.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.22/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kconfigwidgets/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kconfigwidgets/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.22/kcoreaddons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kcoreaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.22/kcrash.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kcrash.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.22/kdbusaddons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdbusaddons.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kdbusaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.22/kdeclarative.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kdeclarative.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kded.nix b/pkgs/desktops/kde-5/frameworks-5.22/kded.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kded.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kded.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/nix-kde-include-dir.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/nix-kde-include-dir.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/nix-kde-include-dir.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/series rename to pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/setup-hook.sh similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.22/kdesignerplugin.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kdesignerplugin.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.22/kdesu.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kdesu.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.22/kdnssd.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kdnssd.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kdoctools/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kdoctools/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.22/kdoctools/kdoctools-no-find-docbook-xml.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdoctools/kdoctools-no-find-docbook-xml.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.22/kdoctools/setup-hook.sh similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kdoctools/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks-5.22/kdoctools/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.22/kemoticons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kemoticons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/cmake-install-paths.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/cmake-install-paths.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/series rename to pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.22/kglobalaccel.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kglobalaccel.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.22/kguiaddons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kguiaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.22/khtml.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/khtml.nix rename to pkgs/desktops/kde-5/frameworks-5.22/khtml.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.22/ki18n.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix rename to pkgs/desktops/kde-5/frameworks-5.22/ki18n.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default-theme-breeze.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default-theme-breeze.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default-theme-breeze.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/series rename to pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.22/kidletime.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kidletime.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.22/kimageformats.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kimageformats.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kinit/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kinit/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/series b/pkgs/desktops/kde-5/frameworks-5.22/kinit/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kinit/series rename to pkgs/desktops/kde-5/frameworks-5.22/kinit/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kio/default.nix similarity index 96% rename from pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kio/default.nix index cfa597e9cd10..7e4317a3f099 100644 --- a/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.22/kio/default.nix @@ -22,7 +22,6 @@ kdeFramework { wrapQtProgram "$out/bin/kcookiejar5" wrapQtProgram "$out/bin/ktelnetservice5" wrapQtProgram "$out/bin/ktrash5" - wrapQtProgram "$out/bin/kmailservice5" wrapQtProgram "$out/bin/protocoltojson" ''; } diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.22/kio/samba-search-path.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kio/samba-search-path.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kio/samba-search-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kio/series b/pkgs/desktops/kde-5/frameworks-5.22/kio/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kio/series rename to pkgs/desktops/kde-5/frameworks-5.22/kio/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.22/kitemmodels.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kitemmodels.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.22/kitemviews.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kitemviews.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.22/kjobwidgets.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kjobwidgets.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.22/kjs.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kjs.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kjs.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.22/kjsembed.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kjsembed.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.22/kmediaplayer.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kmediaplayer.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.22/knewstuff.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix rename to pkgs/desktops/kde-5/frameworks-5.22/knewstuff.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.22/knotifications.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix rename to pkgs/desktops/kde-5/frameworks-5.22/knotifications.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.22/knotifyconfig.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix rename to pkgs/desktops/kde-5/frameworks-5.22/knotifyconfig.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.22/kpackage/allow-external-paths.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kpackage/allow-external-paths.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kpackage/allow-external-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kpackage/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kpackage/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.22/kpackage/qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kpackage/qdiriterator-follow-symlinks.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kpackage/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.22/kpackage/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kpackage/series rename to pkgs/desktops/kde-5/frameworks-5.22/kpackage/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.22/kparts.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kparts.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kparts.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.22/kpeople.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kpeople.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.22/kplotting.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kplotting.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.22/kpty.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kpty.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kpty.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kross.nix b/pkgs/desktops/kde-5/frameworks-5.22/kross.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kross.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kross.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.22/krunner.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/krunner.nix rename to pkgs/desktops/kde-5/frameworks-5.22/krunner.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/kservice/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kservice/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.22/kservice/no-canonicalize-path.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kservice/no-canonicalize-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.22/kservice/qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch rename to pkgs/desktops/kde-5/frameworks-5.22/kservice/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kservice/series b/pkgs/desktops/kde-5/frameworks-5.22/kservice/series new file mode 100644 index 000000000000..3ce22dbd35a0 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.22/kservice/series @@ -0,0 +1,2 @@ +qdiriterator-follow-symlinks.patch +no-canonicalize-path.patch \ No newline at end of file diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.22/kservice/setup-hook.sh similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kservice/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks-5.22/kservice/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix rename to pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/no-qcoreapplication.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/no-qcoreapplication.patch rename to pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/no-qcoreapplication.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/series rename to pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/series diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.22/ktextwidgets.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix rename to pkgs/desktops/kde-5/frameworks-5.22/ktextwidgets.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.22/kunitconversion.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kunitconversion.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.22/kwallet.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kwallet.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.22/kwidgetsaddons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kwidgetsaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.22/kwindowsystem.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kwindowsystem.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.22/kxmlgui.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kxmlgui.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.22/kxmlrpcclient.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix rename to pkgs/desktops/kde-5/frameworks-5.22/kxmlrpcclient.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.22/modemmanager-qt.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix rename to pkgs/desktops/kde-5/frameworks-5.22/modemmanager-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.22/networkmanager-qt.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix rename to pkgs/desktops/kde-5/frameworks-5.22/networkmanager-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.22/oxygen-icons5.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix rename to pkgs/desktops/kde-5/frameworks-5.22/oxygen-icons5.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix b/pkgs/desktops/kde-5/frameworks-5.22/plasma-framework.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix rename to pkgs/desktops/kde-5/frameworks-5.22/plasma-framework.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/solid.nix b/pkgs/desktops/kde-5/frameworks-5.22/solid.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/solid.nix rename to pkgs/desktops/kde-5/frameworks-5.22/solid.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.22/sonnet.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix rename to pkgs/desktops/kde-5/frameworks-5.22/sonnet.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix new file mode 100644 index 000000000000..eecb2431f807 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix @@ -0,0 +1,581 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/attica-5.22.0.tar.xz"; + sha256 = "1i26nwxyrb62icw49znlyz9y670cv7xvibzbdfnnxq9czsalwym7"; + name = "attica-5.22.0.tar.xz"; + }; + }; + baloo = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/baloo-5.22.0.tar.xz"; + sha256 = "0h51j41pa8b18jkdna0247z5alqfbvgfzlxc6s6p0c7g7658z0w3"; + name = "baloo-5.22.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/bluez-qt-5.22.0.tar.xz"; + sha256 = "1lrkkg2f2qjj8cy968l3scdrvi506m5hr9x22d1zn6r12fvq6304"; + name = "bluez-qt-5.22.0.tar.xz"; + }; + }; + breeze-icons = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/breeze-icons-5.22.0.tar.xz"; + sha256 = "162698h01cs7116la4jfygn8ka4ffjmnv7nxjl6yhcqrs25nky7l"; + name = "breeze-icons-5.22.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/extra-cmake-modules-5.22.0.tar.xz"; + sha256 = "042ad7kp2ijp66gvz0q60glk95wj9f0fymrjyw68253rqynf3zj3"; + name = "extra-cmake-modules-5.22.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/frameworkintegration-5.22.0.tar.xz"; + sha256 = "0jf9y738r86ss520hqhfll8prrfpha73myj99hbz3sqrix7b0va9"; + name = "frameworkintegration-5.22.0.tar.xz"; + }; + }; + kactivities = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kactivities-5.22.0.tar.xz"; + sha256 = "068jhc6lw47hcibvys968m4wa1b278ccy2gas9iymzzys1ccv6kr"; + name = "kactivities-5.22.0.tar.xz"; + }; + }; + kactivities-stats = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kactivities-stats-5.22.0.tar.xz"; + sha256 = "1gx5wm337nwbwqb56xvl16vhk47v7a5qpx5hhn7ygpfxkgxh6wiq"; + name = "kactivities-stats-5.22.0.tar.xz"; + }; + }; + kapidox = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kapidox-5.22.0.tar.xz"; + sha256 = "0cs133g1rvbcrdvy7zvk5c14p5iwwn0x0m76c2ifal0g8qh0hmd1"; + name = "kapidox-5.22.0.tar.xz"; + }; + }; + karchive = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/karchive-5.22.0.tar.xz"; + sha256 = "1ywd38j6jpwj21kdp504gs0pfvlnvg6ak8hjk6a269pkci3dyf91"; + name = "karchive-5.22.0.tar.xz"; + }; + }; + kauth = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kauth-5.22.0.tar.xz"; + sha256 = "1c0kp25g57nldh1x5vfq9fypbznc991jrry2lydvb06d3jh44vbn"; + name = "kauth-5.22.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kbookmarks-5.22.0.tar.xz"; + sha256 = "093rlg8pprjg7ba52dh2z9j2x5ir7s9kjas6ni4fqxxzpp15hh3p"; + name = "kbookmarks-5.22.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kcmutils-5.22.0.tar.xz"; + sha256 = "1s7gw9l2n92rrcdzy9pnwq8na65axd8bkk9nphyhpbxk76zj1gyy"; + name = "kcmutils-5.22.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kcodecs-5.22.0.tar.xz"; + sha256 = "0rlqs8m2ib2kkj679gn74zqqxzsddfcbywpgwlcd6b992i4cad87"; + name = "kcodecs-5.22.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kcompletion-5.22.0.tar.xz"; + sha256 = "07jqjrddigdqsdy2adzari7g626sakilg9d765s75vncv5amrvzy"; + name = "kcompletion-5.22.0.tar.xz"; + }; + }; + kconfig = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kconfig-5.22.0.tar.xz"; + sha256 = "0n0dzgba96pkabbvk1cfm34j9jirgbd84xha6adscpxs28506cg0"; + name = "kconfig-5.22.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kconfigwidgets-5.22.0.tar.xz"; + sha256 = "0jr6ygd8c0gap2ay2685wj3fx4scrahzbpaaj4bjhq2s79nvmlyg"; + name = "kconfigwidgets-5.22.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kcoreaddons-5.22.0.tar.xz"; + sha256 = "0zzwcw0n9bd3pi3rv7cdwynb67x1bqf1bh3s59hjipf9d412wl15"; + name = "kcoreaddons-5.22.0.tar.xz"; + }; + }; + kcrash = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kcrash-5.22.0.tar.xz"; + sha256 = "1r0i9ngk5jypzfhhssjm5b3n5sqli3jhh896r1qwpfcq9w15x7qg"; + name = "kcrash-5.22.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kdbusaddons-5.22.0.tar.xz"; + sha256 = "0w9spb5i5qi2r5kfgrylpvw6mwjxfhd4j7yslc9jy0q4y8j3f1dk"; + name = "kdbusaddons-5.22.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kdeclarative-5.22.0.tar.xz"; + sha256 = "06n6wqy8dm2hv6dbar453z4rmiyf6f34zak1fhs38sqkfy6syva1"; + name = "kdeclarative-5.22.0.tar.xz"; + }; + }; + kded = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kded-5.22.0.tar.xz"; + sha256 = "1zfggr6pmiypw5bnh6hr22agms589hm7hw35nhfhc4r7qd1drf6q"; + name = "kded-5.22.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/portingAids/kdelibs4support-5.22.0.tar.xz"; + sha256 = "1mmrr54kkicnz4pjksnrh40md80m18mr5ba2la7kwjxmdyl6znm3"; + name = "kdelibs4support-5.22.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kdesignerplugin-5.22.0.tar.xz"; + sha256 = "0cfnmpz845l39qpy5r6pknzm78js81bci9qi0xfnrf8gm3lvjg5l"; + name = "kdesignerplugin-5.22.0.tar.xz"; + }; + }; + kdesu = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kdesu-5.22.0.tar.xz"; + sha256 = "1jsr9m32dyzvsvsy743h3jih8v4yyr2zf15hh908anbamp7449bd"; + name = "kdesu-5.22.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kdewebkit-5.22.0.tar.xz"; + sha256 = "0rmxa4j3jx7689jcf45fghh7jff16x34xrzrw0clg3fj4w47ik0b"; + name = "kdewebkit-5.22.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kdnssd-5.22.0.tar.xz"; + sha256 = "1b0s5gwn51zh2h5w2mzpzjj86qaz6pl7gzqf5q88vpzsiqjg14vp"; + name = "kdnssd-5.22.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kdoctools-5.22.0.tar.xz"; + sha256 = "0y4ayms0hyj4nv5flr0a198lb545plfbxkwhqsmzc0c77gagcw5k"; + name = "kdoctools-5.22.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kemoticons-5.22.0.tar.xz"; + sha256 = "1swrpqm441ngmps00hr15pgvw1382zbf2q2ncndj7i30725nfq1g"; + name = "kemoticons-5.22.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kfilemetadata-5.22.0.tar.xz"; + sha256 = "0p6s1r2qv5396ghkw79wyf7yf4hzj562yp83wgplwmr6lgh4b2fc"; + name = "kfilemetadata-5.22.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kglobalaccel-5.22.0.tar.xz"; + sha256 = "1m1aviz5g0vwk58j0z9jckz4rzns7md7mr3zlqqpvp1r032qc30k"; + name = "kglobalaccel-5.22.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kguiaddons-5.22.0.tar.xz"; + sha256 = "10chxcvf4hxyfkgprsj7rg4dv788dzqjgsm6m0a4m6qmx12zhckh"; + name = "kguiaddons-5.22.0.tar.xz"; + }; + }; + khtml = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/portingAids/khtml-5.22.0.tar.xz"; + sha256 = "1w5q41fjrqqq91j3dvhc9lrrhvrwy1izws6af7srh768gn6yig0m"; + name = "khtml-5.22.0.tar.xz"; + }; + }; + ki18n = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/ki18n-5.22.0.tar.xz"; + sha256 = "0881y42h5k8ik6lf7pfsylch1ldksc5m4qm3gvshp8aazic8iyzd"; + name = "ki18n-5.22.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kiconthemes-5.22.0.tar.xz"; + sha256 = "1bh76f7kpha4c5qs3n8z6g1qah0rsk99yqcz8j1dlss4ws65j9j3"; + name = "kiconthemes-5.22.0.tar.xz"; + }; + }; + kidletime = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kidletime-5.22.0.tar.xz"; + sha256 = "0dgw0rin6wz31xdspbjpvcs5x1b163ggqkz2zn73zavbr7f5jypc"; + name = "kidletime-5.22.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kimageformats-5.22.0.tar.xz"; + sha256 = "0g3f73m3yj5iqivcsn83pm32w4l13zbyzz5azgm3jjfhgnd00c18"; + name = "kimageformats-5.22.0.tar.xz"; + }; + }; + kinit = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kinit-5.22.0.tar.xz"; + sha256 = "1f71y6gf00p4jkqvpzyjlbnwc4gvjl2h4wi61xhpjz8lrmpsb6ac"; + name = "kinit-5.22.0.tar.xz"; + }; + }; + kio = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kio-5.22.0.tar.xz"; + sha256 = "02knylbs9ymb8qm7fkp3dkdqc9cvgw2dwfl4phzl1iax2fx2zkqy"; + name = "kio-5.22.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kitemmodels-5.22.0.tar.xz"; + sha256 = "03gnglfhpzrc67bi0xdcy4xdhankic5cqnpahp9wwsis12ac6i83"; + name = "kitemmodels-5.22.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kitemviews-5.22.0.tar.xz"; + sha256 = "0nhwg7bmv1c8p6pnbfsz96mq9wbq339ir9yp7kfnhfrg0wqi44ar"; + name = "kitemviews-5.22.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kjobwidgets-5.22.0.tar.xz"; + sha256 = "1inqrb0j64b3519qcr0wk9izd4c1zi4kfjc8wa04s2kwxg6z7j1p"; + name = "kjobwidgets-5.22.0.tar.xz"; + }; + }; + kjs = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/portingAids/kjs-5.22.0.tar.xz"; + sha256 = "0xqlkhm8r021xd5a25nwp9a4r7cbjkpqkc89fjma8qyvq5785qxw"; + name = "kjs-5.22.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/portingAids/kjsembed-5.22.0.tar.xz"; + sha256 = "0fcc1lm5l8r0lj35r3niliyn8zxr90by2vjc9krzfm4i7kwij7wb"; + name = "kjsembed-5.22.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/portingAids/kmediaplayer-5.22.0.tar.xz"; + sha256 = "1pn3fmaixcxba1wl63hblhnpj7jblrala9j3xrj8z2abhhfl5vzy"; + name = "kmediaplayer-5.22.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/knewstuff-5.22.0.tar.xz"; + sha256 = "1gr566k95bg58hpn569kkarmlxk5rp12jcxdp7ksw1j8mp6la7a7"; + name = "knewstuff-5.22.0.tar.xz"; + }; + }; + knotifications = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/knotifications-5.22.0.tar.xz"; + sha256 = "0fh6ahfr9pa8643i1ma40h7afnd1jn0m6dw5f9hgndxhwi6h3bps"; + name = "knotifications-5.22.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/knotifyconfig-5.22.0.tar.xz"; + sha256 = "0p4g7wv2w6cpjzhlkh7rnzzhwcj86sgz98fl97is1fl65q8f0szr"; + name = "knotifyconfig-5.22.0.tar.xz"; + }; + }; + kpackage = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kpackage-5.22.0.tar.xz"; + sha256 = "1nbwjc4n8f2iisdckm5ll3qyls1sq02ia6vmhj4mfm4w44q4s1bk"; + name = "kpackage-5.22.0.tar.xz"; + }; + }; + kparts = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kparts-5.22.0.tar.xz"; + sha256 = "091wm2flhqgpqsffdd8nlwbdffvsj7cyd0c46949d9chm64723cg"; + name = "kparts-5.22.0.tar.xz"; + }; + }; + kpeople = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kpeople-5.22.0.tar.xz"; + sha256 = "0rbwxzmyaig92vcd26v1yqd13swk15pp0lpvjp6hdpxbhpxijyf7"; + name = "kpeople-5.22.0.tar.xz"; + }; + }; + kplotting = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kplotting-5.22.0.tar.xz"; + sha256 = "0ljiyxa2320v937lkqkxx3jc7sg45z4vjl74lxfybwspgs6y5hqk"; + name = "kplotting-5.22.0.tar.xz"; + }; + }; + kpty = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kpty-5.22.0.tar.xz"; + sha256 = "12lfwv45d06ksx5xc4hgk075mj2ckkqpc8mksx99f700yvcyk1db"; + name = "kpty-5.22.0.tar.xz"; + }; + }; + kross = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/portingAids/kross-5.22.0.tar.xz"; + sha256 = "1ika9ha06vspjn8hy6mv5vi5n7xj7sj45csmjjxcqwhn2wlcdj4l"; + name = "kross-5.22.0.tar.xz"; + }; + }; + krunner = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/krunner-5.22.0.tar.xz"; + sha256 = "09jhdy48dciqd8hwxmvjyw547fr48mzns5f0yknsnnb8a47yhrd4"; + name = "krunner-5.22.0.tar.xz"; + }; + }; + kservice = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kservice-5.22.0.tar.xz"; + sha256 = "1c5q8cxghbji3imamjbxymcd5cz9a9rapqriy1wmskys3ms3fag9"; + name = "kservice-5.22.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/ktexteditor-5.22.0.tar.xz"; + sha256 = "1jsa8cfq0245bsris46i3k8f8g7l0sc5jpj4iwkxrl9m0nk5j1v0"; + name = "ktexteditor-5.22.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/ktextwidgets-5.22.0.tar.xz"; + sha256 = "01a2vkdpq06libap5g6a90jrcc0phmfd859kilraqyxhbrp9sw5l"; + name = "ktextwidgets-5.22.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kunitconversion-5.22.0.tar.xz"; + sha256 = "1phbqxddp8ks36nr4982n4bwwx7d6yxll629gpb0ddc4yfsjv48p"; + name = "kunitconversion-5.22.0.tar.xz"; + }; + }; + kwallet = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kwallet-5.22.0.tar.xz"; + sha256 = "1i20kp1gkdiwmwy8vf7vd6r89qx6lpxwr6nib35khp93ci9l3838"; + name = "kwallet-5.22.0.tar.xz"; + }; + }; + kwayland = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kwayland-5.22.0.tar.xz"; + sha256 = "1jfibqai7vy1vklj19x7z0r4qc0rc7yd5r4wpp98mmdwzpnhlrgy"; + name = "kwayland-5.22.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kwidgetsaddons-5.22.0.tar.xz"; + sha256 = "1bwmnfa1l3s33nc6b0ryk78gxhrynyd07ffqw7mw211r34pg4c14"; + name = "kwidgetsaddons-5.22.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kwindowsystem-5.22.0.tar.xz"; + sha256 = "05jwmjqk03pc2g09rnyb9qh0dfi0c46awbaxgc7i7z4i9swv1k30"; + name = "kwindowsystem-5.22.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kxmlgui-5.22.0.tar.xz"; + sha256 = "16q222jvnsd6pj49ih44qpks97lcjsamcpjg5x5ysn4a6w5h4mds"; + name = "kxmlgui-5.22.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/kxmlrpcclient-5.22.0.tar.xz"; + sha256 = "00qj4pa7r0ny6pwivq6qqw80v4dsg9lgwd2qdlp9kddi0f8i2p1b"; + name = "kxmlrpcclient-5.22.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/modemmanager-qt-5.22.0.tar.xz"; + sha256 = "1b1gx33vrw7qcvy3zlc01x7wlalx5csfl590gfxlf870i3m7dnhf"; + name = "modemmanager-qt-5.22.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/networkmanager-qt-5.22.0.tar.xz"; + sha256 = "03b710n4107qw9c3p7wdma9fz9vqixrjydfa02f7vgzw1rixmmqq"; + name = "networkmanager-qt-5.22.0.tar.xz"; + }; + }; + oxygen-icons5 = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/oxygen-icons5-5.22.0.tar.xz"; + sha256 = "1m3f5wrgahqlzzl3jyfymh6n515fsmsi8ckimvma2d8qqpb0dc2l"; + name = "oxygen-icons5-5.22.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/plasma-framework-5.22.0.tar.xz"; + sha256 = "1wn7ib030dw8rj5dprl8bzz4c3dv4nlmrfb9wgr6x78w4ac967zc"; + name = "plasma-framework-5.22.0.tar.xz"; + }; + }; + solid = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/solid-5.22.0.tar.xz"; + sha256 = "04a7z5g2ylhbj2572wa6w51cs98ddn4d7lfirzawxf0f8d2693w2"; + name = "solid-5.22.0.tar.xz"; + }; + }; + sonnet = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/sonnet-5.22.0.tar.xz"; + sha256 = "0y8l3mfa65a59vjj424ga87q3bixx8inicp2jp9zi36p4g7xwww8"; + name = "sonnet-5.22.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.22.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.22/threadweaver-5.22.0.tar.xz"; + sha256 = "1ax58k6nl8za79j99spa2r76m9xz8ih9iflksgpng40wlnkwlp59"; + name = "threadweaver-5.22.0.tar.xz"; + }; + }; +} diff --git a/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.22/threadweaver.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix rename to pkgs/desktops/kde-5/frameworks-5.22/threadweaver.nix diff --git a/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh index 93f58373ca29..adb61ceeab0f 100755 --- a/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh +++ b/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/plasma/5.6.3/" +RELEASE_URL="http://download.kde.org/stable/plasma/5.6.4/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch index ead7452daa84..ca85119e97f0 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch @@ -1,17 +1,17 @@ -From 7c379686def9f15be1aa8fa4b5358124f7ed57c6 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 19 Oct 2015 18:45:36 -0500 -Subject: [PATCH 1/3] qt-5.5 QML import paths +From a91568d7c6635f4d66bb4e8ebaf2666c24980312 Mon Sep 17 00:00:00 2001 +From: Frederik Rietdijk +Date: Sat, 14 May 2016 12:54:27 +0200 +Subject: [PATCH] qml import paths --- applets/pager/package/contents/ui/main.qml | 2 +- containments/desktop/package/contents/ui/FolderView.qml | 2 +- - containments/desktop/package/contents/ui/main.qml | 2 +- + containments/desktop/package/contents/ui/main.qml | 4 ++-- containments/panel/contents/ui/main.qml | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml -index 0c367c6..c9a82be 100644 +index b8eb8a6..fad3f69 100644 --- a/applets/pager/package/contents/ui/main.qml +++ b/applets/pager/package/contents/ui/main.qml @@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents @@ -24,7 +24,7 @@ index 0c367c6..c9a82be 100644 MouseArea { id: root diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml -index 578ec87..04e088c 100644 +index ced3507..6073545 100644 --- a/containments/desktop/package/contents/ui/FolderView.qml +++ b/containments/desktop/package/contents/ui/FolderView.qml @@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras @@ -37,20 +37,22 @@ index 578ec87..04e088c 100644 Item { id: main diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml -index 422e8f7..3c8906e 100644 +index a438b74..b907a36 100644 --- a/containments/desktop/package/contents/ui/main.qml +++ b/containments/desktop/package/contents/ui/main.qml -@@ -29,7 +29,7 @@ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons +@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons import org.kde.private.desktopcontainment.desktop 0.1 as Desktop -import "LayoutManager.js" as LayoutManager +-import "FolderTools.js" as FolderTools +import "../code/LayoutManager.js" as LayoutManager ++import "../code/FolderTools.js" as FolderTools DragDrop.DropArea { id: root diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml -index bad6ba0..b1fc331 100644 +index 4d71c6e..337c356 100644 --- a/containments/panel/contents/ui/main.qml +++ b/containments/panel/contents/ui/main.qml @@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents @@ -63,5 +65,5 @@ index bad6ba0..b1fc331 100644 DragDrop.DropArea { id: root -- -2.6.3 +2.8.0 diff --git a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix index 288378771e50..76b5befacdee 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix @@ -3,339 +3,339 @@ { bluedevil = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/bluedevil-5.6.3.tar.xz"; - sha256 = "1x8rdsk2jhx01pfw5d74ks2240w9pky7c38rwb84w18l3w1mrq6q"; - name = "bluedevil-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/bluedevil-5.6.4.tar.xz"; + sha256 = "043damq5pgalrv77rggcwkvhvxkdpmzhq022zga7nvbzv58hygk0"; + name = "bluedevil-5.6.4.tar.xz"; }; }; breeze = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/breeze-5.6.3.tar.xz"; - sha256 = "191pkbkn1hb1c2k7f5y8x2wm99p4v2rm74jk1ygqk72bh8wpc9zx"; - name = "breeze-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/breeze-5.6.4.tar.xz"; + sha256 = "184fkv6wda3g0fcmvnzck1vz7vmiin9zsgi3lycrnhf8bwmdp88x"; + name = "breeze-5.6.4.tar.xz"; }; }; breeze-grub = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/breeze-grub-5.6.3.tar.xz"; - sha256 = "0i4kxjw8rmp3y40z10yyc792kbvyai9pxd4lva24bilzsh3x2g5c"; - name = "breeze-grub-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/breeze-grub-5.6.4.tar.xz"; + sha256 = "0ccc1r7gmfgv5hbd2lvy8qmkmnfsxywax136i0813bjnc3nmvmpy"; + name = "breeze-grub-5.6.4.tar.xz"; }; }; breeze-gtk = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/breeze-gtk-5.6.3.tar.xz"; - sha256 = "0yr20v5b0hq4jicfx8lxmy23znqwf3d87hz88qiizjiad4fyy4ca"; - name = "breeze-gtk-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/breeze-gtk-5.6.4.tar.xz"; + sha256 = "07y5vpikp2q0knmf86m5hzg8dl7a05zlcmd56mg655b9vijkn7sp"; + name = "breeze-gtk-5.6.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/breeze-plymouth-5.6.3.tar.xz"; - sha256 = "0gkiwravkpxwk9r6l0mzjyr5hc9fpj1d6l5a0i755q7m80h1dahk"; - name = "breeze-plymouth-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/breeze-plymouth-5.6.4.tar.xz"; + sha256 = "1vdxbl4mkdmac9i1wnnlsfpx35n6qzymjkjm3zmxa5saxdwv6w0f"; + name = "breeze-plymouth-5.6.4.tar.xz"; }; }; discover = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/discover-5.6.3.tar.xz"; - sha256 = "1rpn22xjabsaakqgdsx0vz4h0v40l8ssfrjqahpj95axs14zi2gg"; - name = "discover-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/discover-5.6.4.tar.xz"; + sha256 = "0l9rp77hm8gbih7qkr8j1nf37mymysbyjj9nxx3ilgv3dac1x6lb"; + name = "discover-5.6.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kactivitymanagerd-5.6.3.tar.xz"; - sha256 = "0zs3z4r27iiqz3wjsv09ik3h45g2f08y1p3mr1ihiss07qgknbz6"; - name = "kactivitymanagerd-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kactivitymanagerd-5.6.4.tar.xz"; + sha256 = "0xpy392w0xcssabblkw3q7gv9ajn1725i0q5lm3xzrl0x0iq3h2z"; + name = "kactivitymanagerd-5.6.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kde-cli-tools-5.6.3.tar.xz"; - sha256 = "1cxbvgc3nhrr98ygm3i7srr26ds2rmbg6fzjqvdz2z4bz80ai892"; - name = "kde-cli-tools-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kde-cli-tools-5.6.4.tar.xz"; + sha256 = "1kmhi9jx40s8i8zvim0v9dx66gpg6nvjl88ir0w7r903c4c58kpm"; + name = "kde-cli-tools-5.6.4.tar.xz"; }; }; kdecoration = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kdecoration-5.6.3.tar.xz"; - sha256 = "03iryqrkrpphvc8xpqmmpbdgg7rim9yvvyx3kxrjgpbh2xy6rwsr"; - name = "kdecoration-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kdecoration-5.6.4.tar.xz"; + sha256 = "0i84nii940xnd94cch4z7zax3y157mjfngcil34ar0n2lpgya2ap"; + name = "kdecoration-5.6.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kde-gtk-config-5.6.3.tar.xz"; - sha256 = "0jiraahajpfn5k81j077l4ipfadq9aqnnca0kfyag488mhkgmil1"; - name = "kde-gtk-config-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kde-gtk-config-5.6.4.tar.xz"; + sha256 = "11798j2024zjpjmpiwj8a9kp3r9lpkahpvkpyxq2pqsvj4rfi55r"; + name = "kde-gtk-config-5.6.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kdeplasma-addons-5.6.3.tar.xz"; - sha256 = "1p70ms91hd9lhg9fabnrpz1wkc2la9315ffk2wxi334sx4k70gcs"; - name = "kdeplasma-addons-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kdeplasma-addons-5.6.4.tar.xz"; + sha256 = "0h20nq5kkd8gn4x2fysfmzwina6cb98d41c8m7c2vxiw6ycsl5id"; + name = "kdeplasma-addons-5.6.4.tar.xz"; }; }; kgamma5 = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kgamma5-5.6.3.tar.xz"; - sha256 = "1wv32s6yc4b8qaskdb444r7j918pz0x8mkal5affbr12vzfz8m6r"; - name = "kgamma5-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kgamma5-5.6.4.tar.xz"; + sha256 = "0zc7rdw52awrasiynd3b6lhizpzh8yj097fplvnni7nq6mxsc3x3"; + name = "kgamma5-5.6.4.tar.xz"; }; }; khelpcenter = { - version = "5.6.3"; + version = "5.6.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/khelpcenter-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/khelpcenter-5.6.4.1.tar.xz"; sha256 = "14mwy1rv04mp92dfci6ak6dvmaqx2vc0yk0zyp1v6s64jiry658g"; - name = "khelpcenter-5.6.3.tar.xz"; + name = "khelpcenter-5.6.4.1.tar.xz"; }; }; khotkeys = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/khotkeys-5.6.3.tar.xz"; - sha256 = "05235ckdr81cl46iyalapjxxmybqd8b2zy1yqclv7fwld2c347pc"; - name = "khotkeys-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/khotkeys-5.6.4.tar.xz"; + sha256 = "1xkxzganifvcrinj2hwp9927yqzsqp0mawnfbxnpyhas2jj813c5"; + name = "khotkeys-5.6.4.tar.xz"; }; }; kinfocenter = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kinfocenter-5.6.3.tar.xz"; - sha256 = "1rvixj9sr98abna8ss6bmvf7g7i4nm5xa49dv4d42874kskqjci5"; - name = "kinfocenter-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kinfocenter-5.6.4.tar.xz"; + sha256 = "19rkb2rprfyh9i4dn7kz2gf4yxmigq3qdhksffn56g2r77wfp56c"; + name = "kinfocenter-5.6.4.tar.xz"; }; }; kmenuedit = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kmenuedit-5.6.3.tar.xz"; - sha256 = "169ybp4vvay5isfwk2kv73npspiww2abb4vaa7af8rbiv82cwr0g"; - name = "kmenuedit-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kmenuedit-5.6.4.tar.xz"; + sha256 = "1si5gxlcvdywbzwgw6xnwkx509gbc9jpbw5n1kgzxrya0s0baf0z"; + name = "kmenuedit-5.6.4.tar.xz"; }; }; kscreen = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kscreen-5.6.3.tar.xz"; - sha256 = "1cvgxwdh742r7dk59qqa4w28sd7k62gjy7w5hmq3dnhka0nlxr74"; - name = "kscreen-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kscreen-5.6.4.tar.xz"; + sha256 = "0h722khwnd41537daz5v1303jz7h2b72x9gdfxbihvb7gxaxq9yj"; + name = "kscreen-5.6.4.tar.xz"; }; }; kscreenlocker = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kscreenlocker-5.6.3.tar.xz"; - sha256 = "13fqmazqrhcdg32iwdym9rci9fj2jn02mkc01rz8fw9a8fwxzdcn"; - name = "kscreenlocker-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kscreenlocker-5.6.4.tar.xz"; + sha256 = "0anhcpl5r0x17i412imn8q0078dqpxgn1wmjz8xjfn33i2y32k0h"; + name = "kscreenlocker-5.6.4.tar.xz"; }; }; ksshaskpass = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/ksshaskpass-5.6.3.tar.xz"; - sha256 = "0bxpwlylfnicipwkf5fq3s62w9gq8gcxl6iby1lmw8m55fm1xd7y"; - name = "ksshaskpass-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/ksshaskpass-5.6.4.tar.xz"; + sha256 = "1qzxj152pq53ach0ddc7adg6dvz250pzd5vaz7w79jbjn9pgkaky"; + name = "ksshaskpass-5.6.4.tar.xz"; }; }; ksysguard = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/ksysguard-5.6.3.tar.xz"; - sha256 = "0vh0wpsv0jlj6lq6fl45k7aivbj2nwq5ksfnyad74v20qhy2069b"; - name = "ksysguard-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/ksysguard-5.6.4.tar.xz"; + sha256 = "0003w4kad8lvs0hi49qq49sxg8hsqa1b82miw0cmb3r08ivr1pc1"; + name = "ksysguard-5.6.4.tar.xz"; }; }; kwallet-pam = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kwallet-pam-5.6.3.tar.xz"; - sha256 = "1zy5s3pv7qlyckzaz7yvqzb0w478q6zldmm5w7m4ax90j16ihg7n"; - name = "kwallet-pam-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kwallet-pam-5.6.4.tar.xz"; + sha256 = "1yr5nhxrrkz49qn1nd7ql6k1wvilzy1vg40m3x65wk3gbgajq2xj"; + name = "kwallet-pam-5.6.4.tar.xz"; }; }; kwayland = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kwayland-5.6.3.tar.xz"; - sha256 = "04rpvgs25dqrac8bg46w1dpxpwavrlrjyc71bxqiddrya798485v"; - name = "kwayland-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kwayland-5.6.4.tar.xz"; + sha256 = "0limprv5sniscnar6l0q2805nvfiv375r4kdwwlq8r0g7cj1bb6q"; + name = "kwayland-5.6.4.tar.xz"; }; }; kwayland-integration = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kwayland-integration-5.6.3.tar.xz"; - sha256 = "19p224n7knih7gikcxkx6n4v49ysgkxd6ghpqwnw5y6jx147qyg4"; - name = "kwayland-integration-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kwayland-integration-5.6.4.tar.xz"; + sha256 = "1jxl6pmbq33sv09lrs558hpy7n7liz3c0l9mmnsnvam43lmj2mzi"; + name = "kwayland-integration-5.6.4.tar.xz"; }; }; kwin = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kwin-5.6.3.tar.xz"; - sha256 = "0dxscqk5kqkqfq5cs8qpfwi38i20q3w7r8wvq5l8r9q0q56bsnrk"; - name = "kwin-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kwin-5.6.4.tar.xz"; + sha256 = "09869hnck8fas5hkpnn7przdn2hzj8cljpasnzy30nc3h5823rdc"; + name = "kwin-5.6.4.tar.xz"; }; }; kwrited = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/kwrited-5.6.3.tar.xz"; - sha256 = "18lqr7an6zzlqs2s50arw5zwfdzxl644c7i00j332nlv23yxc1g3"; - name = "kwrited-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/kwrited-5.6.4.tar.xz"; + sha256 = "0cgi9ad0kns5z926hbdpg1hrp3pcpjcfpxna248qq7xf9il8cg2q"; + name = "kwrited-5.6.4.tar.xz"; }; }; libkscreen = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/libkscreen-5.6.3.tar.xz"; - sha256 = "0w1v432i8xjk0xgs6vbz68myfqfa93kzhhya4mqri7jzjc6nyc1y"; - name = "libkscreen-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/libkscreen-5.6.4.tar.xz"; + sha256 = "1rrargaaz39xxn9rgvlgm15c9y4zyvz35h4dv6fz7vrix2cjpqkx"; + name = "libkscreen-5.6.4.tar.xz"; }; }; libksysguard = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/libksysguard-5.6.3.tar.xz"; - sha256 = "16pf9p9dbq08mlqrcqrxsmwxgi1dp1rzbm4icksr99cjm30zss0g"; - name = "libksysguard-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/libksysguard-5.6.4.tar.xz"; + sha256 = "0acwb9qnrygggywyf5vj7768mp269hmnxz2q0vgn3pwpc68l4xj6"; + name = "libksysguard-5.6.4.tar.xz"; }; }; milou = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/milou-5.6.3.tar.xz"; - sha256 = "18d3knb1ndj39pffy5xsqdyncsym0izv73r0cmmc3mw8x7xshcfc"; - name = "milou-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/milou-5.6.4.tar.xz"; + sha256 = "1j22i98qwc14xbhc2yy0qq100rnddkmkr6q432pfd2cz31l5pvyk"; + name = "milou-5.6.4.tar.xz"; }; }; oxygen = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/oxygen-5.6.3.tar.xz"; - sha256 = "1pnal63by1hnjal356lmadk7sxq2pndi1gfhf8lmqpw0n5dwd9ng"; - name = "oxygen-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/oxygen-5.6.4.tar.xz"; + sha256 = "0h8ib1b7l1i92vnwhzdxsw8vspx420dk1pw3dg0p550vw411nfm9"; + name = "oxygen-5.6.4.tar.xz"; }; }; plasma-desktop = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/plasma-desktop-5.6.3.tar.xz"; - sha256 = "0dk4ya5srb4czslakbi1f7gyrriv1lb6cdkfirqznax561bk6dk7"; - name = "plasma-desktop-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/plasma-desktop-5.6.4.tar.xz"; + sha256 = "0xj8y2w8qzxih47qmyg31h588i8g2nlyx7rr3qkj8zvllq1fqspw"; + name = "plasma-desktop-5.6.4.tar.xz"; }; }; plasma-integration = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/plasma-integration-5.6.3.tar.xz"; - sha256 = "0wx62s6l8kqhsrc88zji9ydaqgplc9y7l2s52qfwm2g464k4i1qw"; - name = "plasma-integration-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/plasma-integration-5.6.4.tar.xz"; + sha256 = "1aqv3agcba6w789mmg0r56afywqkxwcwnvfznaxzzwi33y039x4m"; + name = "plasma-integration-5.6.4.tar.xz"; }; }; plasma-mediacenter = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/plasma-mediacenter-5.6.3.tar.xz"; - sha256 = "17g5hkpjqsifb413f4p9y10hnbk74k3vbk5srcx46byrsjbkasgq"; - name = "plasma-mediacenter-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/plasma-mediacenter-5.6.4.tar.xz"; + sha256 = "0w2s6s4azdh3if2w88p5h2p8kw14l7z6h6pddj3m4hyq2nyk5izc"; + name = "plasma-mediacenter-5.6.4.tar.xz"; }; }; plasma-nm = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/plasma-nm-5.6.3.tar.xz"; - sha256 = "0axsv7nxfwqhjq3j5yn30b76wvr8p21p5jlqspq7yxhmxhk88x4j"; - name = "plasma-nm-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/plasma-nm-5.6.4.tar.xz"; + sha256 = "1g0flz5f8ydbi1an55anw4zz1h2wmf6xq500qs7ww038gk24113v"; + name = "plasma-nm-5.6.4.tar.xz"; }; }; plasma-pa = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/plasma-pa-5.6.3.tar.xz"; - sha256 = "1d623xav0ckabckr9v51sg6a6695fi7pkcy86q2lrpg1m6f2m2l3"; - name = "plasma-pa-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/plasma-pa-5.6.4.tar.xz"; + sha256 = "0whlqhlnadk20qjmiyhxxsh0g1djmn6hjiqlpya224gjdpg9205s"; + name = "plasma-pa-5.6.4.tar.xz"; }; }; plasma-sdk = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/plasma-sdk-5.6.3.tar.xz"; - sha256 = "0w8gcm0hgqk3yqr981zf1xzd024b06y7zxqmzsbzcr3sfh85f0b2"; - name = "plasma-sdk-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/plasma-sdk-5.6.4.tar.xz"; + sha256 = "1x2g1kf40g249n7hcq15k4nxv269lw2v4y49j448gzp4hglfkq4i"; + name = "plasma-sdk-5.6.4.tar.xz"; }; }; plasma-workspace = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/plasma-workspace-5.6.3.tar.xz"; - sha256 = "0p4g15x1ifcc4kn224h66a6fyv3iki1qqpfnihvmkdxmifmbzy2c"; - name = "plasma-workspace-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/plasma-workspace-5.6.4.tar.xz"; + sha256 = "1rrhw13hr8b3088lxjzaks439yi1kx53qxm8iwspnnkx9b88n18v"; + name = "plasma-workspace-5.6.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/plasma-workspace-wallpapers-5.6.3.tar.xz"; - sha256 = "0jdwm01q7h47qrx832kqshrh17dz4dhjbqmy1x17barxd759kd09"; - name = "plasma-workspace-wallpapers-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/plasma-workspace-wallpapers-5.6.4.tar.xz"; + sha256 = "1nzzi19jgfprlhiq7kfarv1z4c4p2vcdds75hk304sb2bj0a1fq3"; + name = "plasma-workspace-wallpapers-5.6.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.6.3"; + version = "1-5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/polkit-kde-agent-1-5.6.3.tar.xz"; - sha256 = "1d28v8fb5w5snfn5nwghz8mwvk8p1ahs3kxjkhqkwb6sb6l0kkq1"; - name = "polkit-kde-agent-1-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/polkit-kde-agent-1-5.6.4.tar.xz"; + sha256 = "07lkhsb9yr4223qxlfkzl54jsl3amdlf9f86cqh1mryk9hqx4p6z"; + name = "polkit-kde-agent-1-5.6.4.tar.xz"; }; }; powerdevil = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/powerdevil-5.6.3.tar.xz"; - sha256 = "1gq04f2pgr3y7wi3jg6xrk8b3fhf1fqn82knv7cix0d5b2khy2lp"; - name = "powerdevil-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/powerdevil-5.6.4.tar.xz"; + sha256 = "0yv0wcfs678z1h0lglsky439c8qqiz0m6630sv254xydsdwld1m5"; + name = "powerdevil-5.6.4.tar.xz"; }; }; sddm-kcm = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/sddm-kcm-5.6.3.tar.xz"; - sha256 = "1kqkl4p65vl2mvgigw24w3p9p4f0j2fz4d2rv1iy2w93kznl9b4s"; - name = "sddm-kcm-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/sddm-kcm-5.6.4.tar.xz"; + sha256 = "05f7xx0ayyq5l15j7cq6rpb9l473lkizcf41yrr0aszrzj45i94v"; + name = "sddm-kcm-5.6.4.tar.xz"; }; }; systemsettings = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/systemsettings-5.6.3.tar.xz"; - sha256 = "16fgr1qwfbmzriajisq4sj978lni11d4ig80z7k1h7g5xxhahk9k"; - name = "systemsettings-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/systemsettings-5.6.4.tar.xz"; + sha256 = "1i4pqz4whikcvnpprkv9hd435h4akrnmqrjcvq55v3nr8fxd0dlv"; + name = "systemsettings-5.6.4.tar.xz"; }; }; user-manager = { - version = "5.6.3"; + version = "5.6.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.6.3/user-manager-5.6.3.tar.xz"; - sha256 = "1slvz0nxhafpprbdzf87dpiw62yar62ia78rcr9xabgz2rfl0bhl"; - name = "user-manager-5.6.3.tar.xz"; + url = "${mirror}/stable/plasma/5.6.4/user-manager-5.6.4.tar.xz"; + sha256 = "1p1xxs4hjacdn2kr2v2rx1c7kipkgsf8wp3bvpf9vpg4g384p2rm"; + name = "user-manager-5.6.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix index 8181b809c83f..7e25bfa75b74 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter.nix @@ -1,19 +1,23 @@ { stdenv, fetchurl, pkgconfig, intltool, xfce4panel, libxfce4util, gtk, libsoup -, exo}: +, exo, hicolor_icon_theme }: stdenv.mkDerivation rec { p_name = "xfce4-screenshooter"; ver_maj = "1.8"; - ver_min = "1"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492"; + sha256 = "9dce2ddfaa87f703e870e29bae13f3fc82a1b3f06b44f8386640e45a135f5f69"; }; name = "${p_name}-${ver_maj}.${ver_min}"; + nativeBuildInputs = [ + pkgconfig intltool + ]; + buildInputs = [ - pkgconfig intltool xfce4panel libxfce4util gtk libsoup exo + xfce4panel libxfce4util gtk libsoup exo hicolor_icon_theme ]; meta = { diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 06046bc122b3..0da2756f877f 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -61,7 +61,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od xfce4notifyd = callPackage ./applications/xfce4-notifyd.nix { }; xfce4taskmanager= callPackage ./applications/xfce4-taskmanager.nix { }; xfce4terminal = callPackage ./applications/terminal.nix { }; - xfce4screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; + xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter.nix { }; xfce4volumed = let gst = callPackage ./applications/xfce4-volumed.nix { }; pulse = callPackage ./applications/xfce4-volumed-pulse.nix { }; diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 1c915fb5a1d2..bcdeb2f19e81 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation { and powerful properties of functional, object-oriented and aspect-oriented styles. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 8b4ea36330c0..51b3cf11823f 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.2.6"; + version = "0.2.7"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "0hfaw8mrxrmb9kdbz5sp4nfjsmncmq6zqwm1n2x2p6arn0za6y9i"; + sha256 = "1w9cncahv0vkqsj4vlfnn7bn61jvgxgjhk7wbppcm3yhb48pkmda"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 09e3751580c5..5089f703d5ed 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -515,7 +515,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric simons ]; + maintainers = with stdenv.lib.maintainers; [ viric peti ]; # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 2d568980fd45..212413648236 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -522,7 +522,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric simons ]; + maintainers = with stdenv.lib.maintainers; [ viric peti ]; # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 20c60eac3097..d7ff8fe99dfc 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -515,7 +515,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric simons ]; + maintainers = with stdenv.lib.maintainers; [ viric peti ]; # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index cbd4e1e340c9..6ca0f2f59f44 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -515,7 +515,7 @@ stdenv.mkDerivation ({ compiler used in the GNU system including the GNU/Linux variant. ''; - maintainers = with stdenv.lib.maintainers; [ viric simons ]; + maintainers = with stdenv.lib.maintainers; [ viric peti ]; # gnatboot is not available out of linux platforms, so we disable the darwin build # for the gnat (ada compiler). diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 5c33a193c501..6ee447be6507 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; broken = true; # broken by gcc 5.x: http://hydra.nixos.org/build/33627548 diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 9152210b420d..7442c5ca53c8 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons + stdenv.lib.maintainers.peti ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is not supported. inherit (ghc.meta) license; diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index d7f1e064030b..aaf76d2ae40c 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index ce62a1277d36..2bed6d1487ad 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index a08745732f88..06f7cb9af2c4 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons + stdenv.lib.maintainers.peti ]; platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. inherit (ghc.meta) license; diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index bf48e50b6b73..c74461a064e6 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons + stdenv.lib.maintainers.peti ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index af9fd3f8d93c..6ee629cc9804 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons + stdenv.lib.maintainers.peti ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix index 706899a8f7ba..55f8655c7009 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index cdcc2cf0e75e..6e10b1443c8f 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 092d9d7820a7..bb8a98d61b1f 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 00de233c0ec2..79234fd55abe 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index f2b5a04df986..283bfedcf54e 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { declarativity of logic programming. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/development/compilers/jhc/default.nix b/pkgs/development/compilers/jhc/default.nix index 091b81b16416..213447bb7ec4 100644 --- a/pkgs/development/compilers/jhc/default.nix +++ b/pkgs/development/compilers/jhc/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; - [ aforemny simons thoughtpolice ]; + [ aforemny peti thoughtpolice ]; }; } diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index 1f38198b30b5..f9857fcc5690 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index 2482f2ac1316..021efbba34c1 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A ISO-compatible high-performance Prolog compiler"; license = stdenv.lib.licenses.artistic2; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.linux; broken = !stdenv.is64bit; # the linux 32 bit build fails. }; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index f6b946dfd4cc..a5f12e2cfe31 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, guile, ncurses, libffi }: stdenv.mkDerivation rec { - name = "guile-ncurses-1.4"; + name = "guile-ncurses-1.7"; src = fetchurl { url = "mirror://gnu/guile-ncurses/${name}.tar.gz"; - sha256 = "070wl664lsm14hb6y9ch97x9q6cns4k6nxgdzbdzi5byixn74899"; + sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; }; buildInputs = [ guile ncurses libffi ]; diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix new file mode 100644 index 000000000000..5a166f3703ee --- /dev/null +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -0,0 +1,47 @@ +{ stdenv, + SDL2, + SDL2_image, + SDL2_ttf, + SDL2_mixer, + autoconf, + automake, + fetchgit, + guile, + libtool, + pkgconfig, + buildEnv + }: +stdenv.mkDerivation rec { + name = "guile-sdl2-${version}"; + version = "0.1.0"; + buildInputs = [ autoconf + automake + SDL2 + SDL2_image + SDL2_ttf + SDL2_mixer + libtool + guile + pkgconfig ]; + src = fetchgit { + url = "git://dthompson.us/guile-sdl2.git"; + rev = "048f80ddb5c6b03b87bba199a99a6f22d911bfff"; + sha256 = "1wbx157xd8lsv4vs8igqy3qw8yym5r5s7z94an18kwbf89npmf5d"; + }; + preConfigurePhases = [ "bootstrapPhase" ]; + bootstrapPhase = '' + ./bootstrap + ''; + configureFlags = [ "--with-libsdl2-prefix=${SDL2}" + "--with-libsdl2-image-prefix=${SDL2_image}" + "--with-libsdl2-ttf-prefix=${SDL2_ttf}" + "--with-libsdl2-mixer-prefix=${SDL2_mixer}"]; + makeFlags = ["GUILE_AUTO_COMPILE=0"]; + meta = { + description = "Bindings to SDL2 for GNU Guile"; + homepage = "https://git.dthompson.us/guile-sdl2.git"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.seppeljordan ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 36e498d4be1b..5a89cd0aed91 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -59,7 +59,7 @@ extra-packages: - zlib < 0.6 # newer versions break cabal-install package-maintainers: - simons: + peti: - cabal2nix - cabal-install - funcmp diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bbdaa79ae124..2fb8e65450f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -47035,7 +47035,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install_1_18_0_6" = callPackage @@ -47071,7 +47071,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install_1_18_0_7" = callPackage @@ -47109,7 +47109,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install_1_18_0_8" = callPackage @@ -47147,7 +47147,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install_1_18_1_0" = callPackage @@ -47185,7 +47185,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install_1_22_6_0" = callPackage @@ -47221,7 +47221,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install_1_22_7_0" = callPackage @@ -47258,7 +47258,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install_1_22_8_0" = callPackage @@ -47293,7 +47293,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install" = callPackage @@ -47327,7 +47327,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install_1_24_0_0" = callPackage @@ -47367,7 +47367,7 @@ self: { description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install-bundle" = callPackage @@ -48117,7 +48117,7 @@ self: { homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal2spec" = callPackage @@ -87198,7 +87198,7 @@ self: { homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "funcons-tools" = callPackage @@ -91278,7 +91278,7 @@ self: { license = stdenv.lib.licenses.gpl3; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; @@ -91345,7 +91345,7 @@ self: { license = stdenv.lib.licenses.gpl3; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; @@ -91412,7 +91412,7 @@ self: { license = stdenv.lib.licenses.gpl3; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; @@ -91479,7 +91479,7 @@ self: { description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; @@ -99181,7 +99181,7 @@ self: { homepage = "http://github.com/peti/hackage-db"; description = "access Hackage's package database via Data.Map"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hackage-diff" = callPackage @@ -112629,7 +112629,7 @@ self: { homepage = "http://github.com/peti/hledger-interest"; description = "computes interest for a given account"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hledger-irr" = callPackage @@ -115725,7 +115725,7 @@ self: { homepage = "http://github.com/peti/hopenssl"; description = "FFI bindings to OpenSSL's EVP digest interface"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) openssl;}; "hopfield" = callPackage @@ -118663,7 +118663,7 @@ self: { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; "hsdns-cache" = callPackage @@ -118758,7 +118758,7 @@ self: { homepage = "http://github.com/peti/hsemail"; description = "Internet Message Parsers"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hsemail-ns" = callPackage @@ -121830,7 +121830,7 @@ self: { homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "hszephyr" = callPackage @@ -132421,7 +132421,7 @@ self: { homepage = "http://github.com/peti/jailbreak-cabal"; description = "Strip version restrictions from build dependencies in Cabal files"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "jalaali" = callPackage @@ -138598,7 +138598,7 @@ self: { homepage = "https://github.com/peti/language-nix#readme"; description = "Data types and useful functions to represent and manipulate the Nix language"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "language-objc" = callPackage @@ -203311,7 +203311,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_0_1_3_1" = callPackage @@ -203380,7 +203380,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_0_1_4_1" = callPackage @@ -203450,7 +203450,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_0_1_5_0" = callPackage @@ -203520,7 +203520,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_0_1_6_0" = callPackage @@ -203590,7 +203590,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_0_1_8_0" = callPackage @@ -203660,7 +203660,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_0_1_10_0" = callPackage @@ -203731,7 +203731,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_0_1_10_1" = callPackage @@ -203802,7 +203802,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_1_0_0" = callPackage @@ -203874,7 +203874,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack_1_0_2" = callPackage @@ -203946,7 +203946,7 @@ self: { description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack" = callPackage @@ -204013,7 +204013,7 @@ self: { homepage = "http://haskellstack.org"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "stack-hpc-coveralls" = callPackage @@ -207109,7 +207109,7 @@ self: { homepage = "http://github.com/peti/streamproc"; description = "Stream Processer Arrow"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "streams_3_2" = callPackage diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 151e0c3cbbc0..7ae7af30717c 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -68,8 +68,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; - # Note: Maintainer of prev. erlang version was simons. If he wants - # to continue maintaining erlang I'm totally ok with that. maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 8096ca555a44..b32e3af9865e 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -85,8 +85,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; - # Note: Maintainer of prev. erlang version was simons. If he wants - # to continue maintaining erlang I'm totally ok with that. maintainers = [ maintainers.the-kenny maintainers.sjmackenzie ]; }; } diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index adeaa9fae7bb..9d9e104fb85f 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -56,6 +56,5 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 313db1038b85..b5ac4157d651 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -98,6 +98,5 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix index faa4b7694ee4..27ca9c9160f8 100644 --- a/pkgs/development/interpreters/lua-5/5.3.nix +++ b/pkgs/development/interpreters/lua-5/5.3.nix @@ -97,6 +97,5 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index e14132a8acfd..3473a11e8198 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { ''; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index fdbf7b1bab63..e9857f6f4400 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -6,8 +6,8 @@ assert zlibSupport -> zlib != null; let - majorVersion = "4.0"; - version = "${majorVersion}.1"; + majorVersion = "5.1.1"; + version = "${majorVersion}"; libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; - sha256 = "1g7iipllgdfjgdkypsa1g2pzxgjw9agp40rh82hk31rsbak2hfbl"; + sha256 = "1dmckvffanmh0b50pq34shnw05r55gjxn43kgvnkz5kkvvsbxdg1"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] @@ -70,15 +70,11 @@ let export HOME="$TMPDIR"; # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail - # disable test_mhlib because it fails for unknown reason - # disable sqlite3 due to https://bugs.pypy.org/issue1740 - # disable test_multiprocessing due to transient errors - # disable test_os because test_urandom_failure fails # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) - # disable test_zipfile64 because it randomly timeouts - # disable test_cpickle because timeouts # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_ssl or test_cpickle or test_sqlite or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python + # disable test_zipfile64 because it causes ENOSPACE + # disable test_epoll because of invalid arg, should be fixed in as of version 5.1.2 + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 or test_epoll )' lib-python ''; installPhase = '' diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 2196bb7e8b86..ceb71c4997ba 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -119,7 +119,7 @@ let ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow iElectric ]; # If you want to use Python 2.6, remove "broken = true;" at your own # risk. Python 2.6 has known security vulnerabilities is not receiving # security updates as of October 2013. diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 6b336766db78..2f8907628fa3 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -173,7 +173,7 @@ let ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow iElectric ]; }; }; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix deleted file mode 100644 index 8a2d24d76f98..000000000000 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ stdenv, fetchurl -, bzip2 -, db -, gdbm -, libX11, xproto -, ncurses -, openssl -, readline -, sqlite -, tcl, tk -, zlib -, callPackage -, self -}: - -assert readline != null -> ncurses != null; - -with stdenv.lib; - -let - majorVersion = "3.2"; - version = "${majorVersion}.6"; - - buildInputs = filter (p: p != null) [ - zlib bzip2 gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto - ]; -in -stdenv.mkDerivation { - name = "python3-${version}"; - pythonVersion = majorVersion; - inherit majorVersion version; - - src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "1p3vvvh3qw8avq959hdl6bq5d6r7mbhrnigqzgx6mllzh40va4hx"; - }; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - - preConfigure = '' - for i in /usr /sw /opt /pkg; do # improve purity - substituteInPlace ./setup.py --replace $i /no-such-path - done - ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} - - configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode - CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" - LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" - ) - ''; - - setupHook = ./setup-hook.sh; - - postInstall = '' - # needed for some packages, especially packages that backport functionality - # to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do - if [[ "$item" != */test_support.py* ]]; then - rm -rf "$item" - else - echo $item - fi - done - touch $out/lib/python${majorVersion}/test/__init__.py - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - paxmark E $out/bin/python${majorVersion} - ''; - - passthru = rec { - zlibSupport = zlib != null; - sqliteSupport = sqlite != null; - dbSupport = db != null; - buildEnv = callPackage ../wrapper.nix { python = self; }; - readlineSupport = readline != null; - opensslSupport = openssl != null; - tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python3.2m"; - isPy3 = true; - isPy32 = true; - is_py3k = true; # deprecated - sitePackages = "lib/${libPrefix}/site-packages"; - interpreter = "${self}/bin/${executable}"; - }; - - enableParallelBuilding = true; - - meta = { - homepage = "http://python.org"; - description = "a high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ]; - }; -} diff --git a/pkgs/development/interpreters/python/3.2/setup-hook.sh b/pkgs/development/interpreters/python/3.2/setup-hook.sh deleted file mode 100644 index e8215ef9877c..000000000000 --- a/pkgs/development/interpreters/python/3.2/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.2/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python3.2/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index 60d56597ea0f..3c4580a061f1 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation { pythonVersion = majorVersion; inherit majorVersion version; + inherit buildInputs; + src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj"; @@ -102,6 +104,6 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.psfl; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow cstrahan ]; }; } diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 517dfc3d8b27..346046441d55 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -27,15 +27,27 @@ let fullVersion = "${version}"; buildInputs = filter (p: p != null) [ - zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto - ]; + zlib + bzip2 + lzma + gdbm + sqlite + db + readline + ncurses + openssl + tcl + tk + libX11 + xproto + ] ++ optionals stdenv.isDarwin [ CF configd ]; in stdenv.mkDerivation { name = "python3-${fullVersion}"; pythonVersion = majorVersion; inherit majorVersion version; - buildInputs = optionals stdenv.isDarwin [ CF configd ]; + inherit buildInputs; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; @@ -115,6 +127,6 @@ stdenv.mkDerivation { ''; license = licenses.psfl; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ]; + maintainers = with maintainers; [ chaoflow iElectric cstrahan ]; }; } diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 15e02d1ab3ed..ae1bbe1e822c 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -27,15 +27,27 @@ let fullVersion = "${version}"; buildInputs = filter (p: p != null) [ - zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto - ]; + zlib + bzip2 + lzma + gdbm + sqlite + db + readline + ncurses + openssl + tcl + tk + libX11 + xproto + ] ++ optionals stdenv.isDarwin [ CF configd ]; in stdenv.mkDerivation { name = "python3-${fullVersion}"; pythonVersion = majorVersion; inherit majorVersion version; - buildInputs = optionals stdenv.isDarwin [ CF configd ]; + inherit buildInputs; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; @@ -115,6 +127,6 @@ stdenv.mkDerivation { ''; license = licenses.psfl; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ]; + maintainers = with maintainers; [ chaoflow iElectric cstrahan ]; }; } diff --git a/pkgs/development/interpreters/python/docs/3.0-html.nix b/pkgs/development/interpreters/python/docs/3.0-html.nix deleted file mode 100644 index fb793da3e5ff..000000000000 --- a/pkgs/development/interpreters/python/docs/3.0-html.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python30-docs-html-3.0.1"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-html.tar.bz2; - sha256 = "0ybjnhg8qfr9kc4axm5xlghkz9dmsg6b1caj6m4gz28q89vggv3c"; - }; - installPhase = '' - mkdir -p $out/share/doc/python30 - cp -R ./ $out/share/doc/python30/html - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix deleted file mode 100644 index e4b185a11c6b..000000000000 --- a/pkgs/development/interpreters/python/docs/3.0-pdf-a4.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python30-docs-pdf-a4-3.0.1"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-pdf-a4.tar.bz2; - sha256 = "1qgcydqxxhy317lkzzs2v5as4hcwcblir8y3mdr173qsg51iggra"; - }; - installPhase = '' - mkdir -p $out/share/doc/python30 - cp -R ./ $out/share/doc/python30/pdf-a4 - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix deleted file mode 100644 index 1373ae21284b..000000000000 --- a/pkgs/development/interpreters/python/docs/3.0-pdf-letter.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python30-docs-pdf-letter-3.0.1"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-pdf-letter.tar.bz2; - sha256 = "1x59q0k6fv55vvpsgr5xcq66k5zsd0f142cp6aa4rb6c81i31yml"; - }; - installPhase = '' - mkdir -p $out/share/doc/python30 - cp -R ./ $out/share/doc/python30/pdf-letter - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.0-text.nix b/pkgs/development/interpreters/python/docs/3.0-text.nix deleted file mode 100644 index c37fa99f7c5b..000000000000 --- a/pkgs/development/interpreters/python/docs/3.0-text.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python30-docs-text-3.0.1"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.0.1/python-3.0.1-docs-text.tar.bz2; - sha256 = "12qlh9ywbnw50wk5siq7lmhr935dd16q3vjbii6gfv0g80b1byzx"; - }; - installPhase = '' - mkdir -p $out/share/doc/python30 - cp -R ./ $out/share/doc/python30/text - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.1-html.nix b/pkgs/development/interpreters/python/docs/3.1-html.nix deleted file mode 100644 index 625aa181c63f..000000000000 --- a/pkgs/development/interpreters/python/docs/3.1-html.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python31-docs-html-3.1.5"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-html.tar.bz2; - sha256 = "187shb92218k0i07hj9ak1kqbqjcxkivmwxlzj18v791l7x7qcpz"; - }; - installPhase = '' - mkdir -p $out/share/doc/python31 - cp -R ./ $out/share/doc/python31/html - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix deleted file mode 100644 index 564103dd101a..000000000000 --- a/pkgs/development/interpreters/python/docs/3.1-pdf-a4.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python31-docs-pdf-a4-3.1.5"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-pdf-a4.tar.bz2; - sha256 = "0kbj6b43gnwlb1czkzmirasmc31j10plq0rlb9s9rh8phqnbmhx1"; - }; - installPhase = '' - mkdir -p $out/share/doc/python31 - cp -R ./ $out/share/doc/python31/pdf-a4 - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix deleted file mode 100644 index d6e3009f59c9..000000000000 --- a/pkgs/development/interpreters/python/docs/3.1-pdf-letter.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python31-docs-pdf-letter-3.1.5"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-pdf-letter.tar.bz2; - sha256 = "0s202vrjfa8dnp3vpfjb21bmqym9wyj8jn2glgwjzk63z6fwb60i"; - }; - installPhase = '' - mkdir -p $out/share/doc/python31 - cp -R ./ $out/share/doc/python31/pdf-letter - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.1-text.nix b/pkgs/development/interpreters/python/docs/3.1-text.nix deleted file mode 100644 index 3ce559e3ecc5..000000000000 --- a/pkgs/development/interpreters/python/docs/3.1-text.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python31-docs-text-3.1.5"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.1.5/python-3.1.5-docs-text.tar.bz2; - sha256 = "1jsfgfgdi1i2l3lhdk7ss5gwrcg3qhhh8syfrwz8xrv2klmmmn9b"; - }; - installPhase = '' - mkdir -p $out/share/doc/python31 - cp -R ./ $out/share/doc/python31/text - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.2-html.nix b/pkgs/development/interpreters/python/docs/3.2-html.nix deleted file mode 100644 index 146901005489..000000000000 --- a/pkgs/development/interpreters/python/docs/3.2-html.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python32-docs-html-3.2.3"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-html.tar.bz2; - sha256 = "058pryg0gn0rlpswkj1z0xvpr39s3ymx3dwqfhhf83w0mlysdm0x"; - }; - installPhase = '' - mkdir -p $out/share/doc/python32 - cp -R ./ $out/share/doc/python32/html - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix b/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix deleted file mode 100644 index 729101b2d012..000000000000 --- a/pkgs/development/interpreters/python/docs/3.2-pdf-a4.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python32-docs-pdf-a4-3.2.3"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-pdf-a4.tar.bz2; - sha256 = "1lw1sbk3nx70k2zxgjc36ryvyzlxndzsvhrxyzdy9sjfhasyd807"; - }; - installPhase = '' - mkdir -p $out/share/doc/python32 - cp -R ./ $out/share/doc/python32/pdf-a4 - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix b/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix deleted file mode 100644 index da9b0ce4dccb..000000000000 --- a/pkgs/development/interpreters/python/docs/3.2-pdf-letter.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python32-docs-pdf-letter-3.2.3"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-pdf-letter.tar.bz2; - sha256 = "199ibzslw3zrwjd49582vc5q6ghp5ig8zalvslawz0xkz1226wg2"; - }; - installPhase = '' - mkdir -p $out/share/doc/python32 - cp -R ./ $out/share/doc/python32/pdf-letter - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/3.2-text.nix b/pkgs/development/interpreters/python/docs/3.2-text.nix deleted file mode 100644 index 3ceef2431f73..000000000000 --- a/pkgs/development/interpreters/python/docs/3.2-text.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python32-docs-text-3.2.3"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.2.3/python-3.2.3-docs-text.tar.bz2; - sha256 = "1jdc9rj2b4vsbvg5mq6vcdfa2b72avhhvjw7rn7k3kl521cvxs09"; - }; - installPhase = '' - mkdir -p $out/share/doc/python32 - cp -R ./ $out/share/doc/python32/text - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/docs/default.nix b/pkgs/development/interpreters/python/docs/default.nix index 16ade3af3f95..8f5fc810fb71 100644 --- a/pkgs/development/interpreters/python/docs/default.nix +++ b/pkgs/development/interpreters/python/docs/default.nix @@ -7,15 +7,6 @@ pythonDocs = { python33 = import ./3.3-html.nix { inherit stdenv fetchurl lib; }; - python32 = import ./3.2-html.nix { - inherit stdenv fetchurl lib; - }; - python31 = import ./3.1-html.nix { - inherit stdenv fetchurl lib; - }; - python30 = import ./3.0-html.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-html.nix { inherit stdenv fetchurl lib; }; @@ -28,15 +19,6 @@ pythonDocs = { python33 = import ./3.3-pdf-a4.nix { inherit stdenv fetchurl lib; }; - python32 = import ./3.2-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; - python31 = import ./3.1-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; - python30 = import ./3.0-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-pdf-a4.nix { inherit stdenv fetchurl lib; }; @@ -49,15 +31,6 @@ pythonDocs = { python33 = import ./3.3-pdf-letter.nix { inherit stdenv fetchurl lib; }; - python32 = import ./3.2-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; - python31 = import ./3.1-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; - python30 = import ./3.0-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-pdf-letter.nix { inherit stdenv fetchurl lib; }; @@ -70,15 +43,6 @@ pythonDocs = { python33 = import ./3.3-text.nix { inherit stdenv fetchurl lib; }; - python32 = import ./3.2-text.nix { - inherit stdenv fetchurl lib; - }; - python31 = import ./3.1-text.nix { - inherit stdenv fetchurl lib; - }; - python30 = import ./3.0-text.nix { - inherit stdenv fetchurl lib; - }; python27 = import ./2.7-text.nix { inherit stdenv fetchurl lib; }; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index cecb8ee0a496..745cdf746ecc 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 335bc1b68c67..f2da2624755f 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -111,7 +111,7 @@ let -exec sed '1i#line 1 "{}"' -i '{}' \; ) '' + optionalString (stdenv.cross.libc or null == "msvcrt") '' - ${stdenv.cross.config}-ranlib "$out"/lib/*.a + ${stdenv.cross.config}-ranlib "$out/lib/"*.a ''; in @@ -127,7 +127,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.boost; platforms = platforms.unix; - maintainers = with maintainers; [ simons wkennington ]; + maintainers = with maintainers; [ peti wkennington ]; }; preConfigure = '' diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index d23b2f27c078..8b40260ddf39 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = "as-is"; platforms = with stdenv.lib.platforms; allBut cygwin; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index ed670e61243d..72b60391f4fd 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.8"; + version = "1.9.10"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "055kpl3ghznk028jnhzsa3p48qgipckfzn2liwq932crxviicl2l"; + sha256 = "025lmriaq4qqy99lh826wx2cnqqgxn7srz4m3q06bl6r9ch15hr6"; }; dontBuild = true; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 55f705971701..5da29273a8be 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, gmp, isl }: stdenv.mkDerivation rec { - name = "cloog-0.18.3"; + name = "cloog-0.18.4"; src = fetchurl { url = "http://www.bastoul.net/cloog/pages/download/count.php3?url=./${name}.tar.gz"; - sha256 = "0d4pqs4rs1qx0302wpv06ww1nwyg4yv5cw9qpfzxz36b19s6q326"; + sha256 = "03km1aqaiy3sbqc2f046ms9x0mlmacxlvs5rxsvjj8nf20vxynij"; }; buildInputs = [ gmp ]; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index 0b9b09a4bd19..4c64cb715e4e 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -12,6 +12,5 @@ stdenv.mkDerivation { homepage = "http://sourceforge.net/apps/mediawiki/cppunit/"; description = "C++ unit testing framework"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix new file mode 100644 index 000000000000..6494a0428e0a --- /dev/null +++ b/pkgs/development/libraries/cpputest/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + version = "3.7.2"; + name = "cpputest-${version}"; + + src = fetchurl { + url = "https://github.com/cpputest/cpputest/releases/download/${version}/${name}.tar.gz"; + sha256 = "0lwn226d8mrppdyzcvr08vsnnp6h0mpy5kz5a475ish87az00pcc"; + }; + + meta = { + homepage = "http://cpputest.github.io/"; + description = "Unit testing and mocking framework for C/C++"; + platforms = stdenv.lib.platforms.linux ; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.juliendehos ]; + }; +} diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 21ad12869f9c..f1cd9d526e4a 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { homepage = "http://cyrusimap.web.cmu.edu/"; description = "library for adding authentication support to connection-based protocols"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ]; }; } diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix index b008151d6cb7..4eebad6b307d 100644 --- a/pkgs/development/libraries/ffmpeg/0.10.nix +++ b/pkgs/development/libraries/ffmpeg/0.10.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // rec { version = "${branch}.16"; branch = "0.10"; sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; + patches = [ ./vpxenc-0.10-libvpx-1.5.patch ]; }) diff --git a/pkgs/development/libraries/ffmpeg/1.2.nix b/pkgs/development/libraries/ffmpeg/1.2.nix index c87cf581c76c..312eb70fdf20 100644 --- a/pkgs/development/libraries/ffmpeg/1.2.nix +++ b/pkgs/development/libraries/ffmpeg/1.2.nix @@ -4,4 +4,5 @@ callPackage ./generic.nix (args // rec { version = "${branch}.12"; branch = "1.2"; sha256 = "0za9w87rk4x6wkjc6iaxqx2ihlsgj181ilfgxfjc54mdgxfcjfli"; + patches = [ ./vpxenc-1.2-libvpx-1.5.patch ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index d50c20331e4a..0c4e9df3df19 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -15,7 +15,7 @@ # Darwin frameworks , Cocoa # Inherit generics -, branch, sha256, version, ... +, branch, sha256, version, patches ? [], ... }: /* Maintainer notes: @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { inherit sha256; }; - patchPhase = ''patchShebangs .''; + postPatch = ''patchShebangs .''; + inherit patches; outputs = [ "dev" "out" "bin" ] ++ optional (reqMin "1.0") "doc" ; # just dev-doc diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch new file mode 100644 index 000000000000..740bb746aade --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/vpxenc-0.10-libvpx-1.5.patch @@ -0,0 +1,24 @@ +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 1d33ce9..dface51 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -78,19 +78,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch new file mode 100644 index 000000000000..7f1ec1df6c76 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/vpxenc-1.2-libvpx-1.5.patch @@ -0,0 +1,24 @@ +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 4f1adb8..1791952 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -87,19 +87,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/gd/CVE-2016-3074.patch b/pkgs/development/libraries/gd/CVE-2016-3074.patch new file mode 100644 index 000000000000..76994697729b --- /dev/null +++ b/pkgs/development/libraries/gd/CVE-2016-3074.patch @@ -0,0 +1,13 @@ +diff --git a/src/gd_gd2.c b/src/gd_gd2.c +index 6f28461..a50b33d 100644 +--- a/src/gd_gd2.c ++++ b/src/gd_gd2.c +@@ -165,6 +165,8 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy, + if (gdGetInt (&cidx[i].size, in) != 1) { + goto fail2; + }; ++ if (cidx[i].offset < 0 || cidx[i].size < 0) ++ goto fail2; + }; + *chunkIdx = cidx; + }; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 7c3c53626b5d..bf3b63db399b 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -1,21 +1,34 @@ -{stdenv, fetchurl, zlib, libpng, freetype, libjpeg, fontconfig}: +{ stdenv, fetchurl +, pkgconfig +, zlib +, libjpeg +, libpng +, libtiff ? null +, libXpm ? null +, fontconfig +, freetype +}: + +stdenv.mkDerivation rec { + name = "gd-${version}"; + version = "2.1.1"; -stdenv.mkDerivation { - name = "gd-2.0.35"; - src = fetchurl { - url = http://www.libgd.org/releases/gd-2.0.35.tar.bz2; - sha256 = "1y80lcmb8qbzf0a28841zxhq9ndfapmh2fsrqfd9lalxfj8288mz"; + url = "https://github.com/libgd/libgd/releases/download/${name}/libgd-${version}.tar.xz"; + sha256 = "11djy9flzxczphigqgp7fbbblbq35gqwwhn9xfcckawlapa1xnls"; }; - - buildInputs = [zlib libpng freetype]; - propagatedBuildInputs = [libjpeg fontconfig]; # urgh + patches = [ + ./CVE-2016-3074.patch + ]; - configureFlags = "--without-x"; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib fontconfig freetype libjpeg libpng libtiff libXpm ]; - meta = { - homepage = http://www.libgd.org/; - description = "An open source code library for the dynamic creation of images by programmers"; + meta = with stdenv.lib; { + homepage = https://libgd.github.io/; + description = "A dynamic image creation library"; + license = licenses.free; # some custom license + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 4663f7aac224..0ca281b0722f 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - version = "2.4.4"; + version = "2.4.6"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "07svgp7c928sw712gq6rx4h0c6wp2kr1n8fmxjlzb031l51jzkf5"; + sha256 = "0rgqgkjyqgld0hpa311z8cddp42v9ihzidyanwyxqpv3jmcrlsfk"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 3cf429ab1d73..3e9e0bea8e3b 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.23.2"; + version = "0.24.1"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; + sha256 = "0rw80480dx2f6a2wbb1bwixygg1iwq3r7vwhxdmkkf4lpxd35jhd"; }; cmakeFlags = "-DTHREADSAFE=ON"; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 0768df60a794..1e9142444d11 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.simons ]; + maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index a7443c02c5b6..d17ac5b87607 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -73,7 +73,7 @@ let self = stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.simons ]; + maintainers = [ maintainers.peti ]; }; }; in self diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index 1ca5d019b220..720ff06ceaa5 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gss, libidn, krb5Full }: +{ fetchurl, stdenv, gss, libidn, kerberos }: stdenv.mkDerivation rec { name = "gsasl-1.8.0"; @@ -8,11 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1rci64cxvcfr8xcjpqc4inpfq7aw4snnsbf5xz7d30nhvv8n40ii"; }; - buildInputs = [ libidn ] - ++ stdenv.lib.optional (!stdenv.isDarwin) gss - ++ stdenv.lib.optional stdenv.isDarwin krb5Full; + buildInputs = [ libidn kerberos ]; - configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--with-gssapi-impl=mit"; + configureFlags = "--with-gssapi-impl=mit"; doCheck = true; @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/gsasl/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ shlevy ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 6dd8efddaa65..ddbcc3a26c29 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }: let - version = "2.6.1"; + version = "2.7.0"; in stdenv.mkDerivation { name = "http-parser-${version}"; src = fetchurl { url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz"; - sha256 = "1b9ahv77zryx1z6j7sax2asx0gj209wh2244q9crj7hj14h8bkj8"; + sha256 = "0rqij6v6wv1giwx4prfa082kw1nka5d9vlb06zkc8mwszq1vzidh"; }; patches = [ ./build-shared.patch ]; diff --git a/pkgs/development/libraries/incrtcl/default.nix b/pkgs/development/libraries/incrtcl/default.nix index e6474abf11c1..a8f29b60c2b0 100644 --- a/pkgs/development/libraries/incrtcl/default.nix +++ b/pkgs/development/libraries/incrtcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "incrtcl-${version}"; - version = "3.4.1"; + version = "4.0.4"; src = fetchurl { - url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl3.4.1.tar.gz; - sha256 = "0s457j9mn3c1wjj43iwy3zwhyz980jlyqn3s9487da9dwwn86c2k"; + url = mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/3.4/itcl4.0.4.tar.gz; + sha256 = "1ppc9b13cvmc6rp77k7dl2zb26xk0z30vxygmr4h1xr2r8w091k3"; }; buildInputs = [ tcl ]; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index b84b852691fd..ef09b9e4b40b 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -38,6 +38,10 @@ let inherit sha1; # upstream directly provides sha1 of releases over https }; + patches = [] + ++ optionals (vpxSupport && version == "0.8.17" ) [ ./vpxenc-0.8.17-libvpx-1.5.patch ] + ++ optionals (vpxSupport && version == "11.6") [ ./vpxenc-11.6-libvpx-1.5.patch ]; + preConfigure = "patchShebangs doc/texi2pod.pl"; configureFlags = diff --git a/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch new file mode 100644 index 000000000000..456828c025ef --- /dev/null +++ b/pkgs/development/libraries/libav/vpxenc-0.8.17-libvpx-1.5.patch @@ -0,0 +1,22 @@ +--- a/libavcodec/libvpxenc.c 2016-05-01 17:57:16.753852614 +0200 ++++ b/libavcodec/libvpxenc.c 2016-05-01 18:01:08.252147138 +0200 +@@ -67,19 +67,11 @@ + + /** String mappings for enum vp8e_enc_control_id */ + static const char *ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch new file mode 100644 index 000000000000..f3c52582b44e --- /dev/null +++ b/pkgs/development/libraries/libav/vpxenc-11.6-libvpx-1.5.patch @@ -0,0 +1,22 @@ +--- a/libavcodec/libvpxenc.c 2016-05-01 17:53:17.974517377 +0200 ++++ b/libavcodec/libvpxenc.c 2016-05-01 17:54:30.564923297 +0200 +@@ -70,19 +70,11 @@ + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 26aa974a7eed..9171471882ca 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.3.3"; + name = "libksba-1.3.4"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "11kp3h9l3b8ikydkcdkwgx45r662zi30m26ra5llyhfh6kz5yzqc"; + sha256 = "0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn"; }; propagatedBuildInputs = [ libgpgerror ]; meta = with stdenv.lib; { - homepage = http://www.gnupg.org; - description = "CMS and X.509 access library under development"; + homepage = https://www.gnupg.org; + description = "CMS and X.509 access library"; platforms = platforms.all; license = licenses.lgpl3; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix new file mode 100644 index 000000000000..d127531b1e01 --- /dev/null +++ b/pkgs/development/libraries/libmpack/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libtool }: + +stdenv.mkDerivation rec { + name = "libmpack-${version}"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "tarruda"; + repo = "libmpack"; + rev = version; + sha256 = "0s391vyz1gv4j95zdyvxspw7c0xq7d7b4fh0yxrgqqqp5js1rlj0"; + }; + buildInputs = [ libtool ]; + installPhase = '' + mkdir -p $out/lib/libmpack + cp -R build/* $out/lib/libmpack + rm -rf $out/lib/libmpack/debug + ''; + meta = with stdenv.lib; { + description = "Simple implementation of msgpack in C"; + homepage = "https://github.com/tarruda/libmpack/"; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 243b4b9420ae..3038b9f83d36 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.15"; + version = "0.4.16"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0yvjc3hvjk29irdii2h1hpq4cg9l1c71jfvglz67y1pc89z63yax"; + sha256 = "0aabz9hjw47xqis2xr3rvxw1slpig4hq9wkl8fbdpgq2fgrzqdmw"; }; buildInputs = [zlib openssl]; makeFlags = [ diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 5c593dd1f75e..278679698c63 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -13,12 +13,10 @@ , runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime , thumbSupport ? false # build arm assembly in thumb mode , examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) -, fastUnalignedSupport ? true # use unaligned accesses if supported by hardware , debugLibsSupport ? false # include debug version of each library , postprocSupport ? true # postprocessing , multithreadSupport ? true # multithreaded decoding & encoding , internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) -, memTrackerSupport ? false # track memory usage , spatialResamplingSupport ? true # spatial sampling (scaling) , realtimeOnlySupport ? false # build for real-time encoding , ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding @@ -61,13 +59,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { name = "libvpx-${version}"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "webmproject"; repo = "libvpx"; rev = "v${version}"; - sha256 = "1y8cf2q5ij8z8ab5j36m18rbs62aah6sw6shzbs3jr70ja0z6n8s"; + sha256 = "19ill4c7dak5f8m4pdbas87zknw3a34sca8a4i952q0l0jnif0np"; }; patchPhase = ''patchShebangs .''; @@ -103,7 +101,6 @@ stdenv.mkDerivation rec { "--as=yasm" # Limit default decoder max to WHXGA (if sizeLimitSupport then "--size-limit=5120x3200" else null) - (enableFeature fastUnalignedSupport "fast-unaligned") "--disable-codec-srcs" (enableFeature debugLibsSupport "debug-libs") (enableFeature isMips "dequant-tokens") @@ -112,7 +109,6 @@ stdenv.mkDerivation rec { (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") (enableFeature multithreadSupport "multithread") (enableFeature internalStatsSupport "internal-stats") - (enableFeature memTrackerSupport "mem-tracker") (enableFeature spatialResamplingSupport "spatial-resampling") (enableFeature realtimeOnlySupport "realtime-only") (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") @@ -158,6 +154,7 @@ stdenv.mkDerivation rec { dontSetConfigureCross = true; configureFlags = configureFlags ++ [ #"--extra-cflags=" + #"--extra-cxxflags=" #"--prefix=" #"--libc=" #"--libdir=" diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 2bf7bbaabb31..7cfccfe05f74 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.5.0"; + name = "libxkbcommon-0.6.1"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha256 = "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"; + sha256 = "0q47xa1szlxwgvwmhv4b7xwawnykz1hnc431d84nj8dlh2q8f22v"; }; outputs = [ "dev" "out" ]; @@ -20,8 +20,10 @@ stdenv.mkDerivation rec { sed -i 's/,--version-script=.*$//' Makefile ''; - meta = { + meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; homepage = http://xkbcommon.org; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; }; } diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 9d07f033eda0..6d63e8367f79 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - name = "log4cplus-1.1.2"; + name = "log4cplus-1.2.0"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://sourceforge/log4cplus/${name}.tar.bz2"; - sha256 = "14zdfaxnxjrnfdjipmcrvsqp8pj1s4wscphvg4jvbp3kd34mcvf4"; + sha256 = "1fb3g9l12sps3mv4xjiql2kcvj439mww3skz735y7113cnlcf338"; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2d05861605a5..6ac8acebfe87 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -169,6 +169,6 @@ stdenv.mkDerivation { homepage = http://www.mesa3d.org/; license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ eduarrrd simons vcunat ]; + maintainers = with maintainers; [ eduarrrd vcunat ]; }; } diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix index ddf47cf31d8e..4e3db9b0d401 100644 --- a/pkgs/development/libraries/nlopt/default.nix +++ b/pkgs/development/libraries/nlopt/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { description = "Free open-source library for nonlinear optimization"; license = stdenv.lib.licenses.lgpl21Plus; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; broken = true; # cannot cope with Octave 4.x }; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 157ce5fb9dec..8c0ad107d77f 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -97,7 +97,7 @@ let homepage = http://www.openssl.org/; description = "A cryptographic library that implements the SSL and TLS protocols"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; priority = 10; # resolves collision with ‘man-pages’ }; }; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 91af6f4dadf3..c56eef31961d 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -62,6 +62,5 @@ in stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 5f41eb61c29b..f3e2312f4845 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -89,6 +89,10 @@ in rec { sha256 = "02gsi1cm63kf0r7881444lrkzdjqhhpz9a5zav3al0q24nq01r8g"; sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; builtInputs = [gdal json_c pkgconfig]; + + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + dontDisableStatic = true; preConfigure = '' sed -i 's@/usr/bin/file@${file}/bin/file@' configure diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix index 1fa48ffea91c..23f12e7cf762 100644 --- a/pkgs/development/libraries/science/math/atlas/default.nix +++ b/pkgs/development/libraries/science/math/atlas/default.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation { - name = "atlas-${version}" + optionalString withLapack "-with-lapack"; + name = "atlas${optionalString withLapack "-with-lapack"}-${version}"; src = fetchurl { url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2"; diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index ef89c0bfee21..1d05e6bb2a36 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index f3832ba0a205..80b66c5ab167 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation rec { description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; - platforms = platforms.all; - maintainers = [ maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index dcb09af84f95..14eb5a24056f 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pName = "soundtouch"; - name = "${pName}-1.8.0"; + name = "${pName}-1.9.2"; src = fetchurl { url = "http://www.surina.net/soundtouch/${name}.tar.gz"; - sha256 = "3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"; + sha256 = "04y5l56yn4jvwpv9mn1p3m2vi5kdym9xpdac8pmhwhl13r8qdsya"; }; buildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 31fc5401e754..8a91086c5dbe 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { details and threading mechanisms for scalability and performance. ''; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ simons thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index f83b34e40d1a..6f30497d870c 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = "as-is"; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix index 70467a253600..313f67b1b6ac 100644 --- a/pkgs/development/libraries/webkitgtk/2.12.nix +++ b/pkgs/development/libraries/webkitgtk/2.12.nix @@ -40,13 +40,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl python ruby bison gperf sqlite pkgconfig gettext gobjectIntrospection - ] ++ (with xlibs; [ libXdmcp ]); + ]; buildInputs = [ gtk2 wayland libwebp enchant libnotify libxml2 libsecret libxslt harfbuzz libpthreadstubs gst-plugins-base libxkbcommon epoxy at_spi2_core - ] ++ optional enableGeoLocation geoclue2; + ] ++ optional enableGeoLocation geoclue2 + ++ (with xlibs; [ libXdmcp libXt libXtst ]); propagatedBuildInputs = [ libsoup gtk3 diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index b33fc13224a3..1689b2f506fa 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -59,6 +59,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfreeRedistributableFirmware; platforms = stdenv.lib.platforms.linux; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index b20662c889ab..778aaa90cbe9 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = http://cppcheck.sourceforge.net/; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ simons joachifm ]; + maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 374f0fee3f11..bd3f33d169a1 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.5"; + version = "0.6"; src = fetchurl { - sha256 = "19pwhgwvfr86n8ks099p9r02v7zh8d3qs7g7snzkhpdgq1azww85"; + sha256 = "0n3z4pfbby0rl338irbs4yvcmjfnza82xg9a8r9amyl0bkfasbxb"; url = "${meta.homepage}/downloads/${name}.src.tar.gz"; }; diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix index de6f96ce99f6..7c45a6c8e674 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix @@ -40,7 +40,6 @@ stdenv.mkDerivation { to build and install the program. ''; - maintainers = with stdenv.lib.maintainers; [ simons ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 417ab348c405..19dbdb76a360 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -38,6 +38,5 @@ stdenv.mkDerivation { software. ''; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 7373d8584c23..bf9fb4f30352 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { manual (in LaTeX) from a set of documented source files. ''; - maintainers = [stdenv.lib.maintainers.simons]; platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index 724942c57c83..e2996b030ef8 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -33,5 +33,5 @@ mkDerivation rec { homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; } diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index 870f3d40961e..edaec9c257a8 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -29,5 +29,5 @@ mkDerivation rec { homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Data types and functions to manipulate the Nixpkgs distribution"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; } diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index 461cf464f454..56cd1d29dde4 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -32,5 +32,5 @@ mkDerivation rec { homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ simons ]; + maintainers = with stdenv.lib.maintainers; [ peti ]; } diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 44491fa0ef98..faf1bd6d9bde 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -7,12 +7,12 @@ }: mkDerivation { pname = "tinc"; - version = "20160419"; + version = "20160511"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; - rev = "b9f7cc1076098b1f99f20655052c9fd34598d891"; - sha256 = "1f0k7a4vxdd2cd2h5qwska9hfw7ig6q2rx87d09fg2xlix96g81r"; + rev = "405af997c182b89edfc9656612c32616e98c7862"; + sha256 = "0zryw3abp64922dnk6jss58lq4k7ijwbbn35zh5vbg3ns8307k6b"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 3951212495d4..fb1e4a8ca4b5 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix index 96a481ade1c1..77fe2b7b92c2 100644 --- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix index c78e9e6c0a41..fd074e6b96c8 100644 --- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/pkgs/development/tools/misc/automake/automake-1.15.x.nix index 9db2375a5c63..3c4a8d1189e4 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -36,8 +36,6 @@ stdenv.mkDerivation rec { Standards. Automake requires the use of Autoconf. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 35c332f28773..60a0370e86e2 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "complexity-${version}"; - version = "1.3"; + version = "1.10"; src = fetchurl { url = "mirror://gnu/complexity/${name}.tar.gz"; - sha256 = "19bc64sxpqd5rqylqaa7dijz2x7qp2b0dg3ah3fb3qbcvd8b4wgy"; + sha256 = "1vfns9xm7w0wrz12a3w15slrqnrfh6qxk15nv7qkj3irll3ff522"; }; buildInputs = [ autogen ]; diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 584095c904d5..af40f3df20fa 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { ''; homepage = http://ctags.sourceforge.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ simons ]; platforms = platforms.unix; # So that Exuberant ctags is preferred over emacs's ctags diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index ed3ad45c463a..26acd085bb85 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -75,7 +75,7 @@ let license = "GPL"; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ simons anderspapitto ]; + maintainers = with stdenv.lib.maintainers; [ anderspapitto ]; }; }; in diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index f89e7bca5a76..5d4da29e9b0c 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { to use Bison. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index ee0074140178..6aa717c53cde 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { to use Bison. ''; - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index add85805500a..1228484fc65e 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,13 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.6.2015.08.20"; + version="0.10.0"; name="${baseName}-${version}"; - hash="0wry296iv63bmvm3qbkbgk42nbs80cbir0kv27v0ah5f6kvjc9cq"; - #url="http://download.slimerjs.org/releases/0.9.6/slimerjs-0.9.6.zip"; - url = "https://github.com/laurentj/slimerjs.git"; - rev = "87e0ff1d666897754a914131d8f1744195ee4d7a"; - sha256="0ifgr8pi40id7vcv8ipc754bys22bhij0kkhd691285x19f52alc"; + hash="1yqs4f90bp8vxa7n8y1a3hi9hd7374hq9qa44xgfb4l5kn6h1f40"; + url="http://download.slimerjs.org/releases/0.10.0/slimerjs-0.10.0.zip"; + sha256="1yqs4f90bp8vxa7n8y1a3hi9hd7374hq9qa44xgfb4l5kn6h1f40"; }; buildInputs = [ unzip zip @@ -18,12 +16,12 @@ in stdenv.mkDerivation { inherit (s) name version; inherit buildInputs; - #src = fetchurl { - # inherit (s) url sha256; - #}; - src = fetchgit { - inherit (s) url sha256 rev; + src = fetchurl { + inherit (s) url sha256; }; + #src = fetchgit { + # inherit (s) url sha256 rev; + #}; preConfigure = '' test -d src && cd src test -f omni.ja || zip omni.ja -r */ diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 329a23ae81f4..eb3692b05ab0 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.all; - maintainers = with maintainers; [ simons pSub ]; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 04bad7f16842..53227f2cc81b 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchgit, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit, freetype -, gettext, doxygen +{ stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp +, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit +, freetype, gettext, doxygen, ncurses, leveldb }: let - version = "0.4.13"; + version = "0.4.14"; sources = { - src = fetchgit { - url = "https://github.com/minetest/minetest.git"; - rev = "d44fceac7e1237b00c6431ee1bb5805b602d0dcd"; - sha256 = "034w9nv23ncdwbs4arzxfph60cfgvalh27hxprjassmz8p7ixnra"; + src = fetchFromGitHub { + owner = "minetest"; + repo = "minetest"; + rev = "${version}"; + sha256 = "1f74wsiqj8x1m8wqmxijb00df5ljlvy4ac0ahbh325vfzi0bjla3"; }; - data = fetchgit { - url = "https://github.com/minetest/minetest_game.git"; - rev = "2392842948b114670334eabbb593b66e1427747c"; - sha256 = "0wb8rdqc2ghi66k8bm8w2db0w7k5rsbdld0dyj1wdr3d6x0bpkcr"; + data = fetchFromGitHub { + owner = "minetest"; + repo = "minetest_game"; + rev = "${version}"; + sha256 = "1dc9zfbp603h2nlk39bw37kjbswrfmpd9yg3v72z1jb89pcxzsqs"; }; }; in stdenv.mkDerivation { @@ -32,7 +34,8 @@ in stdenv.mkDerivation { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa - openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen + openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen ncurses + leveldb ]; postInstall = '' diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index f805030aa92b..747bd26afcc5 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -9,8 +9,8 @@ in stdenv.mkDerivation rec { name = "openra-${version}"; meta = with stdenv.lib; { - description = "Real Time Strategy game engine recreates the C&C titles"; - homepage = "http://www.open-ra.org/"; + description = "Real Time Strategy game engine recreating the C&C titles"; + homepage = "http://www.openra.net/"; maintainers = [ maintainers.rardiol ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 40f1d1d41452..ce0bc5550144 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,14 +1,14 @@ -{stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake114x, autoconf}: +{stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake115x, autoconf}: let - version = "20160410.9d15092"; + version = "20160429.b31155b"; buildInputs = [ - gtk3 pkgconfig libX11 perl automake114x autoconf + gtk3 pkgconfig libX11 perl automake115x autoconf ]; in stdenv.mkDerivation { src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "184n29mfgj56alp5853mya878rlxf5zxy0r3zfhi9h2yfqiwszi4"; + sha256 = "0y807srhf6571ijdwpa493qzsx161f0a1pmh2qi44f6ixfcrkgzi"; }; name = "sgt-puzzles-r" + version; inherit buildInputs; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index a8037be8f830..1f643c5194af 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -82,6 +82,7 @@ let ] ++ lib.optional (!newStdcpp) gcc48.cc; overridePkgs = with pkgs; [ + libgpgerror libpulseaudio alsaLib openalSoft @@ -93,18 +94,18 @@ let else overridePkgs; steamRuntime = lib.optional (!nativeOnly) steam-runtime; + allPkgs = ourRuntime ++ steamRuntime; + in stdenv.mkDerivation rec { name = "steam-runtime-wrapped"; - allPkgs = ourRuntime ++ steamRuntime; - nativeBuildInputs = [ perl ]; builder = ./build-wrapped.sh; installPhase = '' - buildDir "${toString steam-runtime.libs}" "$allPkgs" - buildDir "${toString steam-runtime.bins}" "$allPkgs" + buildDir "${toString steam-runtime.libs}" "${toString (map lib.getLib allPkgs)}" + buildDir "${toString steam-runtime.bins}" "${toString (map lib.getBin allPkgs)}" ''; meta.hydraPlatforms = []; diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index a07cc6dca3b5..c1f53ec7f8ac 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { Stockfish is one of the strongest chess engines in the world. It is also much stronger than the best human chess grandmasters. ''; - maintainers = with maintainers; [ luispedro simons ]; + maintainers = with maintainers; [ luispedro peti ]; platforms = with platforms; i686 ++ x86_64; license = licenses.gpl2; }; diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 61329389d168..8d57b48481ec 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -1,20 +1,21 @@ {stdenv, fetchurl, libX11, xproto, libXt, libXaw, libSM, libICE, libXmu -, libXext, gnuchess, texinfo, libXpm, pkgconfig, librsvg, cairo +, libXext, gnuchess, texinfo, libXpm, pkgconfig, librsvg, cairo, pango +, gtk2 }: let s = # Generated upstream information rec { baseName="xboard"; - version="4.8.0"; + version="4.9.0"; name="${baseName}-${version}"; - hash="05rdj0nyirc4g1qi5hhrjy45y52ihp1j3ldq2c5bwrz0gzy4i3y8"; - url="http://ftp.gnu.org/gnu/xboard/xboard-4.8.0.tar.gz"; - sha256="05rdj0nyirc4g1qi5hhrjy45y52ihp1j3ldq2c5bwrz0gzy4i3y8"; + hash="1av6r3s5vyclwf3c9i1pkr2442ryrf4ixhhf2i44a4j1xyhlp5jb"; + url="http://ftp.gnu.org/gnu/xboard/xboard-4.9.0.tar.gz"; + sha256="1av6r3s5vyclwf3c9i1pkr2442ryrf4ixhhf2i44a4j1xyhlp5jb"; }; buildInputs = [ libX11 xproto libXt libXaw libSM libICE libXmu libXext gnuchess texinfo libXpm pkgconfig librsvg - cairo + cairo pango gtk2 ]; in stdenv.mkDerivation { diff --git a/pkgs/misc/base16/default.nix b/pkgs/misc/base16/default.nix new file mode 100644 index 000000000000..5dad210ab54b --- /dev/null +++ b/pkgs/misc/base16/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchgit, fetchurl, ruby, which, coreutils }: + +stdenv.mkDerivation rec { + rev = "9b24598c08a27780f87c318e6145c1468b9880ba"; + name = "base16-2015-09-29_rev${builtins.substring 0 6 rev}"; + + src = fetchgit { + inherit rev; + url = "https://github.com/chriskempson/base16-builder"; + sha256 = "05wyf0qz5z3n3g8lz2rd1b6gv6v7qjaazwjm0w4ib4anj4v026sd"; + }; + + patches = [ + (fetchurl { + url = "https://github.com/chriskempson/base16-builder/pull/341.patch"; + sha256 = "1r7i22qr5maxnp8a84mwin0a48klb8fym2hkw15ichkqfn3cdqdn"; + }) + (fetchurl { + url = "https://github.com/chriskempson/base16-builder/pull/331.patch"; + sha256 = "0hbyc9i62ihms00rk1ap0apjw8zf5axrvsk63vdy1hfyd9n5y2yf"; + }) + (fetchurl { + url = "https://github.com/chriskempson/base16-builder/pull/330.patch"; + sha256 = "1gfsbrxzdk3pz9dmyxismc3mzgm0cz8pkmf52iz4s9gq7vkv1d14"; + }) + (fetchurl { + url = "https://github.com/chriskempson/base16-builder/pull/325.patch"; + sha256 = "0n10yzm0n4g77z29s5f69261qy6x6kkjc6nj6ccdjlncz0bk6d8k"; + }) + (fetchurl { + url = "https://github.com/chriskempson/base16-builder/pull/318.patch"; + sha256 = "0c044bimdbiw2n2nzzivzrvxhwk6i93lc4ydah56xhs6pp1x0i60"; + }) + (fetchurl { + url = "https://github.com/chriskempson/base16-builder/pull/346.patch"; + sha256 = "145wblgqz28wq9lvgh1i705y97zblc6d488j7xm230ywy81abbwi"; + }) + ]; + + buildInputs = [ ruby which ]; + + buildPhase = '' + sed -i -e "s|\/bin\/false|${coreutils}/bin/false|" templates/shell/dark.sh.erb + sed -i -e "s|\/bin\/false|${coreutils}/bin/false|" templates/shell/light.sh.erb + patchShebangs base16 + ./base16 + ''; + + installPhase = '' + mkdir -p $out + cp output/* $out -R + ''; + + meta = with stdenv.lib; { + description = "Base16 provides carefully chosen syntax highlighting and a default set of sixteen colors suitable for a wide range of applications. Base16 is both a color scheme and a template."; + homepage = "https://github.com/chriskempson/base16"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; + +} diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d140ee4783f0..88c3d335f876 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { homepage = https://cups.org/; description = "A standards-based printing system for UNIX"; license = licenses.gpl2; # actually LGPL for the library and GPL for the rest - maintainers = with maintainers; [ urkud simons jgeerds ]; + maintainers = with maintainers; [ urkud jgeerds ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 9a924e044d7f..2cdaca8d7832 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://splix.sourceforge.net; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix new file mode 100644 index 000000000000..7cf70cf9555a --- /dev/null +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, libudev }: + +stdenv.mkDerivation rec { + name = "moltengamepad-git-${version}"; + version = "2016-05-04"; + + src = fetchFromGitHub { + owner = "jgeumlek"; + repo = "MoltenGamepad"; + rev = "6656357964c22be97227fc5353b53c6ab1e69929"; + sha256 = "05cpxfzxgm86kxx0a9f76bshjwpz9w1g8bn30ib1i5a3fv7bmirl"; + }; + + buildInputs = [ libudev ]; + + buildPhase = '' + make + ''; + + installPhase = '' + mkdir -p $out/bin + cp moltengamepad $out/bin + ''; + + patchPhase = '' + sed -i -e '159d;161d;472d;473d;474d;475d' source/eventlists/key_list.cpp + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/jgeumlek/MoltenGamepad; + description = "Flexible Linux input device translator, geared for gamepads"; + license = licenses.mit; + maintainers = [ maintainers.ebzzry ]; + }; + +} diff --git a/pkgs/misc/screensavers/xautolock/default.nix b/pkgs/misc/screensavers/xautolock/default.nix index b40827e7bfbc..f72fed624c04 100644 --- a/pkgs/misc/screensavers/xautolock/default.nix +++ b/pkgs/misc/screensavers/xautolock/default.nix @@ -1,15 +1,26 @@ -{stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto}: +{ stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { name = "xautolock-2.2"; - src = fetchurl - { + src = fetchurl { url = "http://www.ibiblio.org/pub/Linux/X11/screensavers/${name}.tgz"; sha256 = "11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2"; }; + patches = [ + # https://gist.github.com/miekg/9430422 + (fetchurl { + url = "https://gist.githubusercontent.com/miekg/9430422/raw/f00965cd63c497d320f028a9972d1185b0dae039/14-add-lockaftersleep-patch"; + sha256 = "042lc5yyyl3zszll2l930apysd0lip26w0d0f0gjkl7sbhshgk8v"; + }) + ]; makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man"; preBuild = "xmkmf"; installTargets = "install install.man"; buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto]; + meta = with stdenv.lib; { + description = "A program that launches a given program when your X session has been idle for a given time."; + homepage = http://www.ibiblio.org/pub/linux/X11/screensavers; + maintainers = with maintainers; [ garbas ]; + license = licenses.gpl2; + }; } diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 34e6f0d45d69..ed218abd4207 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 , libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk -, libxml2, libglade, intltool +, libxml2, libglade, intltool, xorg, makeWrapper }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender - libXxf86misc intltool + libXxf86misc intltool xorg.appres makeWrapper ]; preConfigure = @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { "--with-x-app-defaults=\${out}/share/xscreensaver/app-defaults" ]; + postInstall = '' + wrapProgram $out/bin/xscreensaver-text \ + --prefix PATH : ${stdenv.lib.makeBinPath [xorg.appres]} + ''; + meta = { homepage = "http://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index e61a1327a82b..eda2daf15c97 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,18 +1,20 @@ { stdenv, autoconf, automake, fetchFromGitHub, gnome3, gtk, gtk-engine-murrine, pkgconfig}: stdenv.mkDerivation rec { - version = "2015-10-21"; + version = "2016-05-14"; name = "arc-gtk-theme-git-${version}"; src = fetchFromGitHub { owner = "horst3180"; repo = "arc-theme"; - sha256 = "09s452ysg5ys5i3ahb2dgdmr9j64b92hy9rgfvbgw6r5kdrnb60s"; - rev = "f4c71247cf9470037d052ae4a12b86073d0001ff"; + rev = "fb3fe2fc0b280e9d8ca4b5fc5ca23e5b00fcac27"; + sha256 = "1q844i7bkf75jv9fvf15n47vwvzzbkvhv5ssxl98q8x66dgjwx35"; }; preferLocalBuild = true; - buildInputs = [ autoconf automake gtk-engine-murrine pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + buildInputs = [ gtk-engine-murrine ]; configureScript = "./autogen.sh"; configureFlags = "--with-gnome=${gnome3.version}"; diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix new file mode 100644 index 000000000000..2104f6da876b --- /dev/null +++ b/pkgs/misc/themes/blackbird/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "Blackbird"; + version = "2016-04-10"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + repo = "${pname}"; + owner = "shimmerproject"; + rev = "e9f780993c957e3349f97b0e2e6fabdc36ccefb0"; + sha256 = "00fdd63lnb2gmsn6cbdkanvh3rvz48jg08gmzg372byhj70m63hi"; + }; + + buildInputs = [ gtk-engine-murrine ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/themes/${pname} + cp -a * $out/share/themes/${pname}/ + ''; + + meta = { + description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; + homepage = http://github.com/shimmerproject/Blackbird; + license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index fcb5ebba9d81..6ee520b8d155 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip -, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages_38, zip -, vim_configurable, vimPlugins, xkb_switch, git, racerdRust +, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip +, vim_configurable, vimPlugins, xkb_switch, git, racerdRust, goPackages , Cocoa ? null }: @@ -98,6 +98,14 @@ rec { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; + fzf = buildVimPluginFrom2Nix { + name = goPackages.fzf.name; + src = "${goPackages.fzf}/share/go/src/github.com/junegunn/fzf"; + dependencies = []; + }; + + # --- generated packages bellow this line --- + CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -165,22 +173,22 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-04-14"; + name = "Syntastic-2016-05-12"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "e879f729d4ca1810debe83c5e6d3986c9dfa586c"; - sha256 = "0h5ini13j7qcambkcl2i7v4rrrw06wh64icywm01s0l24kr00d4q"; + rev = "c2c6a075113adbfcc4f1ad5b1c0200a0d35ceeb6"; + sha256 = "1b6wc3705n7pj93cf6cv2sazihqw11zq53a7slr646lcdx8r6d7f"; }; dependencies = []; }; Tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tabular-2013-05-16"; + name = "Tabular-2016-05-04"; src = fetchgit { url = "git://github.com/godlygeek/tabular"; - rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "03zbpyvrw82cp6d1xm8pgi94cxwrlg8lgbiz471z51qmcann1j18"; + rev = "00e1e7fcdbc6d753e0bc8043e0d2546fa81bf367"; + sha256 = "0d4n6vggrxvd0jab7yp8wz56dq79g4gjr9fgxfv0q31d3dx1j6js"; }; dependencies = []; @@ -209,22 +217,22 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2015-12-02"; + name = "The_NERD_tree-2016-05-11"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "4ebbb533c3faf2c480211db2b547972bb3b60f2b"; - sha256 = "1v883q3nbv8f5a7gkdsa1kvghf2k4s2pj4ql2m2i1ryn8xrslc7p"; + rev = "15445be5fb2559829ac7a1f05af5d713586e8ec9"; + sha256 = "0lpna2w0s85hagx6dpqanicrllmahjnmd0df4cndk0n5nih36x5k"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-04-14"; + name = "UltiSnips-2016-05-08"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "4c71935cbaf2264c06bf6f9c7384fa2d7cbe83c8"; - sha256 = "0x0n3sc3qzjwn8q22s9kj9v17vl69i95bk7ibz4x76h22hi18xw6"; + rev = "b5edea2e998ae6c62517c7ed3e4c57b652537141"; + sha256 = "03ib1vq5rsj8xsakvdwdwgcwivyr8byx2z3s5rnq0rnwjlnpmqpn"; }; dependencies = []; @@ -242,11 +250,11 @@ rec { }; WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "WebAPI-2016-04-15"; + name = "WebAPI-2016-05-12"; src = fetchgit { url = "git://github.com/mattn/webapi-vim"; - rev = "07b727d88314bbd47ae0c92650c25e3c5e671364"; - sha256 = "1676sg82x7df4andz3s4602gficq9rgg9h98y1g90pphzwm7scbw"; + rev = "ca89bd5867e76b154d4eca325b5a9ad6509fccc5"; + sha256 = "14gs351xm474ak4lxava38wrbwd5s26rca387slknncj5x404i65"; }; dependencies = []; @@ -313,11 +321,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-04-14"; + name = "fugitive-2016-05-11"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "bdd216827ae53cdf70d933bb30762da9bf42cad4"; - sha256 = "0v72mbhircfm16z7l8hcga4zg6gin9yy468a02biccyk4qbclchx"; + rev = "3439f999b138254e4bb56187fc91f91f545b4b12"; + sha256 = "0p6vzfyhy7yvzrfmzyj0f1ccad3fqb3nd86phbl4hwnj8q00qvgw"; }; dependencies = []; @@ -335,11 +343,11 @@ rec { }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-04-06"; + name = "vim-autoformat-2016-05-13"; src = fetchgit { url = "git://github.com/Chiel92/vim-autoformat"; - rev = "713e7c258052d94dfd752647ea03cf423cace8ff"; - sha256 = "1nwms79m28wp5k53x2x2kzaq16lkzl25z96fqnqin70xh7m7nkbm"; + rev = "aaf19a31a9fcc53c5158710b69f17fe5ce137698"; + sha256 = "0sps5wzva07g0bc3qgr4l6bh90gl3mrx5913g8q2igvzsfp7g9m3"; }; dependencies = []; @@ -356,12 +364,23 @@ rec { }; + deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "deoplete-nvim-2016-05-15"; + src = fetchgit { + url = "git://github.com/Shougo/deoplete.nvim"; + rev = "22b6244d72aa4d4e015191a88120eceda1064df0"; + sha256 = "1nc6wn3ha9r80p0bpjm05afqddaa5p94cm0a9xfpm6an43g7jxs1"; + }; + dependencies = []; + + }; + Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Spacegray-vim-2015-04-04"; + name = "Spacegray-vim-2016-04-24"; src = fetchgit { url = "git://github.com/ajh17/Spacegray.vim"; - rev = "1c10d0da045609910e8fb03b33c043bbcff35d9e"; - sha256 = "1ddlnjgizma1kavr06q6x1kasv9219by540b6n22z94waf3qkvdw"; + rev = "ed44e2a6b0a7cb48ccd1a41c45ab8399e12910ba"; + sha256 = "0m3xm2p1d4ywp20cziz1iiihq4y0ca88hjs4gr48ps0n7h5qf477"; }; dependencies = []; @@ -379,11 +398,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2016-03-09"; + name = "neomake-2016-05-15"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "efed015f59001b2cf28e95bff24e87ff5764a62b"; - sha256 = "129jhzmwk2y7fnkzh4l54dx7vavc4bzd59bm5r9d34k9d0yzz1jm"; + rev = "10689403d15879859715d7ef42d854c35615854b"; + sha256 = "1fbflq7851x3vqxp2jn0gp1x2cigb9llv3gzhj02mkqc6imhqkcp"; }; dependencies = []; @@ -401,22 +420,33 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2015-12-05"; + name = "vim-tmux-navigator-2016-05-09"; src = fetchgit { url = "git://github.com/christoomey/vim-tmux-navigator"; - rev = "1298b71c420f1d0abceba3f35cc710131f84d73b"; - sha256 = "1dafgclrq0243lz2v5dq4zc47yqp27kyc14p1l1nzka12kz65sdx"; + rev = "e13914d89e9413cfa449f0c3daff18691356f2d1"; + sha256 = "17cdjj9r13hm5iwnghnfp1bwvz619dv4xg5014962pgkwh9kzdz2"; + }; + dependencies = []; + + }; + + spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "spacevim-2016-05-16"; + src = fetchgit { + url = "git://github.com/ctjhoa/spacevim"; + rev = "c5d03538a8b2f81f2bdb7ca35e589a6a61806ae2"; + sha256 = "0r8jsygm30x8v31lm8al1qr6bh2wvnd9bxj6n8bxv4f87jl8dd2s"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-04-12"; + name = "ctrlp-vim-2016-05-01"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "d00960b4f34bc45b5f88d9363a768bcce5ac3933"; - sha256 = "12yhvhdzaijgy8s6br2s1ng7jh01h2nblb6yqfrmcapjin34iwlk"; + rev = "28fce0fb860fe8df0915da1de1fb6e90d6ab2edc"; + sha256 = "1xyxr7m0y2bwiqrb9sj0cjfdc5x474ajqg3bzv4cjv289gvql2qh"; }; dependencies = []; @@ -434,11 +464,22 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2016-04-15"; + name = "neco-ghc-2016-05-07"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "3a413c1c059e0bc47f11d863f52af06cd858791c"; - sha256 = "0bx8fp95ybsbrn5jxnf2xaq55igi2hckg33jg42qw67gc6090bcr"; + rev = "b91b30f145d4daaf7e50d083e377bd9fbfdc670b"; + sha256 = "0znz8ym32k2y0ymdr070a9kx35mlalqfv9qlfz252ny348lwkgb8"; + }; + dependencies = []; + + }; + + vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-haskellConcealPlus-2016-05-13"; + src = fetchgit { + url = "git://github.com/enomsg/vim-haskellConcealPlus"; + rev = "81dfb51ff8e471fb1f30659a10daaf1bdd65fb03"; + sha256 = "0vm76gxw62lkyxccrlnn8sblfl3d51svwfra9wfixq4h51jdggyr"; }; dependencies = []; @@ -455,12 +496,12 @@ rec { }; - vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2016-05-01"; + vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-go-2016-05-15"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "91ffc410832d0b027f2258c7a91dbbfa378bf71a"; - sha256 = "00793ick6vralihvmmx8np7japxrd3jkbn5ggqzq0ymgr508gxj4"; + rev = "48cc65dfbd3172b989f82c8b67ceb6d88db3c522"; + sha256 = "1zw6jsyzhpl46f37dwslvhg74djl9ngi3h2rzrpgzscpm5wa6h38"; }; dependencies = []; @@ -478,11 +519,22 @@ rec { }; vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2016-01-21"; + name = "vim-jsonnet-2016-05-10"; src = fetchgit { url = "git://github.com/google/vim-jsonnet"; - rev = "5d59d0ba6af2bca4484909e02d72c96fbdd5b220"; - sha256 = "0y6fms0anshw4p6zmyhlzcinxsibp6829xh4y6vxqsz8vjp0hxgb"; + rev = "9cde81ff3f1afb64f8e6b51e8ebba25b074e26f8"; + sha256 = "0g1xbx8hw03dxpdhdhy4h355lwhfay15294c1i1i7lq3xnb8y6n8"; + }; + dependencies = []; + + }; + + vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-leader-guide-2016-05-09"; + src = fetchgit { + url = "git://github.com/hecal3/vim-leader-guide"; + rev = "871f36a1001dd697d679a64a9d58da05ca3f90b8"; + sha256 = "0dflv8nmpxr33q0h0cl8z9ijnbsa895agjbmisz7kq54anwwz763"; }; dependencies = []; @@ -500,22 +552,22 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-04-10"; + name = "calendar-vim-2016-05-09"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "d6bba38a73a6e73bed866664df21f422f97cc3fe"; - sha256 = "05gph8mf1n3d2b7p7qlvwqk618h1mnf9pg04y1p66anyy4rlsnyy"; + rev = "4820ac93f9e8bb0c06c6b8abc1059048f17d1868"; + sha256 = "0zgj73z5c13zgrs3asy3h299ws7gkqqjhl2cqkf1kgssdmyfnbmm"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2016-04-15"; + name = "lightline-vim-2016-05-14"; src = fetchgit { url = "git://github.com/itchyny/lightline.vim"; - rev = "ec7d944f06821f96461fc0ba81aebf1dc650cded"; - sha256 = "0yvjsvkql999cldlq7xhy873mk42awh3xsh9ihfs5rbaj1v27z4p"; + rev = "6de7b19812e3051f739fe05dbd23f040b870c00b"; + sha256 = "1qc95dnmg3zqvizfy1bk2yvw0vkyz547m7a06ccln9pd4hy0kgfk"; }; dependencies = []; @@ -555,11 +607,11 @@ rec { }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2016-04-11"; + name = "vim-orgmode-2016-05-15"; src = fetchgit { url = "git://github.com/jceb/vim-orgmode"; - rev = "0bb1eff513880b90dd2c3ecde3726c21863cb4d9"; - sha256 = "07gw5d5gipmcsa9cqii2n2cqghdny22m37z2dllm8n82j9yk1qzg"; + rev = "e0d56a6e93798b7a503bb4ab86fec016cd74d466"; + sha256 = "1nm04d5ngbk21c0ykjbflqn9xym1x67rijq7wsgmmm79q0irn25q"; }; dependencies = []; @@ -631,6 +683,17 @@ rec { postInstall = false; }; + fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "fzf-vim-2016-05-17"; + src = fetchgit { + url = "git://github.com/junegunn/fzf.vim"; + rev = "78c3d254ae29ac877e73e85545c3ae200203f168"; + sha256 = "0lsmn3a9qnjkmw5gzhk2lgr1qg0mi9g0l96vj5v4178432swgsrv"; + }; + dependencies = []; + + }; + limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "limelight-vim-2016-04-12"; src = fetchgit { @@ -687,22 +750,22 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-04-14"; + name = "vimtex-2016-05-15"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "270eb339ea67ac08622b5e386490bf09be6e0190"; - sha256 = "1bdznp73q989ha0ws8kzq92dcbmg2nn8b4nkx4hzcin56n8bx4x4"; + rev = "57df1d1686ab339eec93ac51b02993c8c54343c5"; + sha256 = "1lfry5njp6w3gan54xmilczzqryj9n27xdgs72svaljla6c7lbdy"; }; dependencies = []; }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2016-03-27"; + name = "vim-easymotion-2016-05-07"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "a6b3c10b417d90d6751352b53826f94062ff466d"; - sha256 = "0f9jdc9czhw14wr0hs1acdf779lx7v5a5hjbf19rw80bb6sp7f3b"; + rev = "5c6f3cd9a713491e6b32752a05c45198aa91540a"; + sha256 = "086zih2mjrv1s596sw09a0vkaijm0ml3v2668n45cpxb04aa11d7"; }; dependencies = []; @@ -735,11 +798,22 @@ rec { }; lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lushtags-2016-03-24"; + name = "lushtags-2016-04-26"; src = fetchgit { url = "git://github.com/mkasa/lushtags"; - rev = "f54dd9b2819a5573f110099b232149c5202c1eb4"; - sha256 = "15v2f58i1z3421rgxh1i5rbd6cgc4s3vljv1bdjx19b2x9fq237f"; + rev = "641e4163d078e7c3844f2ac82a8153a3ef06484b"; + sha256 = "0fydgz40bfnz6jpmv9bbr3b5bb5vd1514zk9qg3wh12ynpfhqc89"; + }; + dependencies = []; + + }; + + hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "hlint-refactor-vim-2015-12-05"; + src = fetchgit { + url = "git://github.com/mpickering/hlint-refactor-vim"; + rev = "fffb044ecef854a82c5c2efda252e09044ba03e0"; + sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8"; }; dependencies = []; @@ -756,6 +830,17 @@ rec { }; + haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "haskell-vim-2016-05-10"; + src = fetchgit { + url = "git://github.com/neovimhaskell/haskell-vim"; + rev = "4e87782d1657ac1556c2128ff8dee967953554a1"; + sha256 = "0yyk7ja6ljhn9s55v3d0fsnk0a3y0skcb0wjjspk2nvdj90s4n8z"; + }; + dependencies = []; + + }; + shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "shabadou-vim-2014-07-27"; src = fetchgit { @@ -779,33 +864,44 @@ rec { }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2016-03-29"; + name = "vim-racer-2016-05-12"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "54f10ee0016f90167e4ff9acaca9beaf8c3b85b5"; - sha256 = "0gpm8h3wqsncyy8ldgwsyk7b70b4j0ia3632h5f3pchq7pb46h8g"; + rev = "6677d268b3bb2770379874eaea275632bf59ff76"; + sha256 = "08g1wbc3cwgkhpyn954n3bb5qyp2zz9lifxzfgndxb0dhmxprf15"; + }; + dependencies = []; + + }; + + rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "rust-vim-2016-04-12"; + src = fetchgit { + url = "git://github.com/rust-lang/rust.vim"; + rev = "115d321d383eb96d438466c56cc871fcc1bd0faa"; + sha256 = "1xanv9933vh9rzki6vfzshiav6xrx7025a40v2q9c1l2zx3iz7pb"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-04-06"; + name = "neocomplete-vim-2016-04-30"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "738bf323deaa844f9bd45c9a65d99699e73cd772"; - sha256 = "15nbykpp8mshmxb1dfb256yx0k4296arahz97f2x6wm6x44g8yns"; + rev = "81d39635625730ca43f08762e2908b96e7b7f077"; + sha256 = "0kqyfpz2apj1pz6p4mqzy4256cxmdbd9ra9hiz2f92wymgmnwpcv"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-03-21"; + name = "neosnippet-snippets-2016-05-15"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "1cd353ac0d0e9ad0eba9d57e3eda34b3abefd7ff"; - sha256 = "066svirnvz35bz1hi23ffqsa208l467lsld0jg7yzmh8gvfi32jb"; + rev = "b068cc47707ecc7d023d75359687b21545bfc341"; + sha256 = "1gy7dn2h1w8bpqr681nqm1kyb9ggxakw25mlhlb3vvb2p8nm553r"; }; dependencies = []; @@ -823,22 +919,22 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-04-15"; + name = "unite-vim-2016-05-15"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "21b6c8846b4c8fb62761e1470cbad8d2fc08ce6c"; - sha256 = "15h835401ki6phnxcmh6w8prkfdf37qdq0rc64dslg5jv3cw3b0r"; + rev = "5638a2469ecb29eb302aee668981d61da96d301f"; + sha256 = "0jblcwqdq8jgday3khnvari9gijsfvyc0s0c585x0i255rmq414y"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2016-04-10"; + name = "vimproc-vim-2016-04-27"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "b05d30228ecb97acc2b398cca34b230092722268"; - sha256 = "0r27652gpqrb8p552yansvdvw703bpd9i67lzs3i11mp1gd5krrd"; + rev = "0ff17bc0725cd0323df87664fa02b1436349f667"; + sha256 = "0r5kfj1zl9hld9rx5jdvgmdr30d573ncikily0qcjl90y4rjw3fp"; }; dependencies = []; buildInputs = [ which ]; @@ -874,22 +970,44 @@ rec { }; vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-hardtime-2016-03-28"; + name = "vim-hardtime-2016-05-03"; src = fetchgit { url = "git://github.com/takac/vim-hardtime"; - rev = "9764bc446dc2a917583e29c5dc58eac3f2c1f80d"; - sha256 = "1yk4452lb19s04184h58562rmkbbyb4w02h5ay3j4da3gc0j1fml"; + rev = "acf59c8df88e1445c145dfca626957d54a1310c3"; + sha256 = "1q7lhj6ll3lycsxqj0ymm7pb6m1sdglgip7wkirjv357yxl7y7kr"; + }; + dependencies = []; + + }; + + vim-expand-region = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-expand-region-2013-08-19"; + src = fetchgit { + url = "git://github.com/terryma/vim-expand-region"; + rev = "966513543de0ddc2d673b5528a056269e7917276"; + sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv"; + }; + dependencies = []; + + }; + + vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vimpreviewpandoc-2016-03-07"; + src = fetchgit { + url = "git://github.com/tex/vimpreviewpandoc"; + rev = "b109d41ad6478df5ec7f1311950c6efca66f36e4"; + sha256 = "1gx326xarjs3qjygpkrknncad90crjqfx8v6pir4r7k1hl7dfxc4"; }; dependencies = []; }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2016-03-27"; + name = "vim-quickrun-2016-05-10"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "5e3d1c94f0deee5b4e0c7630e7b7362213d9fda7"; - sha256 = "0lzvfxsvq1c85h7ym87yjx71w4pissd68hgfn3w2nwyl7zj4d91s"; + rev = "76f576959cc7d971fcb5ffea25ad72887e3ea035"; + sha256 = "06nbx1ssg95nv3z3i75m134jbihk7iajkf7plfr46i2vmrj602c5"; }; dependencies = []; @@ -907,11 +1025,11 @@ rec { }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2016-04-13"; + name = "vim-eunuch-2016-04-16"; src = fetchgit { url = "git://github.com/tpope/vim-eunuch"; - rev = "07ca4836c5f0b325ebb4d706f94a14eb8c722f51"; - sha256 = "0im8fkw313z3hzhpz5wan8lj1ka6d2vx70ngg9anipwyx0lvl5q3"; + rev = "5ee2b82b565e6c6d80f1cb7735c78f66a159b198"; + sha256 = "1ampwnbi0vpl4g6aj2rax0v902fxk1jyz6azvnnffqzr0b2rnk9b"; }; dependencies = []; @@ -940,17 +1058,17 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-04-28"; + name = "youcompleteme-2016-05-11"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "cb5756943fdd3ba062f101a5aba34acdd34d1356"; - sha256 = "1fg85mf4x48g6jpn9idjp0k2nz1i34lrx1bxbvp0189ph1xfq7jj"; + rev = "6a81436bd83d174f63c5691e1a9eb24470108942"; + sha256 = "0ir28yk3sgy66y8xxrj9628881lmp6l7bg52zjgycdz57hv85zlg"; }; dependencies = []; buildInputs = [ python go cmake - (if stdenv.isDarwin then llvmPackages_38.clang else llvmPackages_38.clang-unwrapped) - llvmPackages_38.llvm + (if stdenv.isDarwin then llvmPackages.clang else llvmPackages.clang-unwrapped) + llvmPackages.llvm ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; propogatedBuildInputs = [ @@ -980,22 +1098,33 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-04-14"; + name = "vim-airline-themes-2016-05-14"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "60105c7e8827623f646b9b030a68026cddee3d19"; - sha256 = "1xs30363797l4f5n56d0f4f35bgkpq00fv3j9jbcz0nj0cjwik2v"; + rev = "8bf1961e3b50551956fe2703bdfca1eb84ba1daf"; + sha256 = "1ifvg5pmy8g8pcwvx6pnlym2v6szaziliqvl46da8g7g3mxmd4zb"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2016-04-06"; + name = "vim-pandoc-2016-05-03"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "c08a9205ad6960ac1b0931acc9742ac1fa6ce58c"; - sha256 = "0k4hbxblw3jwm0hl222alg2f0z0ar3lkphydqrnqgckcm3cgzpdy"; + rev = "b32791d3cfc999344a9acf22738b41e8ab21aec7"; + sha256 = "1lvq9767ng8156l5946z44sw2s19mb70hn7afxkdsk9771agd365"; + }; + dependencies = []; + + }; + + vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-pandoc-after-2015-06-01"; + src = fetchgit { + url = "git://github.com/vim-pandoc/vim-pandoc-after"; + rev = "4377665e5c98f29ea838deb3b942200b8dd096ef"; + sha256 = "1di82bgi7sjn7lmma7g9zbdraamsy9c6g7ms6jgglfvynbbvmgg0"; }; dependencies = []; @@ -1090,11 +1219,11 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-03-21"; + name = "vim-wakatime-2016-04-29"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "def34fb17502e555ac9b70348640c4614779bfff"; - sha256 = "0m3dgs4jf2q0kn2b4rff0j2kaf2030h7ixsn5ab54xdlgfdn6z7n"; + rev = "2d30996a1622a7f2cd9bf55cf9078d4301648f4c"; + sha256 = "0mkj6bxxjdyi7dd52nfk881ayjym5rqa5r4zjcra9lhbh0fcdhfk"; }; dependencies = []; buildInputs = [ python ]; @@ -1183,17 +1312,6 @@ rec { }; - rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-2015-01-29"; - src = fetchgit { - url = "git://github.com/wting/rust.vim"; - rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376"; - sha256 = "1vn4ynvx1pbgvq9ggn21aaazz8jpsh9l6r3n3sd0y46n0qn8nblx"; - }; - dependencies = []; - - }; - sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "sensible-2016-03-18"; src = fetchgit { @@ -1250,11 +1368,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2016-04-09"; + name = "table-mode-2016-05-08"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "4cf1f534307fc2c89b63075bd6b36b3ee352fdbb"; - sha256 = "0amjlb4im19irahlqmp6pmcyjdy0ndiyrgrm0jm6k9iv74arhg8r"; + rev = "b613e39bd08ecebdb9b18100dae518050f496048"; + sha256 = "0vqiqph6y1dcfhy5xwh3ksafdzhrinpdppvjvw51xhy8i9ycznf6"; }; dependencies = []; @@ -1293,11 +1411,11 @@ rec { }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2016-02-23"; + name = "undotree-2016-05-08"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "e5a01b2eb94afd256a96cac07ba2981a55dd9665"; - sha256 = "1dga7yhk5gh980w2qlf764i9f2mba4ij9habd86i9mlsh3wdqnrm"; + rev = "0917446af029a055a34f12bf668ea0d561e97037"; + sha256 = "0v174icbhgvyddqg1psws3fyian5pwn4cki7skwlsxp6ahl49kal"; }; dependencies = []; @@ -1513,11 +1631,22 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-04-12"; + name = "vim-airline-2016-05-15"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "1bb8b6278e901cbc282535cabb1f6e17f8059e2a"; - sha256 = "10vlbv9p6zcibvxyjkgf03v8720j8zryl9s7kq0hj0h2z646kdw8"; + rev = "70c16f4c46f11395bbbc30b2f0a6822669e7df87"; + sha256 = "1ib3rs0ysz41dxk4fmzjrha005adrrlya5bnb8cv1p1ny7ipny1d"; + }; + dependencies = []; + + }; + + vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-closetag-2016-04-21"; + src = fetchgit { + url = "git://github.com/alvan/vim-closetag"; + rev = "26e41a5b0c3752d5300506a49120d9dff19d8323"; + sha256 = "0c8x25hb912jmhf5jpfll08937wr2yls28i9divldm9jkmxvcx2k"; }; dependencies = []; @@ -1557,11 +1686,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-03-29"; + name = "vim-gitgutter-2016-05-13"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "78d83c7056e1973ed4cbf9b5b3f09263a3dbf968"; - sha256 = "0gslmjizqaaa4fhcbdmrw2yvl70s06b3hwvjsx2zw7mlnj66lakv"; + rev = "cae4f72aa1290c353aa8d0898cac0781ef2ee538"; + sha256 = "0kx117v92pglm72m52p6d2pqa1gsnzy476l7ai1c23jk696pl9vq"; }; dependencies = []; @@ -1623,22 +1752,22 @@ rec { }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-04-13"; + name = "vim-snippets-2016-05-16"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "e055cf9a71e52690a6fd5b4d0b145672950aa423"; - sha256 = "0d0dzhlngpzgwz6d21qdfmc4b9nl8zlhkm861y0fkxr81y6mvp80"; + rev = "a9b920b478e2c92bb8ce699c27835013a2cc25fb"; + sha256 = "1msi4kvs7zgyi6l9jf0w462kw3lfsxb4bg7i3vrd16zcr5n742mj"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2016-03-04"; + name = "vim-webdevicons-2016-04-17"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "f8841e2bd46e9fed95c0389190e3ef1b6ba77440"; - sha256 = "0f0fxn7pck9k642sgmv0y68qi0hqnw46pl919c2sq542da7g4k0p"; + rev = "ad5d6d7f9fdf741a1e0d45b2bebab1d0116e1158"; + sha256 = "039asq5ggbpjc3g8xnd7bgk2szqqgmdh5xa7xhr8yfag26mal1ja"; }; dependencies = []; @@ -1656,11 +1785,11 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2016-03-31"; + name = "vimwiki-2016-04-25"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "129c2818106bdb9230bbd99ee8eb81fa47c7a414"; - sha256 = "16qq2c2vwc3yndmv2qd9vb2krrx3drwk4ylql49wf04h8sdshfsp"; + rev = "f56700932967f09ea6faa0bad60367b0d6b19a0d"; + sha256 = "1x176z40653nqp4rgla298dazwyh3rm95k4d4v4qs5hka14b2jfg"; }; dependencies = []; @@ -1688,58 +1817,4 @@ rec { }; - vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-after-2015-06-01"; - src = fetchgit { - url = "git://github.com/vim-pandoc/vim-pandoc-after"; - rev = "4377665e5c98f29ea838deb3b942200b8dd096ef"; - sha256 = "1di82bgi7sjn7lmma7g9zbdraamsy9c6g7ms6jgglfvynbbvmgg0"; - }; - dependencies = []; - - }; - - vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimpreviewpandoc-2016-03-03"; - src = fetchgit { - url = "git://github.com/tex/vimpreviewpandoc"; - rev = "7c05b4a7bf55a361c7ac33e6e05f7965daed5889"; - sha256 = "12xnnsvdsl2wc7fy537pdk6s3nfxw46g1l4xqr0fxzhz712nczk5"; - }; - dependencies = []; - - }; - - vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-haskellConcealPlus-2015-11-14"; - src = fetchgit { - url = "git://github.com/enomsg/vim-haskellConcealPlus"; - rev = "fdd4e15800121edcb72e050650b02537af2d64ce"; - sha256 = "0dw9ibj54bnszvkzxhfdwxwyjlv5a5k1pbyjmbw44ldqx48x4651"; - }; - dependencies = []; - - }; - - hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "hlint-refactor-vim-2015-12-05"; - src = fetchgit { - url = "git://github.com/mpickering/hlint-refactor-vim"; - rev = "fffb044ecef854a82c5c2efda252e09044ba03e0"; - sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8"; - }; - dependencies = []; - - }; - - haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2016-04-18"; - src = fetchgit { - url = "git://github.com/neovimhaskell/haskell-vim"; - rev = "40bb7c933d2e95432571fcb353d69323a1432d4e"; - sha256 = "08da8hp1jirxzlwbnzf2zlpzya1jc74mahwsb37xnbs6hgvvpd86"; - }; - dependencies = []; - - }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7a2f018a81be..de87046d3bc9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -21,19 +21,23 @@ "ghcmod" "github:Chiel92/vim-autoformat" "github:LnL7/vim-nix" +"github:Shougo/deoplete.nvim" "github:ajh17/Spacegray.vim" +"github:alvan/vim-closetag" "github:ap/vim-css-color" "github:benekastah/neomake" "github:bitc/vim-hdevtools" "github:christoomey/vim-tmux-navigator" +"github:ctjhoa/spacevim" "github:ctrlpvim/ctrlp.vim" "github:digitaltoad/vim-jade" "github:eagletmt/neco-ghc" -"github:esneider/YUNOcommit.vim" "github:enomsg/vim-haskellConcealPlus" +"github:esneider/YUNOcommit.vim" "github:fatih/vim-go" "github:flazz/vim-colorschemes" "github:google/vim-jsonnet" +"github:hecal3/vim-leader-guide" "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" "github:itchyny/lightline.vim" @@ -47,6 +51,7 @@ "github:jnurmine/zenburn" "github:jonbri/vim-colorstepper" "github:joonty/vim-xdebug" +"github:junegunn/fzf.vim" "github:junegunn/limelight.vim" "github:junegunn/vim-peekaboo" "github:justincampbell/vim-eighties" @@ -63,6 +68,7 @@ "github:osyo-manga/shabadou.vim" "github:osyo-manga/vim-watchdogs" "github:racer-rust/vim-racer" +"github:rust-lang/rust.vim" "github:shougo/neocomplete.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" @@ -71,6 +77,7 @@ "github:shougo/vimshell.vim" "github:sjl/gundo.vim" "github:takac/vim-hardtime" +"github:terryma/vim-expand-region" "github:tex/vimpreviewpandoc" "github:thinca/vim-quickrun" "github:tomasr/molokai" @@ -80,8 +87,8 @@ "github:valloric/youcompleteme" "github:vim-airline/vim-airline-themes" "github:vim-pandoc/vim-pandoc" -"github:vim-pandoc/vim-pandoc-syntax" "github:vim-pandoc/vim-pandoc-after" +"github:vim-pandoc/vim-pandoc-syntax" "github:vim-scripts/Colour-Sampler-Pack" "github:vim-scripts/a.vim" "github:vim-scripts/align" @@ -96,7 +103,6 @@ "pathogen" "quickfixstatus" "rainbow_parentheses" -"rust" "sensible" "sleuth" "snipmate" @@ -106,9 +112,13 @@ "taglist" "tlib" "undotree" +"vim-addon-actions" "vim-addon-async" +"vim-addon-background-cmd" "vim-addon-commenting" "vim-addon-completion" +"vim-addon-errorformats" +"vim-addon-goto-thing-at-cursor" "vim-addon-local-vimrc" "vim-addon-manager" "vim-addon-mru" @@ -116,6 +126,7 @@ "vim-addon-nix" "vim-addon-other" "vim-addon-php-manual" +"vim-addon-signs" "vim-addon-sql" "vim-addon-syntax-checker" "vim-addon-toggle-buffer" diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index fc3b0500fed9..466ecb1efee1 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -39,8 +39,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ipsec-tools.sourceforge.net/"; description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"; - platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.simons]; }; } diff --git a/pkgs/os-specific/linux/kernel/grsecurity-path-3.14.patch b/pkgs/os-specific/linux/kernel/grsecurity-path-3.14.patch deleted file mode 100644 index 6f477c22b5ee..000000000000 --- a/pkgs/os-specific/linux/kernel/grsecurity-path-3.14.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/kernel/kmod.c b/kernel/kmod.c -index a689506..30747b4 100644 ---- a/kernel/kmod.c -+++ b/kernel/kmod.c -@@ -294,10 +294,8 @@ static int ____call_usermodehelper(void *data) - out the path to be used prior to this point and are now operating - on that copy - */ -- if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && -- strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) && -- strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) && -- strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) { -+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && -+ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) { - printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path); - retval = -EPERM; - goto out; diff --git a/pkgs/os-specific/linux/kernel/grsecurity-path-4.4.patch b/pkgs/os-specific/linux/kernel/grsecurity-path-4.4.patch deleted file mode 100644 index bef1a75c23d4..000000000000 --- a/pkgs/os-specific/linux/kernel/grsecurity-path-4.4.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/kernel/kmod.c b/kernel/kmod.c -index a689506..30747b4 100644 ---- a/kernel/kmod.c -+++ b/kernel/kmod.c -@@ -294,11 +294,8 @@ static int ____call_usermodehelper(void *data) - out the path to be used prior to this point and are now operating - on that copy - */ -- if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && -- strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) && -- strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) && -- strncmp(sub_info->path, "/usr/sbin/", 10) && -- strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) { -+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && -+ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) { - printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path); - retval = -EPERM; - goto out; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.6.nix similarity index 68% rename from pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix rename to pkgs/os-specific/linux/kernel/linux-4.6.nix index e51fe6423680..0a85af58473a 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.6.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: -throw "grsecurity stable is no longer supported; please update your configuration" - import ./generic.nix (args // rec { - version = "4.4.5"; - extraMeta.branch = "4.4"; + version = "4.6"; + modDirVersion = "4.6.0"; + extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1daavrj2msl85aijh1izfm1cwf14c7mi75hldzidr1h2v629l89h"; + sha256 = "a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-3.14.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-3.14.nix deleted file mode 100644 index da6286207642..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity-3.14.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -throw "grsecurity stable is no longer supported; please update your configuration" - -import ./generic.nix (args // rec { - version = "3.14.51"; - extraMeta.branch = "3.14"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1gqsd69cqijff4c4br4ydmcjl226d0yy6vrmgfvy16xiraavq1mk"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index efa3cb2eb864..8e198e7a3ed9 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -88,22 +88,9 @@ rec { sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; }; - grsecurity_3_14 = grsecPatch - { kernel = pkgs.grsecurity_base_linux_3_14; - patches = [ grsecurity_fix_path_3_14 ]; - kversion = "3.14.51"; - revision = "201508181951"; - branch = "stable"; - sha256 = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f"; - }; + grsecurity_3_14 = throw "grsecurity stable is no longer supported"; - grsecurity_4_4 = grsecPatch - { kernel = pkgs.grsecurity_base_linux_4_4; - patches = [ grsecurity_fix_path_4_4 ]; - kversion = "4.4.5"; - revision = "201603131305"; - sha256 = "04k4nhshl6r5n41ha5620s7cd70dmmmvyf9mnn5359jr1720kxpf"; - }; + grsecurity_4_4 = throw "grsecurity stable is no longer supported"; grsecurity_4_5 = grsecPatch { kernel = pkgs.grsecurity_base_linux_4_5; @@ -115,16 +102,6 @@ rec { grsecurity_latest = grsecurity_4_5; - grsecurity_fix_path_3_14 = - { name = "grsecurity-fix-path-3.14"; - patch = ./grsecurity-path-3.14.patch; - }; - - grsecurity_fix_path_4_4 = - { name = "grsecurity-fix-path-4.4"; - patch = ./grsecurity-path-4.4.patch; - }; - grsecurity_fix_path_4_5 = { name = "grsecurity-fix-path-4.5"; patch = ./grsecurity-path-4.5.patch; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 7b7e1c96ab56..8d05a0d7d232 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation { homepage = "http://linux.dell.com/libsmbios/main"; description = "a library to obtain BIOS information"; license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1 - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix index 70e82662b415..03a587cdd3e7 100644 --- a/pkgs/os-specific/linux/lsscsi/default.nix +++ b/pkgs/os-specific/linux/lsscsi/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation { - name = "lsscsi-0.27"; + name = "lsscsi-0.28"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.27.tgz"; - sha256 = "1d6rl2jwpd6zlqymmp9z4ri5j43d44db2s71j0v0rzs1nbvm90kb"; + url = "http://sg.danny.cz/scsi/lsscsi-0.28.tgz"; + sha256 = "0l6xz8545lnfd9f4z974ar1pbzfdkr6c8r56zjrcaazl3ad00p82"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 4ac5d0c7951c..275f325b84ab 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = with maintainers; [ simons wkennington globin fpletz ]; + maintainers = with maintainers; [ wkennington globin fpletz ]; }; } diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 254a5ce4e287..a376e1f8459a 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "136"; + version = "137"; src = fetchFromGitHub { - sha256 = "0bk46vi39cifahqwrkzivqf4fr34aqfip960x7awks9hiil8skwr"; + sha256 = "0kx4jcgs2h5jvrjyrkn92vl2wxg6ny4sipzs2mlszcr4ky27am6z"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; diff --git a/pkgs/os-specific/linux/pmtools/default.nix b/pkgs/os-specific/linux/pmtools/default.nix index 7fa32ce4c943..a284924f0058 100644 --- a/pkgs/os-specific/linux/pmtools/default.nix +++ b/pkgs/os-specific/linux/pmtools/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { homepage = http://www.lesswatts.org/projects/acpi/utilities.php; description = "Linux ACPI utilities"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3af702982fb6..15ec3202e6b7 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -208,7 +208,6 @@ stdenv.mkDerivation rec { homepage = "http://www.freedesktop.org/wiki/Software/systemd"; description = "A system and service manager for Linux"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } - diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 03cee0fe55bc..096bddf62d65 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Domain name server"; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [viric simons]; + maintainers = with stdenv.lib.maintainers; [viric peti]; platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index bb4fa9782d6a..361aa3d58f75 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/pkgs/servers/http/apache-httpd/2.2.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = http://httpd.apache.org/; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ eelco simons lovek323 ]; + maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index f69001da08ac..bc7fd1441c13 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = http://httpd.apache.org/; license = licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with maintainers; [ lovek323 simons ]; + maintainers = with maintainers; [ lovek323 peti ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 178900570d07..40bd37ce40bf 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 7aded47dad18..4cccf237b9e2 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { homepage = http://code.google.com/p/modwsgi/; description = "Host Python applications in Apache through the WSGI interface"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 7fb6a16dd1c3..f35497fef8e4 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "a minimalistic high-performance web server"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 5bfdc5949247..1889e0e38c45 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [viric simons rickynils]; + maintainers = with stdenv.lib.maintainers; [viric peti rickynils]; hydraPlatforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 13455cb3f537..933b0fabc4b7 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Free software for managing electronic mail discussion and e-newsletter lists"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index 6c6cde8a46a6..cf8aea594325 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 8590f80c8aea..14149713ee8b 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -45,6 +45,6 @@ buildPerlPackage rec { description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 84937467b0ca..7360cbbcebaa 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "3.0.1"; + version = "3.1.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "0qim7jnq9gzwpfw6a41s3ngz2sjmxzlaiqjf0lrzycxy9mig2xc1"; + sha256 = "1nfb567v9s17j31l75v5gkdalmkrqba7ahz3z8gzz4kpmdzdhajk"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index bbc7bb496fe5..bc83d0cccab6 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "2.3.1"; + version = "2.4.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "1c5330kwnby1vqcia1vm6z17j8hzyyajvvv46rf478l7wkzmyvlp"; + sha256 = "0jjrgvnc571wdkv722k0xc43n94w0rn1ci4ndxya9fvlag1rjhlb"; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 5fec92a5bf8a..bd7b8fd3dea0 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -32,12 +32,19 @@ let patches = [ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) ./less-is-more.patch + ./hardcode-pgxs-path.patch ]; installTargets = [ "install-world" ]; LC_ALL = "C"; + postConfigure = + '' + # Hardcode the path to pgxs so pg_config returns the path in $out + substituteInPlace "src/bin/pg_config/pg_config.c" --replace HARDCODED_PGXS_PATH $out/lib + ''; + postInstall = '' moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it diff --git a/pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch b/pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch new file mode 100644 index 000000000000..355813ffe20e --- /dev/null +++ b/pkgs/servers/sql/postgresql/hardcode-pgxs-path.patch @@ -0,0 +1,17 @@ +--- a/src/bin/pg_config/pg_config.c ++++ b/src/bin/pg_config/pg_config.c +@@ -220,11 +220,13 @@ show_sysconfdir(bool all) + static void + show_pgxs(bool all) + { +- char path[MAXPGPATH]; ++ char path[MAXPGPATH] = "HARDCODED_PGXS_PATH"; + + if (all) + printf("PGXS = "); ++ /* commented out to be able to point to nix $out path + get_pkglib_path(mypath, path); ++ */ + strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); + cleanup_path(path); + printf("%s\n", path); diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 7ba97cf35b04..45c01d74cdb3 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -28,6 +28,17 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; + appres = (mkDerivation "appres" { + name = "appres-1.0.4"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/app/appres-1.0.4.tar.bz2; + sha256 = "139yp08qy1w6dccamdy0fh343yhaf1am1v81m2j435nd4ya4wqcz"; + }; + buildInputs = [pkgconfig libX11 xproto libXt ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit libX11 xproto libXt ;}; + bdftopcf = (mkDerivation "bdftopcf" { name = "bdftopcf-1.0.5"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list index 80b5e14d8c3b..fc3068b8f357 100644 --- a/pkgs/servers/x11/xorg/extra.list +++ b/pkgs/servers/x11/xorg/extra.list @@ -8,3 +8,4 @@ http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2 http://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 +mirror://xorg/individual/app/appres-1.0.4.tar.bz2 diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 6c7051c9c7a2..91d6b3335416 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = "GPL"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 49d149eb183c..0e3fc1d80690 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; - maintainers = [ maintainers.simons ]; + maintainers = [ maintainers.peti ]; }; passthru = { diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix new file mode 100644 index 000000000000..8aa6c2608fa1 --- /dev/null +++ b/pkgs/shells/rssh/default.nix @@ -0,0 +1,82 @@ +# CAVEATS: +# - Have only tested this with rsync, scp, and sftp. cvs support should work, but chroot integration is unlikely to function without further work +# - It is compiled without rdist support because rdist is ludicrously ancient (and not already in nixpkgs) + +{ stdenv, fetchurl, openssh, rsync, cvs }: + +stdenv.mkDerivation rec { + name = "rssh-${version}"; + version = "2.3.4"; + + src = fetchurl { + url = "mirror://sourceforge/rssh/rssh/${version}/${name}.tar.gz"; + sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9"; + }; + + patches = [ + ./fix-config-path.patch + + # Patches from AUR + (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh; + name = "0001-fail-logging.patch"; + sha256 = "d30f2f4fdb1b57f94773f5b0968a4da3356b14a040efe69ec1e976c615035c65"; + }) + (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh; + name = "0002-info-to-debug.patch"; + sha256 = "86f6ecf34f62415b0d6204d4cbebc47322dc2ec71732d06aa27758e35d688fcd"; + }) + (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh; + name = "0003-man-page-spelling.patch"; + sha256 = "455b3bbccddf1493999d00c2cd46e62930ef4fd8211e0b7d3a89d8010d6a5431"; + }) + (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh; + name = "0004-mkchroot.patch"; + sha256 = "f7fd8723d2aa94e64e037c13c2f263a52104af680ab52bfcaea73dfa836457c2"; + }) + (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh; + name = "0005-mkchroot-arch.patch"; + sha256 = "ac8894c4087a063ae8267d2fdfcde69c2fe6b67a8ff5917e4518b8f73f08ba3f"; + }) + (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh; + name = "0006-mkchroot-symlink.patch"; + sha256 = "bce98728cb9b55c92182d4901c5f9adf49376a07c5603514b0004e3d1c85e9c7"; + }) + (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh; + name = "0007-destdir.patch"; + sha256 = "7fa03644f81dc37d77cc7e2cad994f17f91b2b8a49b1a74e41030a4ac764385e"; + }) + (fetchurl { + url = https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh; + name = "0008-rsync-protocol.patch"; + sha256 = "0c772afe9088eeded129ead86775ef18e58c318bbc58fc3e2585e7ff09cc5e91"; + }) + ]; + + buildInputs = [ openssh rsync cvs ]; + + configureFlags = [ + "--with-sftp-server=${openssh}/libexec/sftp-server" + "--with-scp=${openssh}/bin/scp" + "--with-rsync=${rsync}/bin/rsync" + "--with-cvs=${cvs}/bin/cvs" + ]; + + + meta = with stdenv.lib; { + description = "A restricted shell for use with OpenSSH, allowing only scp and/or sftp"; + longDescription = '' + rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that. + ''; + homepage = "http://www.pizzashack.org/rssh/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ arobyn ]; + }; +} diff --git a/pkgs/shells/rssh/fix-config-path.patch b/pkgs/shells/rssh/fix-config-path.patch new file mode 100644 index 000000000000..eecffb376ab3 --- /dev/null +++ b/pkgs/shells/rssh/fix-config-path.patch @@ -0,0 +1,12 @@ +diff -Naur rssh-2.3.4/Makefile.in rssh-2.3.4-fixed/Makefile.in +--- rssh-2.3.4/Makefile.in 2012-11-27 11:19:34.000000000 +1100 ++++ rssh-2.3.4-fixed/Makefile.in 2015-11-11 21:13:58.516651742 +1100 +@@ -186,7 +186,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + AUTOMAKE_OPTIONS = nostdinc +-ourdefs = -DPATH_RSSH_CONFIG=\"@sysconfdir@/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\" ++ourdefs = -DPATH_RSSH_CONFIG=\"/etc/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\" + ourflags = @defcflags@ @static@ + AM_CFLAGS = $(ourflags) + nodist_rssh_SOURCES = main.c pathnames.h config.h diff --git a/pkgs/shells/zsh-prezto/default.nix b/pkgs/shells/zsh-prezto/default.nix new file mode 100644 index 000000000000..96b8cdd62500 --- /dev/null +++ b/pkgs/shells/zsh-prezto/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, fetchgit, fetchFromGitHub }: + +let + # https://github.com/spwhitt/nix-zsh-completions/pull/2 + nix-zsh-completions = fetchFromGitHub { + owner = "garbas"; + repo = "nix-zsh-completions"; + rev = "9b7d216ec095ccee541ebfa5f04249aa2964d054"; + sha256 = "1pvmfcqdvdi3nc1jm72f54mwf06yrmlq31pqw6b5fczawcz02jrz"; + }; +in stdenv.mkDerivation rec { + rev = "4f19700919c8ebbaf75755fc0d03716d13183f49"; + name = "zsh-prezto-2015-03-03_rev${builtins.substring 0 7 rev}"; + src = fetchgit { + url = "https://github.com/sorin-ionescu/prezto"; + inherit rev; + sha256 = "1q137r2vv16cq962n0f2hyn8m04d3phvh72gz737zv99jcrqg821"; + fetchSubmodules = true; + }; + patches = [ + (fetchurl { + url = "https://github.com/sorin-ionescu/prezto/pull/1028.patch"; + sha256 = "0n2s7kfp9ljrq8lw5iibv0vyv66awrkzkqbyvy7hlcl06d8aykjv"; + }) + ]; + buildPhase = '' + sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zpreztorc|/etc/zpreztorc|g" init.zsh + sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" init.zsh + for i in runcoms/*; do + sed -i -e "s|\''${ZDOTDIR:\-\$HOME}/.zprezto/|$out/|g" $i + done + sed -i -e "s|\''${0:h}/cache.zsh|\''${ZDOTDIR:\-\$HOME}/.zfasd_cache|g" modules/fasd/init.zsh + ''; + installPhase = '' + mkdir -p $out/modules/nix + cp ${nix-zsh-completions}/* $out/modules/nix -R + cp ./* $out/ -R + ''; + meta = with stdenv.lib; { + description = "Prezto is the configuration framework for Zsh; it enriches the command line interface environment with sane defaults, aliases, functions, auto completion, and prompt themes."; + homepage = "https://github.com/sorin-ionescu/prezto"; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; +} diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index 54dac32141fe..a309ed3826e9 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { homepage = "http://www.analog.cx/"; license = stdenv.lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index ea58ca3f8c1c..e160c62adb57 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; homepage = "http://www.nongnu.org/duplicity"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric simons]; + maintainers = with stdenv.lib.maintainers; [viric peti]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index e4ecb4becdef..77f5951d39e2 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, writeText, perl, openssh, rsync, logger }: stdenv.mkDerivation rec { - name = "rsnapshot-1.4.1"; + name = "rsnapshot-1.4.2"; src = fetchurl { url = "http://rsnapshot.org/downloads/${name}.tar.gz"; - sha256 = "1s28wkpqajgmwi88n3xs3qsa4b7yxd6lkl4zfi0mr06klwli2jpv"; + sha256 = "05jfy99a0xs6lvsjfp3wz21z0myqhmwl2grn3jr9clijbg282ah4"; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 912a0b6f0f2a..b0dfd79b9bac 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://www.nongnu.org/lzip/lzip.html"; description = "a lossless data compressor based on the LZMA algorithm"; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index df6b21956d91..38e032494fbe 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -27,8 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; - hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index 5a43aa52a0ec..dff66fe6bde5 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation { meta = { description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 20b71af6331d..b2246e73328f 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 94bfb5fb4988..3defa6ab1238 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.7.10"; + version="3.7.11"; name="${baseName}-${version}"; - hash="0shqvhqlmiywrr3vy8yazc8xcj6b04ci2zjgyca2vy7wa60lzfgg"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.10/glusterfs-3.7.10.tar.gz"; - sha256="0shqvhqlmiywrr3vy8yazc8xcj6b04ci2zjgyca2vy7wa60lzfgg"; + hash="083dzpz6mafmf4rd55pak5q7x8509y4ggsckcb6i0gmkhzlbf1xd"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.11/glusterfs-3.7.11.tar.gz"; + sha256="083dzpz6mafmf4rd55pak5q7x8509y4ggsckcb6i0gmkhzlbf1xd"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index bf108ad42abb..b640af8201d9 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libuuid, libselinux }: let sourceInfo = rec { - version = "2.2.3"; + version = "2.2.4"; url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; - sha256 = "1sv0p5d9ivik7lhrdynf6brma66llcvn11zhzasws12n4sfk6k6q"; + sha256 = "1ywmhrf6dz5g3ik4wf3hlnzmv1qa0q2qrgh3ir1pmbdhlgmkxdhm"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 1c5c4983c801..971a7e973cc0 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -10,11 +10,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.37"; + version="2.38"; name="${baseName}-${version}"; - hash="16nh02m52mk9a53i8wc6l9vg710gnzr3lfbypcbvamghvaj0458i"; - url="mirror://sourceforge/project/asymptote/2.37/asymptote-2.37.src.tgz"; - sha256="16nh02m52mk9a53i8wc6l9vg710gnzr3lfbypcbvamghvaj0458i"; + hash="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; + url="mirror://sourceforge/project/asymptote/2.38/asymptote-2.38.src.tgz"; + sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; }; buildInputs = [ freeglut ghostscriptX imagemagick fftw @@ -55,7 +55,7 @@ stdenv.mkDerivation { inherit (s) version; description = "A tool for programming graphics intended to replace Metapost"; license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons]; + maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.peti]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index 64222185044d..c9b1febcc93a 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -17,6 +17,5 @@ stdenv.mkDerivation rec { description = "a dynamic resource editor for X Toolkit applications"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 8da3ea0a1749..8a7205621673 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ]; + maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ]; inherit version; branch = "2.32"; }; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index ce620cf30177..9eccee536bdd 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ]; + maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ]; downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/"; inherit version; updateWalker = true; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 36a75743ed8a..34daae36ce9c 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, freetype, zlib }: +{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib }: let version = "0.20"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; - buildInputs = [ flex bison gd libpng freetype zlib ]; + buildInputs = [ flex bison gd libjpeg libpng freetype zlib ]; doCheck = true; preCheck = '' @@ -37,6 +37,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index d4e977128cfe..624f5321c2a6 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, ghostscript, gd, zlib, plotutils }: +{ stdenv, fetchurl, pkgconfig, ghostscript, gd, libjpeg, zlib, plotutils }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "pstoedit-3.62"; src = fetchurl { - url = mirror://sourceforge/pstoedit/pstoedit-3.62.tar.gz; + url = "mirror://sourceforge/pstoedit/${name}.tar.gz"; sha256 = "0j410dm9nqwa7n03yiyz0jwvln0jlqc3n9iv4nls33yl6x3c8x40"; }; - buildInputs = [ pkgconfig ghostscript gd zlib plotutils ]; + buildInputs = [ pkgconfig ghostscript gd libjpeg zlib plotutils ]; meta = { - description = "translates PostScript and PDF graphics into other vector formats"; + description = "Translates PostScript and PDF graphics into other vector formats"; homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index bcb7803785b0..8e0217ca839c 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -95,7 +95,6 @@ stdenv.mkDerivation rec { -no-xshape -no-xsync -opensource - -openssl -release -static -system-libjpeg diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 99a415407c17..4cab54d0b706 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, ncurses, cmake, anthy, automoc4, m17n_lib, m17n_db}: stdenv.mkDerivation rec { @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { gtk2 gtk3 kdelibs + ncurses cmake anthy automoc4 diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index d6ae74e02b5e..29d09ff09c97 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix new file mode 100644 index 000000000000..5261035b35c5 --- /dev/null +++ b/pkgs/tools/misc/fpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, python27Full }: + +stdenv.mkDerivation rec { + name = "fpp-${version}"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "PathPicker"; + rev = version; + sha256 = "1mfyr9k5s3l1sg3c9vlyiqg8n1wwppzb981az2xaxqyk95wwl1sa"; + }; + + postPatch = '' + substituteInPlace fpp --replace 'PYTHONCMD="python"' 'PYTHONCMD="${python27Full.interpreter}"' + ''; + + installPhase = '' + mkdir -p $out/share/fpp $out/bin + cp -r fpp src $out/share/fpp + ln -s $out/share/fpp/fpp $out/bin/fpp + ''; + + meta = { + description = "CLI program that accepts piped input and presents files for selection"; + homepage = https://facebook.github.io/PathPicker/; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index de9836422e66..652c4f989050 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ simons jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ peti jgeerds ]; }; } diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a10fd37da281..bee8231b64ee 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -40,6 +40,6 @@ buildPythonApplication rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 simons phreedom AndersonTorres fuuzetsu ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu ]; }; } diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index ce1d0b840125..ffd48bef58c2 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zsh-navigation-tools-${version}"; - version = "2.1.12"; + version = "2.1.14"; src = fetchFromGitHub { owner = "psprint"; repo = "zsh-navigation-tools"; rev = "v${version}"; - sha256 = "0ih7k6sbhjskwxhqq0hm0j3ydzrzi56wzb656clgnc6zihsjr2m2"; + sha256 = "0q0c5kcvwxfyn5hz3ir3s03jhdr6yjs5mmldz6kpkrh45qmzq9zz"; }; dontBuild = true; diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 0d004a63920e..5a1095506424 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "utilities for encoding and decoding binary files in MIME"; - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 967b3863f205..b89d2adea6bc 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "http://nbd.sourceforge.net"; description = "map arbitrary files as block devices over the network"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 78ef6998e3a1..ea5e265fa064 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2 -, gnutls, libgcrypt, zlib }: +, gnutls, libgcrypt, zlib, openssl }: stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "16.4"; + version = "17.0-r1686"; + filename = "nzbget-17.0-testing-r1686"; src = fetchurl { - url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${name}-src.tar.gz"; - sha256 = "03sdzxxsjpxp82jpk593xls96yk29989z05j73jah21dbpkkx7lf"; + url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${filename}-src.tar.gz"; + sha256 = "0hk0hiccdk3bivdnc2635kqqdwgwf73wvis1wl9k0snds25dwfiw"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls - libgcrypt zlib ]; + libgcrypt zlib openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 4f8c493a0f0d..ec38ec8d487c 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ebzzry codyopel ]; + maintainers = with maintainers; [ ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 0d676795ab82..2883043f8b76 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ebzzry codyopel ]; + maintainers = with maintainers; [ ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index aa1b01c11fad..b01566bed075 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -61,7 +61,7 @@ pythonPackages.buildPythonApplication rec { ''; homepage = http://tahoe-lafs.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; - maintainers = with lib.maintainers; [ simons MostAwesomeDude ]; + maintainers = with lib.maintainers; [ MostAwesomeDude ]; platforms = lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index fa3fc4472f3b..a5b548c80852 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation { ''; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index c62d5addb59f..e1905e2deb65 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -53,6 +53,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 895704ec6464..d66ce319aca7 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "nox-${version}"; - version = "0.0.2"; + version = "0.0.3"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz"; - sha256 = "1wpxh5fhj8nx4yx4cvmc087cnf4iqwxf7zd7rdh2ln3pgxrjfral"; + sha256 = "0bbd8nyvxwwz56qp82h3bln960bmpy2lczxr00h2jva1gpz5a964"; }; buildInputs = [ pythonPackages.pbr ]; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index bc57dd7c80f3..bdd02e58cbb6 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "packagekit-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - sha256 = "0sn38b80c6jx9d9r329ji9bg4m4gj6gnl04rv8fkmincj61qf7ag"; + sha256 = "1i6an483vmm6y39szr2alq5vf6kfxhk3j5ca79qrshcj9jjlhcs8"; url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; }; diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix index be6d184a4f2c..50eb6750a455 100644 --- a/pkgs/tools/security/dirmngr/default.nix +++ b/pkgs/tools/security/dirmngr/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, openldap }: +{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap }: stdenv.mkDerivation rec { - name = "dirmngr-1.0.3"; + name = "dirmngr-1.1.1"; src = fetchurl { - url = "mirror://gnupg/${name}.tar.bz2"; - sha256 = "03f54582caxgwjdv1b71azyk612a738ckgk2k05bmg466r1cw8jd"; + url = "mirror://gnupg/dirmngr/${name}.tar.bz2"; + sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j"; }; - - buildInputs = [ libgpgerror libgcrypt libassuan libksba openldap ]; + buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ]; } diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index e3c84fe71f2c..6119f708070d 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://gnupg.org; description = "a complete and free implementation of the OpenPGP standard"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ wkennington simons fpletz ]; + maintainers = with maintainers; [ wkennington peti fpletz ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index be21f92cd760..4dbcdf71f9f9 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://tcpcrypt.org/"; description = "enable opportunistic encryption of all TCP traffic"; - - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix index c013c97cdbbd..f6b9863d1bec 100644 --- a/pkgs/tools/system/daemonize/default.nix +++ b/pkgs/tools/system/daemonize/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "daemonize-${version}"; - version = "1.7.6"; + version = "1.7.7"; src = fetchurl { url = "https://github.com/bmc/daemonize/archive/release-${version}.tar.gz"; - sha256 = "07yv82mkhc57vnawwldqcy64c5yqyh817gksd3b4rgavbsp1fmwd"; + sha256 = "01gabcc8m4jkymd31p6v5883ii3g7126cici6rd03maf4jizxjmk"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 6ae92b685cc9..c34d81f63536 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -24,8 +24,6 @@ stdenv.mkDerivation { homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/"; description = "Consolidate duplicate files via hardlinks"; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 9301107d2db9..26ebf6f822fc 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://hisham.hm/htop/; license = licenses.gpl2Plus; platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; - maintainers = with maintainers; [ rob simons relrod nckx ]; + maintainers = with maintainers; [ rob relrod nckx ]; }; } diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 930778fe573f..16bb05898416 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -32,8 +32,6 @@ stdenv.mkDerivation { description = ''Command-line interface to IPMI-enabled devices''; license = stdenv.lib.licenses.bsd3; homepage = http://ipmitool.sourceforge.net; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index e0f5a5e68a8e..41b51aa41775 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "2.9.8"; + version = "2.9.9"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "066xfmzkrjbazddik2kx8k5adppkd3hm3pna6x8vri18sg7421w6"; + sha256 = "1xi5d49zmcczya4iq662wkx39slrk3d4p2dzpfjcc0m0hs1y1b5y"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 157b980be8c6..8445767e7b78 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = http://smartmontools.sourceforge.net/; license = licenses.gpl2Plus; platforms = with platforms; linux ++ darwin; - maintainers = [ maintainers.simons ]; + maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 02834b70d629..a5050047256b 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.all; - maintainers = [stdenv.lib.maintainers.simons]; + maintainers = [stdenv.lib.maintainers.peti]; }; } diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 5015a220afb5..808574e27355 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -2,14 +2,14 @@ let name = "source-highlight"; - version = "3.1.7"; + version = "3.1.8"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; - sha256 = "1s49ld8cnpzhhwq0r7s0sfm3cg3nhhm0wla27lwraifrrl3y1cp1"; + sha256 = "18xdalxg7yzrxc1njzgw7aryq2jdm7zq2yqz41sc7k6il5z6lcq1"; }; buildInputs = [ boost ]; diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 9ec623a0f119..558d9102352b 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -18,8 +18,6 @@ rec { meta = { description = "the moderncv class for TeXLive"; - maintainers = [ args.lib.maintainers.simons ]; - # Actually, arch-independent.. hydraPlatforms = []; }; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 6d57a659b63b..189d418b0391 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -18,8 +18,6 @@ rec { meta = { description = "the moderntimeline extensions for moderncv"; - maintainers = [ args.lib.maintainers.simons ]; - # Actually, arch-independent.. hydraPlatforms = []; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45df8ecfcfac..0b4fa87bd763 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -554,6 +554,8 @@ in backup = callPackage ../tools/backup/backup { }; + base16 = callPackage ../misc/base16 { }; + basex = callPackage ../tools/text/xml/basex { }; babeld = callPackage ../tools/networking/babeld { }; @@ -785,6 +787,8 @@ in fop = callPackage ../tools/typesetting/fop { }; + fpp = callPackage ../tools/misc/fpp { }; + fsmark = callPackage ../tools/misc/fsmark { }; fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; }; @@ -2280,6 +2284,8 @@ in libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; + libmpack = callPackage ../development/libraries/libmpack { }; + libiberty = callPackage ../development/libraries/libiberty { }; libiberty_static = callPackage ../development/libraries/libiberty { staticBuild = true; }; @@ -2510,6 +2516,8 @@ in ndjbdns = callPackage ../tools/networking/ndjbdns { }; + nerdfonts = callPackage ../data/fonts/nerdfonts { }; + nestopia = callPackage ../misc/emulators/nestopia { }; netatalk = callPackage ../tools/filesystems/netatalk { }; @@ -4017,6 +4025,8 @@ in tcsh = callPackage ../shells/tcsh { }; + rssh = callPackage ../shells/rssh { }; + rush = callPackage ../shells/rush { }; xonsh = callPackage ../shells/xonsh { }; @@ -4025,6 +4035,8 @@ in nix-zsh-completions = callPackage ../shells/nix-zsh-completions { }; + zsh-prezto = callPackage ../shells/zsh-prezto { }; + grml-zsh-config = callPackage ../shells/grml-zsh-config { }; @@ -5599,9 +5611,6 @@ in self = python27; inherit (darwin) CF configd; }; - python32 = callPackage ../development/interpreters/python/3.2 { - self = python32; - }; python33 = callPackage ../development/interpreters/python/3.3 { self = python33; }; @@ -5765,6 +5774,8 @@ in guile-sdl = callPackage ../development/guile-modules/guile-sdl { }; + guile-sdl2 = callPackage ../development/guile-modules/guile-sdl2 { }; + guile-xcb = callPackage ../development/guile-modules/guile-xcb { }; pharo-vms = callPackage_i686 ../development/pharo/vm { }; @@ -6158,7 +6169,7 @@ in }; include-what-you-use = callPackage ../development/tools/analysis/include-what-you-use { - llvmPackages = llvmPackages_37; + llvmPackages = llvmPackages_38; }; indent = callPackage ../development/tools/misc/indent { }; @@ -6723,6 +6734,8 @@ in cppunit = callPackage ../development/libraries/cppunit { }; + cpputest = callPackage ../development/libraries/cpputest { }; + cracklib = callPackage ../development/libraries/cracklib { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -6963,7 +6976,10 @@ in gettext = callPackage ../development/libraries/gettext { }; - gd = callPackage ../development/libraries/gd { }; + gd = callPackage ../development/libraries/gd { + libtiff = null; + libXpm = null; + }; gdal = callPackage ../development/libraries/gdal { }; @@ -9570,11 +9586,6 @@ in self = python27Packages; })); - python32Packages = callPackage ./python-packages.nix { - python = python32; - self = python32Packages; - }; - python33Packages = callPackage ./python-packages.nix { python = python33; self = python33Packages; @@ -10684,6 +10695,15 @@ in ]; }; + linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -10710,38 +10730,7 @@ in linux_chromiumos_latest = self.linux_chromiumos_3_18; - /* grsec configuration - - We build several flavors of 'default' grsec kernels. These are - built by default with Hydra. If the user selects a matching - 'default' flavor, then the pre-canned package set can be - chosen. Typically, users will make very basic choices like - 'security' + 'server' or 'performance' + 'desktop' with - virtualisation support. These will then be picked. - - Note: Xen guest kernels are included for e.g. NixOps deployments - to EC2, where Xen is the Hypervisor. - */ - - # Base kernels to apply the grsecurity patch onto - - grsecurity_base_linux_3_14 = callPackage ../os-specific/linux/kernel/linux-grsecurity-3.14.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - grsecurity_base_linux_4_4 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.4.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; + # grsecurity configuration grsecurity_base_linux_4_5 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.5.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] @@ -10764,14 +10753,6 @@ in # grsecurity kernels (see also linuxPackages_grsec_*) - linux_grsec_desktop_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.desktop; - linux_grsec_server_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.server; - linux_grsec_server_xen_3_14 = self.grKernel kernelPatches.grsecurity_3_14 self.grFlavors.server_xen; - - linux_grsec_desktop_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.desktop; - linux_grsec_server_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server; - linux_grsec_server_xen_4_4 = self.grKernel kernelPatches.grsecurity_4_4 self.grFlavors.server_xen; - linux_grsec_desktop_4_5 = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.desktop; linux_grsec_server_4_5 = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.server; linux_grsec_server_xen_4_5 = self.grKernel kernelPatches.grsecurity_4_5 self.grFlavors.server_xen; @@ -10780,16 +10761,6 @@ in linux_grsec_server_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server; linux_grsec_server_xen_latest = self.grKernel kernelPatches.grsecurity_latest self.grFlavors.server_xen; - # grsecurity: old names - - linux_grsec_testing_desktop = self.linux_grsec_desktop_latest; - linux_grsec_testing_server = self.linux_grsec_server_latest; - linux_grsec_testing_server_xen = self.linux_grsec_server_xen_latest; - - linux_grsec_stable_desktop = self.linux_grsec_desktop_3_14; - linux_grsec_stable_server = self.linux_grsec_server_3_14; - linux_grsec_stable_server_xen = self.linux_grsec_server_xen_3_14; - /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a specific kernel, we have a function that builds those packages @@ -10908,7 +10879,7 @@ in linux = self.linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = self.linuxPackages_4_5; + linuxPackages_latest = self.linuxPackages_4_6; linux_latest = self.linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -10923,6 +10894,8 @@ in linuxPackages_4_3 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_3 linuxPackages_4_3); linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); linuxPackages_4_5 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_5 linuxPackages_4_5); + linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6); + # Don't forget to update linuxPackages_latest! linuxPackages_testing = recurseIntoAttrs (self.linuxPackagesFor self.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile; @@ -10935,14 +10908,6 @@ in # grsecurity packages - linuxPackages_grsec_desktop_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.desktop; - linuxPackages_grsec_server_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server; - linuxPackages_grsec_server_xen_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server_xen; - - linuxPackages_grsec_desktop_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.desktop; - linuxPackages_grsec_server_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server; - linuxPackages_grsec_server_xen_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server_xen; - linuxPackages_grsec_desktop_4_5 = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.desktop; linuxPackages_grsec_server_4_5 = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.server; linuxPackages_grsec_server_xen_4_5 = self.grPackage kernelPatches.grsecurity_4_5 self.grFlavors.server_xen; @@ -10951,7 +10916,34 @@ in linuxPackages_grsec_server_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server; linuxPackages_grsec_server_xen_latest = self.grPackage kernelPatches.grsecurity_latest self.grFlavors.server_xen; - # grsecurity: old names + # grsecurity: legacy + + grsecurity_base_linux_3_14 = throw "grsecurity stable is no longer supported"; + grsecurity_base_linux_4_4 = throw "grsecurity stable is no longer supported"; + + linux_grsec_desktop_3_14 = throw "grsecurity stable is no longer supported"; + linux_grsec_server_3_14 = throw "grsecurity stable is no longer supported"; + linux_grsec_server_xen_3_14 = throw "grsecurity stable is no longer supported"; + + linux_grsec_desktop_4_4 = throw "grsecurity stable is no longer supported"; + linux_grsec_server_4_4 = throw "grsecurity stable is no longer supported"; + linux_grsec_server_xen_4_4 = throw "grsecurity stable is no longer supported"; + + linux_grsec_testing_desktop = self.linux_grsec_desktop_latest; + linux_grsec_testing_server = self.linux_grsec_server_latest; + linux_grsec_testing_server_xen = self.linux_grsec_server_xen_latest; + + linux_grsec_stable_desktop = self.linux_grsec_desktop_3_14; + linux_grsec_stable_server = self.linux_grsec_server_3_14; + linux_grsec_stable_server_xen = self.linux_grsec_server_xen_3_14; + + linuxPackages_grsec_desktop_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.desktop; + linuxPackages_grsec_server_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server; + linuxPackages_grsec_server_xen_3_14 = self.grPackage kernelPatches.grsecurity_3_14 self.grFlavors.server_xen; + + linuxPackages_grsec_desktop_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.desktop; + linuxPackages_grsec_server_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server; + linuxPackages_grsec_server_xen_4_4 = self.grPackage kernelPatches.grsecurity_4_4 self.grFlavors.server_xen; linuxPackages_grsec_testing_desktop = self.linuxPackages_grsec_desktop_latest; linuxPackages_grsec_testing_server = self.linuxPackages_grsec_server_latest; @@ -11218,12 +11210,11 @@ in # In nixos, you can set systemd.package = pkgs.systemd_with_lvm2 to get # LVM2 working in systemd. - systemd_with_lvm2 = pkgs.lib.overrideDerivation pkgs.systemd (p: { - name = p.name + "-with-lvm2"; + systemd_with_lvm2 = pkgs.appendToName "with-lvm2" (pkgs.lib.overrideDerivation pkgs.systemd (p: { postInstall = p.postInstall + '' cp "${pkgs.lvm2}/lib/systemd/system-generators/"* $out/lib/systemd/system-generators ''; - }); + })); sysvinit = callPackage ../os-specific/linux/sysvinit { }; @@ -11912,7 +11903,7 @@ in bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; - bomi = qt5.callPackage ../applications/video/bomi { + bomi = qt55.callPackage ../applications/video/bomi { youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; }; @@ -12596,6 +12587,34 @@ in desktopName = "Firefox"; }; + firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + channel = "beta"; + gconf = pkgs.gnome.GConf; + inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.gnome3) defaultIconTheme; + }; + + firefox-beta-bin = self.wrapFirefox firefox-beta-bin-unwrapped { + browserName = "firefox"; + name = "firefox-beta-bin-" + + (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; + desktopName = "Firefox Beta"; + }; + + firefox-developer-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + channel = "developer"; + gconf = pkgs.gnome.GConf; + inherit (pkgs.gnome) libgnome libgnomeui; + inherit (pkgs.gnome3) defaultIconTheme; + }; + + firefox-developer-bin = self.wrapFirefox firefox-developer-bin-unwrapped { + browserName = "firefox"; + name = "firefox-developer-bin-" + + (builtins.parseDrvName firefox-developer-bin-unwrapped.name).version; + desktopName = "Firefox Developer Edition"; + }; + firestr = qt5.callPackage ../applications/networking/p2p/firestr { boost = boost155; }; @@ -12909,6 +12928,10 @@ in cairo = cairo.override { xcbSupport = true; }; }; + i3lock-color = callPackage ../applications/window-managers/i3/lock-color.nix { }; + + i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; @@ -13478,6 +13501,7 @@ in synfigstudio = callPackage ../applications/graphics/synfigstudio { fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + inherit (gnome3) defaultIconTheme; }; librep = callPackage ../development/libraries/librep { }; @@ -13488,6 +13512,10 @@ in sxhkd = callPackage ../applications/window-managers/sxhkd { }; + mpop = callPackage ../applications/networking/mpop { + inherit (darwin.apple_sdk.frameworks) Security; + }; + msmtp = callPackage ../applications/networking/msmtp { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -13557,6 +13585,7 @@ in }; obs-studio = qt5.callPackage ../applications/video/obs-studio { + alsaSupport = stdenv.isLinux; pulseaudioSupport = config.pulseaudio or true; }; @@ -13851,6 +13880,8 @@ in rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; + rofi-menugen = callPackage ../applications/misc/rofi-menugen { }; + rstudio = callPackage ../applications/editors/rstudio { }; rsync = callPackage ../applications/networking/sync/rsync { @@ -13867,24 +13898,31 @@ in rxvt = callPackage ../applications/misc/rxvt { }; - # = urxvt + # urxvt rxvt_unicode = callPackage ../applications/misc/rxvt_unicode { perlSupport = true; gdkPixbufSupport = true; unicode3Support = true; }; - udevil = callPackage ../applications/misc/udevil {}; + rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { + plugins = [ + urxvt_perl + urxvt_perls + urxvt_tabbedex + urxvt_font_size + urxvt_theme_switch + ]; + }; # urxvt plugins urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { }; urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { }; + urxvt_theme_switch = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-theme-switch { }; - rxvt_unicode-with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { - plugins = [ urxvt_perl urxvt_perls urxvt_tabbedex urxvt_font_size ]; - }; + udevil = callPackage ../applications/misc/udevil {}; sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte_290; @@ -14252,6 +14290,7 @@ in transmission = callPackage ../applications/networking/p2p/transmission { }; transmission_gtk = transmission.override { enableGTK3 = true; }; + transmission-remote-cli = callPackage ../applications/networking/p2p/transmission-remote-cli {}; transmission_remote_gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk {}; trayer = callPackage ../applications/window-managers/trayer { }; @@ -14361,6 +14400,7 @@ in gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; }; + virtmanager = callPackage ../applications/virtualization/virt-manager { inherit (gnome) gnome_python; vte = gnome3.vte; @@ -15725,7 +15765,7 @@ in kde5 = let - frameworks = import ../desktops/kde-5/frameworks-5.21 { inherit pkgs; }; + frameworks = import ../desktops/kde-5/frameworks-5.22 { inherit pkgs; }; plasma = import ../desktops/kde-5/plasma-5.6 { inherit pkgs; }; applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; }; merged = self: @@ -16260,6 +16300,8 @@ in beep = callPackage ../misc/beep { }; + blackbird = callPackage ../misc/themes/blackbird { }; + brgenml1lpr = callPackage_i686 ../misc/cups/drivers/brgenml1lpr {}; brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; @@ -16410,6 +16452,8 @@ in inherit (pkgs.gnome) GConf; }; + moltengamepad = callPackage ../misc/drivers/moltengamepad { }; + mongoc = callPackage ../development/libraries/mongoc { }; mupen64plus = callPackage ../misc/emulators/mupen64plus { @@ -16677,6 +16721,7 @@ in vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { inherit (darwin.apple_sdk.frameworks) Cocoa; + llvmPackages = llvmPackages_38; }); vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index fca74bcdcc41..abf6f62fc8e0 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -913,8 +913,15 @@ let crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text ]; + patchPhase = '' + sed -i -e "s|expand(':h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim + sed -i -e "s|expand(':h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim + ''; + postInstall= '' cp $src/bin/fzf-tmux $bin/bin + mkdir -p $out/share/vim-plugins + ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${(builtins.parseDrvName fzf.name).name} ''; }; @@ -1310,6 +1317,33 @@ let buildInputs = [ net ]; }; + gore = buildFromGitHub { + rev = "v0.2.5"; + owner = "motemen"; + repo = "gore"; + sha256 = "1kg14ps6yw0715rlbcfk1bmrszzgsqgb0r2p3ra1qwxbhj1jd44y"; + buildInputs = [ go-homedir go-quickfix liner tools pkgs.makeWrapper ]; + + # Gore is a Go REPL, so it needs to be able to use the Go compiler. + allowGoReference = true; + + # Gore seems to only work with Go 1.5. Not sure if it doesn't support + # other versions or if I just haven't figured out how to get them working. + disabled = !isGo15; + + postInstall = '' + mkdir -p $out/bin + cp $NIX_BUILD_TOP/go/bin/gore $out/bin + wrapProgram $out/bin/gore --set GOROOT ${self.go}/share/go + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/motemen/gore"; + description = "Yet another Go REPL that works nicely. Featured with line editing, code completion, and more."; + license = licenses.mit; + }; + }; + goreturns = buildFromGitHub { rev = "b368f1f77f2950c753e05a6a29acfc487fa7a959"; owner = "sqs"; @@ -1792,6 +1826,21 @@ let sha256 = "00ani7fhydcmlsm3n93nmj1hcqp2wmzvihnb1gdzynif1hw0530y"; }; + go-quickfix = buildFromGitHub { + rev = "a5d4c82f7428280897ef403a87aa78b9c5924a47"; + sha256 = "0m1vclhqygnylfyhzpw5myi3f4qz30a3h9mbssxdsgn67s7l666y"; + owner = "motemen"; + repo = "go-quickfix"; + buildInputs = [ tools ]; + excludedPackages = "testdata"; + + meta = with stdenv.lib; { + homepage = "https://github.com/motemen/go-quickfix"; + description = ''Quick fix non-compiling well-typed Go source code e.g. "x declared and not used."''; + license = licenses.mit; + }; + }; + go-radix = buildFromGitHub { rev = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93"; owner = "armon"; @@ -3765,7 +3814,12 @@ let sha256 = "1mf98hagb0yp40g2mbar7aw7hmpq01clnil6y9khvykrb33vy0nb"; postInstall = '' - for i in $bin/bin/{provider,provisioner}-*; do mv $i $bin/bin/terraform-$(basename $i); done + # prefix all the plugins with "terraform-" + for i in $bin/bin/*; do + if [[ ! $(basename $i) =~ terraform* ]]; then + mv -v $i $bin/bin/terraform-$(basename $i); + fi + done ''; }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c3ef92142737..76cb4a7a4d2b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -215,20 +215,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [LocaleMaketextSimple]; }; - AppCmd = buildPerlPackage { - name = "App-Cmd-0.326"; + AppCmd = buildPerlPackage rec { + name = "App-Cmd-0.330"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.326.tar.gz; - sha256 = "1z6vp1am170fczc0srj63rdvrdbrjk3acmj6ka5v5n6qim4xsv9b"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "7a7bfd7196f7551a07509b03ea7abddc1fa9aee19a84e3dd5ba939c619cb6011"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine StringRewritePrefix SubExporter ModulePluggable SubInstall ]; + propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix SubExporter SubInstall ]; meta = { - homepage = https://github.com/rjbs/app-cmd; + homepage = https://github.com/rjbs/App-Cmd; description = "Write command line apps with less suffering"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; }; @@ -2661,10 +2661,10 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.032"; + name = "CryptX-0.034"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "46892112056ca3929e26cd3512cd4560c5beea7548a8632b79f2fe11f4b220c0"; + sha256 = "fad93a560f43ace09de734924f247c4da9d79db7d42fb61954441f5f854225b1"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { @@ -3236,14 +3236,16 @@ let self = _self // overrides; _self = with self; { }; }; - DateTimeFormatStrptime = buildPerlPackage { - name = "DateTime-Format-Strptime-1.56"; + DateTimeFormatStrptime = buildPerlPackage rec { + name = "DateTime-Format-Strptime-1.68"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.56.tar.gz; - sha256 = "2ff69d0f5a0359aab04e7276db5bee3be10040da24fbf09de1d904e7ead78b28"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "d0f97e282b4de61390b5c3a498d3b9ee553f728c169c0845c6de02102d823929"; }; - propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone ParamsValidate ]; + buildInputs = [ TestFatal TestWarnings ]; + propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone PackageDeprecationManager ParamsValidate TryTiny ]; meta = { + homepage = http://metacpan.org/release/DateTime-Format-Strptime; description = "Parse and format strp and strf time patterns"; license = stdenv.lib.licenses.artistic2; }; @@ -3274,15 +3276,15 @@ let self = _self // overrides; _self = with self; { }; DateTimeLocale = buildPerlPackage rec { - name = "DateTime-Locale-0.92"; + name = "DateTime-Locale-1.03"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "1fq2wbpfvi5gy3jaild4974sz02vdvfkb98aahni9par4sgn469z"; + sha256 = "3100568a62a91ca1c09c0aac8e1e4ba34e6f82047ec64f714733a647c040f511"; }; - buildInputs = [ DistCheckConflicts ]; - propagatedBuildInputs = [ ListMoreUtils ParamsValidate ]; + buildInputs = [ DistCheckConflicts TestFatal TestRequires TestWarnings ]; + propagatedBuildInputs = [ DistCheckConflicts ListMoreUtils ParamsValidate ]; meta = { - homepage = http://datetime.perl.org/; + homepage = http://metacpan.org/release/DateTime-Locale; description = "Localization support for DateTime.pm"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3485,15 +3487,16 @@ let self = _self // overrides; _self = with self; { }; DBI = buildPerlPackage rec { - name = "DBI-1.634"; + name = "DBI-1.636"; src = fetchurl { url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; - sha256 = "0l0ldpl5wjh5klaqbb3krkqn3vnr2q6l42d4zfmihj46hpri41r5"; + sha256 = "8f7ddce97c04b4b7a000e65e5d05f679c964d62c8b02c94c1a7d815bb2dd676c"; }; meta = { homepage = http://dbi.perl.org/; description = "Database independent interface for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.all; }; }; @@ -3504,7 +3507,7 @@ let self = _self // overrides; _self = with self; { sha256 = "1picibywz5sdpaa1pmbv7xfw52nbz6fh32afb1p2qwsgzbkhqvnw"; }; buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; - propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName namespaceclean ]; + propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; @@ -3591,11 +3594,11 @@ let self = _self // overrides; _self = with self; { }; }; - DBIxConnector = buildPerlModule { - name = "DBIx-Connector-0.53"; + DBIxConnector = buildPerlModule rec { + name = "DBIx-Connector-0.56"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/DBIx-Connector-0.53.tar.gz; - sha256 = "198qbi97rnq6zbh5vgy437vlca8hns1b995fm4w896m0v7zgjjiw"; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz"; + sha256 = "57c08d2c1951486cb95cfb83f518f462a3dbf20d353f3eee4f46af44fa19c359"; }; buildInputs = [ TestMockModule ]; propagatedBuildInputs = [ DBI ]; @@ -3604,7 +3607,7 @@ let self = _self // overrides; _self = with self; { description = "Fast, safe DBI connection and transaction management"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; }; @@ -6933,6 +6936,21 @@ let self = _self // overrides; _self = with self; { }; }; + ListSomeUtils = buildPerlPackage rec { + name = "List-SomeUtils-0.52"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "1e8c900332ac08c314b78ca1b0d23aba28c146b6133606a817d828d5bd0485ac"; + }; + buildInputs = [ TestLeakTrace ]; + propagatedBuildInputs = [ ExporterTiny ModuleImplementation ]; + meta = { + homepage = http://metacpan.org/release/List-SomeUtils; + description = "Provide the stuff missing in List::Util"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ListUtilsBy = buildPerlPackage rec { name = "List-UtilsBy-0.09"; src = fetchurl { @@ -8148,20 +8166,20 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ Moose ]; }; - MooseXAppCmd = buildPerlPackage { - name = "MooseX-App-Cmd-0.27"; + MooseXAppCmd = buildPerlPackage rec { + name = "MooseX-App-Cmd-0.32"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.27.tar.gz; - sha256 = "18wf8xmp0b8g76rlkmzw9m026w0l5k972w3z9xcskwqmg9p0wg3k"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "2e3bbf7283a4bee72d91d26eb204436030992bbe55cbd35ec33a546f16f973ff"; }; - buildInputs = [ MooseXConfigFromFile TestOutput YAML MouseXGetOpt ]; - propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose AnyMoose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ]; + buildInputs = [ ModuleBuildTiny MooseXConfigFromFile TestOutput YAML ]; + propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXGetopt MooseXNonMoose namespaceautoclean ]; meta = { - homepage = http://metacpan.org/release/MooseX-App-Cmd; + homepage = https://github.com/moose/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; }; @@ -8305,19 +8323,19 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXConfigFromFile = buildPerlPackage { - name = "MooseX-ConfigFromFile-0.13"; + MooseXConfigFromFile = buildPerlPackage rec { + name = "MooseX-ConfigFromFile-0.14"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.13.tar.gz; - sha256 = "0pf5f05hs2i765cnw9sw1hdxf7vz480iyyngjawr4yqjkv4r5nz7"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "9ad343cd9f86d714be9b54b9c68a443d8acc6501b6ad6b15e9ca0130b2e96f08"; }; - buildInputs = [ Moose TestCheckDeps TestDeep TestFatal TestNoWarnings TestRequires TestWithoutModule ]; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny TryTiny namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny Moose MooseXGetopt TestDeep TestFatal TestRequires TestWithoutModule self."if" ]; + propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathTiny namespaceautoclean ]; meta = { + homepage = https://github.com/moose/MooseX-ConfigFromFile; description = "An abstract Moose role for setting attributes from a configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; }; @@ -8328,7 +8346,7 @@ let self = _self // overrides; _self = with self; { sha256 = "111f391221d00f8b09cdcc6c806ab114324cf7f529d12f627fb97d054da42225"; }; buildInputs = [ DevelCheckOS ModuleBuildTiny Moose TestFatal ]; - propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass namespaceautoclean ]; + propagatedBuildInputs = [ Moose MooseXGetopt MooseXTypesPathClass SubExporter namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Daemonize; description = "Role for daemonizing your Moose based application"; @@ -8351,12 +8369,12 @@ let self = _self // overrides; _self = with self; { }; MooseXGetopt = buildPerlPackage rec { - name = "MooseX-Getopt-0.69"; + name = "MooseX-Getopt-0.70"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "0ef348a5edb8aca9a8bf4aff9dbcc2ac4281682fdc65b210b3c87cffd7501308"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "b9a95b01db3a6abf5e9a1cdbb6e283411649c8d279819cbe903bf4a662106194"; }; - buildInputs = [ ModuleBuildTiny Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings self."if" ]; + buildInputs = [ ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings self."if" ]; propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Getopt; @@ -8526,17 +8544,20 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXRunnable = buildPerlPackage { - name = "MooseX-Runnable-0.03"; + MooseXRunnable = buildPerlPackage rec { + name = "MooseX-Runnable-0.10"; src = fetchurl { - url = mirror://cpan/authors/id/J/JR/JROCKWAY/MooseX-Runnable-0.03.tar.gz; - sha256 = "1hl3pnldjlbyj6gm3bzwj827qp54di14hp4zhypmrmbg1lscfdwc"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "40d8fd1b5524ae965965a1f144d7a0a0c850594c524402b2319b24d5c4af1199"; }; - buildInputs = [ Testuseok TestTableDriven ]; - propagatedBuildInputs = [ ListMoreUtils Moose MooseXGetopt MooseXTypes MooseXTypesPathClass namespaceautoclean ParamsUtil ]; + buildInputs = [ ModuleBuildTiny MooseXGetopt TestFatal TestSimple TestTableDriven ]; + propagatedBuildInputs = [ ClassLoad ListSomeUtils Moose MooseXTypes MooseXTypesPathTiny ParamsUtil PathTiny namespaceautoclean ]; meta = { + homepage = https://github.com/moose/MooseX-Runnable; + description = "Tag a class as a runnable application"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; }; @@ -8587,13 +8608,18 @@ let self = _self // overrides; _self = with self; { }; MooseXTraits = buildPerlPackage rec { - name = "MooseX-Traits-0.11"; + name = "MooseX-Traits-0.13"; src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "0sqmpf2kw25847fwrrwpcfhrq694bgs8jbix7qxp9qyjm769np6n"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "74afe0c4faf4e3b97c57f289437caa60becca34cd5821f489dd4cc9da4fbe29a"; + }; + buildInputs = [ ModuleBuildTiny Moose MooseXRoleParameterized TestFatal TestRequires TestSimple ]; + propagatedBuildInputs = [ ClassLoad Moose SubExporter namespaceautoclean ]; + meta = { + homepage = https://github.com/moose/MooseX-Traits; + description = "Automatically apply roles at object creation time"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestException Testuseok ]; - propagatedBuildInputs = [ ClassMOP Moose namespaceautoclean ]; }; MooseXTraitsPluggable = buildPerlPackage rec { @@ -8639,28 +8665,31 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesDateTime = buildPerlPackage { - name = "MooseX-Types-DateTime-0.08"; + MooseXTypesDateTime = buildPerlPackage rec { + name = "MooseX-Types-DateTime-0.13"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-0.08.tar.gz; - sha256 = "0q0d1dd8737rc3k3jb22wvybf03hg3lp1iyda0ivkd8020cib996"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "b89fa26636f6a17eaa3868b4514340472b68bbdc2161a1d79a22a1bf5b1d39c6"; }; - propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean TestException Testuseok ]; + buildInputs = [ ModuleBuildTiny Moose TestFatal TestSimple ]; + propagatedBuildInputs = [ DateTime DateTimeLocale DateTimeTimeZone Moose MooseXTypes namespaceclean self."if" ]; meta = { - maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + homepage = https://github.com/moose/MooseX-Types-DateTime; + description = "DateTime related constraints and coercions for Moose"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; - MooseXTypesDateTimeMoreCoercions = buildPerlPackage { - name = "MooseX-Types-DateTime-MoreCoercions-0.11"; + MooseXTypesDateTimeMoreCoercions = buildPerlPackage rec { + name = "MooseX-Types-DateTime-MoreCoercions-0.15"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/MooseX-Types-DateTime-MoreCoercions-0.11.tar.gz; - sha256 = "c746a9284b7db49ce9acb2fbce26629fa816e6636e883d2ed6c62e336cfc52cb"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796"; }; - buildInputs = [ TestException Testuseok ]; - propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean ]; + buildInputs = [ ModuleBuildTiny TestFatal TestSimple ]; + propagatedBuildInputs = [ DateTime DateTimeXEasy Moose MooseXTypes MooseXTypesDateTime TimeDurationParse namespaceclean self."if" ]; meta = { + homepage = https://github.com/moose/MooseX-Types-DateTime-MoreCoercions; description = "Extensions to MooseX::Types::DateTime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8760,16 +8789,20 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesURI = buildPerlPackage { - name = "MooseX-Types-URI-0.05"; + MooseXTypesURI = buildPerlPackage rec { + name = "MooseX-Types-URI-0.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.05.tar.gz; - sha256 = "08acqm23ff22hicb3l4wc7szvdhlxpan7qmpgl15ilawrmz60p82"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "d310d20fa361fe2dff758236df87949cc7bf98e5cf3a7c79115365eccde6ccc1"; }; - propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass namespaceclean Testuseok URI URIFromHash ]; + buildInputs = [ ModuleBuildTiny Moose TestSimple ]; + propagatedBuildInputs = [ Moose MooseXTypes MooseXTypesPathClass URI URIFromHash namespaceautoclean self."if" ]; meta = { + homepage = https://github.com/moose/MooseX-Types-URI; + description = "URI related types and coercions for Moose"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; }; }; @@ -8864,12 +8897,12 @@ let self = _self // overrides; _self = with self; { }; namespaceautoclean = buildPerlPackage rec { - name = "namespace-autoclean-0.27"; + name = "namespace-autoclean-0.28"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "1m5p76hz2r6mysx6afs5xpjp9yqnbq1q1bv5zkyn3g979l4a3vbc"; + sha256 = "cd410a1681add521a28805da2e138d44f0d542407b50999252a147e553c26c39"; }; - buildInputs = [ ModuleBuildTiny TestRequires Moose ]; + buildInputs = [ TestRequires ]; propagatedBuildInputs = [ BHooksEndOfScope SubIdentify namespaceclean ]; meta = { homepage = https://github.com/moose/namespace-autoclean; @@ -8879,10 +8912,10 @@ let self = _self // overrides; _self = with self; { }; namespaceclean = buildPerlPackage rec { - name = "namespace-clean-0.25"; + name = "namespace-clean-0.26"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.25.tar.gz; - sha256 = "016dds70ql1mp18b07chkxiy4drn976ibnbshqc2hmhrh9xjnsll"; + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; + sha256 = "73986e19c4ad0e634e35f4f26e81437f152d8026eb1d91fe795725746ce13eca"; }; propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; meta = { @@ -8892,34 +8925,11 @@ let self = _self // overrides; _self = with self; { }; }; - NamespaceAutoclean = buildPerlPackage { - name = "namespace-autoclean-0.26"; - src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.26.tar.gz; - sha256 = "c0f805acd3b565c611324b7bde20d32f6ffc31afefc5b8e52f54994802594d43"; - }; - buildInputs = [ ModuleBuildTiny TestRequires ]; - propagatedBuildInputs = [ BHooksEndOfScope SubIdentify NamespaceClean ]; - meta = { - homepage = https://github.com/moose/namespace-autoclean; - description = "Keep imports out of your namespace"; - license = "perl"; - }; - }; + # Deprecated. + NamespaceAutoclean = self.namespaceautoclean; - NamespaceClean = buildPerlPackage { - name = "namespace-clean-0.25"; - src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.25.tar.gz; - sha256 = "946a2b7b8219562818867ad915cd493637e2639f901db050b835500c8e6ecd04"; - }; - propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; - meta = { - homepage = http://search.cpan.org/dist/namespace-clean; - description = "Keep imports and functions out of your namespace"; - license = "perl"; - }; - }; + # Deprecated. + NamespaceClean = self.namespaceclean; NetAddrIP = buildPerlPackage rec { name = "NetAddr-IP-4.079"; @@ -9376,16 +9386,16 @@ let self = _self // overrides; _self = with self; { }; }; - PackageDeprecationManager = buildPerlPackage { - name = "Package-DeprecationManager-0.13"; + PackageDeprecationManager = buildPerlPackage rec { + name = "Package-DeprecationManager-0.16"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.13.tar.gz; - sha256 = "0fkvq3xxwc3l5hg64dr9sj3l12dl59i44cg407qx9sd6r51j3qfi"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "4018a06f7a3ba252c9eccc3fdcad9490cd003dfa6baf261545e96b5a82e784a7"; }; - buildInputs = [ TestRequires TestFatal ]; - propagatedBuildInputs = [ ParamsUtil SubInstall ListMoreUtils ]; + buildInputs = [ TestFatal TestWarnings ]; + propagatedBuildInputs = [ PackageStash ParamsUtil SubInstall SubName namespaceautoclean ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = http://metacpan.org/release/Package-DeprecationManager; description = "Manage deprecation warnings for your distribution"; license = stdenv.lib.licenses.artistic2; }; @@ -9472,16 +9482,16 @@ let self = _self // overrides; _self = with self; { }; }; - ParamsValidate = buildPerlModule { - name = "Params-Validate-1.08"; + ParamsValidate = buildPerlModule rec { + name = "Params-Validate-1.24"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.08.tar.gz; - sha256 = "0641hbz5bx6jnk8dx2djnkd67fh7h1zx6x1bgmivkrh2yky9ch6h"; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; + sha256 = "1e1576f16e6e01ba63aa73775da563b410b49f26ee44169a45280feb958a5f0d"; }; - buildInputs = [ TestFatal ]; + buildInputs = [ ModuleBuild TestFatal TestRequires ]; propagatedBuildInputs = [ ModuleImplementation ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = http://metacpan.org/release/Params-Validate; description = "Validate method/function parameters"; license = stdenv.lib.licenses.artistic2; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96041398002c..f0b838830291 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -386,13 +386,13 @@ in modules // { acme-tiny = buildPythonPackage rec { name = "acme-tiny-${version}"; - version = "20151229"; - rev = "f61f72c212cea27f388eb4a26ede0d65035bdb53"; + version = "2016-03-26"; - src = pkgs.fetchgit { - inherit rev; - url = "https://github.com/diafygi/acme-tiny.git"; - sha256 = "dde59354e483bdff3dfd06717c094889ae673efb568e40b150b4695b0c539649"; + src = pkgs.fetchFromGitHub { + sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g"; + rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971"; + repo = "acme-tiny"; + owner = "diafygi"; }; # source doesn't have any python "packaging" as such @@ -403,7 +403,6 @@ in modules // { patchPhase = '' substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl.bin}/bin/openssl" - substituteInPlace letsencrypt/le_util.py --replace '"sw_vers"' '"/usr/bin/sw_vers"' ''; installPhase = '' @@ -4388,7 +4387,7 @@ in modules // { description = "pytest plugin with mechanisms for caching across test runs"; }; }; - + pytestdjango = buildPythonPackage rec { name = "pytest-django-${version}"; version = "2.9.1"; @@ -4397,7 +4396,7 @@ in modules // { url = "mirror://pypi/p/pytest-django/${name}.tar.gz"; sha256 = "1mmc7zsz3dlhs6sx4sppkj1vgshabi362r1a8b8wpj1qfximpqcb"; }; - + # doing this to allow depending packages to find # pytest's binaries pytest = self.pytest; @@ -6660,6 +6659,31 @@ in modules // { }; }; + jug = buildPythonPackage rec { + version = "1.2.1"; + name = "jug-${version}"; + buildInputs = with self; [ nose numpy ]; + propagatedBuildInputs = with self; [ + pyyaml + redis + six + modules.sqlite3 + pkgs.zlib + ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; + sha256 = "0sg3arfsmf1g4cqfdah3g6lqxj10v5780grlsaln6wj3yclp5gyx"; + }; + + meta = { + description = "A Task-Based Parallelization Framework"; + license = licenses.mit; + url = https://jug.readthedocs.org/; + maintainers = with maintainers; [ luispedro ]; + }; + }; + jsonpatch = buildPythonPackage rec { name = "jsonpatch-1.11"; @@ -7911,14 +7935,25 @@ in modules // { }; py3status = buildPythonPackage rec { - name = "py3status-2.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/py3status/${name}.tar.gz"; - sha256 = "1aq4l1lj6j54a8mh9y3yscbxv41bbhz89fiwnydj2gx0md5sq5v5"; + version = "2.9"; + name = "py3status-${version}"; + src = pkgs.fetchFromGitHub { + owner = "ultrabug"; + repo = "py3status"; + rev = version; + sha256 = "1nvdqwhgk0zff5kspgrh5c5vg1vdnz6gpjplbqi3nz41qws48f1y"; }; propagatedBuildInputs = with self; [ requests2 ]; prePatch = '' sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py + sed -i -e "s|notify-send|${pkgs.libnotify}/bin/notify-send|" py3status/modules/battery_level.py + sed -i -e "s|/usr/bin/whoami|${pkgs.coreutils}/bin/whoami|" py3status/modules/external_script.py + sed -i -e "s|'amixer|'${pkgs.alsaUtils}/bin/amixer|" py3status/modules/volume_status.py + sed -i -e "s|'i3-nagbar|'${pkgs.i3}/bin/i3-nagbar|" py3status/modules/pomodoro.py + sed -i -e "s|'free|'${pkgs.procps}/bin/free|" py3status/modules/sysdata.py + sed -i -e "s|'sensors|'${pkgs.lm_sensors}/bin/sensors|" py3status/modules/sysdata.py + sed -i -e "s|'setxkbmap|'${pkgs.xorg.setxkbmap}/bin/setxkbmap|" py3status/modules/keyboard_layout.py + sed -i -e "s|'xset|'${pkgs.xorg.xset}/bin/xset|" py3status/modules/keyboard_layout.py ''; meta = { maintainers = with maintainers; [ garbas ]; @@ -8950,11 +8985,11 @@ in modules // { SPARQLWrapper = buildPythonPackage rec { name = "SPARQLWrapper-${version}"; - version = "1.7.4"; + version = "1.7.6"; src = pkgs.fetchurl { url = "mirror://pypi/S/SPARQLWrapper/SPARQLWrapper-${version}.tar.gz"; - sha256 = "1dpwwlcdk4m8wr3d9lb24g1xcvs202c0ir4q3jcijy88is3bvgmp"; + sha256 = "1y12hpsfjd779yi29bhvl6g4vszadjvd8jw38z5rg77b034vxjnw"; }; # break circular dependency loop @@ -11459,7 +11494,6 @@ in modules // { }; }; - jsonpath_rw = buildPythonPackage rec { name = "jsonpath-rw-${version}"; version = "1.4.0"; @@ -13831,6 +13865,25 @@ in modules // { }; }; + livestreamer-curses = buildPythonPackage rec { + version = "1.5.2"; + name = "livestreamer-curses-${version}"; + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://github.com/gapato/livestreamer-curses/archive/v${version}.tar.gz"; + sha256 = "1v49sym6mrci9dxy0a7cpbp4bv6fg2ijj6rwk4wzg18c2x4qzkhn"; + }; + + propagatedBuildInputs = with self; [ curses livestreamer ]; + + meta = { + homepage = https://github.com/gapato/livestreamer-curses; + description = "Curses frontend for livestreamer"; + license = licenses.mit; + }; + }; + oauth = buildPythonPackage (rec { name = "oauth-1.0.1"; @@ -16513,6 +16566,7 @@ in modules // { }); protobuf = self.protobuf2_6; + protobuf3_0 = (self.protobufBuild pkgs.protobuf3_0).override { doCheck = false; }; protobuf2_6 = self.protobufBuild pkgs.protobuf2_6; protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; protobufBuild = protobuf: buildPythonPackage rec { @@ -20171,7 +20225,7 @@ in modules // { setuptools_scm_18 = self.setuptools_scm.override rec { name = "setuptools_scm-${version}"; version = "1.8.0"; - + # tests fail: ImportError: cannot import name 'find_files' disabled = isPy35; @@ -27225,4 +27279,37 @@ in modules // { license = licenses.wtfpl; }; }; + + # tensorflow is built from a downloaded wheel, because the upstream + # project's build system is an arcane beast based on + # bazel. Untangling it and building the wheel from source is an open + # problem. + + tensorflow = self.tensorflowNoGpuSupport; + + tensorflowNoGpuSupport = buildPythonPackage rec { + name = "tensorflow"; + version = "0.8.0"; + format = "wheel"; + + src = pkgs.fetchurl { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; + sha256 = "07lb6rknngq9bicd7z1q9caiqxlqn4fdx8q24s3rqvv9wi79szws"; + }; + + propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.swig ]; + + preFixup = '' + RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}" + find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \; + ''; + + doCheck = false; + + meta = { + description = "TensorFlow helps the tensors flow (no gpu support)"; + homepage = http://tensorflow.org; + license = licenses.asl20; + }; + }; }