ec57a4b · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge branch 'master' into add_pkg_gorilla

commitec57a4bc501102e75beba495d96223206b49c721 authorRoman Naumann <namor@hemio.de> dateWed 28 Dec 2016, 23:33 (10 years ago) parente5cd718 81d8a45

72 files changed+2328−672

compare with master

unifiedsplit

lib/maintainers.nix+2

@@ -129,6 +129,7 @@

129129 dochang = "Desmond O. Chang <dochang@gmail.com>";

130130 domenkozar = "Domen Kozar <domen@dev.si>";

131131 doublec = "Chris Double <chris.double@double.co.nz>";

132+ dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";

132133 drets = "Dmytro Rets <dmitryrets@gmail.com>";

133134 drewkett = "Andrew Burkett <burkett.andrew@gmail.com>";

134135 dtzWill = "Will Dietz <nix@wdtz.org>";

@@ -507,4 +508,5 @@

507508 zimbatm = "zimbatm <zimbatm@zimbatm.com>";

508509 zohl = "Al Zohali <zohl@fmap.me>";

509510 zoomulator = "Kim Simmons <zoomulator@gmail.com>";

511+ zraexy = "David Mell <zraexy@gmail.com>";

510512}

nixos/lib/make-squashfs.nix+1−1

@@ -25,6 +25,6 @@ stdenv.mkDerivation {

2525

2626 # Generate the squashfs image.

2727 mksquashfs nix-path-registration $storePaths $out \

28− -keep-as-directory -all-root -comp xz

28+ -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100%

2929 '';

3030}

nixos/modules/installer/cd-dvd/installation-cd-minimal.nix+6−2

@@ -1,11 +1,15 @@

11# This module defines a small NixOS installation CD. It does not

22# contain any graphical stuff.

4−{ config, lib, ... }:

4+{ config, lib, pkgs, ... }:

66{

77 imports =

88 [ ./installation-cd-base.nix

9− ../../profiles/minimal.nix

9+ ];

10+

11+ environment.systemPackages =

12+ [

13+ pkgs.vim

1014 ];

1115}

nixos/modules/misc/ids.nix+1−1

@@ -467,7 +467,7 @@

467467 ihaskell = 189;

468468 i2p = 190;

469469 lambdabot = 191;

470− #asterisk = 192; # unused

470+ asterisk = 192;

471471 plex = 193;

472472 sabnzbd = 194;

473473 #grafana = 196; #unused

nixos/modules/misc/locate.nix+10−1

@@ -15,6 +15,15 @@ in {

1515 '';

1616 };

1717

18+ locate = mkOption {

19+ type = types.package;

20+ default = pkgs.findutils;

21+ example = "pkgs.mlocate";

22+ description = ''

23+ The locate implementation to use

24+ '';

25+ };

26+

1827 interval = mkOption {

1928 type = types.str;

2029 default = "02:15";

@@ -77,7 +86,7 @@ in {

7786 script =

7887 ''

7988 mkdir -m 0755 -p $(dirname ${toString cfg.output})

80− exec updatedb \

89+ exec ${cfg.locate}/bin/updatedb \

8190 --localuser=${cfg.localuser} \

8291 ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \

8392 --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}

nixos/modules/profiles/base.nix+1−1

@@ -45,7 +45,7 @@

4545 ];

4646

4747 # Include support for various filesystems.

48− boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ];

48+ boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];

4949

5050 # Configure host id for ZFS to work

5151 networking.hostId = lib.mkDefault "8425e349";

nixos/modules/services/monitoring/graphite.nix+1−1

@@ -585,7 +585,7 @@ in {

585585 serviceConfig = {

586586 ExecStart = ''

587587 ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \

588− --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}

588+ --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}

589589 '';

590590 User = "graphite";

591591 Group = "graphite";

nixos/modules/services/monitoring/prometheus/alertmanager.nix+2−2

@@ -62,8 +62,8 @@ in {

6262 };

6363

6464 listenAddress = mkOption {

65− type = types.nullOr types.str;

66− default = null;

65+ type = types.str;

66+ default = "";

6767 description = ''

6868 Address to listen on for the web interface and API.

6969 '';

nixos/modules/services/networking/asterisk.nix+47−13

@@ -6,29 +6,38 @@ let

66 cfg = config.services.asterisk;

88 asteriskUser = "asterisk";

9+ asteriskGroup = "asterisk";

910

1011 varlibdir = "/var/lib/asterisk";

1112 spooldir = "/var/spool/asterisk";

1213 logdir = "/var/log/asterisk";

1314

15+ # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override

16+ defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles;

17+ allConfFiles =

18+ cfg.confFiles //

19+ builtins.listToAttrs (map (x: { name = x;

20+ value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); })

21+ defaultConfFiles);

22+

1423 asteriskEtc = pkgs.stdenv.mkDerivation

1524 ((mapAttrs' (name: value: nameValuePair

1625 # Fudge the names to make bash happy

1726 ((replaceChars ["."] ["_"] name) + "_")

1827 (value)

19− ) cfg.confFiles) //

28+ ) allConfFiles) //

2029 {

2130 confFilesString = concatStringsSep " " (

22− attrNames cfg.confFiles

31+ attrNames allConfFiles

2332 );

2433

25− name = "asterisk.etc";

34+ name = "asterisk-etc";

2635

2736 # Default asterisk.conf file

2837 # (Notice that astetcdir will be set to the path of this derivation)

2938 asteriskConf = ''

3039 [directories]

31− astetcdir => @out@

40+ astetcdir => /etc/asterisk

3241 astmoddir => ${pkgs.asterisk}/lib/asterisk/modules

3342 astvarlibdir => /var/lib/asterisk

3443 astdbdir => /var/lib/asterisk

@@ -169,6 +178,16 @@ in

169178 '';

170179 };

171180

181+ useTheseDefaultConfFiles = mkOption {

182+ default = [ "ari.conf" "acl.conf" "agents.conf" "amd.conf" "calendar.conf" "cdr.conf" "cdr_syslog.conf" "cdr_custom.conf" "cel.conf" "cel_custom.conf" "cli_aliases.conf" "confbridge.conf" "dundi.conf" "features.conf" "hep.conf" "iax.conf" "pjsip.conf" "pjsip_wizard.conf" "phone.conf" "phoneprov.conf" "queues.conf" "res_config_sqlite3.conf" "res_parking.conf" "statsd.conf" "udptl.conf" "unistim.conf" ];

183+ type = types.listOf types.str;

184+ example = [ "sip.conf" "dundi.conf" ];

185+ description = ''Sets these config files to the default content. The default value for

186+ this option contains all necesscary files to avoid errors at startup.

187+ This does not override settings via <option>services.asterisk.confFiles</option>.

188+ '';

189+ };

190+

172191 extraArguments = mkOption {

173192 default = [];

174193 type = types.listOf types.str;

@@ -182,12 +201,22 @@ in

182201 };

183202

184203 config = mkIf cfg.enable {

185− users.extraUsers = singleton

186− { name = asteriskUser;

187− uid = config.ids.uids.asterisk;

188− description = "Asterisk daemon user";

189− home = varlibdir;

190− };

204+ environment.systemPackages = [ pkgs.asterisk ];

205+

206+ environment.etc.asterisk.source = asteriskEtc;

207+

208+ users.extraUsers.asterisk =

209+ { name = asteriskUser;

210+ group = asteriskGroup;

211+ uid = config.ids.uids.asterisk;

212+ description = "Asterisk daemon user";

213+ home = varlibdir;

214+ };

215+

216+ users.extraGroups.asterisk =

217+ { name = asteriskGroup;

218+ gid = config.ids.gids.asterisk;

219+ };

191220

192221 systemd.services.asterisk = {

193222 description = ''

@@ -196,14 +225,17 @@ in

196225

197226 wantedBy = [ "multi-user.target" ];

198227

228+ # Do not restart, to avoid disruption of running calls. Restart unit by yourself!

229+ restartIfChanged = false;

230+

199231 preStart = ''

200232 # Copy skeleton directory tree to /var

201233 for d in '${varlibdir}' '${spooldir}' '${logdir}'; do

202234 # TODO: Make exceptions for /var directories that likely should be updated

203235 if [ ! -e "$d" ]; then

204236 mkdir -p "$d"

205− cp --recursive ${pkgs.asterisk}/"$d" "$d"

206− chown --recursive ${asteriskUser} "$d"

237+ cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/

238+ chown --recursive ${asteriskUser}:${asteriskGroup} "$d"

207239 find "$d" -type d | xargs chmod 0755

208240 fi

209241 done

@@ -215,7 +247,9 @@ in

215247 # FIXME: This doesn't account for arguments with spaces

216248 argString = concatStringsSep " " cfg.extraArguments;

217249 in

218− "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C ${asteriskEtc}/asterisk.conf ${argString} -F";

250+ "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F";

251+ ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload"

252+ '';

219253 Type = "forking";

220254 PIDFile = "/var/run/asterisk/asterisk.pid";

221255 };

nixos/modules/services/networking/bird.nix+1

@@ -34,6 +34,7 @@ let

3434

3535 ###### implementation

3636 config = mkIf cfg.enable {

37+ environment.systemPackages = [ pkg ];

3738 systemd.services.${variant} = {

3839 description = "BIRD Internet Routing Daemon";

3940 wantedBy = [ "multi-user.target" ];

nixos/modules/services/x11/hardware/wacom.nix+2−2

@@ -22,7 +22,7 @@ in

2222 which will make Xorg reconfigure the device ?

2323

2424 If you're not satisfied by the default behaviour you can override

25− <option>environment.etc."X11/xorg.conf.d/50-wacom.conf"</option> in

25+ <option>environment.etc."X11/xorg.conf.d/70-wacom.conf"</option> in

2626 configuration.nix easily.

2727 '';

2828 };

@@ -40,7 +40,7 @@ in

4040

4141 services.udev.packages = [ pkgs.xf86_input_wacom ];

4242

43− environment.etc."X11/xorg.conf.d/50-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/50-wacom.conf";

43+ environment.etc."X11/xorg.conf.d/70-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf";

4444

4545 };

4646

pkgs/applications/graphics/ImageMagick/7.0.nixnew file+89

@@ -0,0 +1,89 @@

1+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool

2+, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg

3+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp

4+}:

6+let

7+ arch =

8+ if stdenv.system == "i686-linux" then "i686"

9+ else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"

10+ else if stdenv.system == "armv7l-linux" then "armv7l"

11+ else throw "ImageMagick is not supported on this platform.";

12+

13+ cfg = {

14+ version = "7.0.4-0";

15+ sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds";

16+ patches = [];

17+ };

18+in

19+

20+stdenv.mkDerivation rec {

21+ name = "imagemagick-${version}";

22+ inherit (cfg) version;

23+

24+ src = fetchurl {

25+ urls = [

26+ "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"

27+ # the original source above removes tarballs quickly

28+ "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"

29+ "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz"

30+ ];

31+ inherit (cfg) sha256;

32+ };

33+

34+ patches = [ ./imagetragick.patch ] ++ cfg.patches;

35+

36+ outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

37+ outputMan = "out"; # it's tiny

38+

39+ enableParallelBuilding = true;

40+

41+ configureFlags =

42+ [ "--with-frozenpaths" ]

43+ ++ [ "--with-gcc-arch=${arch}" ]

44+ ++ lib.optional (librsvg != null) "--with-rsvg"

45+ ++ lib.optionals (ghostscript != null)

46+ [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"

47+ "--with-gslib"

48+ ]

49+ ++ lib.optionals (stdenv.cross.libc or null == "msvcrt")

50+ [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM

51+ ;

52+

53+ nativeBuildInputs = [ pkgconfig libtool ];

54+

55+ buildInputs =

56+ [ zlib fontconfig freetype ghostscript

57+ libpng libtiff libxml2

58+ ]

59+ ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")

60+ [ openexr librsvg openjpeg ]

61+ ;

62+

63+ propagatedBuildInputs =

64+ [ bzip2 freetype libjpeg lcms2 ]

65+ ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")

66+ [ libX11 libXext libXt libwebp ]

67+ ;

68+

69+ postInstall = ''

70+ (cd "$dev/include" && ln -s ImageMagick* ImageMagick)

71+ moveToOutput "bin/*-config" "$dev"

72+ moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params

73+ for file in "$dev"/bin/*-config; do

74+ substituteInPlace "$file" --replace pkg-config \

75+ "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'"

76+ done

77+ '' + lib.optionalString (ghostscript != null) ''

78+ for la in $out/lib/*.la; do

79+ sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la

80+ done

81+ '';

82+

83+ meta = with stdenv.lib; {

84+ homepage = http://www.imagemagick.org/;

85+ description = "A software suite to create, edit, compose, or convert bitmap images";

86+ platforms = platforms.linux ++ platforms.darwin;

87+ maintainers = with maintainers; [ the-kenny wkennington ];

88+ };

89+}

pkgs/applications/graphics/ImageMagick/default.nix+2−2

@@ -11,8 +11,8 @@ let

1111 else throw "ImageMagick is not supported on this platform.";

1212

1313 cfg = {

14− version = "6.9.6-7";

15− sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5";

14+ version = "6.9.7-0";

15+ sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx";

1616 patches = [];

1717 }

1818 # Freeze version on mingw so we don't need to port the patch too often.

pkgs/applications/graphics/xournal/default.nix+7−5

@@ -13,8 +13,10 @@ stdenv.mkDerivation rec {

1313

1414 buildInputs = [

1515 ghostscript atk gtk2 glib fontconfig freetype

16− libgnomecanvas libgnomeprint libgnomeprintui

16+ libgnomecanvas

1717 pango libX11 xproto zlib poppler

18+ ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [

19+ libgnomeprint libgnomeprintui

1820 ];

1921

2022 nativeBuildInputs = [ autoconf automake libtool pkgconfig ];

@@ -47,11 +49,11 @@ stdenv.mkDerivation rec {

4749 cp $out/share/xournal/pixmaps/xournal.png $out/share/icons

4850 '';

4951

50− meta = {

52+ meta = with stdenv.lib; {

5153 homepage = http://xournal.sourceforge.net/;

5254 description = "Note-taking application (supposes stylus)";

53− maintainers = [ stdenv.lib.maintainers.guibert ];

54− license = stdenv.lib.licenses.gpl2;

55− platforms = stdenv.lib.platforms.linux;

55+ maintainers = [ maintainers.guibert ];

56+ license = licenses.gpl2;

57+ platforms = with platforms; linux ++ darwin;

5658 };

5759}

pkgs/applications/misc/confclerk/default.nixnew file+28

@@ -0,0 +1,28 @@

1+{ stdenv, fetchurl, qt4, qmake4Hook }:

3+let version = "0.6.1"; in

4+stdenv.mkDerivation {

5+ name = "confclerk-${version}";

7+ src = fetchurl {

8+ url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz";

9+ sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g";

10+ };

11+

12+ buildInputs = [ qt4 ];

13+

14+ nativeBuildInputs = [ qmake4Hook ];

15+

16+ installPhase = ''

17+ mkdir -p $out/bin

18+ cp src/bin/confclerk $out/bin

19+ '';

20+

21+ meta = {

22+ description = "Offline conference schedule viewer";

23+ homepage = "http://www.toastfreeware.priv.at/confclerk";

24+ license = stdenv.lib.licenses.gpl2;

25+ maintainers = with stdenv.lib.maintainers; [ ehmry ];

26+ inherit (qt4.meta) platforms;

27+ };

28+}

pkgs/applications/misc/qsyncthingtray/default.nixnew file+41

@@ -0,0 +1,41 @@

1+{ stdenv, fetchFromGitHub

2+, qtbase, qtwebengine

3+, qmakeHook }:

5+stdenv.mkDerivation rec {

6+ version = "0.5.5rc2";

7+ name = "qsyncthingtray-${version}";

9+ src = fetchFromGitHub {

10+ owner = "sieren";

11+ repo = "QSyncthingTray";

12+ rev = "${version}";

13+ sha256 = "1x7j7ylgm4ih06m7gb5ls3c9bdjwbra675489caq2f04kgw4yxq2";

14+ };

15+

16+ buildInputs = [ qtbase qtwebengine ];

17+ nativeBuildInputs = [ qmakeHook ];

18+ enableParallelBuilding = true;

19+

20+ postInstall = ''

21+ mkdir -p $out/bin

22+ cp binary/QSyncthingTray $out/bin

23+ cat > $out/bin/qt.conf <<EOF

24+ [Paths]

25+ Prefix = ${qtwebengine.out}

26+ EOF

27+ '';

28+

29+ meta = with stdenv.lib; {

30+ homepage = https://github.com/sieren/QSyncthingTray/;

31+ description = "A Traybar Application for Syncthing written in C++";

32+ longDescription = ''

33+ A cross-platform status bar for Syncthing.

34+ Currently supports OS X, Windows and Linux.

35+ Written in C++ with Qt.

36+ '';

37+ license = licenses.lgpl3;

38+ maintainers = with maintainers; [ zraexy ];

39+ platforms = platforms.all;

40+ };

41+}

pkgs/applications/misc/urlscan/default.nixnew file+25

@@ -0,0 +1,25 @@

1+{ stdenv, buildPythonPackage, isPy35, fetchFromGitHub, urwid, pythonOlder }:

3+buildPythonPackage rec {

4+ name = "urlscan-${version}";

5+ version = "0.8.3";

7+ src = fetchFromGitHub {

8+ owner = "firecat53";

9+ repo = "urlscan";

10+ rev = version;

11+ # (equivalent but less nice(?): rev = "00333f6d03bf3151c9884ec778715fc605f58cc5")

12+ sha256 = "0l40anfznam4d3q0q0jp2wwfrvfypz9ppbpjyzjdrhb3r2nizb0y";

13+ };

14+

15+ propagatedBuildInputs = [ urwid ];

16+

17+ # FIXME doesn't work with 2.7; others than 2.7 and 3.5 were not tested (yet)

18+ disabled = !pythonOlder "3.5";

19+

20+ meta = with stdenv.lib; {

21+ description = "Mutt and terminal url selector (similar to urlview)";

22+ license = licenses.gpl2;

23+ maintainers = [ maintainers.dpaetzel ];

24+ };

25+}

pkgs/applications/networking/browsers/google-chrome/default.nix+4−1

@@ -51,10 +51,13 @@ let

5151 flac harfbuzz icu libpng opusWithCustomModes snappy speechd

5252 bzip2 libcap

5353 ] ++ optional pulseSupport libpulseaudio;

54+

55+ suffix = if channel != "stable" then "-" + channel else "";

56+

5457in stdenv.mkDerivation rec {

5558 inherit version;

5659

57− name = "google-chrome-${version}";

60+ name = "google-chrome${suffix}-${version}";

5861

5962 src = binary;

6063

pkgs/applications/networking/instant-messengers/mm/default.nixnew file+21

@@ -0,0 +1,21 @@

1+{ stdenv, buildGoPackage, fetchFromGitLab }:

3+buildGoPackage rec {

4+ name = "mm-${version}";

5+ version = "2016.11.04";

7+ goPackagePath = "gitlab.com/meutraa/mm";

9+ src = fetchFromGitLab {

10+ owner = "meutraa";

11+ repo = "mm";

12+ rev = "473fdd97285168054b672dbad2ffc4047324c518";

13+ sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp";

14+ };

15+

16+ meta = {

17+ description = "A file system based matrix client";

18+ homepage = https://gitlab.com/meutraa/mm;

19+ license = stdenv.lib.licenses.isc;

20+ };

21+}

pkgs/applications/networking/instant-messengers/ricochet/default.nix+3−3

@@ -5,11 +5,11 @@

66stdenv.mkDerivation rec {

77 name = "ricochet-${version}";

8− version = "1.1.2";

8+ version = "1.1.4";

1010 src = fetchurl {

1111 url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz";

12− sha256 = "1szb5vmlqal0vhan87kgbks184f7xbfay1hr3d3vm8r1lvcjjfkr";

12+ sha256 = "1kfj42ksvj7axc809lb8siqzj5hck2pib427b63a3ipnqc5h1faf";

1313 };

1414

1515 desktopItem = makeDesktopItem {

@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {

5151 description = "Anonymous peer-to-peer instant messaging";

5252 homepage = "https://ricochet.im";

5353 license = licenses.bsd3;

54− maintainers = [ maintainers.codsl maintainers.jgillich ];

54+ maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ];

5555 platforms = platforms.linux;

5656 };

5757}

pkgs/applications/science/misc/gplates/boostfix.patchnew file+612

@@ -0,0 +1,612 @@

1+--- a/src/app-logic/ApplicationState.h

2++++ b/src/app-logic/ApplicationState.h

3+@@ -33,6 +33,7 @@

4+ #include <boost/shared_ptr.hpp>

5+ #include <QObject>

7++#ifndef Q_MOC_RUN

8+ #include "FeatureCollectionFileState.h"

9+ #include "Layer.h"

10+ #include "LayerTaskRegistry.h"

11+@@ -48,6 +49,7 @@

12+ #include "model/ModelInterface.h"

13+ #include "model/types.h"

14+ #include "model/WeakReferenceCallback.h"

15++#endif

16+

17+ ////////////////////////////////////////////////////////////////////////////////////////////////

18+ // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers

19+--- a/src/app-logic/CoRegistrationLayerTask.h

20++++ b/src/app-logic/CoRegistrationLayerTask.h

21+@@ -32,11 +32,13 @@

22+ #include <QObject>

23+ #include <QString>

24+

25++#ifndef Q_MOC_RUN

26+ #include "CoRegistrationLayerParams.h"

27+ #include "CoRegistrationLayerProxy.h"

28+ #include "LayerTask.h"

29+

30+ #include "model/FeatureCollectionHandle.h"

31++#endif

32+

33+ namespace GPlatesAppLogic

34+ {

35+--- a/src/app-logic/RasterLayerTask.h

36++++ b/src/app-logic/RasterLayerTask.h

37+@@ -32,11 +32,13 @@

38+ #include <QObject>

39+ #include <QString>

40+

41++#ifndef Q_MOC_RUN

42+ #include "LayerTask.h"

43+ #include "RasterLayerParams.h"

44+ #include "RasterLayerProxy.h"

45+

46+ #include "model/FeatureCollectionHandle.h"

47++#endif

48+

49+

50+ namespace GPlatesAppLogic

51+--- a/src/app-logic/ReconstructGraph.h

52++++ b/src/app-logic/ReconstructGraph.h

53+@@ -46,6 +46,7 @@

54+ #include <boost/lambda/construct.hpp>

55+ #include <QObject>

56+

57++#ifndef Q_MOC_RUN

58+ #include "FeatureCollectionFileState.h"

59+ #include "Layer.h"

60+ #include "Reconstruction.h"

61+@@ -53,6 +54,7 @@

62+

63+ #include "model/FeatureCollectionHandle.h"

64+ #include "model/WeakReferenceCallback.h"

65++#endif

66+

67+

68+ namespace GPlatesAppLogic

69+--- a/src/app-logic/ReconstructLayerTask.h

70++++ b/src/app-logic/ReconstructLayerTask.h

71+@@ -33,6 +33,7 @@

72+ #include <QObject>

73+ #include <QString>

74+

75++#ifndef Q_MOC_RUN

76+ #include "LayerTask.h"

77+ #include "ReconstructLayerProxy.h"

78+ #include "ReconstructLayerParams.h"

79+@@ -42,6 +43,7 @@

80+ #include "maths/types.h"

81+

82+ #include "model/FeatureCollectionHandle.h"

83++#endif

84+

85+

86+ namespace GPlatesAppLogic

87+--- a/src/app-logic/ReconstructScalarCoverageLayerParams.h

88++++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h

89+@@ -30,6 +30,7 @@

90+ #include <boost/optional.hpp>

91+ #include <QObject>

92+

93++#ifndef Q_MOC_RUN

94+ #include "LayerParams.h"

95+ #include "ReconstructScalarCoverageLayerProxy.h"

96+ #include "ReconstructScalarCoverageParams.h"

97+@@ -38,6 +39,7 @@

98+ #include "property-values/ValueObjectType.h"

99+

100+ #include "utils/SubjectObserverToken.h"

101++#endif

102+

103+

104+ namespace GPlatesAppLogic

105+--- a/src/app-logic/ReconstructScalarCoverageLayerTask.h

106++++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h

107+@@ -30,12 +30,14 @@

108+ #include <boost/shared_ptr.hpp>

109+ #include <QObject>

110+

111++#ifndef Q_MOC_RUN

112+ #include "LayerTask.h"

113+ #include "ReconstructScalarCoverageLayerParams.h"

114+ #include "ReconstructScalarCoverageLayerProxy.h"

115+ #include "ScalarCoverageFeatureProperties.h"

116+

117+ #include "model/FeatureCollectionHandle.h"

118++#endif

119+

120+

121+ namespace GPlatesAppLogic

122+--- a/src/app-logic/TopologyNetworkResolverLayerTask.h

123++++ b/src/app-logic/TopologyNetworkResolverLayerTask.h

124+@@ -33,6 +33,7 @@

125+ #include <QObject>

126+ #include <QString>

127+

128++#ifndef Q_MOC_RUN

129+ #include "LayerParams.h"

130+ #include "LayerTask.h"

131+ #include "ReconstructLayerProxy.h"

132+@@ -41,6 +42,7 @@

133+ #include "TopologyNetworkResolverLayerProxy.h"

134+

135+ #include "model/FeatureCollectionHandle.h"

136++#endif

137+

138+

139+ namespace GPlatesAppLogic

140+--- a/src/app-logic/VelocityFieldCalculatorLayerTask.h

141++++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h

142+@@ -32,9 +32,11 @@

143+ #include <QObject>

144+ #include <QString>

145+

146++#ifndef Q_MOC_RUN

147+ #include "LayerTask.h"

148+ #include "VelocityFieldCalculatorLayerParams.h"

149+ #include "VelocityFieldCalculatorLayerProxy.h"

150++#endif

151+

152+ #include "model/FeatureCollectionHandle.h"

153+

154+--- a/src/data-mining/CoRegConfigurationTable.h

155++++ b/src/data-mining/CoRegConfigurationTable.h

156+@@ -28,6 +28,7 @@

157+

158+ #include <vector>

159+ #include <map>

160++#ifndef Q_MOC_RUN

161+ #include <boost/operators.hpp>

162+

163+ #include "CoRegFilter.h"

164+@@ -44,6 +45,7 @@

165+ #include "scribe/Transcribe.h"

166+ #include "scribe/TranscribeContext.h"

167+

168++#endif

169+

170+ namespace GPlatesDataMining

171+ {

172+--- a/src/gui/CommandServer.h

173++++ b/src/gui/CommandServer.h

174+@@ -38,9 +38,11 @@

175+ #include <QRegExp>

176+ #include <QtXml/QXmlStreamReader>

177+

178++#ifndef Q_MOC_RUN

179+ #include "app-logic/ApplicationState.h"

180+

181+ #include "presentation/ViewState.h"

182++#endif

183+

184+ namespace GPlatesGui

185+ {

186+--- a/src/gui/FeatureTableModel.h

187++++ b/src/gui/FeatureTableModel.h

188+@@ -32,8 +32,10 @@

189+ #include <QItemSelection>

190+ #include <QHeaderView>

191+

192++#ifndef Q_MOC_RUN

193+ #include "app-logic/Layer.h"

194+ #include "app-logic/ReconstructionGeometry.h"

195++#endif

196+

197+

198+ namespace GPlatesAppLogic

199+--- a/src/gui/TopologyTools.h

200++++ b/src/gui/TopologyTools.h

201+@@ -35,6 +35,7 @@

202+ #include <QDebug>

203+ #include <QObject>

204+

205++#ifndef Q_MOC_RUN

206+ #include "TopologySectionsContainer.h"

207+

208+ #include "app-logic/Layer.h"

209+@@ -64,6 +65,7 @@

210+ #include "utils/UnicodeStringUtils.h"

211+

212+ #include "view-operations/RenderedGeometryCollection.h"

213++#endif

214+

215+

216+ namespace GPlatesAppLogic

217+--- a/src/opengl/GLVisualLayers.h

218++++ b/src/opengl/GLVisualLayers.h

219+@@ -35,6 +35,7 @@

220+ #include <boost/shared_ptr.hpp>

221+ #include <QObject>

222+

223++#ifndef Q_MOC_RUN

224+ #include "GLAgeGridMaskSource.h"

225+ #include "GLContext.h"

226+ #include "GLLight.h"

227+@@ -79,6 +80,7 @@

228+

229+ #include "view-operations/RenderedGeometry.h"

230+ #include "view-operations/ScalarField3DRenderParameters.h"

231++#endif

232+

233+

234+ namespace GPlatesAppLogic

235+--- a/src/presentation/VisualLayer.h

236++++ b/src/presentation/VisualLayer.h

237+@@ -32,6 +32,7 @@

238+ #include <QString>

239+ #include <QObject>

240+

241++#ifndef Q_MOC_RUN

242+ #include "VisualLayerParams.h"

243+ #include "VisualLayerType.h"

244+

245+@@ -42,6 +43,7 @@

246+ #include "model/FeatureCollectionHandle.h"

247+

248+ #include "view-operations/RenderedGeometryCollection.h"

249++#endif

250+

251+

252+ namespace GPlatesAppLogic

253+--- a/src/presentation/VisualLayers.h

254++++ b/src/presentation/VisualLayers.h

255+@@ -34,6 +34,7 @@

256+ #include <boost/weak_ptr.hpp>

257+ #include <QObject>

258+

259++#ifndef Q_MOC_RUN

260+ #include "VisualLayer.h"

261+

262+ #include "app-logic/FeatureCollectionFileState.h"

263+@@ -42,6 +43,7 @@

264+ #include "gui/Symbol.h"

265+

266+ #include "view-operations/RenderedGeometryCollection.h"

267++#endif

268+

269+

270+ namespace GPlatesAppLogic

271+--- a/src/qt-widgets/AssignReconstructionPlateIdsDialog.h

272++++ b/src/qt-widgets/AssignReconstructionPlateIdsDialog.h

273+@@ -39,6 +39,7 @@

274+ #include "GPlatesDialog.h"

275+ #include "InformationDialog.h"

276+

277++#ifndef Q_MOC_RUN

278+ #include "app-logic/AssignPlateIds.h"

279+

280+ #include "file-io/File.h"

281+@@ -47,6 +48,7 @@

282+ #include "model/ModelInterface.h"

283+

284+ #include "presentation/VisualLayer.h"

285++#endif

286+

287+

288+ namespace GPlatesAppLogic

289+--- a/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h

290++++ b/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h

291+@@ -38,6 +38,7 @@

292+

293+ #include "OpenDirectoryDialog.h"

294+

295++#ifndef Q_MOC_RUN

296+ #include "app-logic/ApplicationState.h"

297+ #include "app-logic/Layer.h"

298+ #include "app-logic/LayerInputChannelName.h"

299+@@ -45,6 +46,7 @@

300+

301+ #include "data-mining/CheckAttrTypeVisitor.h"

302+ #include "data-mining/CoRegConfigurationTable.h"

303++#endif

304+

305+ #include "global/PointerTraits.h"

306+

307+--- a/src/qt-widgets/CoRegistrationOptionsWidget.h

308++++ b/src/qt-widgets/CoRegistrationOptionsWidget.h

309+@@ -31,6 +31,7 @@

310+ #include "CoRegistrationLayerConfigurationDialog.h"

311+ #include "CoRegistrationOptionsWidgetUi.h"

312+ #include "LayerOptionsWidget.h"

313++#ifndef Q_MOC_RUN

314+ #include "CoRegistrationResultTableDialog.h"

315+

316+ #include "app-logic/CoRegistrationLayerTask.h"

317+@@ -41,7 +42,7 @@

318+ #include "file-io/File.h"

319+

320+ #include "presentation/VisualLayer.h"

321+-

322++#endif

323+

324+ namespace GPlatesAppLogic

325+ {

326+--- a/src/qt-widgets/CoRegistrationResultTableDialog.h

327++++ b/src/qt-widgets/CoRegistrationResultTableDialog.h

328+@@ -36,6 +36,7 @@

329+ #include <QEvent>

330+ #include <qevent.h>

331+

332++#ifndef Q_MOC_RUN

333+ #include "CoRegistrationResultTableDialogUi.h"

334+ #include "SaveFileDialog.h"

335+

336+@@ -43,6 +44,7 @@

337+ #include "data-mining/OpaqueDataToQString.h"

338+

339+ #include "presentation/VisualLayer.h"

340++#endif

341+

342+ namespace GPlatesPresentation

343+ {

344+--- a/src/qt-widgets/DrawStyleDialog.h

345++++ b/src/qt-widgets/DrawStyleDialog.h

346+@@ -33,6 +33,7 @@

347+ #include <QMutex>

348+ #include <QMutexLocker>

349+

350++#ifndef Q_MOC_RUN

351+ #include "DrawStyleDialogUi.h"

352+ #include "GPlatesDialog.h"

353+ #include "PythonArgumentWidget.h"

354+@@ -41,6 +42,7 @@

355+ #include "gui/PythonConfiguration.h"

356+

357+ #include "presentation/Application.h"

358++#endif

359+

360+ namespace GPlatesAppLogic

361+ {

362+--- a/src/qt-widgets/EditTableActionWidget.h

363++++ b/src/qt-widgets/EditTableActionWidget.h

364+@@ -27,8 +27,11 @@

365+ #define GPLATES_QTWIDGETS_EDITTABLEACTIONWIDGET_H

366+

367+ #include <QWidget>

368++

369++#ifndef Q_MOC_RUN

370+ #include "app-logic/ApplicationState.h"

371+ #include "EditTableActionWidgetUi.h"

372++#endif

373+

374+ namespace GPlatesQtWidgets

375+ {

376+--- a/src/qt-widgets/GlobeCanvas.h

377++++ b/src/qt-widgets/GlobeCanvas.h

378+@@ -41,6 +41,7 @@

379+ #include <QPainter>

380+ #include <QtOpenGL/qgl.h>

381+

382++#ifndef Q_MOC_RUN

383+ #include "gui/ColourScheme.h"

384+ #include "gui/Globe.h"

385+ #include "gui/ViewportZoom.h"

386+@@ -58,6 +59,7 @@

387+ #include "qt-widgets/SceneView.h"

388+

389+ #include "view-operations/RenderedGeometryFactory.h"

390++#endif

391+

392+

393+ namespace GPlatesGui

394+--- a/src/qt-widgets/LogDialog.h

395++++ b/src/qt-widgets/LogDialog.h

396+@@ -34,7 +34,9 @@

397+ #include "GPlatesDialog.h"

398+ #include "LogDialogUi.h"

399+

400++#ifndef Q_MOC_RUN

401+ #include "app-logic/ApplicationState.h"

402++#endif

403+

404+

405+ namespace GPlatesGui

406+--- a/src/qt-widgets/MapCanvas.h

407++++ b/src/qt-widgets/MapCanvas.h

408+@@ -39,6 +39,7 @@

409+ #include <QSize>

410+ #include <QTransform>

411+

412++#ifndef Q_MOC_RUN

413+ #include "gui/ColourScheme.h"

414+ #include "gui/Map.h"

415+ #include "gui/TextOverlay.h"

416+@@ -47,6 +48,7 @@

417+ #include "opengl/GLMatrix.h"

418+ #include "opengl/GLOffScreenContext.h"

419+ #include "opengl/GLVisualLayers.h"

420++#endif

421+

422+

423+ namespace GPlatesGui

424+--- a/src/qt-widgets/MapView.h

425++++ b/src/qt-widgets/MapView.h

426+@@ -36,6 +36,7 @@

427+ #include <QGLWidget>

428+ #include <QMouseEvent>

429+

430++#ifndef Q_MOC_RUN

431+ #include "gui/ColourScheme.h"

432+

433+ #include "maths/LatLonPoint.h"

434+@@ -44,6 +45,7 @@

435+ #include "opengl/GLVisualLayers.h"

436+

437+ #include "qt-widgets/SceneView.h"

438++#endif

439+

440+

441+ namespace GPlatesGui

442+--- a/src/qt-widgets/MergeReconstructionLayersDialog.h

443++++ b/src/qt-widgets/MergeReconstructionLayersDialog.h

444+@@ -33,7 +33,9 @@

445+

446+ #include "MergeReconstructionLayersDialogUi.h"

447+

448++#ifndef Q_MOC_RUN

449+ #include "app-logic/Layer.h"

450++#endif

451+

452+

453+ namespace GPlatesAppLogic

454+--- a/src/qt-widgets/RasterLayerOptionsWidget.h

455++++ b/src/qt-widgets/RasterLayerOptionsWidget.h

456+@@ -31,6 +31,7 @@

457+ #include <QString>

458+ #include <QToolButton>

459+

460++#ifndef Q_MOC_RUN

461+ #include "RasterLayerOptionsWidgetUi.h"

462+

463+ #include "LayerOptionsWidget.h"

464+@@ -40,6 +41,7 @@

465+

466+ #include "gui/BuiltinColourPaletteType.h"

467+ #include "gui/RasterColourPalette.h"

468++#endif

469+

470+

471+ namespace GPlatesAppLogic

472+--- a/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h

473++++ b/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h

474+@@ -28,6 +28,7 @@

475+

476+ #include <utility>

477+

478++#ifndef Q_MOC_RUN

479+ #include "ReconstructScalarCoverageLayerOptionsWidgetUi.h"

480+

481+ #include "LayerOptionsWidget.h"

482+@@ -37,6 +38,7 @@

483+

484+ #include "gui/BuiltinColourPaletteType.h"

485+ #include "gui/RasterColourPalette.h"

486++#endif

487+

488+

489+ namespace GPlatesAppLogic

490+--- a/src/qt-widgets/ScalarField3DLayerOptionsWidget.h

491++++ b/src/qt-widgets/ScalarField3DLayerOptionsWidget.h

492+@@ -30,6 +30,7 @@

493+ #include <vector>

494+ #include <QSlider>

495+

496++#ifndef Q_MOC_RUN

497+ #include "ScalarField3DLayerOptionsWidgetUi.h"

498+

499+ #include "LayerOptionsWidget.h"

500+@@ -41,6 +42,7 @@

501+ #include "gui/RasterColourPalette.h"

502+

503+ #include "view-operations/ScalarField3DRenderParameters.h"

504++#endif

505+

506+

507+ namespace GPlatesAppLogic

508+--- a/src/qt-widgets/TotalReconstructionPolesDialog.h

509++++ b/src/qt-widgets/TotalReconstructionPolesDialog.h

510+@@ -32,12 +32,14 @@

511+ #include <boost/weak_ptr.hpp>

512+ #include <QDialog>

513+

514++#ifndef Q_MOC_RUN

515+ #include "TotalReconstructionPolesDialogUi.h"

516+

517+ #include "GPlatesDialog.h"

518+ #include "SaveFileDialog.h"

519+

520+ #include "presentation/VisualLayer.h"

521++#endif

522+

523+

524+ namespace GPlatesAppLogic

525+--- a/src/qt-widgets/VisualLayersComboBox.h

526++++ b/src/qt-widgets/VisualLayersComboBox.h

527+@@ -32,8 +32,10 @@

528+ #include <QComboBox>

529+ #include <QObject>

530+

531++#ifndef Q_MOC_RUN

532+ #include "presentation/VisualLayer.h"

533+ #include "presentation/VisualLayerType.h"

534++#endif

535+

536+

537+ namespace GPlatesPresentation

538+--- a/src/qt-widgets/VisualLayerWidget.h

539++++ b/src/qt-widgets/VisualLayerWidget.h

540+@@ -36,11 +36,13 @@

541+ #include <QMenu>

542+ #include <QStackedWidget>

543+

544++#ifndef Q_MOC_RUN

545+ #include "VisualLayerWidgetUi.h"

546+

547+ #include "app-logic/Layer.h"

548+

549+ #include "gui/Colour.h"

550++#endif

551+

552+

553+ namespace GPlatesAppLogic

554+--- a/src/view-operations/InternalGeometryBuilder.h

555++++ b/src/view-operations/InternalGeometryBuilder.h

556+@@ -30,9 +30,11 @@

557+ #include <vector>

558+ #include <boost/optional.hpp>

559+

560++#ifndef Q_MOC_RUN

561+ #include "maths/GeometryOnSphere.h"

562+ #include "maths/GeometryType.h"

563+ #include "maths/PointOnSphere.h"

564++#endif

565+

566+ namespace GPlatesViewOperations

567+ {

568+--- a/src/view-operations/RenderedGeometryCollection.h

569++++ b/src/view-operations/RenderedGeometryCollection.h

570+@@ -39,7 +39,9 @@

571+ #include <boost/foreach.hpp>

572+ #include <QObject>

573+

574++#ifndef Q_MOC_RUN

575+ #include "RenderedGeometryLayer.h"

576++#endif

577+

578+ namespace GPlatesViewOperations

579+ {

580+--- a/src/view-operations/RenderedGeometryFactory.h

581++++ b/src/view-operations/RenderedGeometryFactory.h

582+@@ -33,6 +33,7 @@

583+ #include <QString>

584+ #include <QFont>

585+

586++#ifndef Q_MOC_RUN

587+ #include "RenderedGeometry.h"

588+ #include "RenderedColouredEdgeSurfaceMesh.h"

589+ #include "RenderedColouredTriangleSurfaceMesh.h"

590+@@ -62,6 +63,7 @@

591+ #include "property-values/TextContent.h"

592+

593+ #include "view-operations/ScalarField3DRenderParameters.h"

594++#endif

595+

596+

597+ namespace GPlatesAppLogic

598+--- a/src/view-operations/RenderedGeometryLayer.h

599++++ b/src/view-operations/RenderedGeometryLayer.h

600+@@ -35,10 +35,12 @@

601+ #include <boost/optional.hpp>

602+ #include <QObject>

603+

604++#ifndef Q_MOC_RUN

605+ #include "RenderedGeometry.h"

606+

607+ #include "maths/CubeQuadTreeLocation.h"

608+

609++#endif

610+

611+ namespace GPlatesMaths

612+ {

pkgs/applications/science/misc/gplates/default.nixnew file+24

@@ -0,0 +1,24 @@

1+{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }:

3+stdenv.mkDerivation rec {

4+ name = "gplates-${version}";

5+ version = "2.0.0";

7+ src = fetchurl {

8+ url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2";

9+ sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw";

10+ };

11+

12+ patches = [

13+ ./boostfix.patch

14+ ];

15+

16+ buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ];

17+

18+ meta = with stdenv.lib; {

19+ description = "Desktop software for the interactive visualisation of plate-tectonics";

20+ homepage = https://www.gplates.org;

21+ license = licenses.gpl2;

22+ platforms = platforms.all;

23+ };

24+}

pkgs/applications/version-management/git-and-tools/cgit/default.nix+5−7

@@ -5,21 +5,19 @@

66stdenv.mkDerivation rec {

77 name = "cgit-${version}";

8− version = "0.12";

8+ version = "1.1";

1010 src = fetchurl {

1111 url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";

12− sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif";

12+ sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288";

1313 };

1414

1515 # cgit is tightly coupled with git and needs a git source tree to build.

1616 # IMPORTANT: Remember to check which git version cgit needs on every version

17− # bump (look in the Makefile).

18− # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to

19− # 1.9.2 (see the repository history)

17+ # bump (look for "GIT_VER" in the top-level Makefile).

2018 gitSrc = fetchurl {

21− url = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz";

22− sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";

19+ url = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz";

20+ sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l";

2321 };

2422

2523 buildInputs = [

pkgs/applications/virtualization/qemu/2.8.nixnew file+93

@@ -0,0 +1,93 @@

1+{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib

2+, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex

3+, bison, lzo, snappy, libaio, gnutls, nettle, curl

4+, makeWrapper

5+, attr, libcap, libcap_ng

6+, CoreServices, Cocoa, rez, setfile

7+, numaSupport ? stdenv.isLinux, numactl

8+, seccompSupport ? stdenv.isLinux, libseccomp

9+, pulseSupport ? !stdenv.isDarwin, libpulseaudio

10+, sdlSupport ? !stdenv.isDarwin, SDL

11+, vncSupport ? true, libjpeg, libpng

12+, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir

13+, x86Only ? false

14+, nixosTestRunner ? false

15+}:

16+

17+with stdenv.lib;

18+let

19+ version = "2.8.0";

20+ audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"

21+ + optionalString pulseSupport "pa,"

22+ + optionalString sdlSupport "sdl,";

23+in

24+

25+stdenv.mkDerivation rec {

26+ name = "qemu-"

27+ + stdenv.lib.optionalString x86Only "x86-only-"

28+ + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"

29+ + version;

30+

31+ src = fetchurl {

32+ url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";

33+ sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs";

34+ };

35+

36+ buildInputs =

37+ [ python2 zlib pkgconfig glib ncurses perl pixman

38+ vde2 texinfo libuuid flex bison makeWrapper lzo snappy

39+ gnutls nettle curl

40+ ]

41+ ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ]

42+ ++ optionals seccompSupport [ libseccomp ]

43+ ++ optionals numaSupport [ numactl ]

44+ ++ optionals pulseSupport [ libpulseaudio ]

45+ ++ optionals sdlSupport [ SDL ]

46+ ++ optionals vncSupport [ libjpeg libpng ]

47+ ++ optionals spiceSupport [ spice_protocol spice usbredir ]

48+ ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ];

49+

50+ enableParallelBuilding = true;

51+

52+ patches = [

53+ ./no-etc-install.patch

54+ ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;

55+ hardeningDisable = [ "stackprotector" ];

56+

57+ configureFlags =

58+ [ "--smbd=smbd" # use `smbd' from $PATH

59+ "--audio-drv-list=${audio}"

60+ "--sysconfdir=/etc"

61+ "--localstatedir=/var"

62+ ]

63+ ++ optional numaSupport "--enable-numa"

64+ ++ optional seccompSupport "--enable-seccomp"

65+ ++ optional spiceSupport "--enable-spice"

66+ ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"

67+ ++ optional stdenv.isDarwin "--enable-cocoa"

68+ ++ optional stdenv.isLinux "--enable-linux-aio";

69+

70+ postFixup =

71+ ''

72+ for exe in $out/bin/qemu-system-* ; do

73+ paxmark m $exe

74+ done

75+ '';

76+

77+ postInstall =

78+ ''

79+ # Add a ‘qemu-kvm’ wrapper for compatibility/convenience.

80+ p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}"

81+ if [ -e "$p" ]; then

82+ makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"

83+ fi

84+ '';

85+

86+ meta = with stdenv.lib; {

87+ homepage = http://www.qemu.org/;

88+ description = "A generic and open source machine emulator and virtualizer";

89+ license = licenses.gpl2Plus;

90+ maintainers = with maintainers; [ viric eelco ];

91+ platforms = platforms.linux ++ platforms.darwin;

92+ };

93+}

pkgs/data/misc/tzdata/default.nix+3−3

@@ -2,16 +2,16 @@

33stdenv.mkDerivation rec {

44 name = "tzdata-${version}";

5− version = "2016f";

5+ version = "2016j";

77 srcs =

88 [ (fetchurl {

99 url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";

10− sha256 = "1c024mg4gy572vgdj9rk4dqnb33iap06zs8ibasisbyi1089b37d";

10+ sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm";

1111 })

1212 (fetchurl {

1313 url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";

14− sha256 = "1vb6n29ik7dzhffzzcnskbhmn6h1dxzan3zanbp118wh8hw5yckj";

14+ sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr";

1515 })

1616 ];

1717

pkgs/desktops/kde-5/plasma/fetch.sh+1−1

@@ -1 +1 @@

1−WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' )

1+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.5/ -A '*.tar.xz' )

pkgs/desktops/kde-5/plasma/srcs.nix+160−160

@@ -3,323 +3,323 @@

44{

55 bluedevil = {

6− version = "5.8.4";

6+ version = "5.8.5";

77 src = fetchurl {

8− url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz";

9− sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq";

10− name = "bluedevil-5.8.4.tar.xz";

8+ url = "${mirror}/stable/plasma/5.8.5/bluedevil-5.8.5.tar.xz";

9+ sha256 = "07gj3m5f0rk26n0xm4yddsfny6l2sh0airm45hb33p7m5inaqzgv";

10+ name = "bluedevil-5.8.5.tar.xz";

1111 };

1212 };

1313 breeze = {

14− version = "5.8.4";

14+ version = "5.8.5";

1515 src = fetchurl {

16− url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz";

17− sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw";

18− name = "breeze-5.8.4.tar.xz";

16+ url = "${mirror}/stable/plasma/5.8.5/breeze-5.8.5.tar.xz";

17+ sha256 = "1gcns00iq7a5f1a0w6vf8zck669gzcd785fiybnvc6s6q8x4bp61";

18+ name = "breeze-5.8.5.tar.xz";

1919 };

2020 };

2121 breeze-grub = {

22− version = "5.8.4";

22+ version = "5.8.5";

2323 src = fetchurl {

24− url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz";

25− sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm";

26− name = "breeze-grub-5.8.4.tar.xz";

24+ url = "${mirror}/stable/plasma/5.8.5/breeze-grub-5.8.5.tar.xz";

25+ sha256 = "12ynrxdfcraphbwv9yrfhvwf3xkzrw0raqvgi7ksz5cvh78kl5qf";

26+ name = "breeze-grub-5.8.5.tar.xz";

2727 };

2828 };

2929 breeze-gtk = {

30− version = "5.8.4";

30+ version = "5.8.5";

3131 src = fetchurl {

32− url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz";

33− sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a";

34− name = "breeze-gtk-5.8.4.tar.xz";

32+ url = "${mirror}/stable/plasma/5.8.5/breeze-gtk-5.8.5.tar.xz";

33+ sha256 = "15dx5hl9w9fiash30vgkbww6h7hck0dr42hh8gzysn0xyf0fzpgd";

34+ name = "breeze-gtk-5.8.5.tar.xz";

3535 };

3636 };

3737 breeze-plymouth = {

38− version = "5.8.4";

38+ version = "5.8.5";

3939 src = fetchurl {

40− url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz";

41− sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj";

42− name = "breeze-plymouth-5.8.4.tar.xz";

40+ url = "${mirror}/stable/plasma/5.8.5/breeze-plymouth-5.8.5.tar.xz";

41+ sha256 = "1ryb2jrzw0bzpi7ig4h5k0i33d2qviqsjxw7mnqxcb9q49a4ziq1";

42+ name = "breeze-plymouth-5.8.5.tar.xz";

4343 };

4444 };

4545 discover = {

46− version = "5.8.4";

46+ version = "5.8.5";

4747 src = fetchurl {

48− url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz";

49− sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx";

50− name = "discover-5.8.4.tar.xz";

48+ url = "${mirror}/stable/plasma/5.8.5/discover-5.8.5.tar.xz";

49+ sha256 = "0fr6mksqw46aghfzj78nlq3f89xd63vq2hr4c3gb4vkl5y8v08hg";

50+ name = "discover-5.8.5.tar.xz";

5151 };

5252 };

5353 kactivitymanagerd = {

54− version = "5.8.4";

54+ version = "5.8.5";

5555 src = fetchurl {

56− url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz";

57− sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2";

58− name = "kactivitymanagerd-5.8.4.tar.xz";

56+ url = "${mirror}/stable/plasma/5.8.5/kactivitymanagerd-5.8.5.tar.xz";

57+ sha256 = "07cqnbyznn5wy7vrqyid8h5ah7h3sb3pb30qlm83b4m29bkhggwh";

58+ name = "kactivitymanagerd-5.8.5.tar.xz";

5959 };

6060 };

6161 kde-cli-tools = {

62− version = "5.8.4";

62+ version = "5.8.5";

6363 src = fetchurl {

64− url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz";

65− sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14";

66− name = "kde-cli-tools-5.8.4.tar.xz";

64+ url = "${mirror}/stable/plasma/5.8.5/kde-cli-tools-5.8.5.tar.xz";

65+ sha256 = "1ig9x5h9xkzis9izggkjpiiy4sm77pk347jdngx01qpacz68iyp7";

66+ name = "kde-cli-tools-5.8.5.tar.xz";

6767 };

6868 };

6969 kdecoration = {

70− version = "5.8.4";

70+ version = "5.8.5";

7171 src = fetchurl {

72− url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz";

73− sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4";

74− name = "kdecoration-5.8.4.tar.xz";

72+ url = "${mirror}/stable/plasma/5.8.5/kdecoration-5.8.5.tar.xz";

73+ sha256 = "1vhw57pj9i5224i9irk4qmingvkg5bip11vsqiwhmn5307bpnfiq";

74+ name = "kdecoration-5.8.5.tar.xz";

7575 };

7676 };

7777 kde-gtk-config = {

78− version = "5.8.4";

78+ version = "5.8.5";

7979 src = fetchurl {

80− url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz";

81− sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4";

82− name = "kde-gtk-config-5.8.4.tar.xz";

80+ url = "${mirror}/stable/plasma/5.8.5/kde-gtk-config-5.8.5.tar.xz";

81+ sha256 = "1j0mzmmdhqd3a8papps6cad0gqn081mc4kqzi2hjai7038l6951r";

82+ name = "kde-gtk-config-5.8.5.tar.xz";

8383 };

8484 };

8585 kdeplasma-addons = {

86− version = "5.8.4";

86+ version = "5.8.5";

8787 src = fetchurl {

88− url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz";

89− sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4";

90− name = "kdeplasma-addons-5.8.4.tar.xz";

88+ url = "${mirror}/stable/plasma/5.8.5/kdeplasma-addons-5.8.5.tar.xz";

89+ sha256 = "181kagb4nbl9a7akk79slwkb7m2j4vyhabagih0z8l45wl5wrz9d";

90+ name = "kdeplasma-addons-5.8.5.tar.xz";

9191 };

9292 };

9393 kgamma5 = {

94− version = "5.8.4";

94+ version = "5.8.5";

9595 src = fetchurl {

96− url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz";

97− sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1";

98− name = "kgamma5-5.8.4.tar.xz";

96+ url = "${mirror}/stable/plasma/5.8.5/kgamma5-5.8.5.tar.xz";

97+ sha256 = "073z4w4i2hwsqqgxcfl0w8d57nhzc069h9zwp7fv93aaw4mgzci2";

98+ name = "kgamma5-5.8.5.tar.xz";

9999 };

100100 };

101101 khotkeys = {

102− version = "5.8.4";

102+ version = "5.8.5";

103103 src = fetchurl {

104− url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz";

105− sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3";

106− name = "khotkeys-5.8.4.tar.xz";

104+ url = "${mirror}/stable/plasma/5.8.5/khotkeys-5.8.5.tar.xz";

105+ sha256 = "1fh0z9vfb908nbwj3snkf9z55jbcb5id87k5sa0v8dhazmp91ylh";

106+ name = "khotkeys-5.8.5.tar.xz";

107107 };

108108 };

109109 kinfocenter = {

110− version = "5.8.4";

110+ version = "5.8.5";

111111 src = fetchurl {

112− url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz";

113− sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd";

114− name = "kinfocenter-5.8.4.tar.xz";

112+ url = "${mirror}/stable/plasma/5.8.5/kinfocenter-5.8.5.tar.xz";

113+ sha256 = "1fksnb9klbcrr9ly6dd2yx5y1ngcwcln43zykpc76pr4i49jpggp";

114+ name = "kinfocenter-5.8.5.tar.xz";

115115 };

116116 };

117117 kmenuedit = {

118− version = "5.8.4";

118+ version = "5.8.5";

119119 src = fetchurl {

120− url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz";

121− sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h";

122− name = "kmenuedit-5.8.4.tar.xz";

120+ url = "${mirror}/stable/plasma/5.8.5/kmenuedit-5.8.5.tar.xz";

121+ sha256 = "1vq5f69w75lj81nz75db88lqxc4zvhicd5w7r6k7amggnwxm9f3m";

122+ name = "kmenuedit-5.8.5.tar.xz";

123123 };

124124 };

125125 kscreen = {

126− version = "5.8.4";

126+ version = "5.8.5";

127127 src = fetchurl {

128− url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz";

129− sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl";

130− name = "kscreen-5.8.4.tar.xz";

128+ url = "${mirror}/stable/plasma/5.8.5/kscreen-5.8.5.tar.xz";

129+ sha256 = "069x3vsfqirmq8r7yfa68srhjvygdwsxcj0b4vvb7zivs29zn1mh";

130+ name = "kscreen-5.8.5.tar.xz";

131131 };

132132 };

133133 kscreenlocker = {

134− version = "5.8.4";

134+ version = "5.8.5";

135135 src = fetchurl {

136− url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz";

137− sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv";

138− name = "kscreenlocker-5.8.4.tar.xz";

136+ url = "${mirror}/stable/plasma/5.8.5/kscreenlocker-5.8.5.tar.xz";

137+ sha256 = "11b2v3chhk1ma5kjbmf35qahfr8gbaw78mcqs8vw5m9x74vlimkj";

138+ name = "kscreenlocker-5.8.5.tar.xz";

139139 };

140140 };

141141 ksshaskpass = {

142− version = "5.8.4";

142+ version = "5.8.5";

143143 src = fetchurl {

144− url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz";

145− sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc";

146− name = "ksshaskpass-5.8.4.tar.xz";

144+ url = "${mirror}/stable/plasma/5.8.5/ksshaskpass-5.8.5.tar.xz";

145+ sha256 = "1gr48f4akrn0yhlnjw4yaas6ah5z40fb8iz06gi1dzry5axfmaxh";

146+ name = "ksshaskpass-5.8.5.tar.xz";

147147 };

148148 };

149149 ksysguard = {

150− version = "5.8.4";

150+ version = "5.8.5";

151151 src = fetchurl {

152− url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz";

153− sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3";

154− name = "ksysguard-5.8.4.tar.xz";

152+ url = "${mirror}/stable/plasma/5.8.5/ksysguard-5.8.5.tar.xz";

153+ sha256 = "1gd81y2a459j5k1mpikfrvwcz7v09m526nrl7kpr4l4a1ps8zfy9";

154+ name = "ksysguard-5.8.5.tar.xz";

155155 };

156156 };

157157 kwallet-pam = {

158− version = "5.8.4";

158+ version = "5.8.5";

159159 src = fetchurl {

160− url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz";

161− sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn";

162− name = "kwallet-pam-5.8.4.tar.xz";

160+ url = "${mirror}/stable/plasma/5.8.5/kwallet-pam-5.8.5.tar.xz";

161+ sha256 = "0310vr3p9fxl3vwdgklk0acx6w31pcpq8mi9yldahg1mkjqf7l44";

162+ name = "kwallet-pam-5.8.5.tar.xz";

163163 };

164164 };

165165 kwayland-integration = {

166− version = "5.8.4";

166+ version = "5.8.5";

167167 src = fetchurl {

168− url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz";

169− sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7";

170− name = "kwayland-integration-5.8.4.tar.xz";

168+ url = "${mirror}/stable/plasma/5.8.5/kwayland-integration-5.8.5.tar.xz";

169+ sha256 = "11f63mq7crsbrpdib16q8xg0hk8jr5x1cyv43q8qdqm0591cglli";

170+ name = "kwayland-integration-5.8.5.tar.xz";

171171 };

172172 };

173173 kwin = {

174− version = "5.8.4";

174+ version = "5.8.5";

175175 src = fetchurl {

176− url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz";

177− sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn";

178− name = "kwin-5.8.4.tar.xz";

176+ url = "${mirror}/stable/plasma/5.8.5/kwin-5.8.5.tar.xz";

177+ sha256 = "182z17d4sad9j15qagx9yz13wwzcyy6hlgpy5nlx6dlfcb8s00x7";

178+ name = "kwin-5.8.5.tar.xz";

179179 };

180180 };

181181 kwrited = {

182− version = "5.8.4";

182+ version = "5.8.5";

183183 src = fetchurl {

184− url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz";

185− sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s";

186− name = "kwrited-5.8.4.tar.xz";

184+ url = "${mirror}/stable/plasma/5.8.5/kwrited-5.8.5.tar.xz";

185+ sha256 = "1nsr244niyq2bk29s0cqq1p2qj0h1hx4nl13nc3x3aycfhfkjfkr";

186+ name = "kwrited-5.8.5.tar.xz";

187187 };

188188 };

189189 libkscreen = {

190− version = "5.8.4";

190+ version = "5.8.5";

191191 src = fetchurl {

192− url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz";

193− sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p";

194− name = "libkscreen-5.8.4.tar.xz";

192+ url = "${mirror}/stable/plasma/5.8.5/libkscreen-5.8.5.tar.xz";

193+ sha256 = "1zj2nzyl0nmg5za3iwr4q4nzfv69f35f0394b6k0g3dgh1zxmby9";

194+ name = "libkscreen-5.8.5.tar.xz";

195195 };

196196 };

197197 libksysguard = {

198− version = "5.8.4";

198+ version = "5.8.5";

199199 src = fetchurl {

200− url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz";

201− sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq";

202− name = "libksysguard-5.8.4.tar.xz";

200+ url = "${mirror}/stable/plasma/5.8.5/libksysguard-5.8.5.tar.xz";

201+ sha256 = "1acp4kzdjhipsqw90n3rc1ydbkqhb12afwdsfl25fibv0c39avwp";

202+ name = "libksysguard-5.8.5.tar.xz";

203203 };

204204 };

205205 milou = {

206− version = "5.8.4";

206+ version = "5.8.5";

207207 src = fetchurl {

208− url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz";

209− sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8";

210− name = "milou-5.8.4.tar.xz";

208+ url = "${mirror}/stable/plasma/5.8.5/milou-5.8.5.tar.xz";

209+ sha256 = "0lj5cb43jkqs8qg2acs39dkfwskbw135ap65vxiv27ivxscyvz3d";

210+ name = "milou-5.8.5.tar.xz";

211211 };

212212 };

213213 oxygen = {

214− version = "5.8.4";

214+ version = "5.8.5";

215215 src = fetchurl {

216− url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz";

217− sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4";

218− name = "oxygen-5.8.4.tar.xz";

216+ url = "${mirror}/stable/plasma/5.8.5/oxygen-5.8.5.tar.xz";

217+ sha256 = "199jcn6qzyihxmw38b1cl0ah0rzn7f574khx72n9x5y9143p9lh7";

218+ name = "oxygen-5.8.5.tar.xz";

219219 };

220220 };

221221 plasma-desktop = {

222− version = "5.8.4";

222+ version = "5.8.5";

223223 src = fetchurl {

224− url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz";

225− sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q";

226− name = "plasma-desktop-5.8.4.tar.xz";

224+ url = "${mirror}/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz";

225+ sha256 = "045990fvhqpwhfi6jqpkzhgbhc3lwvwhkia1y77m12n1djbynpnr";

226+ name = "plasma-desktop-5.8.5.tar.xz";

227227 };

228228 };

229229 plasma-integration = {

230− version = "5.8.4";

230+ version = "5.8.5";

231231 src = fetchurl {

232− url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz";

233− sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn";

234− name = "plasma-integration-5.8.4.tar.xz";

232+ url = "${mirror}/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz";

233+ sha256 = "1sm7027ywz8xxqfsjv6jvk8zx11kx83rx88bb8cy31qfjipsakfb";

234+ name = "plasma-integration-5.8.5.tar.xz";

235235 };

236236 };

237237 plasma-nm = {

238− version = "5.8.4";

238+ version = "5.8.5";

239239 src = fetchurl {

240− url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz";

241− sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq";

242− name = "plasma-nm-5.8.4.tar.xz";

240+ url = "${mirror}/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz";

241+ sha256 = "1g1yyzc8y2hsgycficvavpl5yizd54ns93cdky9cgsrnxlkfwbvc";

242+ name = "plasma-nm-5.8.5.tar.xz";

243243 };

244244 };

245245 plasma-pa = {

246− version = "5.8.4";

246+ version = "5.8.5";

247247 src = fetchurl {

248− url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz";

249− sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i";

250− name = "plasma-pa-5.8.4.tar.xz";

248+ url = "${mirror}/stable/plasma/5.8.5/plasma-pa-5.8.5.tar.xz";

249+ sha256 = "0vg1dyxfg8rxzyh0xnk41c95zp8rdbx1w462llrwchzp29p3xg1b";

250+ name = "plasma-pa-5.8.5.tar.xz";

251251 };

252252 };

253253 plasma-sdk = {

254− version = "5.8.4";

254+ version = "5.8.5";

255255 src = fetchurl {

256− url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz";

257− sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9";

258− name = "plasma-sdk-5.8.4.tar.xz";

256+ url = "${mirror}/stable/plasma/5.8.5/plasma-sdk-5.8.5.tar.xz";

257+ sha256 = "13lyb5x4a8aq4fykvdv1137yvc4s4q31fdxhxppza1wkw8lvbvpd";

258+ name = "plasma-sdk-5.8.5.tar.xz";

259259 };

260260 };

261261 plasma-tests = {

262− version = "5.8.4";

262+ version = "5.8.5";

263263 src = fetchurl {

264− url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz";

265− sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k";

266− name = "plasma-tests-5.8.4.tar.xz";

264+ url = "${mirror}/stable/plasma/5.8.5/plasma-tests-5.8.5.tar.xz";

265+ sha256 = "0wgqyqlqygi3z0cccpfrpi259jp4yhh2g4x3mqcxisv58mbjrj1b";

266+ name = "plasma-tests-5.8.5.tar.xz";

267267 };

268268 };

269269 plasma-workspace = {

270− version = "5.8.4";

270+ version = "5.8.5";

271271 src = fetchurl {

272− url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz";

273− sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd";

274− name = "plasma-workspace-5.8.4.tar.xz";

272+ url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-5.8.5.tar.xz";

273+ sha256 = "18bf5wmyb198jnbpivjjwsk65sksrvzlvykx3mr3wvj30mr0f9bd";

274+ name = "plasma-workspace-5.8.5.tar.xz";

275275 };

276276 };

277277 plasma-workspace-wallpapers = {

278− version = "5.8.4";

278+ version = "5.8.5";

279279 src = fetchurl {

280− url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz";

281− sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3";

282− name = "plasma-workspace-wallpapers-5.8.4.tar.xz";

280+ url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-wallpapers-5.8.5.tar.xz";

281+ sha256 = "116s9qw888lbgxc9ggxf7fa99vggixr2ig1715xb5zmqm14yznyz";

282+ name = "plasma-workspace-wallpapers-5.8.5.tar.xz";

283283 };

284284 };

285285 polkit-kde-agent = {

286− version = "1-5.8.4";

286+ version = "1-5.8.5";

287287 src = fetchurl {

288− url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz";

289− sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg";

290− name = "polkit-kde-agent-1-5.8.4.tar.xz";

288+ url = "${mirror}/stable/plasma/5.8.5/polkit-kde-agent-1-5.8.5.tar.xz";

289+ sha256 = "1dwk848wljcd9bi0h58h0ljnjlz1qq50rd7i38f3cb848iipisw7";

290+ name = "polkit-kde-agent-1-5.8.5.tar.xz";

291291 };

292292 };

293293 powerdevil = {

294− version = "5.8.4";

294+ version = "5.8.5";

295295 src = fetchurl {

296− url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz";

297− sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy";

298− name = "powerdevil-5.8.4.tar.xz";

296+ url = "${mirror}/stable/plasma/5.8.5/powerdevil-5.8.5.tar.xz";

297+ sha256 = "0lj7jcaqfsipiwi7x4q684p4pfsqzflvddr7hrhirfl1p62bc704";

298+ name = "powerdevil-5.8.5.tar.xz";

299299 };

300300 };

301301 sddm-kcm = {

302− version = "5.8.4";

302+ version = "5.8.5";

303303 src = fetchurl {

304− url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz";

305− sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx";

306− name = "sddm-kcm-5.8.4.tar.xz";

304+ url = "${mirror}/stable/plasma/5.8.5/sddm-kcm-5.8.5.tar.xz";

305+ sha256 = "0dcvk3f3cqq4z5hc63ccpxyl3kknjvd8jsnx7r2hfrwsw0y90fqc";

306+ name = "sddm-kcm-5.8.5.tar.xz";

307307 };

308308 };

309309 systemsettings = {

310− version = "5.8.4";

310+ version = "5.8.5";

311311 src = fetchurl {

312− url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz";

313− sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv";

314− name = "systemsettings-5.8.4.tar.xz";

312+ url = "${mirror}/stable/plasma/5.8.5/systemsettings-5.8.5.tar.xz";

313+ sha256 = "0pkwmgbjglbyc8i22hivh5gnaj742df3ff3f998k66k81mfjkwga";

314+ name = "systemsettings-5.8.5.tar.xz";

315315 };

316316 };

317317 user-manager = {

318− version = "5.8.4";

318+ version = "5.8.5";

319319 src = fetchurl {

320− url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz";

321− sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d";

322− name = "user-manager-5.8.4.tar.xz";

320+ url = "${mirror}/stable/plasma/5.8.5/user-manager-5.8.5.tar.xz";

321+ sha256 = "1ck8x860q3aqgbbgiwfdhs0i0bs2nhqqva19kl9x1b015p64gl5z";

322+ name = "user-manager-5.8.5.tar.xz";

323323 };

324324 };

325325}

pkgs/development/compilers/crystal/default.nix+3

@@ -60,6 +60,9 @@ stdenv.mkDerivation rec {

6060 # patch the script which launches the prebuilt compiler

6161 substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \

6262 "/usr/bin/env bash" "${stdenv.shell}"

63+ substituteInPlace $(pwd)/crystal-${version}/bin/crystal --replace \

64+ "/usr/bin/env bash" "${stdenv.shell}"

65+

6366 ${fixPrebuiltBinary}

6467

6568 cd crystal-${version}

pkgs/development/compilers/ghc/8.0.1.nix+2−2

@@ -1,5 +1,5 @@

11{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils

2−, hscolour, patchutils

2+, hscolour, patchutils, sphinx

33}:

55let

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

2929 (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; })

3030 ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;

3131

32− buildInputs = [ ghc perl hscolour ];

32+ buildInputs = [ ghc perl hscolour sphinx];

3333

3434 enableParallelBuilding = true;

3535

pkgs/development/compilers/ghc/8.0.2.nix+2−2

@@ -1,5 +1,5 @@

11{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils

2−, hscolour, patchutils

2+, hscolour, patchutils, sphinx

33}:

55let

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

2323

2424 patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch;

2525

26− buildInputs = [ ghc perl hscolour ];

26+ buildInputs = [ ghc perl hscolour sphinx ];

2727

2828 enableParallelBuilding = true;

2929

pkgs/development/haskell-modules/configuration-common.nix+3−1

@@ -998,7 +998,7 @@ self: super: {

998998

999999 # The most current version needs some packages to build that are not in LTS 7.x.

10001000 stack = super.stack.overrideScope (self: super: {

1001− http-client = self.http-client_0_5_4;

1001+ http-client = self.http-client_0_5_5;

10021002 http-client-tls = self.http-client-tls_0_3_3;

10031003 http-conduit = self.http-conduit_2_2_3;

10041004 optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;

@@ -1136,4 +1136,6 @@ self: super: {

11361136 # requires vty 5.13

11371137 brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; });

11381138

1139+ # https://github.com/krisajenkins/elm-export/pull/22

1140+ elm-export = doJailbreak super.elm-export;

11391141}

pkgs/development/haskell-modules/configuration-ghc-head.nix+1

@@ -19,6 +19,7 @@ self: super: {

1919 directory = null;

2020 filepath = null;

2121 ghc-prim = null;

22+ ghci = null;

2223 haskeline = null;

2324 hoopl = null;

2425 hpc = null;

pkgs/development/haskell-modules/configuration-hackage2nix.yaml+4−1

@@ -2068,10 +2068,13 @@ package-maintainers:

20682068 - ghc-srcspan-plugin

20692069 - located-base

20702070 jb55:

2071− - skeletons

2071+ - bson-lens

20722072 - cased

2073+ - elm-export-persistent

20732074 - pipes-csv

20742075 - pipes-mongodb

2076+ - skeletons

2077+ - streaming-wai

20752078 khumba:

20762079 - hoppy-docs

20772080 - hoppy-generator

pkgs/development/haskell-modules/hackage-packages.nix+667−239

@@ -1675,8 +1675,8 @@ self: {

16751675 }:

16761676 mkDerivation {

16771677 pname = "BitStringRandomMonad";

1678− version = "0.1.0.0";

1679− sha256 = "70acdb3e821d9fb17190b6bb9882217f31ae44e6d2ddf28f644a8f271156b785";

1678+ version = "0.1.1.1";

1679+ sha256 = "496715852ecfd5651fee81eba635b88865ef6dbc87792e56ea47eeac36fd9c36";

16801680 libraryHaskellDepends = [

16811681 base bitstring bytestring mtl parallel primitive transformers

16821682 vector

@@ -9696,6 +9696,8 @@ self: {

96969696 pname = "IPv6Addr";

96979697 version = "0.6.2.0";

96989698 sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926";

9699+ revision = "1";

9700+ editedCabalFile = "7da9aae32a048aca882ec02c1f184ed24e53119de5345ff8b8d6fc62ccd6808e";

96999701 libraryHaskellDepends = [

97009702 attoparsec base iproute network network-info random text

97019703 ];

@@ -9707,6 +9709,28 @@ self: {

97079709 license = stdenv.lib.licenses.bsd3;

97089710 }) {};

97099711

9712+ "IPv6Addr_0_6_3" = callPackage

9713+ ({ mkDerivation, attoparsec, base, HUnit, iproute, network

9714+ , network-info, random, test-framework, test-framework-hunit, text

9715+ }:

9716+ mkDerivation {

9717+ pname = "IPv6Addr";

9718+ version = "0.6.3";

9719+ sha256 = "d51d7316a72e7cbe680cafda0b422d07bf9755261f040061ae72351aaf470e02";

9720+ revision = "1";

9721+ editedCabalFile = "55425a8e76d1b236298bd447f5ff7d4280a8eb51e0c1e363ed2c6a418dadbb85";

9722+ libraryHaskellDepends = [

9723+ attoparsec base iproute network network-info random text

9724+ ];

9725+ testHaskellDepends = [

9726+ base HUnit test-framework test-framework-hunit text

9727+ ];

9728+ homepage = "https://github.com/MichelBoucey/IPv6Addr";

9729+ description = "Library to deal with IPv6 address text representations";

9730+ license = stdenv.lib.licenses.bsd3;

9731+ hydraPlatforms = stdenv.lib.platforms.none;

9732+ }) {};

9733+

97109734 "IcoGrid" = callPackage

97119735 ({ mkDerivation, array, base, GlomeVec }:

97129736 mkDerivation {

@@ -10878,8 +10902,8 @@ self: {

1087810902 ({ mkDerivation, base, directory, filepath, List, transformers }:

1087910903 mkDerivation {

1088010904 pname = "ListTree";

10881− version = "0.2.2";

10882− sha256 = "b261ac13493c992c44156f81ad194e43f2ab5aa2ae5ea0596414280c3a8addba";

10905+ version = "0.2.3";

10906+ sha256 = "0b3aa1d34193d9f7f90b4afeea681a79ab1595e8e651cae093f8fca3c50f60cc";

1088310907 libraryHaskellDepends = [

1088410908 base directory filepath List transformers

1088510909 ];

@@ -15815,12 +15839,12 @@ self: {

1581515839 license = stdenv.lib.licenses.bsd3;

1581615840 }) {};

1581715841

15818− "Spintax_0_3_0_0" = callPackage

15842+ "Spintax_0_3_1" = callPackage

1581915843 ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:

1582015844 mkDerivation {

1582115845 pname = "Spintax";

15822− version = "0.3.0.0";

15823− sha256 = "b417809b3734c582f1a08be3a14845b913562077bfc35b3bf067ced2309b0ffc";

15846+ version = "0.3.1";

15847+ sha256 = "335e13554aa0a13c97b4f9258be904e3007c35a56e8131bdb363c5f7930fc521";

1582415848 libraryHaskellDepends = [

1582515849 attoparsec base extra mtl mwc-random text

1582615850 ];

@@ -18303,6 +18327,8 @@ self: {

1830318327 pname = "YamlReference";

1830418328 version = "0.10.0";

1830518329 sha256 = "4d89cd7714f25c82c6a49a99e8d8b1789640222a1b5863da0a7aa3f4566b9205";

18330+ revision = "1";

18331+ editedCabalFile = "987331ab821e7171c21f2b79eb678f2ece44759d4eb1155e5ca93ac2396a99dd";

1830618332 isLibrary = true;

1830718333 isExecutable = true;

1830818334 libraryHaskellDepends = [

@@ -32983,7 +33009,7 @@ self: {

3298333009 hydraPlatforms = stdenv.lib.platforms.none;

3298433010 }) {};

3298533011

32986− "bitcoin-payment-channel_0_6_0_0" = callPackage

33012+ "bitcoin-payment-channel_0_6_0_1" = callPackage

3298733013 ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring

3298833014 , bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck

3298933015 , scientific, string-conversions, tagged, test-framework

@@ -32991,8 +33017,8 @@ self: {

3299133017 }:

3299233018 mkDerivation {

3299333019 pname = "bitcoin-payment-channel";

32994− version = "0.6.0.0";

32995− sha256 = "487e5bb74a3a6c6829971d1071576b302c70298160f9b03654911e2094bcc011";

33020+ version = "0.6.0.1";

33021+ sha256 = "10085ef9254d88a4494986f372b07d4109d1767196cc6d230c02ffe18f5f1abd";

3299633022 libraryHaskellDepends = [

3299733023 aeson base base16-bytestring bytestring cereal errors haskoin-core

3299833024 hexstring QuickCheck scientific string-conversions tagged text time

@@ -34858,6 +34884,28 @@ self: {

3485834884 license = stdenv.lib.licenses.mit;

3485934885 }) {};

3486034886

34887+ "bower-json_1_0_0_1" = callPackage

34888+ ({ mkDerivation, aeson, aeson-better-errors, base, bytestring

34889+ , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text

34890+ , transformers, unordered-containers, vector

34891+ }:

34892+ mkDerivation {

34893+ pname = "bower-json";

34894+ version = "1.0.0.1";

34895+ sha256 = "7aa954e2b1bf79307db710c158108bd9ddb45b333ca96072cdbfaf96c77b7e73";

34896+ libraryHaskellDepends = [

34897+ aeson aeson-better-errors base bytestring deepseq ghc-prim mtl

34898+ scientific text transformers unordered-containers vector

34899+ ];

34900+ testHaskellDepends = [

34901+ aeson base bytestring tasty tasty-hunit text unordered-containers

34902+ ];

34903+ homepage = "https://github.com/hdgarrood/bower-json";

34904+ description = "Read bower.json from Haskell";

34905+ license = stdenv.lib.licenses.mit;

34906+ hydraPlatforms = stdenv.lib.platforms.none;

34907+ }) {};

34908+

3486134909 "bowntz" = callPackage

3486234910 ({ mkDerivation, base, containers, GLUT, hosc, hsc3, random }:

3486334911 mkDerivation {

@@ -38964,6 +39012,29 @@ self: {

3896439012 hydraPlatforms = stdenv.lib.platforms.none;

3896539013 }) {};

3896639014

39015+ "cayley-client_0_3_0" = callPackage

39016+ ({ mkDerivation, aeson, attoparsec, base, binary, bytestring

39017+ , exceptions, hspec, http-client, http-conduit, lens, lens-aeson

39018+ , mtl, text, transformers, unordered-containers, vector

39019+ }:

39020+ mkDerivation {

39021+ pname = "cayley-client";

39022+ version = "0.3.0";

39023+ sha256 = "6c2d35f5c70df4744c3cac4a3cda952bd6a36f0f40cbdcf79ec54670ab1c5e1a";

39024+ revision = "1";

39025+ editedCabalFile = "7bc68d5b02fa41ebd7652a4e0d080417f4a66e179f24e6cc70845dac0fbb9f63";

39026+ libraryHaskellDepends = [

39027+ aeson attoparsec base binary bytestring exceptions http-client

39028+ http-conduit lens lens-aeson mtl text transformers

39029+ unordered-containers vector

39030+ ];

39031+ testHaskellDepends = [ aeson base hspec unordered-containers ];

39032+ homepage = "https://github.com/MichelBoucey/cayley-client";

39033+ description = "A Haskell client for the Cayley graph database";

39034+ license = stdenv.lib.licenses.bsd3;

39035+ hydraPlatforms = stdenv.lib.platforms.none;

39036+ }) {};

39037+

3896739038 "cayley-dickson" = callPackage

3896839039 ({ mkDerivation, base, random }:

3896939040 mkDerivation {

@@ -45057,14 +45128,14 @@ self: {

4505745128 }) {};

4505845129

4505945130 "constraint-classes" = callPackage

45060− ({ mkDerivation, base }:

45131+ ({ mkDerivation, base, constraints, transformers }:

4506145132 mkDerivation {

4506245133 pname = "constraint-classes";

45063− version = "0.4.0";

45064− sha256 = "0a5dda19ad7688081e43ec1445eac7a1ae0c4ae54139c4b92fd91e5f872a45b8";

45065− libraryHaskellDepends = [ base ];

45134+ version = "0.5.1";

45135+ sha256 = "5e26e76d7d1bcbdf77a384ffc74eb36a39f82e23a29d3ee80b6bf29ab7ce6921";

45136+ libraryHaskellDepends = [ base constraints transformers ];

4506645137 homepage = "http://github.com/guaraqe/constraint-classes#readme";

45067− description = "Prelude classes using ConstraintKinds";

45138+ description = "Various typeclasses using ConstraintKinds";

4506845139 license = stdenv.lib.licenses.bsd3;

4506945140 }) {};

4507045141

@@ -47542,8 +47613,8 @@ self: {

4754247613 pname = "crypto-enigma";

4754347614 version = "0.0.2.6";

4754447615 sha256 = "eb162e2b4ea2d73bb3594e12438f02988e338ae58c602e817a31970163533142";

47545− revision = "1";

47546− editedCabalFile = "4cc74c0744e15e1149d7419e47232db6f0bf53a56360f35d71665b180c2f2a53";

47616+ revision = "3";

47617+ editedCabalFile = "c94ac05824b4eb891ee0351c533f6b7a12586437b58c4615538903bfd807317c";

4754747618 libraryHaskellDepends = [ base containers MissingH mtl split ];

4754847619 testHaskellDepends = [ base HUnit QuickCheck ];

4754947620 homepage = "https://github.com/orome/crypto-enigma-hs";

@@ -50128,8 +50199,8 @@ self: {

5012850199 ({ mkDerivation, base, template-haskell }:

5012950200 mkDerivation {

5013050201 pname = "data-flags";

50131− version = "0.0.3.2";

50132− sha256 = "9e8944d63a314a116d1cc8ecb115ad0ea8dabd5ccb84dbbefd332e641430794a";

50202+ version = "0.0.3.3";

50203+ sha256 = "a1e390d6a58b45c5f9a193c8244badf31f104fad26d5178298c8043ad136faaa";

5013350204 libraryHaskellDepends = [ base template-haskell ];

5013450205 homepage = "https://github.com/mvv/data-flags";

5013550206 description = "A package for working with bit masks and flags in general";

@@ -50700,14 +50771,14 @@ self: {

5070050771

5070150772 "data-serializer" = callPackage

5070250773 ({ mkDerivation, base, binary, bytestring, cereal, data-endian

50703− , parsers, tasty, tasty-quickcheck

50774+ , parsers, semigroups, tasty, tasty-quickcheck

5070450775 }:

5070550776 mkDerivation {

5070650777 pname = "data-serializer";

50707− version = "0.2";

50708− sha256 = "1e134ab268125d0202ed95c723cd903283e8dc111918498cf27696820285a584";

50778+ version = "0.3";

50779+ sha256 = "c8befa7acf0293b0a367bf8100d19e8cf1ad4b4b48358394daa578103a505e2e";

5070950780 libraryHaskellDepends = [

50710− base binary bytestring cereal data-endian parsers

50781+ base binary bytestring cereal data-endian parsers semigroups

5071150782 ];

5071250783 testHaskellDepends = [

5071350784 base binary bytestring cereal tasty tasty-quickcheck

@@ -50810,8 +50881,8 @@ self: {

5081050881 }:

5081150882 mkDerivation {

5081250883 pname = "data-sword";

50813− version = "0.2";

50814− sha256 = "57db4db48eb3bda4a8b70c781c64342241ee7d7b53f020262dc3c7506f8eec95";

50884+ version = "0.2.0.1";

50885+ sha256 = "d2348ed2515a484866d92185640db0d20991ec9b0c6a891ed229ff41d5f304d1";

5081550886 libraryHaskellDepends = [

5081650887 base data-bword hashable template-haskell

5081750888 ];

@@ -60873,6 +60944,22 @@ self: {

6087360944 license = stdenv.lib.licenses.bsd3;

6087460945 }) {};

6087560946

60947+ "eths-rlp" = callPackage

60948+ ({ mkDerivation, base, binary, binary-strict, bytestring, doctest

60949+ , hspec, QuickCheck, quickcheck-instances

60950+ }:

60951+ mkDerivation {

60952+ pname = "eths-rlp";

60953+ version = "0.1.0.0";

60954+ sha256 = "aa24e8f30bbb1eff7bd4cbfc635224f772d5bdba26a1db6ef346415b8d2ea09b";

60955+ libraryHaskellDepends = [ base binary binary-strict bytestring ];

60956+ testHaskellDepends = [

60957+ base bytestring doctest hspec QuickCheck quickcheck-instances

60958+ ];

60959+ description = "Ethereum Recursive Length Prefix Encoding";

60960+ license = stdenv.lib.licenses.mit;

60961+ }) {};

60962+

6087660963 "ety" = callPackage

6087760964 ({ mkDerivation, base, bytestring, curl, random, text-icu

6087860965 , utf8-string, xml

@@ -62417,6 +62504,17 @@ self: {

6241762504 license = stdenv.lib.licenses.bsd3;

6241862505 }) {};

6241962506

62507+ "fast-nats" = callPackage

62508+ ({ mkDerivation, base }:

62509+ mkDerivation {

62510+ pname = "fast-nats";

62511+ version = "0.1.0.1";

62512+ sha256 = "8197f83252621182c32350c20f995fb3ad3549499e2fbf2687235ff80024e3ce";

62513+ libraryHaskellDepends = [ base ];

62514+ description = "Natural Numbers with no overhead";

62515+ license = stdenv.lib.licenses.mit;

62516+ }) {};

62517+

6242062518 "fast-tags" = callPackage

6242162519 ({ mkDerivation, array, async, base, bytestring, containers, cpphs

6242262520 , deepseq, directory, filepath, mtl, tasty, tasty-hunit, text

@@ -62557,6 +62655,24 @@ self: {

6255762655 hydraPlatforms = stdenv.lib.platforms.none;

6255862656 }) {};

6255962657

62658+ "fastpbkdf2" = callPackage

62659+ ({ mkDerivation, base, base16-bytestring, bytestring, openssl

62660+ , tasty, tasty-hunit

62661+ }:

62662+ mkDerivation {

62663+ pname = "fastpbkdf2";

62664+ version = "0.1.0.0";

62665+ sha256 = "843103419b79f8fc21062e6842dace2a6e0c214f20c496a4268e1377c512f2f9";

62666+ libraryHaskellDepends = [ base bytestring ];

62667+ librarySystemDepends = [ openssl ];

62668+ testHaskellDepends = [

62669+ base base16-bytestring bytestring tasty tasty-hunit

62670+ ];

62671+ homepage = "https://github.com/adinapoli/fastpbkdf2-hs#readme";

62672+ description = "Haskell bindings to the fastpbkdf2 C library";

62673+ license = stdenv.lib.licenses.bsd3;

62674+ }) {inherit (pkgs) openssl;};

62675+

6256062676 "fathead-util" = callPackage

6256162677 ({ mkDerivation, base, bytestring, cassava, hxt, network-uri, text

6256262678 }:

@@ -70293,18 +70409,18 @@ self: {

7029370409 license = stdenv.lib.licenses.lgpl21;

7029470410 }) {inherit (pkgs) atk;};

7029570411

70296− "gi-atk_2_0_9" = callPackage

70412+ "gi-atk_2_0_11" = callPackage

7029770413 ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib

7029870414 , gi-gobject, haskell-gi, haskell-gi-base, text, transformers

7029970415 }:

7030070416 mkDerivation {

7030170417 pname = "gi-atk";

70302− version = "2.0.9";

70303− sha256 = "246b50192e25a6f125cb51b2c57a38cb76702fe02c7b87b89e548851479598bf";

70418+ version = "2.0.11";

70419+ sha256 = "32594ce32ab70fcf7b7e4d2fd212a4714c72d28776be7649f88a989b40632d9b";

7030470420 setupHaskellDepends = [ base Cabal haskell-gi ];

7030570421 libraryHaskellDepends = [

70306− base bytestring containers gi-glib gi-gobject haskell-gi-base text

70307− transformers

70422+ base bytestring containers gi-glib gi-gobject haskell-gi

70423+ haskell-gi-base text transformers

7030870424 ];

7030970425 libraryPkgconfigDepends = [ atk ];

7031070426 doHaddock = false;

@@ -70339,18 +70455,19 @@ self: {

7033970455 license = stdenv.lib.licenses.lgpl21;

7034070456 }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};

7034170457

70342− "gi-cairo_1_0_9" = callPackage

70458+ "gi-cairo_1_0_11" = callPackage

7034370459 ({ mkDerivation, base, bytestring, Cabal, cairo, containers

7034470460 , gobjectIntrospection, haskell-gi, haskell-gi-base, text

7034570461 , transformers

7034670462 }:

7034770463 mkDerivation {

7034870464 pname = "gi-cairo";

70349− version = "1.0.9";

70350− sha256 = "acdc06c2543aae4462dee525b7fb806fd974e58d3d1b3482167f5bde2eb14a99";

70465+ version = "1.0.11";

70466+ sha256 = "a70bbb9b120d10c95e1bc603511d542b38cecf1025bed870e6dbe2bd2d7e552f";

7035170467 setupHaskellDepends = [ base Cabal haskell-gi ];

7035270468 libraryHaskellDepends = [

70353− base bytestring containers haskell-gi-base text transformers

70469+ base bytestring containers haskell-gi haskell-gi-base text

70470+ transformers

7035470471 ];

7035570472 libraryPkgconfigDepends = [ cairo gobjectIntrospection ];

7035670473 doHaddock = false;

@@ -70387,19 +70504,19 @@ self: {

7038770504 hydraPlatforms = stdenv.lib.platforms.none;

7038870505 }) {gtk3 = pkgs.gnome3.gtk;};

7038970506

70390− "gi-gdk_3_0_9" = callPackage

70507+ "gi-gdk_3_0_11" = callPackage

7039170508 ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo

7039270509 , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3

7039370510 , haskell-gi, haskell-gi-base, text, transformers

7039470511 }:

7039570512 mkDerivation {

7039670513 pname = "gi-gdk";

70397− version = "3.0.9";

70398− sha256 = "6a908ed5be0a79c0d25a82ddcad4c910e2e65f756696141aaac970ac853fee22";

70514+ version = "3.0.11";

70515+ sha256 = "b1947f5abad3e500ac748ccea44275050c8a7261d0f81e49aee21a4266cf34b1";

7039970516 setupHaskellDepends = [ base Cabal haskell-gi ];

7040070517 libraryHaskellDepends = [

7040170518 base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib

70402− gi-gobject gi-pango haskell-gi-base text transformers

70519+ gi-gobject gi-pango haskell-gi haskell-gi-base text transformers

7040370520 ];

7040470521 libraryPkgconfigDepends = [ gtk3 ];

7040570522 doHaddock = false;

@@ -70435,18 +70552,18 @@ self: {

7043570552 }) {inherit (pkgs) gdk_pixbuf;

7043670553 inherit (pkgs) gobjectIntrospection;};

7043770554

70438− "gi-gdkpixbuf_2_0_9" = callPackage

70555+ "gi-gdkpixbuf_2_0_11" = callPackage

7043970556 ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf

7044070557 , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi

7044170558 , haskell-gi-base, text, transformers

7044270559 }:

7044370560 mkDerivation {

7044470561 pname = "gi-gdkpixbuf";

70445− version = "2.0.9";

70446− sha256 = "880089ae75884e8e89b2ebba3d524c9f07864b37f3dc8475fea14ed18a01efb0";

70562+ version = "2.0.11";

70563+ sha256 = "068c4e9df68a03180dc0f174414af010877ffc781d35d2776e01a63bd1a80149";

7044770564 setupHaskellDepends = [ base Cabal haskell-gi ];

7044870565 libraryHaskellDepends = [

70449− base bytestring containers gi-gio gi-glib gi-gobject

70566+ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi

7045070567 haskell-gi-base text transformers

7045170568 ];

7045270569 libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ];

@@ -70483,19 +70600,19 @@ self: {

7048370600 license = stdenv.lib.licenses.lgpl21;

7048470601 }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};

7048570602

70486− "gi-gio_2_0_9" = callPackage

70603+ "gi-gio_2_0_11" = callPackage

7048770604 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib

7048870605 , gi-gobject, glib, gobjectIntrospection, haskell-gi

7048970606 , haskell-gi-base, text, transformers

7049070607 }:

7049170608 mkDerivation {

7049270609 pname = "gi-gio";

70493− version = "2.0.9";

70494− sha256 = "fb08fb617f7d845d8e6f50802ad6f30e6063ee71c05dc10da29f581227f16bb8";

70610+ version = "2.0.11";

70611+ sha256 = "d63f1c32a935cb818f8f2c1d70dbf4f71cc65a23e200744a93dee66ade50f039";

7049570612 setupHaskellDepends = [ base Cabal haskell-gi ];

7049670613 libraryHaskellDepends = [

70497− base bytestring containers gi-glib gi-gobject haskell-gi-base text

70498− transformers

70614+ base bytestring containers gi-glib gi-gobject haskell-gi

70615+ haskell-gi-base text transformers

7049970616 ];

7050070617 libraryPkgconfigDepends = [ glib gobjectIntrospection ];

7050170618 doHaddock = false;

@@ -70513,12 +70630,12 @@ self: {

7051370630 }:

7051470631 mkDerivation {

7051570632 pname = "gi-girepository";

70516− version = "1.0.9";

70517− sha256 = "773fc9bb6d55006f12f68fdb4a68edc25fdc74448549a819ecb4f88a2f0b0efb";

70633+ version = "1.0.11";

70634+ sha256 = "3779ee7c9e97a96b05f43607adbde81addf0451b0a1f21e94a9a4353cec1fde2";

7051870635 setupHaskellDepends = [ base Cabal haskell-gi ];

7051970636 libraryHaskellDepends = [

70520− base bytestring containers gi-gobject haskell-gi-base text

70521− transformers

70637+ base bytestring containers gi-gobject haskell-gi haskell-gi-base

70638+ text transformers

7052270639 ];

7052370640 libraryPkgconfigDepends = [ gobjectIntrospection ];

7052470641 doHaddock = false;

@@ -70549,18 +70666,19 @@ self: {

7054970666 license = stdenv.lib.licenses.lgpl21;

7055070667 }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};

7055170668

70552− "gi-glib_2_0_9" = callPackage

70669+ "gi-glib_2_0_11" = callPackage

7055370670 ({ mkDerivation, base, bytestring, Cabal, containers, glib

7055470671 , gobjectIntrospection, haskell-gi, haskell-gi-base, text

7055570672 , transformers

7055670673 }:

7055770674 mkDerivation {

7055870675 pname = "gi-glib";

70559− version = "2.0.9";

70560− sha256 = "1b295151c9d5f83c13c01204f67c10d071173377a67d6c1d4e8093a253c86555";

70676+ version = "2.0.11";

70677+ sha256 = "f707cc142c6c7a202b86a5804af38c53fd74c99ee2092946e3f39451220d94e9";

7056170678 setupHaskellDepends = [ base Cabal haskell-gi ];

7056270679 libraryHaskellDepends = [

70563− base bytestring containers haskell-gi-base text transformers

70680+ base bytestring containers haskell-gi haskell-gi-base text

70681+ transformers

7056470682 ];

7056570683 libraryPkgconfigDepends = [ glib gobjectIntrospection ];

7056670684 doHaddock = false;

@@ -70592,18 +70710,18 @@ self: {

7059270710 license = stdenv.lib.licenses.lgpl21;

7059370711 }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};

7059470712

70595− "gi-gobject_2_0_9" = callPackage

70713+ "gi-gobject_2_0_11" = callPackage

7059670714 ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib

7059770715 , gobjectIntrospection, haskell-gi, haskell-gi-base, text

7059870716 , transformers

7059970717 }:

7060070718 mkDerivation {

7060170719 pname = "gi-gobject";

70602− version = "2.0.9";

70603− sha256 = "8525c707a7f6569ac57da4c16fc5c2ea174f4282c8436ba789d36d22cdbe7f1a";

70720+ version = "2.0.11";

70721+ sha256 = "fcfe35af13e118db109b9b0d969b89bb5c2a0162a1c3d1fc9413cafcd173058c";

7060470722 setupHaskellDepends = [ base Cabal haskell-gi ];

7060570723 libraryHaskellDepends = [

70606− base bytestring containers gi-glib haskell-gi-base text

70724+ base bytestring containers gi-glib haskell-gi haskell-gi-base text

7060770725 transformers

7060870726 ];

7060970727 libraryPkgconfigDepends = [ glib gobjectIntrospection ];

@@ -70622,12 +70740,12 @@ self: {

7062270740 }:

7062370741 mkDerivation {

7062470742 pname = "gi-gst";

70625− version = "1.0.9";

70626− sha256 = "4ed3756052c41b4198d7c3cfd5d179f2d0f49d2a43d20f2be320d85c0a61b22e";

70743+ version = "1.0.11";

70744+ sha256 = "36e63c2330cb274ac6ac8b1a5d4b06a590e10d91ed4209555a72a85dc0c2591a";

7062770745 setupHaskellDepends = [ base Cabal haskell-gi ];

7062870746 libraryHaskellDepends = [

70629− base bytestring containers gi-glib gi-gobject haskell-gi-base text

70630− transformers

70747+ base bytestring containers gi-glib gi-gobject haskell-gi

70748+ haskell-gi-base text transformers

7063170749 ];

7063270750 libraryPkgconfigDepends = [ gstreamer ];

7063370751 doHaddock = false;

@@ -70644,12 +70762,12 @@ self: {

7064470762 }:

7064570763 mkDerivation {

7064670764 pname = "gi-gstaudio";

70647− version = "1.0.9";

70648− sha256 = "c6021390e020c2d5c21b003bffb6340059feca7ea416fcad60d5c6bb0c0841c8";

70765+ version = "1.0.11";

70766+ sha256 = "faca30e17c95fc5fc00e72bbaef20bbb9edf2a4785f6bad6f6b4a742006d2f5d";

7064970767 setupHaskellDepends = [ base Cabal haskell-gi ];

7065070768 libraryHaskellDepends = [

7065170769 base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase

70652− haskell-gi-base text transformers

70770+ haskell-gi haskell-gi-base text transformers

7065370771 ];

7065470772 librarySystemDepends = [ gobjectIntrospection ];

7065570773 libraryPkgconfigDepends = [ gst_plugins_base ];

@@ -70668,11 +70786,11 @@ self: {

7066870786 }:

7066970787 mkDerivation {

7067070788 pname = "gi-gstbase";

70671− version = "1.0.9";

70672− sha256 = "5e86bc44fcc16d4009a5cd881169d29abffbd08e8ff0a07098b9e54729137e5d";

70789+ version = "1.0.11";

70790+ sha256 = "ca1cf846609ee3a340161747df48885432304b4a4339d3328d3f8b5e683ff577";

7067370791 setupHaskellDepends = [ base Cabal haskell-gi ];

7067470792 libraryHaskellDepends = [

70675− base bytestring containers gi-glib gi-gobject gi-gst

70793+ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi

7067670794 haskell-gi-base text transformers

7067770795 ];

7067870796 librarySystemDepends = [ gobjectIntrospection ];

@@ -70692,12 +70810,12 @@ self: {

7069270810 }:

7069370811 mkDerivation {

7069470812 pname = "gi-gstvideo";

70695− version = "1.0.9";

70696− sha256 = "1d36e8f907c6ece57c1db76b9a3ebf866b2ce57f9312c0153ab2e1259356c6ab";

70813+ version = "1.0.11";

70814+ sha256 = "9f2b49fc2ee31fb4ee4f2bf82f509a8b9d4dc963eff0da62efa6b60e760f42e7";

7069770815 setupHaskellDepends = [ base Cabal haskell-gi ];

7069870816 libraryHaskellDepends = [

7069970817 base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase

70700− haskell-gi-base text transformers

70818+ haskell-gi haskell-gi-base text transformers

7070170819 ];

7070270820 librarySystemDepends = [ gobjectIntrospection ];

7070370821 libraryPkgconfigDepends = [ gst_plugins_base ];

@@ -70732,19 +70850,19 @@ self: {

7073270850 hydraPlatforms = stdenv.lib.platforms.none;

7073370851 }) {gtk3 = pkgs.gnome3.gtk;};

7073470852

70735− "gi-gtk_3_0_9" = callPackage

70853+ "gi-gtk_3_0_11" = callPackage

7073670854 ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk

7073770855 , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject

7073870856 , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers

7073970857 }:

7074070858 mkDerivation {

7074170859 pname = "gi-gtk";

70742− version = "3.0.9";

70743− sha256 = "5b7b6d064b97066c058288a366e37dffa0b330a4a1d15f3018ed46d2b3a877f3";

70860+ version = "3.0.11";

70861+ sha256 = "a4bce9a9ea706a880bb9e8f6a2f8eb872b66acf550f8f42dd13a552b4d725f3f";

7074470862 setupHaskellDepends = [ base Cabal haskell-gi ];

7074570863 libraryHaskellDepends = [

7074670864 base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf

70747− gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text

70865+ gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text

7074870866 transformers

7074970867 ];

7075070868 libraryPkgconfigDepends = [ gtk3 ];

@@ -70782,12 +70900,12 @@ self: {

7078270900 }:

7078370901 mkDerivation {

7078470902 pname = "gi-gtkosxapplication";

70785− version = "2.0.9";

70786− sha256 = "d4661ae492916d4fc16f34b234e6c22917f3fc8bf37aef0ae6f2dd17123b7834";

70903+ version = "2.0.11";

70904+ sha256 = "4d64ad35431052f221a37998b8ca7fa8850a9a98d2741133f64f978b2e3bcad7";

7078770905 setupHaskellDepends = [ base Cabal haskell-gi ];

7078870906 libraryHaskellDepends = [

7078970907 base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk

70790− haskell-gi-base text transformers

70908+ haskell-gi haskell-gi-base text transformers

7079170909 ];

7079270910 libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];

7079370911 doHaddock = false;

@@ -70805,13 +70923,13 @@ self: {

7080570923 }:

7080670924 mkDerivation {

7080770925 pname = "gi-gtksource";

70808− version = "3.0.9";

70809− sha256 = "3ba4e8d8b446c4c37248748535951e31803140a69cf53a69bdb0e68e254b5090";

70926+ version = "3.0.11";

70927+ sha256 = "fb130bc4894aa689ecccb01be94ef246585ddba296fef5145a688e9c14027646";

7081070928 setupHaskellDepends = [ base Cabal haskell-gi ];

7081170929 libraryHaskellDepends = [

7081270930 base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf

70813− gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi-base text

70814− transformers

70931+ gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi

70932+ haskell-gi-base text transformers

7081570933 ];

7081670934 libraryPkgconfigDepends = [ gtksourceview ];

7081770935 doHaddock = false;

@@ -70842,17 +70960,18 @@ self: {

7084270960 hydraPlatforms = stdenv.lib.platforms.none;

7084370961 }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;};

7084470962

70845− "gi-javascriptcore_4_0_9" = callPackage

70963+ "gi-javascriptcore_4_0_11" = callPackage

7084670964 ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi

7084770965 , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk

7084870966 }:

7084970967 mkDerivation {

7085070968 pname = "gi-javascriptcore";

70851− version = "4.0.9";

70852− sha256 = "9acd59b75799a572919c3a65541de73296b6f33f54572902c91eeb93ee7a5375";

70969+ version = "4.0.11";

70970+ sha256 = "d67899269ffeba7fa266644fb6d540c74d36fa9e15ca1890fc2c6bb1fa19e066";

7085370971 setupHaskellDepends = [ base Cabal haskell-gi ];

7085470972 libraryHaskellDepends = [

70855− base bytestring containers haskell-gi-base text transformers

70973+ base bytestring containers haskell-gi haskell-gi-base text

70974+ transformers

7085670975 ];

7085770976 libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ];

7085870977 doHaddock = false;

@@ -70870,12 +70989,12 @@ self: {

7087070989 }:

7087170990 mkDerivation {

7087270991 pname = "gi-notify";

70873− version = "0.7.9";

70874− sha256 = "7c87c5003d96303398ccca3c2e256d409c8853a7007158e052469ac650aa0221";

70992+ version = "0.7.11";

70993+ sha256 = "206eaf4d06e5837e21f665212517c27c201e48bb306ea0ea77e05ce9e8d059ce";

7087570994 setupHaskellDepends = [ base Cabal haskell-gi ];

7087670995 libraryHaskellDepends = [

7087770996 base bytestring containers gi-gdkpixbuf gi-glib gi-gobject

70878− haskell-gi-base text transformers

70997+ haskell-gi haskell-gi-base text transformers

7087970998 ];

7088070999 libraryPkgconfigDepends = [ libnotify ];

7088171000 doHaddock = false;

@@ -70912,19 +71031,19 @@ self: {

7091271031 }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;

7091371032 inherit (pkgs.gnome2) pango;};

7091471033

70915− "gi-pango_1_0_9" = callPackage

71034+ "gi-pango_1_0_11" = callPackage

7091671035 ({ mkDerivation, base, bytestring, Cabal, cairo, containers

7091771036 , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi

7091871037 , haskell-gi-base, pango, text, transformers

7091971038 }:

7092071039 mkDerivation {

7092171040 pname = "gi-pango";

70922− version = "1.0.9";

70923− sha256 = "2410b013c336f70b0711aa52b2ff9145945b5fd4b246b09703adac86ca00df1b";

71041+ version = "1.0.11";

71042+ sha256 = "8e709c61b8e6a8d2973d7206b15e324327d79ec4b6c301b949837d33d1f7ec66";

7092471043 setupHaskellDepends = [ base Cabal haskell-gi ];

7092571044 libraryHaskellDepends = [

70926− base bytestring containers gi-glib gi-gobject haskell-gi-base text

70927− transformers

71045+ base bytestring containers gi-glib gi-gobject haskell-gi

71046+ haskell-gi-base text transformers

7092871047 ];

7092971048 libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ];

7093071049 doHaddock = false;

@@ -70947,12 +71066,12 @@ self: {

7094771066 }:

7094871067 mkDerivation {

7094971068 pname = "gi-pangocairo";

70950− version = "1.0.9";

70951− sha256 = "7c9e3c78703852ab5e879f8b3ecbb3e6898389d10d1458e3b6341ada252464a4";

71069+ version = "1.0.11";

71070+ sha256 = "604c2759510e6987fb2ca63c4b20940147fd07fcf56f701c221bf836de0481ad";

7095271071 setupHaskellDepends = [ base Cabal haskell-gi ];

7095371072 libraryHaskellDepends = [

7095471073 base bytestring containers gi-cairo gi-glib gi-gobject gi-pango

70955− haskell-gi-base text transformers

71074+ haskell-gi haskell-gi-base text transformers

7095671075 ];

7095771076 libraryPkgconfigDepends = [ pango ];

7095871077 doHaddock = false;

@@ -70969,12 +71088,12 @@ self: {

7096971088 }:

7097071089 mkDerivation {

7097171090 pname = "gi-poppler";

70972− version = "0.18.9";

70973− sha256 = "6566f9698ff21dc0eac6b8fb79db191ad48044b424a8d7a2b931ca69a1d517a8";

71091+ version = "0.18.11";

71092+ sha256 = "76ec68a35a83c99d3c8fd3374b02b0fede275ced4c21d4c967d817411a8c581b";

7097471093 setupHaskellDepends = [ base Cabal haskell-gi ];

7097571094 libraryHaskellDepends = [

7097671095 base bytestring containers gi-cairo gi-gio gi-glib gi-gobject

70977− haskell-gi-base text transformers

71096+ haskell-gi haskell-gi-base text transformers

7097871097 ];

7097971098 libraryPkgconfigDepends = [ poppler ];

7098071099 doHaddock = false;

@@ -71004,18 +71123,18 @@ self: {

7100471123 license = stdenv.lib.licenses.lgpl21;

7100571124 }) {inherit (pkgs.gnome2) libsoup;};

7100671125

71007− "gi-soup_2_4_9" = callPackage

71126+ "gi-soup_2_4_11" = callPackage

7100871127 ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio

7100971128 , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text

7101071129 , transformers

7101171130 }:

7101271131 mkDerivation {

7101371132 pname = "gi-soup";

71014− version = "2.4.9";

71015− sha256 = "e4e45ac1d877e1334ee6b57154422dad87e3e03c2f453f34c05e75aafb7a5daa";

71133+ version = "2.4.11";

71134+ sha256 = "5488104e98b7a295b44990d0063b162c951b8a1eec5df35a42bd4ba828dbd0ad";

7101671135 setupHaskellDepends = [ base Cabal haskell-gi ];

7101771136 libraryHaskellDepends = [

71018− base bytestring containers gi-gio gi-glib gi-gobject

71137+ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi

7101971138 haskell-gi-base text transformers

7102071139 ];

7102171140 libraryPkgconfigDepends = [ libsoup ];

@@ -71033,12 +71152,12 @@ self: {

7103371152 }:

7103471153 mkDerivation {

7103571154 pname = "gi-vte";

71036− version = "2.91.10";

71037− sha256 = "8da2e88e7b00ac3f7ab1523836415a53cb92f3c6da576d48fc9fd363f88b3bf0";

71155+ version = "2.91.12";

71156+ sha256 = "c286d581ad3f3e25dc4f7b5b8439d4e6a0e2d6312218e5cc528c490c07573670";

7103871157 setupHaskellDepends = [ base Cabal haskell-gi ];

7103971158 libraryHaskellDepends = [

7104071159 base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject

71041− gi-gtk gi-pango haskell-gi-base text transformers

71160+ gi-gtk gi-pango haskell-gi haskell-gi-base text transformers

7104271161 ];

7104371162 libraryPkgconfigDepends = [ vte ];

7104471163 doHaddock = false;

@@ -71071,7 +71190,7 @@ self: {

7107171190 hydraPlatforms = stdenv.lib.platforms.none;

7107271191 }) {webkit = null;};

7107371192

71074− "gi-webkit_3_0_9" = callPackage

71193+ "gi-webkit_3_0_11" = callPackage

7107571194 ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk

7107671195 , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject

7107771196 , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base

@@ -71079,13 +71198,13 @@ self: {

7107971198 }:

7108071199 mkDerivation {

7108171200 pname = "gi-webkit";

71082− version = "3.0.9";

71083− sha256 = "5cd7b6d244b3aeb9eba3f437d40e3b3fbc2fcb253d84d1d5e1e105e7deefc976";

71201+ version = "3.0.11";

71202+ sha256 = "d707c10a9f758d5bee1fe59639fb6773a1fcdb596bc86b46c7ce19639556ff3f";

7108471203 setupHaskellDepends = [ base Cabal haskell-gi ];

7108571204 libraryHaskellDepends = [

7108671205 base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf

7108771206 gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup

71088− haskell-gi-base text transformers

71207+ haskell-gi haskell-gi-base text transformers

7108971208 ];

7109071209 libraryPkgconfigDepends = [ webkit ];

7109171210 doHaddock = false;

@@ -71103,13 +71222,13 @@ self: {

7110371222 }:

7110471223 mkDerivation {

7110571224 pname = "gi-webkit2";

71106− version = "4.0.9";

71107− sha256 = "982635e1c9f7f726100ed980eb12f7bee523d4b8aae14889c10024409f112be5";

71225+ version = "4.0.11";

71226+ sha256 = "bc43fb893695cd0395ffdd3381e857d5201e2a7209feb6f6024e0d832219070b";

7110871227 setupHaskellDepends = [ base Cabal haskell-gi ];

7110971228 libraryHaskellDepends = [

7111071229 base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib

71111− gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text

71112− transformers

71230+ gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi

71231+ haskell-gi-base text transformers

7111371232 ];

7111471233 libraryPkgconfigDepends = [ webkit2gtk webkitgtk ];

7111571234 doHaddock = false;

@@ -71127,12 +71246,12 @@ self: {

7112771246 }:

7112871247 mkDerivation {

7112971248 pname = "gi-webkit2webextension";

71130− version = "4.0.9";

71131− sha256 = "df4bac3557c8b29c1fd6b8e7da859a394eef2df5bed12dab5491a57b585835ac";

71249+ version = "4.0.11";

71250+ sha256 = "b16b5b2f54bceaa777c64bb5ed19244815892dafcd8b4ce949c6a858ccf19033";

7113271251 setupHaskellDepends = [ base Cabal haskell-gi ];

7113371252 libraryHaskellDepends = [

7113471253 base bytestring containers gi-gobject gi-gtk gi-javascriptcore

71135− gi-soup haskell-gi-base text transformers

71254+ gi-soup haskell-gi haskell-gi-base text transformers

7113671255 ];

7113771256 libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ];

7113871257 doHaddock = false;

@@ -71602,15 +71721,17 @@ self: {

7160271721 }:

7160371722 mkDerivation {

7160471723 pname = "git-mediate";

71605− version = "1.0";

71606− sha256 = "0ec4f74b30997f05059ac4dc1433a3618cd40240bbb93b6ec434d90f40390790";

71724+ version = "1.0.1";

71725+ sha256 = "12320be6a3a0c8f982346c3fdb15e2102339ca2ae454b413d2664124f08c3c57";

71726+ revision = "1";

71727+ editedCabalFile = "208ad1540eab41d7530395ef31095f6aa8a1c0e415f6e9f6236418f6d4ebb32d";

7160771728 isLibrary = false;

7160871729 isExecutable = true;

7160971730 executableHaskellDepends = [

7161071731 ansi-terminal base base-compat Diff directory filepath mtl

7161171732 optparse-applicative process unix

7161271733 ];

71613− homepage = "https://github.com/ElastiLotem/git-mediate";

71734+ homepage = "https://github.com/Peaker/git-mediate";

7161471735 description = "Remove trivial conflict markers in a git repository";

7161571736 license = stdenv.lib.licenses.gpl2;

7161671737 hydraPlatforms = stdenv.lib.platforms.none;

@@ -72254,8 +72375,8 @@ self: {

7225472375 }:

7225572376 mkDerivation {

7225672377 pname = "gitter";

72257− version = "0.0.0.1";

72258− sha256 = "cc755243b8be4a235aaf8ed3dc4aa6d1b5dcecf602c3457131ac96e6bd665a97";

72378+ version = "0.1";

72379+ sha256 = "640371046315d609811e3062edc202e386722165f84fbe1f15e22a5e2d66324a";

7225972380 libraryHaskellDepends = [

7226072381 aeson base bytestring exceptions lens lens-aeson mtl text wreq

7226172382 ];

@@ -72342,15 +72463,15 @@ self: {

7234272463 license = stdenv.lib.licenses.bsd3;

7234372464 }) {};

7234472465

72345− "glabrous_0_2_0_1" = callPackage

72466+ "glabrous_0_2_1" = callPackage

7234672467 ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring

7234772468 , cereal, cereal-text, directory, either, hspec, text

7234872469 , unordered-containers

7234972470 }:

7235072471 mkDerivation {

7235172472 pname = "glabrous";

72352− version = "0.2.0.1";

72353− sha256 = "cb2f9a9f60395f0abc062311a7cbea8505ecd546f1cb71e51b01291aea323327";

72473+ version = "0.2.1";

72474+ sha256 = "79793394c25a1f7bdb0c57e634a8ad37824a2a108272d521cf9fe78bdf9a70a4";

7235472475 libraryHaskellDepends = [

7235572476 aeson aeson-pretty attoparsec base bytestring cereal cereal-text

7235672477 either text unordered-containers

@@ -76046,6 +76167,23 @@ self: {

7604676167 hydraPlatforms = stdenv.lib.platforms.none;

7604776168 }) {};

7604876169

76170+ "google-oauth2-jwt_0_1_3" = callPackage

76171+ ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL

76172+ , RSA, text, unix-time

76173+ }:

76174+ mkDerivation {

76175+ pname = "google-oauth2-jwt";

76176+ version = "0.1.3";

76177+ sha256 = "1597575b4d03fea87e7411dd905b2db59221a6050986bd4cffadf4473da1c00b";

76178+ libraryHaskellDepends = [

76179+ base base64-bytestring bytestring HsOpenSSL RSA text unix-time

76180+ ];

76181+ homepage = "https://github.com/MichelBoucey/google-oauth2-jwt";

76182+ description = "Get a signed JWT for Google Service Accounts";

76183+ license = stdenv.lib.licenses.bsd3;

76184+ hydraPlatforms = stdenv.lib.platforms.none;

76185+ }) {};

76186+

7604976187 "google-search" = callPackage

7605076188 ({ mkDerivation, base, free, nats, text, time }:

7605176189 mkDerivation {

@@ -82097,8 +82235,8 @@ self: {

8209782235 }:

8209882236 mkDerivation {

8209982237 pname = "hasbolt";

82100− version = "0.1.0.2";

82101− sha256 = "0ef9006c38adb2d4caf4de88c1ac9b3ad26175fc2c4c54ac70ac5e4750062462";

82238+ version = "0.1.0.4";

82239+ sha256 = "d17bffafa4c729eab2e9b288c636d201013dd05ed04656e40de5a5fb7bc052a4";

8210282240 libraryHaskellDepends = [

8210382241 base binary bytestring containers data-binary-ieee754 data-default

8210482242 hex network network-simple text transformers

@@ -82407,8 +82545,8 @@ self: {

8240782545 pname = "hashing";

8240882546 version = "0.1.0.1";

8240982547 sha256 = "e5a4a19c6cd6f0a0adda381db76d608d23f8d303e68f1d744735433f91f49410";

82410− revision = "1";

82411− editedCabalFile = "a50b8538d365ef9fbdc0083c3de91fbdbcebe5e630f36330475e0d10243e2596";

82548+ revision = "2";

82549+ editedCabalFile = "98861f16791946cdf28e3c7a6ee9ac8b72d546d6e33c569c7087ef18253294e7";

8241282550 isLibrary = true;

8241382551 isExecutable = true;

8241482552 libraryHaskellDepends = [ array base bytestring ];

@@ -87258,6 +87396,27 @@ self: {

8725887396 hydraPlatforms = stdenv.lib.platforms.none;

8725987397 }) {};

8726087398

87399+ "helf" = callPackage

87400+ ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty

87401+ , QuickCheck

87402+ }:

87403+ mkDerivation {

87404+ pname = "helf";

87405+ version = "0.2016.12.25";

87406+ sha256 = "7d96b7bb7716b16d0b7b744629b3702766ec5e825cdd9b5015ada24d34a71a0e";

87407+ revision = "1";

87408+ editedCabalFile = "a3d5ffe78978b357890472700f2c0d5ac796f312909777476d89941753994385";

87409+ isLibrary = false;

87410+ isExecutable = true;

87411+ executableHaskellDepends = [

87412+ array base containers mtl pretty QuickCheck

87413+ ];

87414+ executableToolDepends = [ alex happy ];

87415+ homepage = "http://www2.tcs.ifi.lmu.de/~abel/projects.html#helf";

87416+ description = "Typechecking terms of the Edinburgh Logical Framework (LF)";

87417+ license = "unknown";

87418+ }) {};

87419+

8726187420 "helics" = callPackage

8726287421 ({ mkDerivation, base, bytestring, bytestring-show

8726387422 , data-default-class, newrelic-collector-client, newrelic-common

@@ -88055,8 +88214,8 @@ self: {

8805588214 ({ mkDerivation, base, bytestring, extra }:

8805688215 mkDerivation {

8805788216 pname = "hexml";

88058− version = "0.3";

88059− sha256 = "ace36d4b3a6ca44dad0b4c2f1ab008252acd281e4ff97c3b08c9af41cafb7386";

88217+ version = "0.3.1";

88218+ sha256 = "90d31d91beb87bfb9c0f1b867061b3db6d14dcbf9da87a483d620617aca0b1b0";

8806088219 libraryHaskellDepends = [ base bytestring extra ];

8806188220 testHaskellDepends = [ base bytestring ];

8806288221 homepage = "https://github.com/ndmitchell/hexml#readme";

@@ -92001,8 +92160,8 @@ self: {

9200192160 }:

9200292161 mkDerivation {

9200392162 pname = "hoogle";

92004− version = "5.0.6";

92005− sha256 = "fd151310dcdb4fc8c317aabe0faf0b9563ccd59471de12ea3f10136c6f134712";

92163+ version = "5.0.7";

92164+ sha256 = "a6ef18db8d3e10707771c216af33e166130ba664eae380b060a1669e44454409";

9200692165 isLibrary = true;

9200792166 isExecutable = true;

9200892167 libraryHaskellDepends = [

@@ -97869,7 +98028,7 @@ self: {

9786998028 license = stdenv.lib.licenses.mit;

9787098029 }) {};

9787198030

97872− "http-client_0_5_4" = callPackage

98031+ "http-client_0_5_5" = callPackage

9787398032 ({ mkDerivation, array, async, base, base64-bytestring

9787498033 , blaze-builder, bytestring, case-insensitive, containers, cookie

9787598034 , deepseq, directory, exceptions, filepath, ghc-prim, hspec

@@ -97878,8 +98037,8 @@ self: {

9787898037 }:

9787998038 mkDerivation {

9788098039 pname = "http-client";

97881− version = "0.5.4";

97882− sha256 = "f226b9dd4b7a6b5ef3becddd02baeabe3429b88584a42609ca3733c84bfe7300";

98040+ version = "0.5.5";

98041+ sha256 = "d1fdda6035e0bab95d3294f5175ac8c3629f9cd1d32e1bce5d0aa27226751c85";

9788398042 libraryHaskellDepends = [

9788498043 array base base64-bytestring blaze-builder bytestring

9788598044 case-insensitive containers cookie deepseq exceptions filepath

@@ -102931,6 +103090,26 @@ self: {

102931103090 license = stdenv.lib.licenses.mit;

102932103091 }) {};

102933103092

103093+ "inflections_0_3_0_0" = callPackage

103094+ ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec

103095+ , megaparsec, QuickCheck, text, unordered-containers

103096+ }:

103097+ mkDerivation {

103098+ pname = "inflections";

103099+ version = "0.3.0.0";

103100+ sha256 = "0391cb804f012fb27edc9d11c45bb60412bd703b5a7ebca5ccbf776d338926f1";

103101+ libraryHaskellDepends = [

103102+ base exceptions megaparsec text unordered-containers

103103+ ];

103104+ testHaskellDepends = [

103105+ base hspec hspec-megaparsec megaparsec QuickCheck text

103106+ ];

103107+ homepage = "https://github.com/stackbuilders/inflections-hs";

103108+ description = "Inflections library for Haskell";

103109+ license = stdenv.lib.licenses.mit;

103110+ hydraPlatforms = stdenv.lib.platforms.none;

103111+ }) {};

103112+

102934103113 "inflist" = callPackage

102935103114 ({ mkDerivation, base, QuickCheck }:

102936103115 mkDerivation {

@@ -103138,8 +103317,8 @@ self: {

103138103317 }:

103139103318 mkDerivation {

103140103319 pname = "inline-java";

103141− version = "0.6";

103142− sha256 = "364c14c0003b6bdbb6338c017ff706ca2bd57dde828c801a1b588356ce15a4c1";

103320+ version = "0.6.1";

103321+ sha256 = "f722733b43839d12f936c5d2e3e8f2d33aae6752a605d4582959a7ad71ce2045";

103143103322 libraryHaskellDepends = [

103144103323 base binary bytestring Cabal containers directory

103145103324 distributed-closure filepath ghc-heap-view inline-c jni jvm

@@ -103839,6 +104018,25 @@ self: {

103839104018 license = stdenv.lib.licenses.gpl3;

103840104019 }) {};

103841104020

104021+ "intro" = callPackage

104022+ ({ mkDerivation, base, bifunctors, binary, bytestring, containers

104023+ , deepseq, dlist, extra, hashable, mtl, safe, string-conversions

104024+ , tagged, text, transformers, unordered-containers, writer-cps-mtl

104025+ }:

104026+ mkDerivation {

104027+ pname = "intro";

104028+ version = "0.0.2.0";

104029+ sha256 = "21cab2d2d744ace03a892f06970db52f9f12294b9e04aa8dfca1c91d3ccef1c4";

104030+ libraryHaskellDepends = [

104031+ base bifunctors binary bytestring containers deepseq dlist extra

104032+ hashable mtl safe string-conversions tagged text transformers

104033+ unordered-containers writer-cps-mtl

104034+ ];

104035+ homepage = "https://github.com/minad/intro#readme";

104036+ description = "Total Prelude with Text and Monad transformers";

104037+ license = stdenv.lib.licenses.mit;

104038+ }) {};

104039+

103842104040 "introduction" = callPackage

103843104041 ({ mkDerivation, async, base, bytestring, containers, deepseq

103844104042 , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl

@@ -104277,6 +104475,21 @@ self: {

104277104475 license = stdenv.lib.licenses.bsd3;

104278104476 }) {};

104279104477

104478+ "ip6addr_0_5_2" = callPackage

104479+ ({ mkDerivation, base, cmdargs, IPv6Addr, text }:

104480+ mkDerivation {

104481+ pname = "ip6addr";

104482+ version = "0.5.2";

104483+ sha256 = "ad460bf7d2765aa050968154188ba51a1b8483b6a27b179042528058b0e9549f";

104484+ isLibrary = false;

104485+ isExecutable = true;

104486+ executableHaskellDepends = [ base cmdargs IPv6Addr text ];

104487+ homepage = "https://github.com/MichelBoucey/ip6addr";

104488+ description = "Commandline tool to generate IPv6 address text representations";

104489+ license = stdenv.lib.licenses.bsd3;

104490+ hydraPlatforms = stdenv.lib.platforms.none;

104491+ }) {};

104492+

104280104493 "ipatch" = callPackage

104281104494 ({ mkDerivation, base, bytestring, darcs, directory, filepath

104282104495 , hashed-storage, process, unix

@@ -106050,8 +106263,8 @@ self: {

106050106263 }:

106051106264 mkDerivation {

106052106265 pname = "jni";

106053− version = "0.2";

106054− sha256 = "f98f57417cc015219446f2439c543dc0accd45a4bfdd87004c4c5be1b0b862bf";

106266+ version = "0.2.2";

106267+ sha256 = "67c1dc21d8f8a3d85e7b4ced2834d1bac4857e9102bb39f3c9d78618c1e72ea4";

106055106268 libraryHaskellDepends = [

106056106269 base bytestring containers inline-c singletons thread-local-storage

106057106270 ];

@@ -106231,6 +106444,29 @@ self: {

106231106444 license = stdenv.lib.licenses.bsd3;

106232106445 }) {};

106233106446

106447+ "jose-jwt_0_7_4" = callPackage

106448+ ({ mkDerivation, aeson, base, bytestring, cereal, containers

106449+ , cryptonite, doctest, either, hspec, HUnit, memory, mtl

106450+ , QuickCheck, text, time, unordered-containers, vector

106451+ }:

106452+ mkDerivation {

106453+ pname = "jose-jwt";

106454+ version = "0.7.4";

106455+ sha256 = "747088658aee2b57bce8dc27fa921f9c4181f2f01677dde9a4c17de18bd3febd";

106456+ libraryHaskellDepends = [

106457+ aeson base bytestring cereal containers cryptonite either memory

106458+ mtl text time unordered-containers vector

106459+ ];

106460+ testHaskellDepends = [

106461+ aeson base bytestring cryptonite doctest either hspec HUnit memory

106462+ mtl QuickCheck text unordered-containers vector

106463+ ];

106464+ homepage = "http://github.com/tekul/jose-jwt";

106465+ description = "JSON Object Signing and Encryption Library";

106466+ license = stdenv.lib.licenses.bsd3;

106467+ hydraPlatforms = stdenv.lib.platforms.none;

106468+ }) {};

106469+

106234106470 "jpeg" = callPackage

106235106471 ({ mkDerivation, base, mtl }:

106236106472 mkDerivation {

@@ -106308,8 +106544,8 @@ self: {

106308106544 }:

106309106545 mkDerivation {

106310106546 pname = "jsaddle-dom";

106311− version = "0.7.0.3";

106312− sha256 = "3ee57a6d2640833a511ac1b0aadbfa46bd0be09efabde9bb5e32ddb6d330a2df";

106547+ version = "0.7.1.0";

106548+ sha256 = "e93ea7dccd9aa640226a162fb6674b0c71c7acebf0ce9b85d76b0d388f06d53a";

106313106549 libraryHaskellDepends = [

106314106550 base base-compat jsaddle lens text transformers

106315106551 ];

@@ -107396,6 +107632,25 @@ self: {

107396107632 license = stdenv.lib.licenses.bsd3;

107397107633 }) {};

107398107634

107635+ "jvm-streaming" = callPackage

107636+ ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni

107637+ , jvm, singletons, streaming

107638+ }:

107639+ mkDerivation {

107640+ pname = "jvm-streaming";

107641+ version = "0.1";

107642+ sha256 = "45788461c552dc2cdcbbe389f3783c67942341e38fa7ba17bd0a906db573d256";

107643+ revision = "1";

107644+ editedCabalFile = "f0e204ab4b6d0a8aedb7105800727d22a990a4761787d5abfaa70d016832b184";

107645+ libraryHaskellDepends = [

107646+ base distributed-closure inline-java jni jvm singletons streaming

107647+ ];

107648+ testHaskellDepends = [ base hspec inline-java jvm streaming ];

107649+ homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme";

107650+ description = "Expose Java iterators as streams from the streaming package";

107651+ license = stdenv.lib.licenses.bsd3;

107652+ }) {};

107653+

107399107654 "jwt" = callPackage

107400107655 ({ mkDerivation, aeson, base, bytestring, containers, cryptonite

107401107656 , data-default, doctest, http-types, HUnit, lens, lens-aeson

@@ -111712,22 +111967,21 @@ self: {

111712111967

111713111968 "legion" = callPackage

111714111969 ({ mkDerivation, aeson, attoparsec, base, binary, binary-conduit

111715− , bytestring, canteven-http, canteven-log, conduit, conduit-extra

111716− , containers, data-default-class, data-dword, directory, exceptions

111717− , http-types, monad-logger, network, Ranged-sets, scotty

111718− , scotty-resource, stm, text, time, transformers, unix, uuid, wai

111719− , wai-extra, warp

111970+ , bytestring, canteven-http, conduit, conduit-extra, containers

111971+ , data-default-class, data-dword, directory, exceptions, http-types

111972+ , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm

111973+ , text, transformers, unix, uuid, wai, wai-extra, warp

111720111974 }:

111721111975 mkDerivation {

111722111976 pname = "legion";

111723− version = "0.7.0.0";

111724− sha256 = "c2dddc486653344bfe1c5c38c279f5fe8800f725d8778d8df4ef25856d6aed27";

111977+ version = "0.8.0.1";

111978+ sha256 = "5756a0ca948e17db7d6d5a904e2e444c9f0e74108e2a5ed139453a650e84f7f7";

111725111979 libraryHaskellDepends = [

111726111980 aeson attoparsec base binary binary-conduit bytestring

111727− canteven-http canteven-log conduit conduit-extra containers

111728− data-default-class data-dword directory exceptions http-types

111729− monad-logger network Ranged-sets scotty scotty-resource stm text

111730− time transformers unix uuid wai wai-extra warp

111981+ canteven-http conduit conduit-extra containers data-default-class

111982+ data-dword directory exceptions http-types monad-logger network

111983+ Ranged-sets scotty scotty-resource stm text transformers unix uuid

111984+ wai wai-extra warp

111731111985 ];

111732111986 homepage = "https://github.com/owensmurray/legion#readme";

111733111987 description = "Distributed, stateful, homogeneous microservice framework";

@@ -111736,23 +111990,23 @@ self: {

111736111990 }) {};

111737111991

111738111992 "legion-discovery" = callPackage

111739− ({ mkDerivation, aeson, base, binary, bytestring, Cabal

111993+ ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal

111740111994 , canteven-http, canteven-log, conduit, containers

111741− , data-default-class, http-types, legion, legion-extra

111742− , monad-logger, scotty, scotty-resource, SHA, text, time

111743− , transformers, wai, wai-extra, warp

111995+ , data-default-class, graphviz, http-types, legion, legion-extra

111996+ , monad-logger, scotty, scotty-format, scotty-resource, SHA, text

111997+ , time, transformers, wai, wai-extra, warp

111744111998 }:

111745111999 mkDerivation {

111746112000 pname = "legion-discovery";

111747− version = "0.2.1.1";

111748− sha256 = "9ecb4471cf9a52fd973d95c356d35542e4b12306eb7078f43e4a279d0c478131";

112001+ version = "0.2.2.1";

112002+ sha256 = "5338e9ffb14ced8f1ec8bde7c9138e769ef643da8930937fc79cdbac970d6096";

111749112003 isLibrary = true;

111750112004 isExecutable = true;

111751112005 libraryHaskellDepends = [

111752− aeson base binary bytestring Cabal canteven-http canteven-log

111753− conduit containers data-default-class http-types legion

111754− legion-extra monad-logger scotty scotty-resource SHA text time

111755− transformers wai wai-extra warp

112006+ aeson attoparsec base binary bytestring Cabal canteven-http

112007+ canteven-log conduit containers data-default-class graphviz

112008+ http-types legion legion-extra monad-logger scotty scotty-format

112009+ scotty-resource SHA text time transformers wai wai-extra warp

111756112010 ];

111757112011 executableHaskellDepends = [ base ];

111758112012 testHaskellDepends = [ base ];

@@ -111769,8 +112023,8 @@ self: {

111769112023 }:

111770112024 mkDerivation {

111771112025 pname = "legion-discovery-client";

111772− version = "0.1.0.1";

111773− sha256 = "6235b5f23411bfe0807274e4e31b5e9f805045b214f63a2cfbefed29d9fe27f1";

112026+ version = "0.1.0.2";

112027+ sha256 = "d9f8b1f24d90b3711ec81555c21e722280bcb59914c2341bb89e21f9b699dd5d";

111774112028 libraryHaskellDepends = [

111775112029 aeson base bytestring Cabal containers data-default-class

111776112030 http-client http-types load-balancing network text

@@ -111787,8 +112041,8 @@ self: {

111787112041 }:

111788112042 mkDerivation {

111789112043 pname = "legion-extra";

111790− version = "0.1.0.5";

111791− sha256 = "f61dc20ac3380725dbf34b934623131c37c4072f081d6d649ffb2a6d4be007f6";

112044+ version = "0.1.0.6";

112045+ sha256 = "e9471ff2b1d50596bbe86fd414e78bcd31aa78b867ac3439fddd58e21d24c0c5";

111792112046 libraryHaskellDepends = [

111793112047 aeson base bytestring canteven-log containers data-default-class

111794112048 legion network safe split yaml

@@ -112247,8 +112501,8 @@ self: {

112247112501 }:

112248112502 mkDerivation {

112249112503 pname = "lentil";

112250− version = "1.0.4.0";

112251− sha256 = "e990aad8168d8e106ef35a0e8dc1fc707d467dfd87db8127f8ec568a47100f8b";

112504+ version = "1.0.6.0";

112505+ sha256 = "9a55ddd34f6e41ba274fa1b303262dc883868ffcb0e24810b432441e5ebe220a";

112252112506 isLibrary = false;

112253112507 isExecutable = true;

112254112508 executableHaskellDepends = [

@@ -127810,8 +128064,8 @@ self: {

127810128064 ({ mkDerivation, async, base, bytestring, template-haskell, unix }:

127811128065 mkDerivation {

127812128066 pname = "ngx-export";

127813− version = "0.2.5.0";

127814− sha256 = "160e9f29ddc659a39c96de3971de7086528f608e372912a3f4e5b5f11a94590b";

128067+ version = "0.2.5.1";

128068+ sha256 = "d61e25c00736a33cd5f16555751047fb5e1d79cdc606622f4cba400c6f3df008";

127815128069 libraryHaskellDepends = [

127816128070 async base bytestring template-haskell unix

127817128071 ];

@@ -128777,22 +129031,20 @@ self: {

128777129031 }) {};

128778129032

128779129033 "numerals" = callPackage

128780− ({ mkDerivation, base, base-unicode-symbols, containers

128781− , containers-unicode-symbols, fingertree, HUnit, integer-gmp

129034+ ({ mkDerivation, base, containers, fingertree, HUnit, integer-gmp

128782129035 , QuickCheck, test-framework, test-framework-hunit

128783129036 , test-framework-quickcheck2, text

128784129037 }:

128785129038 mkDerivation {

128786129039 pname = "numerals";

128787− version = "0.4";

128788− sha256 = "15139b63ec44ce2c308176c96184b3b2d94537f64298a1e128c32e641ca77dba";

129040+ version = "0.4.1";

129041+ sha256 = "d2a46b9535bd57ed386adad95e145da4c3e72f595328ebd61302e3887583e1d2";

128789129042 libraryHaskellDepends = [

128790− base base-unicode-symbols containers containers-unicode-symbols

128791− fingertree integer-gmp text

129043+ base containers fingertree integer-gmp text

128792129044 ];

128793129045 testHaskellDepends = [

128794− base base-unicode-symbols HUnit integer-gmp QuickCheck

128795− test-framework test-framework-hunit test-framework-quickcheck2 text

129046+ base HUnit QuickCheck test-framework test-framework-hunit

129047+ test-framework-quickcheck2 text

128796129048 ];

128797129049 homepage = "https://github.com/roelvandijk/numerals";

128798129050 description = "Convert numbers to number words";

@@ -129073,6 +129325,23 @@ self: {

129073129325 hydraPlatforms = stdenv.lib.platforms.none;

129074129326 }) {};

129075129327

129328+ "nvim-hs-ghcid" = callPackage

129329+ ({ mkDerivation, base, bytestring, containers, directory, filepath

129330+ , ghcid, nvim-hs, nvim-hs-contrib, resourcet, yaml

129331+ }:

129332+ mkDerivation {

129333+ pname = "nvim-hs-ghcid";

129334+ version = "0.1.0";

129335+ sha256 = "c0f900633873759e49a08be61d8c91c1507f95b2e108d39d1d517adf9adc7bde";

129336+ libraryHaskellDepends = [

129337+ base bytestring containers directory filepath ghcid nvim-hs

129338+ nvim-hs-contrib resourcet yaml

129339+ ];

129340+ homepage = "https://github.com/saep/nvim-hs-ghcid";

129341+ description = "Neovim plugin that runs ghcid to update the quickfix list";

129342+ license = stdenv.lib.licenses.asl20;

129343+ }) {};

129344+

129076129345 "nvvm" = callPackage

129077129346 ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory

129078129347 , filepath, template-haskell

@@ -131293,10 +131562,8 @@ self: {

131293131562 ({ mkDerivation, base, containers }:

131294131563 mkDerivation {

131295131564 pname = "ordered-containers";

131296− version = "0.0";

131297− sha256 = "ea40528ec95f2424bd7231da44b9d96a80b46b4116b2cdfbb57269c88f2419cb";

131298− revision = "1";

131299− editedCabalFile = "a8de69537c43ab967f7f512466a5a0e32000e9179239b4c10adf3cd3cfd1e524";

131565+ version = "0.1.0";

131566+ sha256 = "cb089747cfffd5affedcd08a7e7fed02e5dd90defb513e84440b76f307f35587";

131300131567 libraryHaskellDepends = [ base containers ];

131301131568 description = "Set- and Map-like types that remember the order elements were inserted";

131302131569 license = stdenv.lib.licenses.bsd3;

@@ -133487,8 +133754,8 @@ self: {

133487133754 }:

133488133755 mkDerivation {

133489133756 pname = "patat";

133490− version = "0.4.5.0";

133491− sha256 = "d60fb0d72ad518e3f3cf49fe6576ad5f2c1f371d75884394791fe2dcf417c5c9";

133757+ version = "0.4.6.0";

133758+ sha256 = "166d22f0e1cc2c3e965b84556c07a8ce51537b36aa5ff07d7fd4893a5bcdfd01";

133492133759 isLibrary = false;

133493133760 isExecutable = true;

133494133761 executableHaskellDepends = [

@@ -136265,6 +136532,21 @@ self: {

136265136532 hydraPlatforms = stdenv.lib.platforms.none;

136266136533 }) {};

136267136534

136535+ "pipes-cacophony_0_4_1" = callPackage

136536+ ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes

136537+ }:

136538+ mkDerivation {

136539+ pname = "pipes-cacophony";

136540+ version = "0.4.1";

136541+ sha256 = "bcf15287c4ae951ed12e83c41795dfe212b87cc9b93420dc74783b44e54c5360";

136542+ libraryHaskellDepends = [ base bytestring cacophony memory pipes ];

136543+ testHaskellDepends = [ base hlint ];

136544+ homepage = "https://github.com/centromere/pipes-cacophony";

136545+ description = "Pipes for Noise-secured network connections";

136546+ license = stdenv.lib.licenses.publicDomain;

136547+ hydraPlatforms = stdenv.lib.platforms.none;

136548+ }) {};

136549+

136268136550 "pipes-cellular" = callPackage

136269136551 ({ mkDerivation, base, bytestring, data-cell, pipes }:

136270136552 mkDerivation {

@@ -139463,8 +139745,8 @@ self: {

139463139745 }:

139464139746 mkDerivation {

139465139747 pname = "praglude";

139466− version = "0.2.1.0";

139467− sha256 = "6d0a637bccc13464149d75482e61ed8f10caf93d721d43f49e583032aad6d776";

139748+ version = "0.3.0.0";

139749+ sha256 = "8c5c2cdbff18b89b61b28680d92ad9c8204abcf9ef264b5b4622f1ee21f744da";

139468139750 libraryHaskellDepends = [

139469139751 aeson base base64-bytestring bytestring casing containers

139470139752 data-default deepseq directory filepath hashable lens mtl random

@@ -139480,18 +139762,18 @@ self: {

139480139762 ({ mkDerivation, aeson, base, basic-prelude, exceptions

139481139763 , fast-logger, lens, monad-control, monad-logger, mtl, resourcet

139482139764 , safe, shakers, template-haskell, text, text-manipulate, time

139483− , transformers-base, unordered-containers

139765+ , transformers-base, unordered-containers, uuid

139484139766 }:

139485139767 mkDerivation {

139486139768 pname = "preamble";

139487− version = "0.0.8";

139488− sha256 = "2827df5cd7df280b1ca9092e0a17b585341f758ec91d490be7287483f623b374";

139769+ version = "0.0.13";

139770+ sha256 = "12d47c88d2ea714d58cd4527fb2826d49e2b5d49bc3d8dda8f6fd52bd4dd830a";

139489139771 isLibrary = true;

139490139772 isExecutable = true;

139491139773 libraryHaskellDepends = [

139492139774 aeson base basic-prelude exceptions fast-logger lens monad-control

139493139775 monad-logger mtl resourcet safe template-haskell text

139494− text-manipulate time transformers-base unordered-containers

139776+ text-manipulate time transformers-base unordered-containers uuid

139495139777 ];

139496139778 executableHaskellDepends = [ base shakers ];

139497139779 homepage = "https://github.com/swift-nav/preamble";

@@ -142331,6 +142613,8 @@ self: {

142331142613 pname = "purescript";

142332142614 version = "0.10.3";

142333142615 sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2";

142616+ revision = "2";

142617+ editedCabalFile = "cd4a6818028652cb5c630372f872072197ef5822edf1814eaf8cd672c75683b7";

142334142618 isLibrary = true;

142335142619 isExecutable = true;

142336142620 libraryHaskellDepends = [

@@ -146685,6 +146969,18 @@ self: {

146685146969 license = stdenv.lib.licenses.bsd3;

146686146970 }) {};

146687146971

146972+ "refresht" = callPackage

146973+ ({ mkDerivation, base, data-default, exceptions, lens, mtl }:

146974+ mkDerivation {

146975+ pname = "refresht";

146976+ version = "0.1.0.1";

146977+ sha256 = "5c910830cc9ee1272602d84ef8545f31120bf456205d18553e2e7cb8fc9c223e";

146978+ libraryHaskellDepends = [ base data-default exceptions lens mtl ];

146979+ homepage = "https://github.com/konn/refresht#readme";

146980+ description = "Environment Monad with automatic resource refreshment";

146981+ license = stdenv.lib.licenses.bsd3;

146982+ }) {};

146983+

146688146984 "regex-applicative" = callPackage

146689146985 ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit

146690146986 , tasty-smallcheck, transformers

@@ -146789,10 +147085,8 @@ self: {

146789147085 }:

146790147086 mkDerivation {

146791147087 pname = "regex-do";

146792− version = "3.1";

146793− sha256 = "487ab5968208a0d7ad7b37016145e4a864dc35ae36976ea77328ae3d6b9d590b";

146794− revision = "3";

146795− editedCabalFile = "ca32ec1c90923370783cfe79bbdae877f4f98f8e816a32dde618874842c2f178";

147088+ version = "3.2";

147089+ sha256 = "a7e8a864ee66c2a37fbf4574153dd42ee727283f8f5d0d142f7946172131977b";

146796147090 libraryHaskellDepends = [

146797147091 array base bytestring regex-base regex-pcre stringsearch tagged

146798147092 text

@@ -148481,6 +148775,24 @@ self: {

148481148775 hydraPlatforms = stdenv.lib.platforms.none;

148482148776 }) {};

148483148777

148778+ "resolve" = callPackage

148779+ ({ mkDerivation, attoparsec, attoparsec-binary, base, bv

148780+ , bytestring, hashable, hashmap, hslogger, iproute, network, parsec

148781+ , stm, stm-containers, transformers

148782+ }:

148783+ mkDerivation {

148784+ pname = "resolve";

148785+ version = "0.1.0.0";

148786+ sha256 = "4c011446e1cd2865abbcb3d4979f6bbd65d5bd4f54d11819b5a5777cb4b6aa39";

148787+ libraryHaskellDepends = [

148788+ attoparsec attoparsec-binary base bv bytestring hashable hashmap

148789+ hslogger iproute network parsec stm stm-containers transformers

148790+ ];

148791+ homepage = "https://github.com/riaqn/resolve#readme";

148792+ description = "A name resolusion library";

148793+ license = stdenv.lib.licenses.bsd3;

148794+ }) {};

148795+

148484148796 "resolve-trivial-conflicts" = callPackage

148485148797 ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory

148486148798 , filepath, mtl, optparse-applicative, process, unix

@@ -151134,6 +151446,27 @@ self: {

151134151446 hydraPlatforms = stdenv.lib.platforms.none;

151135151447 }) {};

151136151448

151449+ "safe-money" = callPackage

151450+ ({ mkDerivation, aeson, base, binary, bytestring, cereal

151451+ , constraints, deepseq, hashable, store, tasty, tasty-hunit

151452+ , tasty-quickcheck

151453+ }:

151454+ mkDerivation {

151455+ pname = "safe-money";

151456+ version = "0.2";

151457+ sha256 = "c328e6c36589ad133c8172ce82e64103ad1efd475b311b65a1e7e708dd651636";

151458+ libraryHaskellDepends = [

151459+ aeson base binary cereal constraints deepseq hashable store

151460+ ];

151461+ testHaskellDepends = [

151462+ aeson base binary bytestring cereal constraints deepseq hashable

151463+ store tasty tasty-hunit tasty-quickcheck

151464+ ];

151465+ homepage = "https://github.com/k0001/safe-money";

151466+ description = "Type-safe and lossless encoding and manipulation of money, world currencies and precious metals";

151467+ license = stdenv.lib.licenses.bsd3;

151468+ }) {};

151469+

151137151470 "safe-plugins" = callPackage

151138151471 ({ mkDerivation, base, directory, filepath, haskell-src-exts

151139151472 , plugins, Unixutils

@@ -152725,10 +153058,8 @@ self: {

152725153058 }:

152726153059 mkDerivation {

152727153060 pname = "scotty-format";

152728− version = "0.1.0.2";

152729− sha256 = "848a326a18445c1c7f39a7aa5a46d3f042c2e9abfd1ef8f972751f51b4c00968";

152730− revision = "1";

152731− editedCabalFile = "64c796f66dd445224f06820feec9d91717a1de9d2d24d993d5db1d6021240d32";

153061+ version = "0.1.1.0";

153062+ sha256 = "cb6da220c05c95b8deb0fb8cc1505447d462456dbb36bfacee6467d8207f3599";

152732153063 isLibrary = true;

152733153064 isExecutable = true;

152734153065 libraryHaskellDepends = [ base http-media http-types scotty text ];

@@ -156546,6 +156877,33 @@ self: {

156546156877 maintainers = with stdenv.lib.maintainers; [ psibi ];

156547156878 }) {};

156548156879

156880+ "shakespeare_2_0_12_1" = callPackage

156881+ ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring

156882+ , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec

156883+ , process, scientific, template-haskell, text, time, transformers

156884+ , unordered-containers, vector

156885+ }:

156886+ mkDerivation {

156887+ pname = "shakespeare";

156888+ version = "2.0.12.1";

156889+ sha256 = "057d7153a19a4f28a012f30b5d54b9e1296695ff94ccdfa23c28fa82bd3488ac";

156890+ libraryHaskellDepends = [

156891+ aeson base blaze-html blaze-markup bytestring containers directory

156892+ exceptions ghc-prim parsec process scientific template-haskell text

156893+ time transformers unordered-containers vector

156894+ ];

156895+ testHaskellDepends = [

156896+ aeson base blaze-html blaze-markup bytestring containers directory

156897+ exceptions ghc-prim hspec HUnit parsec process template-haskell

156898+ text time transformers

156899+ ];

156900+ homepage = "http://www.yesodweb.com/book/shakespearean-templates";

156901+ description = "A toolkit for making compile-time interpolated templates";

156902+ license = stdenv.lib.licenses.mit;

156903+ hydraPlatforms = stdenv.lib.platforms.none;

156904+ maintainers = with stdenv.lib.maintainers; [ psibi ];

156905+ }) {};

156906+

156549156907 "shakespeare-babel" = callPackage

156550156908 ({ mkDerivation, base, classy-prelude, data-default, directory

156551156909 , process, shakespeare, template-haskell

@@ -157152,6 +157510,18 @@ self: {

157152157510 license = "GPL";

157153157511 }) {};

157154157512

157513+ "show-please" = callPackage

157514+ ({ mkDerivation, base, mtl, parsec, template-haskell }:

157515+ mkDerivation {

157516+ pname = "show-please";

157517+ version = "0.3";

157518+ sha256 = "1abd203bf8f0ac863f38f1be813594e0ab30ad5b79aa31730926586c40db642e";

157519+ libraryHaskellDepends = [ base mtl parsec template-haskell ];

157520+ homepage = "https://github.com/ddssff/show-please";

157521+ description = "A wrapper type V with improved Show instances";

157522+ license = stdenv.lib.licenses.bsd3;

157523+ }) {};

157524+

157155157525 "show-prettyprint" = callPackage

157156157526 ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }:

157157157527 mkDerivation {

@@ -163209,8 +163579,8 @@ self: {

163209163579 }:

163210163580 mkDerivation {

163211163581 pname = "stack";

163212− version = "1.3.0";

163213− sha256 = "060ed345ee724b916427430004548c519eb0219242a019ee06c8afd9a793497b";

163582+ version = "1.3.2";

163583+ sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7";

163214163584 isLibrary = true;

163215163585 isExecutable = true;

163216163586 libraryHaskellDepends = [

@@ -165279,6 +165649,29 @@ self: {

165279165649 license = stdenv.lib.licenses.bsd3;

165280165650 }) {};

165281165651

165652+ "streaming-bytestring_0_1_4_5" = callPackage

165653+ ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl

165654+ , resourcet, smallcheck, streaming, tasty, tasty-smallcheck

165655+ , transformers, transformers-base

165656+ }:

165657+ mkDerivation {

165658+ pname = "streaming-bytestring";

165659+ version = "0.1.4.5";

165660+ sha256 = "e77047f4027ac7dc4128fdbf651c8a288dab34e580c944bd8eef23e5a236d84e";

165661+ libraryHaskellDepends = [

165662+ base bytestring deepseq exceptions mmorph mtl resourcet streaming

165663+ transformers transformers-base

165664+ ];

165665+ testHaskellDepends = [

165666+ base bytestring smallcheck streaming tasty tasty-smallcheck

165667+ transformers

165668+ ];

165669+ homepage = "https://github.com/michaelt/streaming-bytestring";

165670+ description = "effectful byte steams, or: bytestring io done right";

165671+ license = stdenv.lib.licenses.bsd3;

165672+ hydraPlatforms = stdenv.lib.platforms.none;

165673+ }) {};

165674+

165282165675 "streaming-commons" = callPackage

165283165676 ({ mkDerivation, array, async, base, blaze-builder, bytestring

165284165677 , deepseq, directory, hspec, network, process, QuickCheck, random

@@ -169811,8 +170204,8 @@ self: {

169811170204 }:

169812170205 mkDerivation {

169813170206 pname = "telegram-bot";

169814− version = "0.5.1.0";

169815− sha256 = "525fc12654179fa7c57ae062741bb236f5821dc1b5c0c8b9a5c62946d8817fd3";

170207+ version = "0.5.4.0";

170208+ sha256 = "a163600c8b5bca5b545f7701d14165961ce499263e3a27dac8acdca3fe29b072";

169816170209 isLibrary = true;

169817170210 isExecutable = true;

169818170211 libraryHaskellDepends = [

@@ -171457,8 +171850,8 @@ self: {

171457171850 }:

171458171851 mkDerivation {

171459171852 pname = "text-printer";

171460− version = "0.4";

171461− sha256 = "b878db9dfb786368324c35cb3e1070264eaa6b1d0f1459bf1581114bfbeb9149";

171853+ version = "0.5";

171854+ sha256 = "8f0c01a6a15b4314c2d47ab5f0772d176ec38f1c1fe190b9fa7db5149a6c4a0b";

171462171855 libraryHaskellDepends = [

171463171856 base bytestring pretty semigroups text text-latin1

171464171857 ];

@@ -171782,8 +172175,8 @@ self: {

171782172175 }:

171783172176 mkDerivation {

171784172177 pname = "textlocal";

171785− version = "0.1.0.3";

171786− sha256 = "56237c4982513680358a13d5bba261e55ce4ec2346e402b8ba438f7a11d06e1c";

172178+ version = "0.1.0.5";

172179+ sha256 = "8954ff6270c9920fc390be6b9f398975ea06dd6808a411cbf8fa5fb4a9cf3087";

171787172180 libraryHaskellDepends = [

171788172181 aeson base bytestring http-client http-client-tls http-conduit text

171789172182 unix-time

@@ -173413,42 +173806,50 @@ self: {

173413173806 }) {};

173414173807

173415173808 "time-warp" = callPackage

173416− ({ mkDerivation, ansi-terminal, async, base, bytestring, containers

173417− , data-default, data-msgpack, exceptions, formatting, hslogger

173418− , hspec, lens, lifted-base, monad-control, monad-loops, MonadRandom

173419− , mtl, network-msgpack-rpc, pqueue, QuickCheck

173420− , quickcheck-instances, random, safe, serokell-util, stm

173421− , template-haskell, text, text-format, time, time-units

173422− , transformers, transformers-base

173809+ ({ mkDerivation, ansi-terminal, array, async, attoparsec, base

173810+ , binary, binary-conduit, bytestring, conduit, conduit-extra

173811+ , containers, data-default, data-msgpack, deepseq, exceptions

173812+ , extra, formatting, hashable, hspec, lens, lifted-base, log-warper

173813+ , mmorph, monad-control, monad-loops, MonadRandom, mtl, network

173814+ , pqueue, QuickCheck, quickcheck-instances, random, safe

173815+ , semigroups, serokell-util, slave-thread, stm, stm-chans

173816+ , stm-conduit, streaming-commons, template-haskell, text

173817+ , text-format, time, time-units, transformers, transformers-base

173818+ , unordered-containers

173423173819 }:

173424173820 mkDerivation {

173425173821 pname = "time-warp";

173426− version = "0.1.1.2";

173427− sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187";

173822+ version = "1.1.1.0";

173823+ sha256 = "4e9fa28d8c67801fc302a7eec2457a2dda41b556129aebf0821bc250307ded4d";

173428173824 isLibrary = true;

173429173825 isExecutable = true;

173430173826 libraryHaskellDepends = [

173431− ansi-terminal base bytestring containers data-default data-msgpack

173432− exceptions formatting hslogger lens lifted-base monad-control

173433− monad-loops MonadRandom mtl network-msgpack-rpc pqueue QuickCheck

173434− quickcheck-instances random safe serokell-util stm template-haskell

173435− text text-format time time-units transformers transformers-base

173827+ ansi-terminal array attoparsec base binary binary-conduit

173828+ bytestring conduit conduit-extra containers data-default

173829+ data-msgpack deepseq exceptions extra formatting hashable lens

173830+ lifted-base log-warper mmorph monad-control monad-loops MonadRandom

173831+ mtl network pqueue QuickCheck quickcheck-instances random safe

173832+ semigroups serokell-util slave-thread stm stm-chans stm-conduit

173833+ streaming-commons template-haskell text text-format time time-units

173834+ transformers transformers-base unordered-containers

173436173835 ];

173437173836 executableHaskellDepends = [

173438− async base data-default data-msgpack exceptions formatting hspec

173439− lens MonadRandom mtl network-msgpack-rpc QuickCheck random

173440− serokell-util stm text text-format time-units transformers

173837+ async base binary binary-conduit conduit data-default data-msgpack

173838+ exceptions formatting hspec lens log-warper MonadRandom mtl

173839+ QuickCheck random serokell-util stm text text-format time-units

173840+ transformers

173441173841 ];

173442173842 testHaskellDepends = [

173443− async base data-default data-msgpack exceptions hspec lens mtl

173444− network-msgpack-rpc QuickCheck random serokell-util stm text

173445− text-format time-units transformers

173843+ async base data-default data-msgpack exceptions hspec lens

173844+ log-warper mtl QuickCheck random serokell-util stm text text-format

173845+ time-units transformers

173446173846 ];

173447173847 homepage = "https://github.com/serokell/time-warp";

173448173848 description = "Distributed systems execution emulation";

173449− license = stdenv.lib.licenses.gpl3;

173849+ license = stdenv.lib.licenses.mit;

173450173850 hydraPlatforms = stdenv.lib.platforms.none;

173451− }) {};

173851+ broken = true;

173852+ }) {log-warper = null;};

173452173853

173453173854 "timecalc" = callPackage

173454173855 ({ mkDerivation, base, haskeline, uu-parsinglib }:

@@ -173737,8 +174138,8 @@ self: {

173737174138 }:

173738174139 mkDerivation {

173739174140 pname = "timeseries";

173740− version = "0.4.0";

173741− sha256 = "a073a252dcdb671e57a784f4b37f2009f6e0890579bf705869c572923047af51";

174141+ version = "0.4.1";

174142+ sha256 = "4e7a17717484225b904c5511152087b6ff9cb1d155fde7277b4bcc9b58c5151e";

173742174143 libraryHaskellDepends = [

173743174144 base bytestring cassava statistics text text-time time vector

173744174145 ];

@@ -173756,8 +174157,8 @@ self: {

173756174157 ({ mkDerivation, base, time }:

173757174158 mkDerivation {

173758174159 pname = "timespan";

173759− version = "0.2.0.0";

173760− sha256 = "4e6ce1f32725700c4b78ed4806d90a5ce1275dce9504f78164a454a4ef4b8fe6";

174160+ version = "0.3.0.0";

174161+ sha256 = "46a51e1e0d776d65d0094bf8158c938255491fbaa4d4f39b0a1477806312851f";

173761174162 libraryHaskellDepends = [ base time ];

173762174163 homepage = "https://github.com/agrafix/timespan#readme";

173763174164 description = "Useful timespan datatype and functions";

@@ -180573,6 +180974,8 @@ self: {

180573180974 pname = "validity";

180574180975 version = "0.3.0.4";

180575180976 sha256 = "9ae590d34aeb41f096bd7432ff8c8cb07a4da010825c0190d4ef630ef6370f7f";

180977+ revision = "1";

180978+ editedCabalFile = "73bff6370f4e90101291fb3904f388ea57013a6a45997b273b578332149a8d19";

180576180979 libraryHaskellDepends = [ base ];

180577180980 homepage = "https://github.com/NorfairKing/validity#readme";

180578180981 description = "Validity typeclass";

@@ -183984,8 +184387,8 @@ self: {

183984184387 }:

183985184388 mkDerivation {

183986184389 pname = "wave";

183987− version = "0.1.1";

183988− sha256 = "13d5475356efc3ae95c971e930d5e4bf18f9395dc1bd7b63e8bb8e7ed26ddf23";

184390+ version = "0.1.2";

184391+ sha256 = "930d16bc03779c42bdf117ba2a2ac30b3ab08f9d214d9ca52526150d9eec07e3";

183989184392 libraryHaskellDepends = [

183990184393 base bytestring cereal containers data-default-class transformers

183991184394 ];

@@ -185744,8 +186147,8 @@ self: {

185744186147 }:

185745186148 mkDerivation {

185746186149 pname = "wolf";

185747− version = "0.3.3";

185748− sha256 = "2982a25dbdb4bcbfe563cc49f1bae58d8b837014ad28365eb09405222165f311";

186150+ version = "0.3.4";

186151+ sha256 = "8d22d044f67a1edf37cbb59cc3226585dcaa15f1c2b83696d7e191d50053aea2";

185749186152 isLibrary = true;

185750186153 isExecutable = true;

185751186154 libraryHaskellDepends = [

@@ -192293,6 +192696,31 @@ self: {

192293192696 license = stdenv.lib.licenses.bsd3;

192294192697 }) {};

192295192698

192699+ "zip_0_1_5" = callPackage

192700+ ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive

192701+ , cereal, conduit, conduit-extra, containers, digest, exceptions

192702+ , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck

192703+ , resourcet, text, time, transformers

192704+ }:

192705+ mkDerivation {

192706+ pname = "zip";

192707+ version = "0.1.5";

192708+ sha256 = "92ea1f4b28f89f77e065046095f0d7c1fedadef402ccd4f04ee09bac68556974";

192709+ libraryHaskellDepends = [

192710+ base bytestring bzlib-conduit case-insensitive cereal conduit

192711+ conduit-extra containers digest exceptions filepath mtl path

192712+ path-io plan-b resourcet text time transformers

192713+ ];

192714+ testHaskellDepends = [

192715+ base bytestring conduit containers exceptions filepath hspec path

192716+ path-io QuickCheck text time transformers

192717+ ];

192718+ homepage = "https://github.com/mrkkrp/zip";

192719+ description = "Operations on zip archives";

192720+ license = stdenv.lib.licenses.bsd3;

192721+ hydraPlatforms = stdenv.lib.platforms.none;

192722+ }) {};

192723+

192296192724 "zip-archive" = callPackage

192297192725 ({ mkDerivation, array, base, binary, bytestring, containers

192298192726 , digest, directory, filepath, HUnit, mtl, old-time, pretty

pkgs/development/interpreters/ruby/default.nix+10−1

@@ -113,6 +113,7 @@ let

113113

114114 configureFlags = ["--enable-shared" "--enable-pthread"]

115115 ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby"

116+ ++ op (!docSupport) "--disable-install-doc"

116117 ++ ops stdenv.isDarwin [

117118 # on darwin, we have /usr/include/tk.h -- so the configure script detects

118119 # that tk is installed

@@ -154,7 +155,7 @@ let

154155 license = stdenv.lib.licenses.ruby;

155156 homepage = http://www.ruby-lang.org/en/;

156157 description = "The Ruby language";

157− maintainers = [ stdenv.lib.maintainers.vrthra ];

158+ maintainers = with stdenv.lib.maintainers; [ vrthra manveru ];

158159 platforms = stdenv.lib.platforms.all;

159160 };

160161

@@ -218,4 +219,12 @@ in {

218219 git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6";

219220 };

220221 };

222+

223+ ruby_2_4_0 = generic {

224+ version = rubyVersion "2" "4" "0" "";

225+ sha256 = {

226+ src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm";

227+ git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3";

228+ };

229+ };

221230}

pkgs/development/interpreters/ruby/patchsets.nix+5

@@ -65,4 +65,9 @@ rec {

6565 "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"

6666 "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"

6767 ];

68+ "2.4.0" = ops useRailsExpress [

69+ "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch"

70+ "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch"

71+ "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch"

72+ ];

6873}

pkgs/development/interpreters/ruby/rvm-patchsets.nix+3−3

@@ -1,8 +1,8 @@

11{ fetchFromGitHub }:

33fetchFromGitHub {

4− owner = "skaes";

4+ owner = "manveru";

55 repo = "rvm-patchsets";

6− rev = "951e47ca1022cd1e41de9177fa87438cfb72d127";

7− sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf";

6+ rev = "46e04f230ce91a786f5e583389443efec0ecd594";

7+ sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693";

88}

pkgs/development/libraries/botan/default.nix+5−2

@@ -2,7 +2,10 @@

33callPackage ./generic.nix (args // {

44 baseVersion = "1.10";

5− revision = "13";

6− sha256 = "144vl65z7bys43sxgb09mbisyf2nmh49wh0d957y0ksa9cyrgv13";

5+ revision = "14";

6+ sha256 = "072czy26vfjcqjww4qccsd29fzkb6mb8czamr4x76rdi9lwhpv8h";

77 extraConfigureFlags = "--with-gnump";

8+ postPatch = ''

9+ sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt

10+ '';

811})

pkgs/development/libraries/botan/unstable.nix+2−2

@@ -2,8 +2,8 @@

33callPackage ./generic.nix (args // {

44 baseVersion = "1.11";

5− revision = "32";

6− sha256 = "0b4wgqyv6accsdh7fgr9as34r38f8r9024i6s3vhah6wiah7kddn";

5+ revision = "34";

6+ sha256 = "05hzffp0dxac7414a84z0fgv980cnfx55ch2y4vpg5nvin7m9bar";

77 openssl = null;

88 postPatch = "sed '1i#include <cmath>' -i src/tests/test_bigint.cpp";

99})

pkgs/development/libraries/gdk-pixbuf/default.nix+12−6

@@ -3,18 +3,17 @@

44let

55 ver_maj = "2.36";

6− ver_min = "0";

6+ ver_min = "2";

77in

88stdenv.mkDerivation rec {

99 name = "gdk-pixbuf-${ver_maj}.${ver_min}";

1010

1111 src = fetchurl {

1212 url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";

13− sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c";

13+ sha256 = "3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d";

1414 };

1515

1616 outputs = [ "out" "dev" "devdoc" ];

17− outputBin = "dev";

1817

1918 setupHook = ./setup-hook.sh;

2019

@@ -27,14 +26,21 @@ stdenv.mkDerivation rec {

2726

2827 propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];

2928

29+ configureFlags = "--with-libjasper --with-x11"

30+ + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"

31+ ;

32+

3033 # on darwin, tests don't link

3134 preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''

3235 substituteInPlace Makefile --replace "docs tests" "docs"

3336 '';

3437

35− configureFlags = "--with-libjasper --with-x11"

36− + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"

37− ;

38+ postInstall =

39+ # All except one utility seem to be only useful during building.

40+ ''

41+ moveToOutput "bin" "$dev"

42+ moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"

43+ '';

3844

3945 # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).

4046 inherit (doCheck);

pkgs/development/libraries/gtk+/2.x.nix+7−3

@@ -38,9 +38,13 @@ stdenv.mkDerivation rec {

3838 ++ optional xineramaSupport libXinerama

3939 ++ optionals cupsSupport [ cups ];

4040

41− configureFlags = if stdenv.isDarwin

42− then "--disable-glibtest --disable-introspection --disable-visibility"

43− else "--with-xinput=yes";

41+ configureFlags = [

42+ "--with-xinput=yes"

43+ ] ++ stdenv.lib.optionals stdenv.isDarwin [

44+ "--disable-glibtest"

45+ "--disable-introspection"

46+ "--disable-visibility"

47+ ];

4448

4549 postInstall = ''

4650 moveToOutput share/gtk-2.0/demo "$devdoc"

pkgs/development/libraries/libstrophe/default.nix+4−4

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 name = "libstrophe-${version}";

5− version = "0.8.8";

5+ version = "0.9.1";

77 src = fetchFromGitHub {

88 owner = "strophe";

99 repo = "libstrophe";

1010 rev = version;

11− sha256 = "1xzyqqf99r0jfd0g3v0zwc68sac6y25v1d4m365zpc14l02midis";

11+ sha256 = "099iv13c03y1dsn2ngdhfx2cnax0aj2gfh00w55hlzpvmjm8dsml";

1212 };

1313

1414 buildInputs = [ automake autoconf openssl expat libtool pkgconfig check ];

@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {

2727 runs well on both Linux, Unix, and Windows based platforms.

2828 '';

2929 homepage = http://strophe.im/libstrophe/;

30− license = stdenv.lib.licenses.gpl3;

30+ license = with stdenv.lib.licenses; [gpl3 mit];

3131 platforms = stdenv.lib.platforms.linux;

32− maintainers = [ stdenv.lib.maintainers.devhell ];

32+ maintainers = with stdenv.lib.maintainers; [devhell flosse];

3333 };

3434}

pkgs/development/libraries/pocketsphinx/default.nix+29−4

@@ -1,16 +1,22 @@

1−{ stdenv, fetchurl, sphinxbase, pkgconfig }:

1+{ stdenv

2+, fetchurl

3+, sphinxbase

4+, pkgconfig

5+, python27 # >= 2.6

6+, swig2 # 2.0

7+}:

39stdenv.mkDerivation rec {

4− name = "pocketsphinx-0.8";

10+ name = "pocketsphinx-5prealpha";

511

612 src = fetchurl {

713 url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";

8− sha256 = "0ynf5ik4ib2d3ha3r4i8ywpr2dz5i6v51hmfl8kgzj4i7l44qk47";

14+ sha256 = "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg";

915 };

1016

1117 propagatedBuildInputs = [ sphinxbase ];

1218

13− buildInputs = [ pkgconfig ];

19+ buildInputs = [ pkgconfig python27 swig2 ];

1420

1521 meta = {

1622 description = "Voice recognition library written in C";

@@ -19,3 +25,22 @@ stdenv.mkDerivation rec {

1925 platforms = stdenv.lib.platforms.linux;

2026 };

2127}

28+

29+/* Example usage:

30+

31+

32+1.

33+

34+$ cat << EOF > vocabulary.txt

35+oh mighty computer /1e-40/

36+hello world /1e-30/

37+EOF

38+

39+2.

40+

41+$ pocketsphinx_continuous -inmic yes -kws vocabulary.txt 2> /dev/null

42+# after you say "hello world":

43+hello world

44+...

45+

46+*/

pkgs/development/libraries/qwt/6_qt4.nixnew file+29

@@ -0,0 +1,29 @@

1+{ stdenv, fetchurl, qt4, qmake4Hook }:

3+stdenv.mkDerivation rec {

4+ name = "qwt-6.1.2";

6+ src = fetchurl {

7+ url = "mirror://sourceforge/qwt/${name}.tar.bz2";

8+ sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b";

9+ };

10+

11+ buildInputs = [ qt4 ];

12+ nativeBuildInputs = [ qmake4Hook ];

13+

14+ postPatch = ''

15+ sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri

16+ '';

17+

18+ qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];

19+

20+ meta = with stdenv.lib; {

21+ description = "Qt widgets for technical applications";

22+ homepage = http://qwt.sourceforge.net/;

23+ # LGPL 2.1 plus a few exceptions (more liberal)

24+ license = stdenv.lib.licenses.qwt;

25+ platforms = platforms.linux;

26+ maintainers = [ maintainers.bjornfor ];

27+ branch = "6";

28+ };

29+}

pkgs/development/libraries/sphinxbase/default.nix+5−3

@@ -2,18 +2,20 @@

22, fetchurl

33, bison

44, pkgconfig

5+, python27 # >= 2.6

6+, swig2 # 2.0

57, multipleOutputs ? false #Uses incomplete features of nix!

68}:

810stdenv.mkDerivation (rec {

9− name = "sphinxbase-0.8";

11+ name = "sphinxbase-5prealpha";

1012

1113 src = fetchurl {

1214 url = "mirror://sourceforge/cmusphinx/${name}.tar.gz";

13− sha256 = "1a3c91g6rcfb2k8qyfhnd7s68ds6pxwv61xfp0ai1arbhx28jw2m";

15+ sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp";

1416 };

1517

16− buildInputs = [ pkgconfig bison ];

18+ buildInputs = [ swig2 python27 pkgconfig bison ];

1719

1820 meta = {

1921 description = "Support Library for Pocketsphinx";

pkgs/games/freeciv/default.nix+10−5

@@ -1,7 +1,9 @@

11{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext

22, sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth

33, gtkClient ? false, gtk2

4−, server ? true, readline }:

4+, server ? true, readline

5+, enableSqlite ? true, sqlite

6+}:

68let

79 inherit (stdenv.lib) optional optionals;

@@ -10,14 +12,15 @@ let

1012 gtkName = if gtkClient then "-gtk" else "";

1113

1214 name = "freeciv";

13− version = "2.5.3";

15+ version = "2.5.6";

1416in

1517stdenv.mkDerivation {

1618 name = "${name}${sdlName}${gtkName}-${version}";

19+ inherit version;

1720

1821 src = fetchurl {

1922 url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";

20− sha256 = "0p40bpkhbldsnlqdvfn3qd2vzadxfrfsf1r57x1akwabqs0h62s8";

23+ sha256 = "16wrnsx5rmbz6rjs03bhy0vn20i6n6g73lx7fjpai98ixhzc5bfg";

2124 };

2225

2326 nativeBuildInputs = [ pkgconfig ];

@@ -25,10 +28,12 @@ stdenv.mkDerivation {

2528 buildInputs = [ zlib bzip2 curl lzma gettext ]

2629 ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]

2730 ++ optionals gtkClient [ gtk2 ]

28− ++ optional server readline;

31+ ++ optional server readline

32+ ++ optional enableSqlite sqlite;

2933

30− configureFlags = []

34+ configureFlags = [ "--enable-shared" ]

3135 ++ optional sdlClient "--enable-client=sdl"

36+ ++ optional enableSqlite "--enable-fcdb=sqlite3"

3237 ++ optional (!gtkClient) "--enable-fcmp=cli"

3338 ++ optional (!server) "--disable-server";

3439

pkgs/games/openmw/default.nix+2−2

@@ -11,14 +11,14 @@ let

1111 };

1212 });

1313in stdenv.mkDerivation rec {

14− version = "0.40.0";

14+ version = "0.41.0";

1515 name = "openmw-${version}";

1616

1717 src = fetchFromGitHub {

1818 owner = "OpenMW";

1919 repo = "openmw";

2020 rev = name;

21− sha256 = "0mqd4gpwvczwqfkw5zvnw7cl1nzv9lkiqq2yc2a0qasaby8qv94w";

21+ sha256 = "1qay278965i7ja2rjllhcqfq7zpbapd7w57xly02apniadyfg0yz";

2222 };

2323

2424 enableParallelBuilding = true;

pkgs/games/steam/runtime-wrapped.nix+1−1

@@ -44,7 +44,7 @@ let

4444 libav

4545 atk

4646 # Only libraries are needed from those two

47− udev182

47+ libudev0-shim

4848 networkmanager098

4949

5050 # Verified games requirements

pkgs/os-specific/linux/fuse/default.nix+2−7

@@ -1,13 +1,10 @@

11{ stdenv, fetchFromGitHub, utillinux

2− ,autoconf, automake, libtool, gettext }:

2+, autoconf, automake, libtool, gettext }:

44stdenv.mkDerivation rec {

55 name = "fuse-${version}";

6−

76 version = "2.9.7";

9− #builder = ./builder.sh;

10−

118 src = fetchFromGitHub {

129 owner = "libfuse";

1310 repo = "libfuse";

@@ -17,8 +14,6 @@ stdenv.mkDerivation rec {

1714

1815 buildInputs = [ utillinux autoconf automake libtool gettext ];

1916

20− inherit utillinux;

21−

2217 preConfigure =

2318 ''

2419 export MOUNT_FUSE_PATH=$out/sbin

@@ -32,7 +27,7 @@ stdenv.mkDerivation rec {

3227

3328 sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c

3429 sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh

35−

30+

3631 ./makeconf.sh

3732 '';

3833

pkgs/os-specific/linux/kernel/patches.nix+10

@@ -165,4 +165,14 @@ rec {

165165 sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki";

166166 };

167167 };

168+

169+ panic_on_icmp6_frag_CVE_2016_9919 = rec

170+ { name = "panic_on_icmp6_frag_CVE_2016_9919.patch";

171+ patch = fetchpatch {

172+ inherit name;

173+ url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2";

174+ sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";

175+ };

176+ };

177+

168178}

pkgs/os-specific/linux/libudev0-shim/default.nixnew file+29

@@ -0,0 +1,29 @@

1+{ stdenv, fetchFromGitHub, udev }:

3+stdenv.mkDerivation rec {

4+ name = "libudev0-shim-${version}";

5+ version = "1";

7+ src = fetchFromGitHub {

8+ owner = "archlinux";

9+ repo = "libudev0-shim";

10+ rev = "v${version}";

11+ sha256 = "1460qm6rp1cqnns39lj24z7191m8sbpvbjabqbzb55dkdd2kw50z";

12+ };

13+

14+ buildInputs = [ udev ];

15+

16+ installPhase = ''

17+ name="$(echo libudev.so.*)"

18+ install -Dm755 "$name" "$out/lib/$name"

19+ ln -s "$name" "$out/lib/libudev.so.0"

20+ '';

21+

22+ meta = with stdenv.lib; {

23+ description = "Shim to preserve libudev.so.0 compatibility";

24+ homepage = "https://github.com/archlinux/libudev0-shim";

25+ platforms = platforms.linux;

26+ license = licenses.lgpl21;

27+ maintainers = with maintainers; [ abbradar ];

28+ };

29+}

pkgs/os-specific/linux/udev/145.nixdeleted−53

@@ -1,53 +0,0 @@

1−{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }:

2−

3−assert stdenv ? glibc;

4−

5−stdenv.mkDerivation rec {

6− name = "udev-145";

7−

8− src = fetchurl {

9− url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";

10− sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";

11− };

12−

13− buildInputs = [gperf pkgconfig glib acl libusb usbutils];

14−

15− configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";

16−

17− preConfigure =

18− ''

19− substituteInPlace extras/keymap/Makefile.in \

20− --replace /usr/include ${stdenv.glibc.dev}/include

21− '';

22−

23− postInstall =

24− ''

25− # Install some rules that really should be installed by default.

26− for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do

27− cp rules/packages/$i $out/libexec/rules.d/

28− done

29−

30− # The path to rule_generator.functions in write_cd_rules and

31− # write_net_rules is broken. Also, don't store the mutable

32− # persistant rules in /etc/udev/rules.d but in

33− # /var/lib/udev/rules.d.

34− for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do

35− substituteInPlace $i \

36− --replace /lib/udev $out/libexec \

37− --replace /etc/udev/rules.d /var/lib/udev/rules.d

38− done

39−

40− # Don't set PATH to /bin:/sbin; won't work in NixOS.

41− substituteInPlace $out/libexec/rule_generator.functions \

42− --replace 'PATH=' '#PATH='

43−

44− # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the

45− # environment of the caller.

46− sed '3,4d' -i $out/libexec/firmware.sh

47− '';

48−

49− meta = {

50− homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;

51− description = "Udev manages the /dev filesystem";

52− };

53−}

pkgs/os-specific/linux/udev/182.nixdeleted−39

@@ -1,39 +0,0 @@

1−{ stdenv, fetchurl, pkgconfig

2−, pciutils, utillinux, kmod, usbutils, gperf

3−}:

4−

5−assert stdenv ? glibc;

6−

7−stdenv.mkDerivation rec {

8− name = "udev-182";

9−

10− src = fetchurl {

11− url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";

12− sha256 = "143qvm0kij26j2l5icnch4x38fajys6li7j0c5mpwi6kqmc8hqx0";

13− };

14−

15− nativeBuildInputs = [ pkgconfig ];

16−

17− buildInputs = [ utillinux kmod usbutils #glib gobjectIntrospection

18− gperf

19− ];

20−

21− configureFlags = [ "--with-pci-ids-path=${pciutils}/share/pci.ids"

22− "--disable-gudev"

23− "--disable-introspection"

24− ];

25−

26− postPatch = ''

27− sed -i 's:input.h:input-event-codes.h:' Makefile.in

28− sed -i '20a#include <stdint.h>' src/mtd_probe/mtd_probe.h

29− '';

30−

31− NIX_LDFLAGS = [ "-lrt" ];

32−

33− meta = with stdenv.lib; {

34− homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;

35− description = "Udev manages the /dev filesystem";

36− platforms = platforms.linux;

37− license = licenses.gpl2;

38− };

39−}

pkgs/servers/asterisk/default.nix+28−16

@@ -1,20 +1,25 @@

1−{ stdenv, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux }:

2−

1+{ stdenv, pkgs, fetchurl, fetchgit,

2+ jansson, libxml2, libxslt, ncurses, openssl, sqlite,

3+ utillinux, dmidecode, libuuid, binutils, newt,

4+ lua,

5+ srtp, wget, curl,

6+ subversionClient

7+}:

38stdenv.mkDerivation rec {

49 name = "asterisk-${version}";

5− version = "13.6.0";

10+ version = "14.1.2";

611

712 src = fetchurl {

813 url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz";

9− sha256 = "0nh0fnqx84as92kk9d73s0386cndd17l06y1c72jl2bdjhyba0ca";

14+ sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8";

1015 };

1116

1217 # Note that these sounds are included with the release tarball. They are

1318 # provided here verbatim for the convenience of anyone wanting to build

1419 # Asterisk from other sources.

1520 coreSounds = fetchurl {

16− url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.26.tar.gz;

17− sha256 = "2300e3ed1d2ded6808a30a6ba71191e7784710613a5431afebbd0162eb4d5d73";

21+ url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz;

22+ sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd";

1823 };

1924 mohSounds = fetchurl {

2025 url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;

@@ -22,7 +27,7 @@ stdenv.mkDerivation rec {

2227 };

2328 # TODO: Sounds for other languages could be added here

2429

25− buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux ];

30+ buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ];

2631

2732 patches = [

2833 # Disable downloading of sound files (we will fetch them

@@ -38,14 +43,24 @@ stdenv.mkDerivation rec {

3843

3944 # Use the following preConfigure section when building Asterisk from sources

4045 # other than the release tarball.

41−# preConfigure = ''

42−# ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz

43−# ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz

44−# '';

46+ # preConfigure = ''

47+ # ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz

48+ # ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz

49+ #'';

4550

4651 # The default libdir is $PREFIX/usr/lib, which causes problems when paths

4752 # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib.

48− configureFlags = "--libdir=\${out}/lib";

53+ configureFlags = [

54+ "--libdir=\${out}/lib"

55+ "--with-lua=${lua}/lib"

56+ "--with-pjproject-bundled"

57+ ];

58+

59+ preBuild = ''

60+ make menuselect.makeopts

61+ substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""

62+ ./contrib/scripts/get_mp3_source.sh

63+ '';

4964

5065 postInstall = ''

5166 # Install sample configuration files for this version of Asterisk

@@ -56,9 +71,6 @@ stdenv.mkDerivation rec {

5671 description = "Software implementation of a telephone private branch exchange (PBX)";

5772 homepage = http://www.asterisk.org/;

5873 license = licenses.gpl2;

59− maintainers = with maintainers; [ auntie ];

60− # Marked as broken due to needing an update for security issues.

61− # See: https://github.com/NixOS/nixpkgs/issues/18856

62− broken = true;

74+ maintainers = with maintainers; [ auntie DerTim1 ];

6375 };

6476}

pkgs/servers/asterisk/disable-download.patch+4−4

@@ -1,7 +1,7 @@

1−diff -ruN asterisk-13.2.0/sounds/Makefile asterisk-13.2.0-patched/sounds/Makefile

2−--- asterisk-13.2.0/sounds/Makefile 2014-09-09 14:01:11.000000000 -0600

3−+++ asterisk-13.2.0-patched/sounds/Makefile 2015-03-31 16:12:00.549133670 -0600

4−@@ -89,7 +89,7 @@

1+diff -ruN asterisk-14.1.2/sounds/Makefile asterisk-14.1.2-patched/sounds/Makefile

2+--- asterisk-14.1.2/sounds/Makefile 2016-11-10 20:43:02.000000000 +0100

3++++ asterisk-14.1.2-patched/sounds/Makefile 2016-11-16 10:08:46.591615147 +0100

4+@@ -90,7 +90,7 @@

55 ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \

66 fi

pkgs/servers/asterisk/runtime-vardirs.patch+3−3

@@ -1,6 +1,6 @@

1−diff -rupN asterisk-13.3.2/build_tools/make_defaults_h asterisk-13.3.2-patched/build_tools/make_defaults_h

2−--- asterisk-13.3.2/build_tools/make_defaults_h 2012-01-30 14:21:16.000000000 -0700

3−+++ asterisk-13.3.2-patched/build_tools/make_defaults_h 2015-04-15 19:07:46.760351155 -0600

1+diff -rupN asterisk-14.1.2/build_tools/make_defaults_h asterisk-14.1.2-patched/build_tools/make_defaults_h

2+--- asterisk-14.1.2/build_tools/make_defaults_h 2016-11-10 20:43:02.000000000 +0100

3++++ asterisk-14.1.2-patched/build_tools/make_defaults_h 2016-11-16 10:09:04.189625495 +0100

44@@ -1,4 +1,13 @@

55 #!/bin/sh

66+

pkgs/servers/http/lighttpd/default.nix+2−2

@@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null;

77assert enableMysql -> mysql != null;

99stdenv.mkDerivation rec {

10− name = "lighttpd-1.4.41";

10+ name = "lighttpd-1.4.44";

1111

1212 src = fetchurl {

1313 url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";

14− sha256 = "0v3b6hp8hfwg7kmmxs64hdn9iqkql5qjv2389wl7pp6nyqz3ik2b";

14+ sha256 = "08jlgcy08w1gd8hkmz0bccipv4dzxdairj89nbz5f6b5hnlnrdmd";

1515 };

1616

1717 buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]

pkgs/servers/http/nginx/generic.nix+1−1

@@ -27,7 +27,6 @@ stdenv.mkDerivation {

2727 "--with-http_realip_module"

2828 "--with-http_addition_module"

2929 "--with-http_xslt_module"

30− "--with-http_image_filter_module"

3130 "--with-http_geoip_module"

3231 "--with-http_sub_module"

3332 "--with-http_dav_module"

@@ -44,6 +43,7 @@ stdenv.mkDerivation {

4443 # Install destination problems

4544 # "--with-http_perl_module"

4645 ] ++ optional withStream "--with-stream"

46+ ++ optional (gd != null) "--with-http_image_filter_module"

4747 ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"

4848 ++ map (mod: "--add-module=${mod.src}") modules;

4949

pkgs/servers/mail/dovecot/2.2.x-module_dir.patch+5−5

@@ -98,15 +98,15 @@ diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream

9898index a0659ab..dba3729 100644

9999--- a/src/lib-ssl-iostream/iostream-ssl.c

100100+++ b/src/lib-ssl-iostream/iostream-ssl.c

101−@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r)

102− memset(&mod_set, 0, sizeof(mod_set));

101+@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r)

103102 mod_set.abi_version = DOVECOT_ABI_VERSION;

104103 mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";

104+ mod_set.require_init_funcs = TRUE;

105105- ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);

106106+ ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set);

107−

108− ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");

109− if (ssl_vfuncs == NULL) {

107+ if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name,

108+ &mod_set, error_r) < 0)

109+ return -1;

110110diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c

111111index e2233bf..bbf981e 100644

112112--- a/src/lib-storage/mail-storage-settings.c

pkgs/servers/mail/dovecot/default.nix+2−2

@@ -8,7 +8,7 @@

88}:

1010stdenv.mkDerivation rec {

11− name = "dovecot-2.2.25";

11+ name = "dovecot-2.2.27";

1212

1313 nativeBuildInputs = [ perl pkgconfig ];

1414 buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

1919

2020 src = fetchurl {

2121 url = "http://dovecot.org/releases/2.2/${name}.tar.gz";

22− sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq";

22+ sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9";

2323 };

2424

2525 preConfigure = ''

pkgs/servers/sql/postgresql/pg_similarity/default.nixnew file+31

@@ -0,0 +1,31 @@

1+{ stdenv, lib, fetchFromGitHub, gcc, postgresql }:

3+stdenv.mkDerivation {

5+ name = "pg_similarity-1.0";

6+ src = fetchFromGitHub {

7+ owner = "eulerto";

8+ repo = "pg_similarity";

9+ rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5";

10+ sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim";

11+ };

12+

13+ buildInputs = [ postgresql gcc ];

14+ buildPhase = "USE_PGXS=1 make";

15+ installPhase = ''

16+ mkdir -p $out/bin # for buildEnv to setup proper symlinks

17+ install -D pg_similarity.so -t $out/lib/

18+ install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension

19+ '';

20+

21+ meta = {

22+ description = ''

23+ pg_similarity is an extension to support similarity queries on PostgreSQL. The implementation

24+ is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional

25+ operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function).

26+ '';

27+ platforms = stdenv.lib.platforms.linux;

28+ license = stdenv.lib.licenses.gpl2;

29+ maintainers = with lib.maintainers; [ danbst ];

30+ };

31+}

pkgs/tools/misc/mlocate/default.nixnew file+21

@@ -0,0 +1,21 @@

1+{ stdenv, fetchurl }:

3+stdenv.mkDerivation rec {

4+ name = "mlocate-${version}";

5+ version = "0.26";

7+ src = fetchurl {

8+ url = "http://fedorahosted.org/releases/m/l/mlocate/${name}.tar.xz";

9+ sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh";

10+ };

11+

12+ buildInputs = [ ];

13+

14+ meta = with stdenv.lib; {

15+ description = "Merging locate is an utility to index and quickly search for files";

16+ homepage = https://fedorahosted.org/mlocate/;

17+ license = licenses.gpl2;

18+ platforms = platforms.linux;

19+ maintainers = with maintainers; [ ];

20+ };

21+}

pkgs/tools/networking/openntpd/default.nix+2−2

@@ -1,4 +1,4 @@

1−{ stdenv, fetchurl, openssl

1+{ stdenv, fetchurl, libressl

22, privsepPath ? "/var/empty"

33, privsepUser ? "ntp"

44}:

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

1919 "--localstatedir=/var"

2020 ];

2121

22− buildInputs = [ openssl ];

22+ buildInputs = [ libressl ];

2323

2424 installFlags = [

2525 "sysconfdir=\${out}/etc"

pkgs/tools/networking/zerotierone/default.nix+3−3

@@ -1,12 +1,12 @@

11{ stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:

33stdenv.mkDerivation rec {

4− version = "1.1.12";

4+ version = "1.1.14";

55 name = "zerotierone";

77 src = fetchurl {

88 url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";

9− sha256 = "0mji6bmxjvxy2mhvzfz4vpdz62n1wv6a02rapzbiad8zr2c869cm";

9+ sha256 = "1brlyqk2p5h9sws15nbkmm4qhx911aib1v7crmcm2rhwsad0c1nj";

1010 };

1111

1212 preConfigure = ''

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {

3838 description = "Create flat virtual Ethernet networks of almost unlimited size";

3939 homepage = https://www.zerotier.com;

4040 license = licenses.gpl3;

41− maintainers = with maintainers; [ sjmackenzie ];

41+ maintainers = with maintainers; [ sjmackenzie zimbatm ];

4242 platforms = platforms.allBut [ "i686-linux" ];

4343 };

4444}

pkgs/tools/security/enpass/data.json+6−6

@@ -1,12 +1,12 @@

11{

22 "amd64": {

3− "path": "pool/main/e/enpass/enpass_5.3.0_amd64.deb",

4− "sha256": "d9da061c6456281da836bdd78bdb7baeced4b7f1805bb2495e4f1d15038cf86b",

5− "version": "5.3.0"

3+ "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb",

4+ "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579",

5+ "version": "5.4.0.post4"

66 },

77 "i386": {

8− "path": "pool/main/e/enpass/enpass_5.3.0_i386.deb",

9− "sha256": "58d9f3b83c2da477c13976e1826d112236eabd46a389de7e8767ee99ac41f469",

10− "version": "5.3.0"

8+ "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb",

9+ "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692",

10+ "version": "5.4.0.post4"

1111 }

1212}

pkgs/tools/security/enpass/default.nix+7−15

@@ -44,16 +44,6 @@ let

4444 inherit (data) version;

4545 name = "enpass-${version}";

4646

47− desktopItem = makeDesktopItem {

48− name = "Enpass";

49− exec = "$out/bin/Enpass";

50− #icon = "Enpass";

51− desktopName = "Enpass";

52− genericName = "Password manager";

53− categories = "Application;Security;";

54− };

55−

56−

5747 src = fetchurl {

5848 inherit (data) sha256;

5949 url = "${baseUrl}/${data.path}";

@@ -74,11 +64,12 @@ let

7464 installPhase=''

7565 mkdir $out

7666 cp -r opt/Enpass/* $out

67+ cp -r usr/* $out

68+ rm $out/bin/runenpass.sh

7769

78− # Make desktop item

79− mkdir -p "$out"/share/applications

80− cp "$desktopItem"/share/applications/* "$out"/share/applications/

81− mkdir -p "$out"/share/icons

70+ sed \

71+ -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \

72+ $out/share/applications/enpass.desktop

8273

8374 patchelf \

8475 --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \

@@ -88,7 +79,8 @@ let

8879 --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \

8980 --set QT_PLUGIN_PATH "$out/plugins" \

9081 --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \

91− --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb"

82+ --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \

83+ --set HIDE_TOOLBAR_LINE 0

9284 '';

9385 };

9486 updater = {

pkgs/tools/text/codesearch/default.nixnew file+26

@@ -0,0 +1,26 @@

1+# This file was generated by go2nix.

2+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:

4+buildGoPackage rec {

5+ name = "codesearch-${version}";

6+ version = "20150617-${stdenv.lib.strings.substring 0 7 rev}";

7+ rev = "a45d81b686e85d01f2838439deaf72126ccd5a96";

9+ goPackagePath = "github.com/google/codesearch";

10+

11+ src = fetchgit {

12+ inherit rev;

13+ url = "https://github.com/google/codesearch";

14+ sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny";

15+ };

16+

17+ goDeps = ./deps.nix;

18+

19+ meta = {

20+ description = "Fast, indexed regexp search over large file trees";

21+ homepage = "https://github.com/google/codesearch";

22+ license = [ stdenv.lib.licenses.bsd3 ];

23+ maintainers = [ stdenv.lib.maintainers.bennofs ];

24+ platforms = stdenv.lib.platforms.unix;

25+ };

26+}

pkgs/tools/text/codesearch/deps.nixnew file+3

@@ -0,0 +1,3 @@

1+# This file was generated by go2nix.

2+[

3+]

pkgs/top-level/all-packages.nix+55−3

@@ -779,6 +779,8 @@ in

779779

780780 cpulimit = callPackage ../tools/misc/cpulimit { };

781781

782+ codesearch = callPackage ../tools/text/codesearch { };

783+

782784 contacts = callPackage ../tools/misc/contacts {

783785 inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;

784786 };

@@ -865,6 +867,7 @@ in

865867 f3 = callPackage ../tools/filesystems/f3 { };

866868

867869 facter = callPackage ../tools/system/facter {

870+ boost = boost160;

868871 ruby = ruby_2_1;

869872 };

870873

@@ -5139,6 +5142,8 @@ in

51395142

51405143 lizardfs = callPackage ../tools/filesystems/lizardfs { };

51415144

5145+ lldb = llvmPackages.lldb;

5146+

51425147 llvm = llvmPackages.llvm;

51435148

51445149 llvm_39 = llvmPackages_39.llvm;

@@ -5776,7 +5781,8 @@ in

57765781 ruby_2_0_0

57775782 ruby_2_1_10

57785783 ruby_2_2_5

5779− ruby_2_3_3;

5784+ ruby_2_3_3

5785+ ruby_2_4_0;

57805786

57815787 # Ruby aliases

57825788 ruby = ruby_2_3;

@@ -5785,6 +5791,7 @@ in

57855791 ruby_2_1 = ruby_2_1_10;

57865792 ruby_2_2 = ruby_2_2_5;

57875793 ruby_2_3 = ruby_2_3_3;

5794+ ruby_2_4 = ruby_2_4_0;

57885795

57895796 scsh = callPackage ../development/interpreters/scsh { };

57905797

@@ -8923,6 +8930,8 @@ in

89238930

89248931 pg_repack = callPackage ../servers/sql/postgresql/pg_repack {};

89258932

8933+ pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {};

8934+

89268935 phonon = callPackage ../development/libraries/phonon {};

89278936

89288937 phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};

@@ -9154,6 +9163,8 @@ in

91549163

91559164 qwt = callPackage ../development/libraries/qwt {};

91569165

9166+ qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { };

9167+

91579168 qxt = callPackage ../development/libraries/qxt {};

91589169

91599170 rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};

@@ -11076,6 +11087,7 @@ in

1107611087 # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking

1107711088 # kernelPatches.cpu-cgroup-v2."4.7"

1107811089 kernelPatches.modinst_arg_list_too_long

11090+ kernelPatches.panic_on_icmp6_frag_CVE_2016_9919

1107911091 ]

1108011092 ++ lib.optionals ((platform.kernelArch or null) == "mips")

1108111093 [ kernelPatches.mips_fpureg_emu

@@ -11659,8 +11671,7 @@ in

1165911671

1166011672 eudev = callPackage ../os-specific/linux/eudev {};

1166111673

11662− # libudev.so.0

11663− udev182 = callPackage ../os-specific/linux/udev/182.nix { };

11674+ libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };

1166411675

1166511676 udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };

1166611677 udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };

@@ -12537,6 +12548,8 @@ in

1253712548 inherit (gnome2) GConf ORBit2 metacity;

1253812549 };

1253912550

12551+ confclerk = callPackage ../applications/misc/confclerk { };

12552+

1254012553 copyq = callPackage ../applications/misc/copyq { };

1254112554

1254212555 coriander = callPackage ../applications/video/coriander {

@@ -13561,6 +13574,32 @@ in

1356113574

1356213575 imagemagickBig = callPackage ../applications/graphics/ImageMagick { };

1356313576

13577+ imagemagick7_light = lowPrio (imagemagick.override {

13578+ bzip2 = null;

13579+ zlib = null;

13580+ libX11 = null;

13581+ libXext = null;

13582+ libXt = null;

13583+ fontconfig = null;

13584+ freetype = null;

13585+ ghostscript = null;

13586+ libjpeg = null;

13587+ lcms2 = null;

13588+ openexr = null;

13589+ libpng = null;

13590+ librsvg = null;

13591+ libtiff = null;

13592+ libxml2 = null;

13593+ openjpeg = null;

13594+ libwebp = null;

13595+ });

13596+

13597+ imagemagick7 = lowPrio (imagemagickBig.override {

13598+ ghostscript = null;

13599+ });

13600+

13601+ imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { });

13602+

1356413603 # Impressive, formerly known as "KeyJNote".

1356513604 impressive = callPackage ../applications/office/impressive { };

1356613605

@@ -14011,6 +14050,8 @@ in

1401114050

1401214051 normalize = callPackage ../applications/audio/normalize { };

1401314052

14053+ mm = callPackage ../applications/networking/instant-messengers/mm { };

14054+

1401414055 mplayer = callPackage ../applications/video/mplayer ({

1401514056 pulseSupport = config.pulseaudio or false;

1401614057 libdvdnav = libdvdnav_4_2_1;

@@ -14161,6 +14202,8 @@ in

1416114202

1416214203 diffpdf = callPackage ../applications/misc/diffpdf { };

1416314204

14205+ mlocate = callPackage ../tools/misc/mlocate { };

14206+

1416414207 mypaint = callPackage ../applications/graphics/mypaint { };

1416514208

1416614209 mythtv = callPackage ../applications/video/mythtv { };

@@ -14441,6 +14484,11 @@ in

1444114484 inherit (darwin.stubs) rez setfile;

1444214485 };

1444314486

14487+ qemu_28 = callPackage ../applications/virtualization/qemu/2.8.nix {

14488+ inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa;

14489+ inherit (darwin.stubs) rez setfile;

14490+ };

14491+

1444414492 qgis = callPackage ../applications/gis/qgis {};

1444514493

1444614494 qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };

@@ -14462,6 +14510,8 @@ in

1446214510 qscreenshot = callPackage ../applications/graphics/qscreenshot {

1446314511 qt = qt4;

1446414512 };

14513+

14514+ qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };

1446514515

1446614516 qsynth = callPackage ../applications/audio/qsynth { };

1446714517

@@ -17050,6 +17100,8 @@ in

1705017100

1705117101 fityk = callPackage ../applications/science/misc/fityk { };

1705217102

17103+ gplates = callPackage ../applications/science/misc/gplates { };

17104+

1705317105 gravit = callPackage ../applications/science/astronomy/gravit { };

1705417106

1705517107 golly = callPackage ../applications/science/misc/golly { };

pkgs/top-level/emacs-packages.nix+16

@@ -238,6 +238,22 @@ let

238238 };

239239 };

240240

241+ haskell-unicode-input-method = melpaBuild rec {

242+ pname = "emacs-haskell-unicode-input-method";

243+ version = "20110905.2307";

244+ src = fetchFromGitHub {

245+ owner = "roelvandijk";

246+ repo = "emacs-haskell-unicode-input-method";

247+ rev = "d8d168148c187ed19350bb7a1a190217c2915a63";

248+ sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";

249+ };

250+ packageRequires = [];

251+ meta = {

252+ homepage = "https://melpa.org/#haskell-unicode-input-method/";

253+ license = lib.licenses.free;

254+ };

255+ };

256+

241257 hindent = melpaBuild rec {

242258 pname = "hindent";

243259 version = external.hindent.version;

pkgs/top-level/haskell-packages.nix+2

@@ -45,10 +45,12 @@ rec {

4545 ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec {

4646 bootPkgs = packages.ghc7103;

4747 inherit (bootPkgs) hscolour;

48+ sphinx = pkgs.python27Packages.sphinx;

4849 };

4950 ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec {

5051 bootPkgs = packages.ghc7103;

5152 inherit (bootPkgs) hscolour;

53+ sphinx = pkgs.python27Packages.sphinx;

5254 };

5355 ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {

5456 bootPkgs = packages.ghc7103;

pkgs/top-level/python-packages.nix+72−24

@@ -9304,27 +9304,48 @@ in {

93049304

93059305

93069306 librosa = buildPythonPackage rec {

9307− name = "librosa-${version}";

9308− version = "0.4.0";

9307+ pname = "librosa";

9308+ name = "${pname}-${version}";

9309+ version = "0.4.3";

93099310 src = pkgs.fetchurl {

9310− url = "mirror://pypi/l/librosa/librosa-0.4.0.tar.gz";

9311− sha256 = "cc11dcc41f51c08e442292e8a2fc7d7ee77e0d47ff771259eb63f57fcee6f6e7";

9311+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";

9312+ sha256 = "209626c53556ca3922e52d2fae767bf5b398948c867fcc8898f948695dacb247";

93129313 };

93139314

9314− propagatedBuildInputs = with self;

9315− [ joblib matplotlib six scikitlearn decorator audioread samplerate ];

9315+ propagatedBuildInputs = with self; [ joblib matplotlib six scikitlearn

9316+ decorator audioread resampy ];

9317+

9318+ # No tests

9319+ doCheck = false;

9320+

9321+ meta = {

9322+ description = "Python module for audio and music processing";

9323+ homepage = http://librosa.github.io/;

9324+ license = licenses.isc;

9325+ };

93169326 };

93179327

93189328 joblib = buildPythonPackage rec {

9319− name = "joblib-${version}";

9320− version = "0.9.4";

9329+ pname = "joblib";

9330+ name = "${pname}-${version}";

9331+ version = "0.10.3";

93219332 src = pkgs.fetchurl {

9322− url = "mirror://pypi/j/joblib/${name}.tar.gz";

9323− sha256 = "e5faacf0da7b3035dbca9d56210962b86564aafca71a25f4ea376a405455cd60";

9333+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";

9334+ sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d";

93249335 };

93259336

9326− buildInputs = with self; [ nose ];

9337+ buildInputs = with self; [ nose sphinx numpydoc ];

93279338

9339+ # Failing test on Python 3.x

9340+ postPatch = '''' + optionalString isPy3k ''

9341+ sed -i -e '70,84d' joblib/test/test_format_stack.py

9342+ '';

9343+

9344+ meta = {

9345+ description = "Lightweight pipelining: using Python functions as pipeline jobs";

9346+ homepage = http://pythonhosted.org/joblib/;

9347+ license = licenses.bsd3;

9348+ };

93289349 };

93299350

93309351 samplerate = buildPythonPackage rec {

@@ -9969,15 +9990,16 @@ in {

99699990 };

99709991

99719992 deluge = buildPythonPackage rec {

9972− name = "deluge-1.3.12";

9993+ name = "deluge-${version}";

9994+ version = "1.3.13";

99739995

99749996 src = pkgs.fetchurl {

99759997 url = "http://download.deluge-torrent.org/source/${name}.tar.bz2";

9976− sha256 = "14rwc5k7q0d36b4jxnmxgnyvx9lnmaifxpyv0z07ymphlfr4amsn";

9998+ sha256 = "1ig8kv22009f0ny6n77a4lcfddhdsxrdklpmhdqvis1wx8na5crp";

99779999 };

997810000

997910001 propagatedBuildInputs = with self; [

9980− pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl service-identity

10002+ pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl service-identity

998110003 ];

998210004

998310005 nativeBuildInputs = [ pkgs.intltool ];

@@ -15185,14 +15207,15 @@ in {

1518515207 };

1518615208

1518715209 pygraphviz = buildPythonPackage rec {

15188− name = "pygraphviz-1.3.1";

15210+ name = "pygraphviz-${version}";

15211+ version = "1.4rc1";

1518915212

1519015213 src = pkgs.fetchurl {

1519115214 url = "mirror://pypi/p/pygraphviz/${name}.tar.gz";

15192− sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";

15215+ sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";

1519315216 };

1519415217

15195− buildInputs = with self; [ doctest-ignore-unicode ];

15218+ buildInputs = with self; [ doctest-ignore-unicode mock nose ];

1519615219 propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ];

1519715220

1519815221 meta = {

@@ -16105,12 +16128,13 @@ in {

1610516128 };

1610616129

1610716130 numpydoc = buildPythonPackage rec {

16108− name = "numpydoc-${version}";

16109− version = "0.5";

16131+ pname = "numpydoc";

16132+ name = "${pname}-${version}";

16133+ version = "0.6.0";

1611016134

1611116135 src = pkgs.fetchurl {

16112− url = "mirror://pypi/n/numpydoc/${name}.tar.gz";

16113− sha256 = "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k";

16136+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";

16137+ sha256 = "1ec573e91f6d868a9940d90a6599f3e834a2d6c064030fbe078d922ee21dcfa1";

1611416138 };

1611516139

1611616140 buildInputs = [ self.nose ];

@@ -22493,6 +22517,28 @@ in {

2249322517 };

2249422518 };

2249522519

22520+ resampy = buildPythonPackage rec {

22521+ pname = "resampy";

22522+ version = "0.1.4";

22523+ name = "${pname}-${version}";

22524+

22525+ src = pkgs.fetchurl {

22526+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";

22527+ sha256 = "cf4f149d8699af70a1b4b0769fa16fab21835d936ea7ff25e98446aa49e743d4";

22528+ };

22529+

22530+ checkInputs = with self; [ pytest pytestcov ];

22531+ # No tests included

22532+ doCheck = false;

22533+ propagatedBuildInputs = with self; [ numpy scipy cython six ];

22534+

22535+ meta = {

22536+ homepage = https://github.com/bmcfee/resampy;

22537+ description = "Efficient signal resampling";

22538+ license = licenses.isc;

22539+ };

22540+ };

22541+

2249622542 robomachine = buildPythonPackage rec {

2249722543 name = "robomachine-0.6";

2249822544

@@ -28311,14 +28357,14 @@ EOF

2831128357 };

2831228358

2831328359 graphite_beacon = buildPythonPackage rec {

28314− name = "graphite_beacon-0.22.1";

28360+ name = "graphite_beacon-0.27.0";

2831528361

2831628362 src = pkgs.fetchurl {

2831728363 url = "mirror://pypi/g/graphite_beacon/${name}.tar.gz";

28318− sha256 = "ebde1aba8030c8aeffaeea39f9d44a2be464b198583ad4a390a2bff5f4172543";

28364+ sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks";

2831928365 };

2832028366

28321− propagatedBuildInputs = [ self.tornado ];

28367+ propagatedBuildInputs = [ self.tornado self.pyyaml self.funcparserlib ];

2832228368

2832328369 preBuild = "> requirements.txt";

2832428370

@@ -31679,6 +31725,8 @@ EOF

3167931725 };

3168031726 };

3168131727

31728+ urlscan = callPackage ../applications/misc/urlscan { };

31729+

3168231730 wp_export_parser = buildPythonPackage rec {

3168331731 name = "${pname}-${version}";

3168431732 pname = "wp_export_parser";