diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7ed8ae953bc..5fa30e86374 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -129,6 +129,7 @@ dochang = "Desmond O. Chang "; domenkozar = "Domen Kozar "; doublec = "Chris Double "; + dpaetzel = "David Pätzel "; drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; dtzWill = "Will Dietz "; @@ -331,6 +332,7 @@ ocharles = "Oliver Charles "; odi = "Oliver Dunkl "; offline = "Jaka Hudoklin "; + oida = "oida "; okasu = "Okasu "; olcai = "Erik Timan "; olejorgenb = "Ole Jørgen Brønner "; @@ -506,4 +508,5 @@ zimbatm = "zimbatm "; zohl = "Al Zohali "; zoomulator = "Kim Simmons "; + zraexy = "David Mell "; } diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 2baa4f66760..4100af27bec 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { # Generate the squashfs image. mksquashfs nix-path-registration $storePaths $out \ - -keep-as-directory -all-root -comp xz + -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100% ''; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 4641b8fcf9d..f4122ab0e51 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,11 +1,15 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, lib, ... }: +{ config, lib, pkgs, ... }: { imports = [ ./installation-cd-base.nix - ../../profiles/minimal.nix + ]; + + environment.systemPackages = + [ + pkgs.vim ]; } diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 70705771183..eb6f8e70689 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -467,7 +467,7 @@ ihaskell = 189; i2p = 190; lambdabot = 191; - #asterisk = 192; # unused + asterisk = 192; plex = 193; sabnzbd = 194; #grafana = 196; #unused diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 27a0fa6cf3d..3cb5bb1a351 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -15,6 +15,15 @@ in { ''; }; + locate = mkOption { + type = types.package; + default = pkgs.findutils; + example = "pkgs.mlocate"; + description = '' + The locate implementation to use + ''; + }; + interval = mkOption { type = types.str; default = "02:15"; @@ -77,7 +86,7 @@ in { script = '' mkdir -m 0755 -p $(dirname ${toString cfg.output}) - exec updatedb \ + exec ${cfg.locate}/bin/updatedb \ --localuser=${cfg.localuser} \ ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index f90d0d992ec..687cd9d80d3 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -45,7 +45,7 @@ ]; # Include support for various filesystems. - boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ]; + boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ]; # Configure host id for ZFS to work networking.hostId = lib.mkDefault "8425e349"; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index b8be9296bc9..c5352e5887d 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -585,7 +585,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \ - --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} + --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} ''; User = "graphite"; Group = "graphite"; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index a9c0ce4ed6c..da2cd02eaa3 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -62,8 +62,8 @@ in { }; listenAddress = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; + default = ""; description = '' Address to listen on for the web interface and API. ''; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 13617a1b6c5..5c71a1d8dda 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -6,29 +6,38 @@ let cfg = config.services.asterisk; asteriskUser = "asterisk"; + asteriskGroup = "asterisk"; varlibdir = "/var/lib/asterisk"; spooldir = "/var/spool/asterisk"; logdir = "/var/log/asterisk"; + # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override + defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles; + allConfFiles = + cfg.confFiles // + builtins.listToAttrs (map (x: { name = x; + value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); }) + defaultConfFiles); + asteriskEtc = pkgs.stdenv.mkDerivation ((mapAttrs' (name: value: nameValuePair # Fudge the names to make bash happy ((replaceChars ["."] ["_"] name) + "_") (value) - ) cfg.confFiles) // + ) allConfFiles) // { confFilesString = concatStringsSep " " ( - attrNames cfg.confFiles + attrNames allConfFiles ); - name = "asterisk.etc"; + name = "asterisk-etc"; # Default asterisk.conf file # (Notice that astetcdir will be set to the path of this derivation) asteriskConf = '' [directories] - astetcdir => @out@ + astetcdir => /etc/asterisk astmoddir => ${pkgs.asterisk}/lib/asterisk/modules astvarlibdir => /var/lib/asterisk astdbdir => /var/lib/asterisk @@ -169,6 +178,16 @@ in ''; }; + useTheseDefaultConfFiles = mkOption { + 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" ]; + type = types.listOf types.str; + example = [ "sip.conf" "dundi.conf" ]; + description = ''Sets these config files to the default content. The default value for + this option contains all necesscary files to avoid errors at startup. + This does not override settings via . + ''; + }; + extraArguments = mkOption { default = []; type = types.listOf types.str; @@ -182,12 +201,22 @@ in }; config = mkIf cfg.enable { - users.extraUsers = singleton - { name = asteriskUser; - uid = config.ids.uids.asterisk; - description = "Asterisk daemon user"; - home = varlibdir; - }; + environment.systemPackages = [ pkgs.asterisk ]; + + environment.etc.asterisk.source = asteriskEtc; + + users.extraUsers.asterisk = + { name = asteriskUser; + group = asteriskGroup; + uid = config.ids.uids.asterisk; + description = "Asterisk daemon user"; + home = varlibdir; + }; + + users.extraGroups.asterisk = + { name = asteriskGroup; + gid = config.ids.gids.asterisk; + }; systemd.services.asterisk = { description = '' @@ -196,14 +225,17 @@ in wantedBy = [ "multi-user.target" ]; + # Do not restart, to avoid disruption of running calls. Restart unit by yourself! + restartIfChanged = false; + preStart = '' # Copy skeleton directory tree to /var for d in '${varlibdir}' '${spooldir}' '${logdir}'; do # TODO: Make exceptions for /var directories that likely should be updated if [ ! -e "$d" ]; then mkdir -p "$d" - cp --recursive ${pkgs.asterisk}/"$d" "$d" - chown --recursive ${asteriskUser} "$d" + cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/ + chown --recursive ${asteriskUser}:${asteriskGroup} "$d" find "$d" -type d | xargs chmod 0755 fi done @@ -215,7 +247,9 @@ in # FIXME: This doesn't account for arguments with spaces argString = concatStringsSep " " cfg.extraArguments; in - "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C ${asteriskEtc}/asterisk.conf ${argString} -F"; + "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F"; + ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload" + ''; Type = "forking"; PIDFile = "/var/run/asterisk/asterisk.pid"; }; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 174354c9eb4..1a7a1e24b70 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -34,6 +34,7 @@ let ###### implementation config = mkIf cfg.enable { + environment.systemPackages = [ pkg ]; systemd.services.${variant} = { description = "BIRD Internet Routing Daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 5e79678023d..ada26f8057b 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -6,7 +6,12 @@ let cfg = config.services.crowd; - pkg = pkgs.atlassian-crowd; + pkg = pkgs.atlassian-crowd.override { + home = cfg.home; + port = cfg.listenPort; + proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}"; + openidPassword = cfg.openidPassword; + }; in @@ -45,6 +50,11 @@ in description = "Port to listen on."; }; + openidPassword = mkOption { + type = types.str; + description = "Application password for OpenID server."; + }; + catalinaOptions = mkOption { type = types.listOf types.str; default = []; @@ -119,10 +129,10 @@ in }; preStart = '' - mkdir -p ${cfg.home}/{logs,work} + mkdir -p ${cfg.home}/{logs,work,database} mkdir -p /run/atlassian-crowd - ln -sf ${cfg.home}/{work,server.xml} /run/atlassian-crowd + ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd chown -R ${cfg.user} ${cfg.home} @@ -134,7 +144,6 @@ in ''; script = "${pkg}/start_crowd.sh"; - #stopScript = "${pkg}/bin/stop_crowd.sh"; serviceConfig = { User = cfg.user; diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix index 540ed168b48..a27889c36a7 100644 --- a/nixos/modules/services/x11/hardware/wacom.nix +++ b/nixos/modules/services/x11/hardware/wacom.nix @@ -22,7 +22,7 @@ in which will make Xorg reconfigure the device ? If you're not satisfied by the default behaviour you can override - in + in configuration.nix easily. ''; }; @@ -40,7 +40,7 @@ in services.udev.packages = [ pkgs.xf86_input_wacom ]; - environment.etc."X11/xorg.conf.d/50-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/50-wacom.conf"; + environment.etc."X11/xorg.conf.d/70-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf"; }; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix new file mode 100644 index 00000000000..3a0771a73ef --- /dev/null +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -0,0 +1,89 @@ +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +}: + +let + arch = + if stdenv.system == "i686-linux" then "i686" + else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" + else if stdenv.system == "armv7l-linux" then "armv7l" + else throw "ImageMagick is not supported on this platform."; + + cfg = { + version = "7.0.4-0"; + sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds"; + patches = []; + }; +in + +stdenv.mkDerivation rec { + name = "imagemagick-${version}"; + inherit (cfg) version; + + src = fetchurl { + urls = [ + "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" + # the original source above removes tarballs quickly + "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" + "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" + ]; + inherit (cfg) sha256; + }; + + patches = [ ./imagetragick.patch ] ++ cfg.patches; + + outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big + outputMan = "out"; # it's tiny + + enableParallelBuilding = true; + + configureFlags = + [ "--with-frozenpaths" ] + ++ [ "--with-gcc-arch=${arch}" ] + ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optionals (ghostscript != null) + [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" + "--with-gslib" + ] + ++ lib.optionals (stdenv.cross.libc or null == "msvcrt") + [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM + ; + + nativeBuildInputs = [ pkgconfig libtool ]; + + buildInputs = + [ zlib fontconfig freetype ghostscript + libpng libtiff libxml2 + ] + ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + [ openexr librsvg openjpeg ] + ; + + propagatedBuildInputs = + [ bzip2 freetype libjpeg lcms2 ] + ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + [ libX11 libXext libXt libwebp ] + ; + + postInstall = '' + (cd "$dev/include" && ln -s ImageMagick* ImageMagick) + moveToOutput "bin/*-config" "$dev" + moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params + for file in "$dev"/bin/*-config; do + substituteInPlace "$file" --replace pkg-config \ + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" + done + '' + lib.optionalString (ghostscript != null) '' + for la in $out/lib/*.la; do + sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la + done + ''; + + meta = with stdenv.lib; { + homepage = http://www.imagemagick.org/; + description = "A software suite to create, edit, compose, or convert bitmap images"; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ the-kenny wkennington ]; + }; +} diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8030302cdcf..e7f0a6b11d9 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -11,8 +11,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.6-7"; - sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5"; + version = "6.9.7-0"; + sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 669fc5a28a7..97b418f08c1 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript atk gtk2 glib fontconfig freetype - libgnomecanvas libgnomeprint libgnomeprintui + libgnomecanvas pango libX11 xproto zlib poppler + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + libgnomeprint libgnomeprintui ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; @@ -47,11 +49,11 @@ stdenv.mkDerivation rec { cp $out/share/xournal/pixmaps/xournal.png $out/share/icons ''; - meta = { + meta = with stdenv.lib; { homepage = http://xournal.sourceforge.net/; description = "Note-taking application (supposes stylus)"; - maintainers = [ stdenv.lib.maintainers.guibert ]; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.guibert ]; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix new file mode 100644 index 00000000000..08f654cdec4 --- /dev/null +++ b/pkgs/applications/misc/confclerk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, qt4, qmake4Hook }: + +let version = "0.6.1"; in +stdenv.mkDerivation { + name = "confclerk-${version}"; + + src = fetchurl { + url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; + sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g"; + }; + + buildInputs = [ qt4 ]; + + nativeBuildInputs = [ qmake4Hook ]; + + installPhase = '' + mkdir -p $out/bin + cp src/bin/confclerk $out/bin + ''; + + meta = { + description = "Offline conference schedule viewer"; + homepage = "http://www.toastfreeware.priv.at/confclerk"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ ehmry ]; + inherit (qt4.meta) platforms; + }; +} diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix new file mode 100644 index 00000000000..96d2aa0c85b --- /dev/null +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub +, qtbase, qtwebengine +, qmakeHook }: + +stdenv.mkDerivation rec { + version = "0.5.5rc2"; + name = "qsyncthingtray-${version}"; + + src = fetchFromGitHub { + owner = "sieren"; + repo = "QSyncthingTray"; + rev = "${version}"; + sha256 = "1x7j7ylgm4ih06m7gb5ls3c9bdjwbra675489caq2f04kgw4yxq2"; + }; + + buildInputs = [ qtbase qtwebengine ]; + nativeBuildInputs = [ qmakeHook ]; + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/bin + cp binary/QSyncthingTray $out/bin + cat > $out/bin/qt.conf < + #include + ++#ifndef Q_MOC_RUN + #include "FeatureCollectionFileState.h" + #include "Layer.h" + #include "LayerTaskRegistry.h" +@@ -48,6 +49,7 @@ + #include "model/ModelInterface.h" + #include "model/types.h" + #include "model/WeakReferenceCallback.h" ++#endif + + //////////////////////////////////////////////////////////////////////////////////////////////// + // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers +--- a/src/app-logic/CoRegistrationLayerTask.h ++++ b/src/app-logic/CoRegistrationLayerTask.h +@@ -32,11 +32,13 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "CoRegistrationLayerParams.h" + #include "CoRegistrationLayerProxy.h" + #include "LayerTask.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + namespace GPlatesAppLogic + { +--- a/src/app-logic/RasterLayerTask.h ++++ b/src/app-logic/RasterLayerTask.h +@@ -32,11 +32,13 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerTask.h" + #include "RasterLayerParams.h" + #include "RasterLayerProxy.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/ReconstructGraph.h ++++ b/src/app-logic/ReconstructGraph.h +@@ -46,6 +46,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "FeatureCollectionFileState.h" + #include "Layer.h" + #include "Reconstruction.h" +@@ -53,6 +54,7 @@ + + #include "model/FeatureCollectionHandle.h" + #include "model/WeakReferenceCallback.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/ReconstructLayerTask.h ++++ b/src/app-logic/ReconstructLayerTask.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerTask.h" + #include "ReconstructLayerProxy.h" + #include "ReconstructLayerParams.h" +@@ -42,6 +43,7 @@ + #include "maths/types.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/ReconstructScalarCoverageLayerParams.h ++++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h +@@ -30,6 +30,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerParams.h" + #include "ReconstructScalarCoverageLayerProxy.h" + #include "ReconstructScalarCoverageParams.h" +@@ -38,6 +39,7 @@ + #include "property-values/ValueObjectType.h" + + #include "utils/SubjectObserverToken.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/ReconstructScalarCoverageLayerTask.h ++++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h +@@ -30,12 +30,14 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerTask.h" + #include "ReconstructScalarCoverageLayerParams.h" + #include "ReconstructScalarCoverageLayerProxy.h" + #include "ScalarCoverageFeatureProperties.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/TopologyNetworkResolverLayerTask.h ++++ b/src/app-logic/TopologyNetworkResolverLayerTask.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerParams.h" + #include "LayerTask.h" + #include "ReconstructLayerProxy.h" +@@ -41,6 +42,7 @@ + #include "TopologyNetworkResolverLayerProxy.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/VelocityFieldCalculatorLayerTask.h ++++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h +@@ -32,9 +32,11 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerTask.h" + #include "VelocityFieldCalculatorLayerParams.h" + #include "VelocityFieldCalculatorLayerProxy.h" ++#endif + + #include "model/FeatureCollectionHandle.h" + +--- a/src/data-mining/CoRegConfigurationTable.h ++++ b/src/data-mining/CoRegConfigurationTable.h +@@ -28,6 +28,7 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include + + #include "CoRegFilter.h" +@@ -44,6 +45,7 @@ + #include "scribe/Transcribe.h" + #include "scribe/TranscribeContext.h" + ++#endif + + namespace GPlatesDataMining + { +--- a/src/gui/CommandServer.h ++++ b/src/gui/CommandServer.h +@@ -38,9 +38,11 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "app-logic/ApplicationState.h" + + #include "presentation/ViewState.h" ++#endif + + namespace GPlatesGui + { +--- a/src/gui/FeatureTableModel.h ++++ b/src/gui/FeatureTableModel.h +@@ -32,8 +32,10 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "app-logic/Layer.h" + #include "app-logic/ReconstructionGeometry.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/gui/TopologyTools.h ++++ b/src/gui/TopologyTools.h +@@ -35,6 +35,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "TopologySectionsContainer.h" + + #include "app-logic/Layer.h" +@@ -64,6 +65,7 @@ + #include "utils/UnicodeStringUtils.h" + + #include "view-operations/RenderedGeometryCollection.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/opengl/GLVisualLayers.h ++++ b/src/opengl/GLVisualLayers.h +@@ -35,6 +35,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "GLAgeGridMaskSource.h" + #include "GLContext.h" + #include "GLLight.h" +@@ -79,6 +80,7 @@ + + #include "view-operations/RenderedGeometry.h" + #include "view-operations/ScalarField3DRenderParameters.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/presentation/VisualLayer.h ++++ b/src/presentation/VisualLayer.h +@@ -32,6 +32,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "VisualLayerParams.h" + #include "VisualLayerType.h" + +@@ -42,6 +43,7 @@ + #include "model/FeatureCollectionHandle.h" + + #include "view-operations/RenderedGeometryCollection.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/presentation/VisualLayers.h ++++ b/src/presentation/VisualLayers.h +@@ -34,6 +34,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "VisualLayer.h" + + #include "app-logic/FeatureCollectionFileState.h" +@@ -42,6 +43,7 @@ + #include "gui/Symbol.h" + + #include "view-operations/RenderedGeometryCollection.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/AssignReconstructionPlateIdsDialog.h ++++ b/src/qt-widgets/AssignReconstructionPlateIdsDialog.h +@@ -39,6 +39,7 @@ + #include "GPlatesDialog.h" + #include "InformationDialog.h" + ++#ifndef Q_MOC_RUN + #include "app-logic/AssignPlateIds.h" + + #include "file-io/File.h" +@@ -47,6 +48,7 @@ + #include "model/ModelInterface.h" + + #include "presentation/VisualLayer.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h ++++ b/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h +@@ -38,6 +38,7 @@ + + #include "OpenDirectoryDialog.h" + ++#ifndef Q_MOC_RUN + #include "app-logic/ApplicationState.h" + #include "app-logic/Layer.h" + #include "app-logic/LayerInputChannelName.h" +@@ -45,6 +46,7 @@ + + #include "data-mining/CheckAttrTypeVisitor.h" + #include "data-mining/CoRegConfigurationTable.h" ++#endif + + #include "global/PointerTraits.h" + +--- a/src/qt-widgets/CoRegistrationOptionsWidget.h ++++ b/src/qt-widgets/CoRegistrationOptionsWidget.h +@@ -31,6 +31,7 @@ + #include "CoRegistrationLayerConfigurationDialog.h" + #include "CoRegistrationOptionsWidgetUi.h" + #include "LayerOptionsWidget.h" ++#ifndef Q_MOC_RUN + #include "CoRegistrationResultTableDialog.h" + + #include "app-logic/CoRegistrationLayerTask.h" +@@ -41,7 +42,7 @@ + #include "file-io/File.h" + + #include "presentation/VisualLayer.h" +- ++#endif + + namespace GPlatesAppLogic + { +--- a/src/qt-widgets/CoRegistrationResultTableDialog.h ++++ b/src/qt-widgets/CoRegistrationResultTableDialog.h +@@ -36,6 +36,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "CoRegistrationResultTableDialogUi.h" + #include "SaveFileDialog.h" + +@@ -43,6 +44,7 @@ + #include "data-mining/OpaqueDataToQString.h" + + #include "presentation/VisualLayer.h" ++#endif + + namespace GPlatesPresentation + { +--- a/src/qt-widgets/DrawStyleDialog.h ++++ b/src/qt-widgets/DrawStyleDialog.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "DrawStyleDialogUi.h" + #include "GPlatesDialog.h" + #include "PythonArgumentWidget.h" +@@ -41,6 +42,7 @@ + #include "gui/PythonConfiguration.h" + + #include "presentation/Application.h" ++#endif + + namespace GPlatesAppLogic + { +--- a/src/qt-widgets/EditTableActionWidget.h ++++ b/src/qt-widgets/EditTableActionWidget.h +@@ -27,8 +27,11 @@ + #define GPLATES_QTWIDGETS_EDITTABLEACTIONWIDGET_H + + #include ++ ++#ifndef Q_MOC_RUN + #include "app-logic/ApplicationState.h" + #include "EditTableActionWidgetUi.h" ++#endif + + namespace GPlatesQtWidgets + { +--- a/src/qt-widgets/GlobeCanvas.h ++++ b/src/qt-widgets/GlobeCanvas.h +@@ -41,6 +41,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "gui/ColourScheme.h" + #include "gui/Globe.h" + #include "gui/ViewportZoom.h" +@@ -58,6 +59,7 @@ + #include "qt-widgets/SceneView.h" + + #include "view-operations/RenderedGeometryFactory.h" ++#endif + + + namespace GPlatesGui +--- a/src/qt-widgets/LogDialog.h ++++ b/src/qt-widgets/LogDialog.h +@@ -34,7 +34,9 @@ + #include "GPlatesDialog.h" + #include "LogDialogUi.h" + ++#ifndef Q_MOC_RUN + #include "app-logic/ApplicationState.h" ++#endif + + + namespace GPlatesGui +--- a/src/qt-widgets/MapCanvas.h ++++ b/src/qt-widgets/MapCanvas.h +@@ -39,6 +39,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "gui/ColourScheme.h" + #include "gui/Map.h" + #include "gui/TextOverlay.h" +@@ -47,6 +48,7 @@ + #include "opengl/GLMatrix.h" + #include "opengl/GLOffScreenContext.h" + #include "opengl/GLVisualLayers.h" ++#endif + + + namespace GPlatesGui +--- a/src/qt-widgets/MapView.h ++++ b/src/qt-widgets/MapView.h +@@ -36,6 +36,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "gui/ColourScheme.h" + + #include "maths/LatLonPoint.h" +@@ -44,6 +45,7 @@ + #include "opengl/GLVisualLayers.h" + + #include "qt-widgets/SceneView.h" ++#endif + + + namespace GPlatesGui +--- a/src/qt-widgets/MergeReconstructionLayersDialog.h ++++ b/src/qt-widgets/MergeReconstructionLayersDialog.h +@@ -33,7 +33,9 @@ + + #include "MergeReconstructionLayersDialogUi.h" + ++#ifndef Q_MOC_RUN + #include "app-logic/Layer.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/RasterLayerOptionsWidget.h ++++ b/src/qt-widgets/RasterLayerOptionsWidget.h +@@ -31,6 +31,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "RasterLayerOptionsWidgetUi.h" + + #include "LayerOptionsWidget.h" +@@ -40,6 +41,7 @@ + + #include "gui/BuiltinColourPaletteType.h" + #include "gui/RasterColourPalette.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h ++++ b/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h +@@ -28,6 +28,7 @@ + + #include + ++#ifndef Q_MOC_RUN + #include "ReconstructScalarCoverageLayerOptionsWidgetUi.h" + + #include "LayerOptionsWidget.h" +@@ -37,6 +38,7 @@ + + #include "gui/BuiltinColourPaletteType.h" + #include "gui/RasterColourPalette.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/ScalarField3DLayerOptionsWidget.h ++++ b/src/qt-widgets/ScalarField3DLayerOptionsWidget.h +@@ -30,6 +30,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "ScalarField3DLayerOptionsWidgetUi.h" + + #include "LayerOptionsWidget.h" +@@ -41,6 +42,7 @@ + #include "gui/RasterColourPalette.h" + + #include "view-operations/ScalarField3DRenderParameters.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/TotalReconstructionPolesDialog.h ++++ b/src/qt-widgets/TotalReconstructionPolesDialog.h +@@ -32,12 +32,14 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "TotalReconstructionPolesDialogUi.h" + + #include "GPlatesDialog.h" + #include "SaveFileDialog.h" + + #include "presentation/VisualLayer.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/VisualLayersComboBox.h ++++ b/src/qt-widgets/VisualLayersComboBox.h +@@ -32,8 +32,10 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "presentation/VisualLayer.h" + #include "presentation/VisualLayerType.h" ++#endif + + + namespace GPlatesPresentation +--- a/src/qt-widgets/VisualLayerWidget.h ++++ b/src/qt-widgets/VisualLayerWidget.h +@@ -36,11 +36,13 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "VisualLayerWidgetUi.h" + + #include "app-logic/Layer.h" + + #include "gui/Colour.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/view-operations/InternalGeometryBuilder.h ++++ b/src/view-operations/InternalGeometryBuilder.h +@@ -30,9 +30,11 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "maths/GeometryOnSphere.h" + #include "maths/GeometryType.h" + #include "maths/PointOnSphere.h" ++#endif + + namespace GPlatesViewOperations + { +--- a/src/view-operations/RenderedGeometryCollection.h ++++ b/src/view-operations/RenderedGeometryCollection.h +@@ -39,7 +39,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "RenderedGeometryLayer.h" ++#endif + + namespace GPlatesViewOperations + { +--- a/src/view-operations/RenderedGeometryFactory.h ++++ b/src/view-operations/RenderedGeometryFactory.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "RenderedGeometry.h" + #include "RenderedColouredEdgeSurfaceMesh.h" + #include "RenderedColouredTriangleSurfaceMesh.h" +@@ -62,6 +63,7 @@ + #include "property-values/TextContent.h" + + #include "view-operations/ScalarField3DRenderParameters.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/view-operations/RenderedGeometryLayer.h ++++ b/src/view-operations/RenderedGeometryLayer.h +@@ -35,10 +35,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "RenderedGeometry.h" + + #include "maths/CubeQuadTreeLocation.h" + ++#endif + + namespace GPlatesMaths + { diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix new file mode 100644 index 00000000000..9dd7b6b72db --- /dev/null +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }: + +stdenv.mkDerivation rec { + name = "gplates-${version}"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2"; + sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw"; + }; + + patches = [ + ./boostfix.patch + ]; + + buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ]; + + meta = with stdenv.lib; { + description = "Desktop software for the interactive visualisation of plate-tectonics"; + homepage = https://www.gplates.org; + license = licenses.gpl2; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index d144d484ed3..e7511e10d40 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -5,21 +5,19 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "0.12"; + version = "1.1"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif"; + sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288"; }; # cgit is tightly coupled with git and needs a git source tree to build. # IMPORTANT: Remember to check which git version cgit needs on every version - # bump (look in the Makefile). - # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to - # 1.9.2 (see the repository history) + # bump (look for "GIT_VER" in the top-level Makefile). gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz"; - sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs"; + url = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz"; + sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; buildInputs = [ diff --git a/pkgs/applications/virtualization/qemu/2.8.nix b/pkgs/applications/virtualization/qemu/2.8.nix new file mode 100644 index 00000000000..677386819d3 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/2.8.nix @@ -0,0 +1,93 @@ +{ stdenv, fetchurl, fetchpatch, python2, zlib, pkgconfig, glib +, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex +, bison, lzo, snappy, libaio, gnutls, nettle, curl +, makeWrapper +, attr, libcap, libcap_ng +, CoreServices, Cocoa, rez, setfile +, numaSupport ? stdenv.isLinux, numactl +, seccompSupport ? stdenv.isLinux, libseccomp +, pulseSupport ? !stdenv.isDarwin, libpulseaudio +, sdlSupport ? !stdenv.isDarwin, SDL +, vncSupport ? true, libjpeg, libpng +, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir +, x86Only ? false +, nixosTestRunner ? false +}: + +with stdenv.lib; +let + version = "2.8.0"; + audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + + optionalString pulseSupport "pa," + + optionalString sdlSupport "sdl,"; +in + +stdenv.mkDerivation rec { + name = "qemu-" + + stdenv.lib.optionalString x86Only "x86-only-" + + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + + version; + + src = fetchurl { + url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; + sha256 = "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs"; + }; + + buildInputs = + [ python2 zlib pkgconfig glib ncurses perl pixman + vde2 texinfo libuuid flex bison makeWrapper lzo snappy + gnutls nettle curl + ] + ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] + ++ optionals seccompSupport [ libseccomp ] + ++ optionals numaSupport [ numactl ] + ++ optionals pulseSupport [ libpulseaudio ] + ++ optionals sdlSupport [ SDL ] + ++ optionals vncSupport [ libjpeg libpng ] + ++ optionals spiceSupport [ spice_protocol spice usbredir ] + ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]; + + enableParallelBuilding = true; + + patches = [ + ./no-etc-install.patch + ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; + hardeningDisable = [ "stackprotector" ]; + + configureFlags = + [ "--smbd=smbd" # use `smbd' from $PATH + "--audio-drv-list=${audio}" + "--sysconfdir=/etc" + "--localstatedir=/var" + ] + ++ optional numaSupport "--enable-numa" + ++ optional seccompSupport "--enable-seccomp" + ++ optional spiceSupport "--enable-spice" + ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" + ++ optional stdenv.isDarwin "--enable-cocoa" + ++ optional stdenv.isLinux "--enable-linux-aio"; + + postFixup = + '' + for exe in $out/bin/qemu-system-* ; do + paxmark m $exe + done + ''; + + postInstall = + '' + # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. + p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" + if [ -e "$p" ]; then + makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" + fi + ''; + + meta = with stdenv.lib; { + homepage = http://www.qemu.org/; + description = "A generic and open source machine emulator and virtualizer"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric eelco ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a99b37f0d17..eb167210126 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -137,6 +137,17 @@ stdenv.mkDerivation rec { # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06 ./CVE-2016-9102.patch + + (fetchpatch { + name = "qemu-CVE-2016-9911.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=791f97758e223de3290592d169f8e6339c281714"; + sha256 = "0952mpc81h42k5kqsw42prnw5vw86r3j88wk5z4sr1xd1sg428d6"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9921_9922.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=commit;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70"; + sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix deleted file mode 100644 index 961296c6eec..00000000000 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, cmake, gperf, imagemagick, pkgconfig, lua -, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil -, xcbutilimage, xcbutilkeysyms, xcbutilwm, libpthreadstubs, libXau -, libXdmcp, pixman, doxygen -, libstartup_notification, libev, asciidoc, xmlto, dbus, docbook_xsl -, docbook_xml_dtd_45, libxslt, coreutils, which }: - -let - version = "3.4.13"; -in - -stdenv.mkDerivation rec { - name = "awesome-${version}"; - - src = fetchurl { - url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0jhsgb8wdzpfmdyl9fxp2w6app7l6zl8b513z3ff513nvdlxj5hr"; - }; - - buildInputs = [ cmake gperf imagemagick pkgconfig lua glib cairo pango - imlib2 libxcb libxdg_basedir xcbutil xcbutilimage xcbutilkeysyms xcbutilwm - libstartup_notification libev libpthreadstubs libXau libXdmcp pixman doxygen - asciidoc xmlto dbus docbook_xsl docbook_xml_dtd_45 libxslt which ]; - - # We use coreutils for 'env', that will allow then finding 'bash' or 'zsh' in - # the awesome lua code. I prefered that instead of adding 'bash' or 'zsh' as - # dependencies. - prePatch = '' - # Fix the tab completion (supporting bash or zsh) - sed s,/usr/bin/env,${coreutils}/bin/env, -i lib/awful/completion.lua.in - # Remove the 'root' PATH override (I don't know why they have that) - sed /WHOAMI/d -i utils/awsetbg - # Russian manpages fail to be generated: - # [ 56%] Generating manpages/ru/man1/awesome.1.xml - # asciidoc: ERROR: : line 3: name section expected - # asciidoc: FAILED: : line 3: section title expected - # make[2]: *** [manpages/ru/man1/awesome.1.xml] Error 1 - substituteInPlace CMakeLists.txt \ - --replace "set(AWE_MAN_LANGS it es fr de ru)" \ - "set(AWE_MAN_LANGS it es fr de)" - ''; - - meta = { - homepage = http://awesome.naquadah.org/; - description = "Highly configurable, dynamic window manager for X"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; - - passthru = { - inherit lua; - }; - -} diff --git a/pkgs/applications/window-managers/awesome/3.5.nix b/pkgs/applications/window-managers/awesome/3.5.nix new file mode 100644 index 00000000000..3a2a030b8a4 --- /dev/null +++ b/pkgs/applications/window-managers/awesome/3.5.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs +, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter +, compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm +, which, dbus, nettools, git, asciidoc, doxygen +, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs +}: + +let + version = "3.5.9"; +in with luaPackages; + +stdenv.mkDerivation rec { + name = "awesome-${version}"; + + src = fetchurl { + url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; + sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; + }; + + meta = with stdenv.lib; { + description = "Highly configurable, dynamic window manager for X"; + homepage = http://awesome.naquadah.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.linux; + }; + + nativeBuildInputs = [ + asciidoc + cmake + doxygen + imagemagick + makeWrapper + pkgconfig + xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + ]; + + buildInputs = [ + cairo + dbus + gdk_pixbuf + gobjectIntrospection + git + lgi + libpthreadstubs + libstartup_notification + libxdg_basedir + lua + nettools + pango + xcb-util-cursor + xorg.libXau + xorg.libXdmcp + xorg.libxcb + xorg.libxshmfence + xorg.xcbutil + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + ]; + + #cmakeFlags = "-DGENERATE_MANPAGES=ON"; + + LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; + GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; + LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; + LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; + + postInstall = '' + wrapProgram $out/bin/awesome \ + --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ + --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" + + wrapProgram $out/bin/awesome-client \ + --prefix PATH : "${which}/bin" + ''; + + passthru = { + inherit lua; + }; +} diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 3a2a030b8a4..9fa4d6a6d8e 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -4,25 +4,26 @@ , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm , which, dbus, nettools, git, asciidoc, doxygen , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs +, libxkbcommon, xcbutilxrm }: let - version = "3.5.9"; + version = "4.0"; in with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; src = fetchurl { - url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; + url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz"; + sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w"; }; meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; - homepage = http://awesome.naquadah.org/; + homepage = https://awesomewm.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 rasendubi ]; platforms = platforms.linux; }; @@ -59,6 +60,8 @@ stdenv.mkDerivation rec { xorg.xcbutilkeysyms xorg.xcbutilrenderutil xorg.xcbutilwm + libxkbcommon + xcbutilxrm ]; #cmakeFlags = "-DGENERATE_MANPAGES=ON"; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index aee4a63c308..d0d831f8cc7 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, bash, which, withFont ? "" }: stdenv.mkDerivation rec { - version = "0.8.0"; + version = "1.0.0"; name = "nerdfonts-${version}"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "nerd-fonts"; rev = version; - sha256 = "0n7idfk4460j8g0rw73hzz195pdh4c916hpc5r6dxpvgcmvryzc5"; + sha256 = "1kz4hhshi3lsaja20kg258jc220q1b6nhwiyv0w433m0kvsgzdqd"; }; dontPatchShebangs = true; buildInputs = [ which ]; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 0e59e2e04e3..7784e59e4b2 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "tzdata-${version}"; - version = "2016f"; + version = "2016j"; srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "1c024mg4gy572vgdj9rk4dqnb33iap06zs8ibasisbyi1089b37d"; + sha256 = "1j4xycpwhs57qnkcxwh3np8wnf3km69n3cf4w6p2yv2z247lxvpm"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "1vb6n29ik7dzhffzzcnskbhmn6h1dxzan3zanbp118wh8hw5yckj"; + sha256 = "1dxhrk4z0n2di8p0yd6q00pa6bwyz5xqbrfbasiz8785ni7zrvxr"; }) ]; diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh index 60928c3900d..76f05bad0a7 100644 --- a/pkgs/desktops/kde-5/plasma/fetch.sh +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.4/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.5/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 75f44f47bec..03ee867453b 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/bluedevil-5.8.4.tar.xz"; - sha256 = "1c49f35574948q541q25wsalhdz0yji9x18hpg7lc9mb117114fq"; - name = "bluedevil-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/bluedevil-5.8.5.tar.xz"; + sha256 = "07gj3m5f0rk26n0xm4yddsfny6l2sh0airm45hb33p7m5inaqzgv"; + name = "bluedevil-5.8.5.tar.xz"; }; }; breeze = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/breeze-5.8.4.tar.xz"; - sha256 = "0jxlvr9yf7pilwjvzzhhx8di6a2gx8812hl08fh4lszbkdia69yw"; - name = "breeze-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/breeze-5.8.5.tar.xz"; + sha256 = "1gcns00iq7a5f1a0w6vf8zck669gzcd785fiybnvc6s6q8x4bp61"; + name = "breeze-5.8.5.tar.xz"; }; }; breeze-grub = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/breeze-grub-5.8.4.tar.xz"; - sha256 = "1sysdw3agm568l8mc6bv7g2vhxny34h1b4k9wm36c1x1xyac72cm"; - name = "breeze-grub-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/breeze-grub-5.8.5.tar.xz"; + sha256 = "12ynrxdfcraphbwv9yrfhvwf3xkzrw0raqvgi7ksz5cvh78kl5qf"; + name = "breeze-grub-5.8.5.tar.xz"; }; }; breeze-gtk = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/breeze-gtk-5.8.4.tar.xz"; - sha256 = "127hhlxicc3rsxxi9cwcqj32w3yyi20p1sfmfk7gjnklm6zv8b0a"; - name = "breeze-gtk-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/breeze-gtk-5.8.5.tar.xz"; + sha256 = "15dx5hl9w9fiash30vgkbww6h7hck0dr42hh8gzysn0xyf0fzpgd"; + name = "breeze-gtk-5.8.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/breeze-plymouth-5.8.4.tar.xz"; - sha256 = "0lsdincygh75yib1nfyqnwghnpi3pwjyjvkgyza142s49vynkdkj"; - name = "breeze-plymouth-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/breeze-plymouth-5.8.5.tar.xz"; + sha256 = "1ryb2jrzw0bzpi7ig4h5k0i33d2qviqsjxw7mnqxcb9q49a4ziq1"; + name = "breeze-plymouth-5.8.5.tar.xz"; }; }; discover = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/discover-5.8.4.tar.xz"; - sha256 = "1wkwkk0cqyz9d68d9s651cjahimb9phwr7k55g6mkigdkljd18fx"; - name = "discover-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/discover-5.8.5.tar.xz"; + sha256 = "0fr6mksqw46aghfzj78nlq3f89xd63vq2hr4c3gb4vkl5y8v08hg"; + name = "discover-5.8.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kactivitymanagerd-5.8.4.tar.xz"; - sha256 = "0rb9gc584lhbqfn9q31rl1h0aqiv90b1cb5pd5rcsq6s2yz0g8i2"; - name = "kactivitymanagerd-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kactivitymanagerd-5.8.5.tar.xz"; + sha256 = "07cqnbyznn5wy7vrqyid8h5ah7h3sb3pb30qlm83b4m29bkhggwh"; + name = "kactivitymanagerd-5.8.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kde-cli-tools-5.8.4.tar.xz"; - sha256 = "0vzb5gq94hwyzz32z5gvdrpzj3ysvsqb6k25cfc3sy93hwla3a14"; - name = "kde-cli-tools-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kde-cli-tools-5.8.5.tar.xz"; + sha256 = "1ig9x5h9xkzis9izggkjpiiy4sm77pk347jdngx01qpacz68iyp7"; + name = "kde-cli-tools-5.8.5.tar.xz"; }; }; kdecoration = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kdecoration-5.8.4.tar.xz"; - sha256 = "06ch3871yifkimqs67z3j7rv673qw6wa01x6qnc6899rckg1kdl4"; - name = "kdecoration-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kdecoration-5.8.5.tar.xz"; + sha256 = "1vhw57pj9i5224i9irk4qmingvkg5bip11vsqiwhmn5307bpnfiq"; + name = "kdecoration-5.8.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kde-gtk-config-5.8.4.tar.xz"; - sha256 = "15jw7wvk3jl9rbcm2f3vx6i5mjqzibj87l85r9cr33cxaq06wdn4"; - name = "kde-gtk-config-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kde-gtk-config-5.8.5.tar.xz"; + sha256 = "1j0mzmmdhqd3a8papps6cad0gqn081mc4kqzi2hjai7038l6951r"; + name = "kde-gtk-config-5.8.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kdeplasma-addons-5.8.4.tar.xz"; - sha256 = "0f1956dppgyx313ihjv8f21lql387rzzkvmg9y9lh7yidl75gfz4"; - name = "kdeplasma-addons-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kdeplasma-addons-5.8.5.tar.xz"; + sha256 = "181kagb4nbl9a7akk79slwkb7m2j4vyhabagih0z8l45wl5wrz9d"; + name = "kdeplasma-addons-5.8.5.tar.xz"; }; }; kgamma5 = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kgamma5-5.8.4.tar.xz"; - sha256 = "1r5mzdk2givjmq5j374hgbf17jni4n7836pli2vka4qbjbrlzfg1"; - name = "kgamma5-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kgamma5-5.8.5.tar.xz"; + sha256 = "073z4w4i2hwsqqgxcfl0w8d57nhzc069h9zwp7fv93aaw4mgzci2"; + name = "kgamma5-5.8.5.tar.xz"; }; }; khotkeys = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/khotkeys-5.8.4.tar.xz"; - sha256 = "1q766aaq1l6ihgvjxlw69kpm91ai8nbcc9qc6xnz1924p9957nl3"; - name = "khotkeys-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/khotkeys-5.8.5.tar.xz"; + sha256 = "1fh0z9vfb908nbwj3snkf9z55jbcb5id87k5sa0v8dhazmp91ylh"; + name = "khotkeys-5.8.5.tar.xz"; }; }; kinfocenter = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kinfocenter-5.8.4.tar.xz"; - sha256 = "1mnvp4bkhvmpqfqjag46fcx0kr7w8mq29djqlfd9akypqmzszbvd"; - name = "kinfocenter-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kinfocenter-5.8.5.tar.xz"; + sha256 = "1fksnb9klbcrr9ly6dd2yx5y1ngcwcln43zykpc76pr4i49jpggp"; + name = "kinfocenter-5.8.5.tar.xz"; }; }; kmenuedit = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kmenuedit-5.8.4.tar.xz"; - sha256 = "0wm40swxarnzv7hs11r1wmj6b0yjby3sxk8n59z6s2zza64n6n8h"; - name = "kmenuedit-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kmenuedit-5.8.5.tar.xz"; + sha256 = "1vq5f69w75lj81nz75db88lqxc4zvhicd5w7r6k7amggnwxm9f3m"; + name = "kmenuedit-5.8.5.tar.xz"; }; }; kscreen = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kscreen-5.8.4.tar.xz"; - sha256 = "1j43gzxv9j4fjszc839968vmlsrqg7bapwvjnwfc3mc8z2w7a6hl"; - name = "kscreen-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kscreen-5.8.5.tar.xz"; + sha256 = "069x3vsfqirmq8r7yfa68srhjvygdwsxcj0b4vvb7zivs29zn1mh"; + name = "kscreen-5.8.5.tar.xz"; }; }; kscreenlocker = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kscreenlocker-5.8.4.tar.xz"; - sha256 = "1n4wbzfi2h9lxj8g1qii43q205by1bqv48xxyr871mmmikxrk6qv"; - name = "kscreenlocker-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kscreenlocker-5.8.5.tar.xz"; + sha256 = "11b2v3chhk1ma5kjbmf35qahfr8gbaw78mcqs8vw5m9x74vlimkj"; + name = "kscreenlocker-5.8.5.tar.xz"; }; }; ksshaskpass = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/ksshaskpass-5.8.4.tar.xz"; - sha256 = "033mjmry0hbz2daa9w0i2drxrdjyraynxhlnq0b331b6klxhzczc"; - name = "ksshaskpass-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/ksshaskpass-5.8.5.tar.xz"; + sha256 = "1gr48f4akrn0yhlnjw4yaas6ah5z40fb8iz06gi1dzry5axfmaxh"; + name = "ksshaskpass-5.8.5.tar.xz"; }; }; ksysguard = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/ksysguard-5.8.4.tar.xz"; - sha256 = "1hmj32c2jzvk6fwbvdh3ij1651bfslfqhy52y79mc6q816wm7fv3"; - name = "ksysguard-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/ksysguard-5.8.5.tar.xz"; + sha256 = "1gd81y2a459j5k1mpikfrvwcz7v09m526nrl7kpr4l4a1ps8zfy9"; + name = "ksysguard-5.8.5.tar.xz"; }; }; kwallet-pam = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kwallet-pam-5.8.4.tar.xz"; - sha256 = "149qwri47yjv85abfv48232ldvl464df4id9gz0kwjp3cd5n12cn"; - name = "kwallet-pam-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kwallet-pam-5.8.5.tar.xz"; + sha256 = "0310vr3p9fxl3vwdgklk0acx6w31pcpq8mi9yldahg1mkjqf7l44"; + name = "kwallet-pam-5.8.5.tar.xz"; }; }; kwayland-integration = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kwayland-integration-5.8.4.tar.xz"; - sha256 = "1s3jy3bb15v49w9ym5d9x352lf57dsg72xqmw3w2jbvmmyacg2a7"; - name = "kwayland-integration-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kwayland-integration-5.8.5.tar.xz"; + sha256 = "11f63mq7crsbrpdib16q8xg0hk8jr5x1cyv43q8qdqm0591cglli"; + name = "kwayland-integration-5.8.5.tar.xz"; }; }; kwin = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kwin-5.8.4.tar.xz"; - sha256 = "1zglmz2c2aiw46vm813m5hznqjx1phs90djlva9vcvv5rvz7y3fn"; - name = "kwin-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kwin-5.8.5.tar.xz"; + sha256 = "182z17d4sad9j15qagx9yz13wwzcyy6hlgpy5nlx6dlfcb8s00x7"; + name = "kwin-5.8.5.tar.xz"; }; }; kwrited = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/kwrited-5.8.4.tar.xz"; - sha256 = "055054i96yxi2pb5lg42d6yjhvwqc5vgqnrczh8f5g6j3ykl6p7s"; - name = "kwrited-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/kwrited-5.8.5.tar.xz"; + sha256 = "1nsr244niyq2bk29s0cqq1p2qj0h1hx4nl13nc3x3aycfhfkjfkr"; + name = "kwrited-5.8.5.tar.xz"; }; }; libkscreen = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/libkscreen-5.8.4.tar.xz"; - sha256 = "1vrh4ympdgnvnrl7c4l3hizxza05y0dr4ii6h109r8iqfhbis56p"; - name = "libkscreen-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/libkscreen-5.8.5.tar.xz"; + sha256 = "1zj2nzyl0nmg5za3iwr4q4nzfv69f35f0394b6k0g3dgh1zxmby9"; + name = "libkscreen-5.8.5.tar.xz"; }; }; libksysguard = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/libksysguard-5.8.4.tar.xz"; - sha256 = "0mc045qvkzsk1rhvasysbjcqvsm9nvmgha6ljsfn61gnwpb3fjzq"; - name = "libksysguard-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/libksysguard-5.8.5.tar.xz"; + sha256 = "1acp4kzdjhipsqw90n3rc1ydbkqhb12afwdsfl25fibv0c39avwp"; + name = "libksysguard-5.8.5.tar.xz"; }; }; milou = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/milou-5.8.4.tar.xz"; - sha256 = "169bcdgbqddmfzz39wdy5cbqqm8djayr3bxn8j28pjkc4l8i93c8"; - name = "milou-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/milou-5.8.5.tar.xz"; + sha256 = "0lj5cb43jkqs8qg2acs39dkfwskbw135ap65vxiv27ivxscyvz3d"; + name = "milou-5.8.5.tar.xz"; }; }; oxygen = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/oxygen-5.8.4.tar.xz"; - sha256 = "1g8zm71k31smyzxc1kmvcl889ljfv6l0ks6g9888qyyzhbqps2p4"; - name = "oxygen-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/oxygen-5.8.5.tar.xz"; + sha256 = "199jcn6qzyihxmw38b1cl0ah0rzn7f574khx72n9x5y9143p9lh7"; + name = "oxygen-5.8.5.tar.xz"; }; }; plasma-desktop = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/plasma-desktop-5.8.4.tar.xz"; - sha256 = "07dw8x74j0am52rxvig0jcwhlk3kx762hfw3vk6innjfcrkjx43q"; - name = "plasma-desktop-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz"; + sha256 = "045990fvhqpwhfi6jqpkzhgbhc3lwvwhkia1y77m12n1djbynpnr"; + name = "plasma-desktop-5.8.5.tar.xz"; }; }; plasma-integration = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/plasma-integration-5.8.4.tar.xz"; - sha256 = "18w4ws0ydqf0lfd16svgs1sbf2q6rc1zkzfhxwj2jzdhqjqwdikn"; - name = "plasma-integration-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz"; + sha256 = "1sm7027ywz8xxqfsjv6jvk8zx11kx83rx88bb8cy31qfjipsakfb"; + name = "plasma-integration-5.8.5.tar.xz"; }; }; plasma-nm = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/plasma-nm-5.8.4.tar.xz"; - sha256 = "0dzk6wa6dsw9mlwxvhyhq8dmk88ia9paavcnw0am165ahpmkpzjq"; - name = "plasma-nm-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz"; + sha256 = "1g1yyzc8y2hsgycficvavpl5yizd54ns93cdky9cgsrnxlkfwbvc"; + name = "plasma-nm-5.8.5.tar.xz"; }; }; plasma-pa = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/plasma-pa-5.8.4.tar.xz"; - sha256 = "1p7f7ahr4xc50cn9iawkpq0xna7s7zar8vlkvizgji566sp1yf4i"; - name = "plasma-pa-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/plasma-pa-5.8.5.tar.xz"; + sha256 = "0vg1dyxfg8rxzyh0xnk41c95zp8rdbx1w462llrwchzp29p3xg1b"; + name = "plasma-pa-5.8.5.tar.xz"; }; }; plasma-sdk = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/plasma-sdk-5.8.4.tar.xz"; - sha256 = "0nkrppv15l4v2f9g3ihixmgya1ky2zrih1ynak7kqkv43d4827s9"; - name = "plasma-sdk-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/plasma-sdk-5.8.5.tar.xz"; + sha256 = "13lyb5x4a8aq4fykvdv1137yvc4s4q31fdxhxppza1wkw8lvbvpd"; + name = "plasma-sdk-5.8.5.tar.xz"; }; }; plasma-tests = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/plasma-tests-5.8.4.tar.xz"; - sha256 = "0hh8rp7sw8lyc61pizhc64138sv41iv9gnn0flbblvd912990i6k"; - name = "plasma-tests-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/plasma-tests-5.8.5.tar.xz"; + sha256 = "0wgqyqlqygi3z0cccpfrpi259jp4yhh2g4x3mqcxisv58mbjrj1b"; + name = "plasma-tests-5.8.5.tar.xz"; }; }; plasma-workspace = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-5.8.4.tar.xz"; - sha256 = "1hwdrwc43s0mfy86ywws2myr1byf4d1j7x685z05cvyg3ha2wwwd"; - name = "plasma-workspace-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-5.8.5.tar.xz"; + sha256 = "18bf5wmyb198jnbpivjjwsk65sksrvzlvykx3mr3wvj30mr0f9bd"; + name = "plasma-workspace-5.8.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/plasma-workspace-wallpapers-5.8.4.tar.xz"; - sha256 = "088vmni3krybg5j6bd0amfqn806pxqjnyb0pvlwbakw53yjbsva3"; - name = "plasma-workspace-wallpapers-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-wallpapers-5.8.5.tar.xz"; + sha256 = "116s9qw888lbgxc9ggxf7fa99vggixr2ig1715xb5zmqm14yznyz"; + name = "plasma-workspace-wallpapers-5.8.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.8.4"; + version = "1-5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/polkit-kde-agent-1-5.8.4.tar.xz"; - sha256 = "0jh1msiaig47114ccdpxf3zl77vgs5wvbsl2vibc05i19alr99jg"; - name = "polkit-kde-agent-1-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/polkit-kde-agent-1-5.8.5.tar.xz"; + sha256 = "1dwk848wljcd9bi0h58h0ljnjlz1qq50rd7i38f3cb848iipisw7"; + name = "polkit-kde-agent-1-5.8.5.tar.xz"; }; }; powerdevil = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/powerdevil-5.8.4.tar.xz"; - sha256 = "1b1cy98zjdc9w8jd0hqrzmvmvfxg5v6imd4pvnlgfix9bm0gcmcy"; - name = "powerdevil-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/powerdevil-5.8.5.tar.xz"; + sha256 = "0lj7jcaqfsipiwi7x4q684p4pfsqzflvddr7hrhirfl1p62bc704"; + name = "powerdevil-5.8.5.tar.xz"; }; }; sddm-kcm = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/sddm-kcm-5.8.4.tar.xz"; - sha256 = "03d2x6hvjvwdmpcs04vs7jqp4nnvw1gmiwfra5xk432argf0nxyx"; - name = "sddm-kcm-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/sddm-kcm-5.8.5.tar.xz"; + sha256 = "0dcvk3f3cqq4z5hc63ccpxyl3kknjvd8jsnx7r2hfrwsw0y90fqc"; + name = "sddm-kcm-5.8.5.tar.xz"; }; }; systemsettings = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/systemsettings-5.8.4.tar.xz"; - sha256 = "1j45yvvm8lx1nvwzq2x979s5x3k4i3phjcw73hxyqv9x7y0pnchv"; - name = "systemsettings-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/systemsettings-5.8.5.tar.xz"; + sha256 = "0pkwmgbjglbyc8i22hivh5gnaj742df3ff3f998k66k81mfjkwga"; + name = "systemsettings-5.8.5.tar.xz"; }; }; user-manager = { - version = "5.8.4"; + version = "5.8.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.4/user-manager-5.8.4.tar.xz"; - sha256 = "0m2yv7qlj0y95z5x3f008aww3jzrs5lf32k9czqia3fyy9szpa1d"; - name = "user-manager-5.8.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.5/user-manager-5.8.5.tar.xz"; + sha256 = "1ck8x860q3aqgbbgiwfdhs0i0bs2nhqqva19kl9x1b015p64gl5z"; + name = "user-manager-5.8.5.tar.xz"; }; }; } diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index ed9907a283b..39a06a4b1dc 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + # patch the script which launches the prebuilt compiler + substituteInPlace $(pwd)/crystal-${version}-1/bin/crystal --replace \ + "/usr/bin/env bash" "${stdenv.shell}" + substituteInPlace $(pwd)/crystal-${version}/bin/crystal --replace \ + "/usr/bin/env bash" "${stdenv.shell}" + ${fixPrebuiltBinary} cd crystal-${version} diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index db9e0682096..1834f3ae50b 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, hscolour, patchutils +, hscolour, patchutils, sphinx }: let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - buildInputs = [ ghc perl hscolour ]; + buildInputs = [ ghc perl hscolour sphinx]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 977a0fb39b6..b2ae92e02c6 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, hscolour, patchutils +, hscolour, patchutils, sphinx }: let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - buildInputs = [ ghc perl hscolour ]; + buildInputs = [ ghc perl hscolour sphinx ]; enableParallelBuilding = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a9ad1a695ac..9b03d4633bc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -998,7 +998,7 @@ self: super: { # The most current version needs some packages to build that are not in LTS 7.x. stack = super.stack.overrideScope (self: super: { - http-client = self.http-client_0_5_4; + http-client = self.http-client_0_5_5; http-client-tls = self.http-client-tls_0_3_3; http-conduit = self.http-conduit_2_2_3; optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; @@ -1136,4 +1136,6 @@ self: super: { # requires vty 5.13 brick = super.brick.overrideScope (self: super: { vty = self.vty_5_14; }); + # https://github.com/krisajenkins/elm-export/pull/22 + elm-export = doJailbreak super.elm-export; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 559096ebd28..a2b6058b166 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -19,6 +19,7 @@ self: super: { directory = null; filepath = null; ghc-prim = null; + ghci = null; haskeline = null; hoopl = null; hpc = null; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 42858390c30..06480f59f28 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2068,10 +2068,13 @@ package-maintainers: - ghc-srcspan-plugin - located-base jb55: - - skeletons + - bson-lens - cased + - elm-export-persistent - pipes-csv - pipes-mongodb + - skeletons + - streaming-wai khumba: - hoppy-docs - hoppy-generator diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8b917a56a90..641968a4d39 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1675,8 +1675,8 @@ self: { }: mkDerivation { pname = "BitStringRandomMonad"; - version = "0.1.0.0"; - sha256 = "70acdb3e821d9fb17190b6bb9882217f31ae44e6d2ddf28f644a8f271156b785"; + version = "0.1.1.1"; + sha256 = "496715852ecfd5651fee81eba635b88865ef6dbc87792e56ea47eeac36fd9c36"; libraryHaskellDepends = [ base bitstring bytestring mtl parallel primitive transformers vector @@ -9696,6 +9696,8 @@ self: { pname = "IPv6Addr"; version = "0.6.2.0"; sha256 = "c0123cbacaba0266ea6eed1cf0ceb0cf323600e9eaa0ca855090edae0b085926"; + revision = "1"; + editedCabalFile = "7da9aae32a048aca882ec02c1f184ed24e53119de5345ff8b8d6fc62ccd6808e"; libraryHaskellDepends = [ attoparsec base iproute network network-info random text ]; @@ -9707,6 +9709,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_0_6_3" = callPackage + ({ mkDerivation, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "0.6.3"; + sha256 = "d51d7316a72e7cbe680cafda0b422d07bf9755261f040061ae72351aaf470e02"; + revision = "1"; + editedCabalFile = "55425a8e76d1b236298bd447f5ff7d4280a8eb51e0c1e363ed2c6a418dadbb85"; + libraryHaskellDepends = [ + attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/MichelBoucey/IPv6Addr"; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -10878,8 +10902,8 @@ self: { ({ mkDerivation, base, directory, filepath, List, transformers }: mkDerivation { pname = "ListTree"; - version = "0.2.2"; - sha256 = "b261ac13493c992c44156f81ad194e43f2ab5aa2ae5ea0596414280c3a8addba"; + version = "0.2.3"; + sha256 = "0b3aa1d34193d9f7f90b4afeea681a79ab1595e8e651cae093f8fca3c50f60cc"; libraryHaskellDepends = [ base directory filepath List transformers ]; @@ -15815,12 +15839,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spintax_0_3_0_0" = callPackage + "Spintax_0_3_1" = callPackage ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; - version = "0.3.0.0"; - sha256 = "b417809b3734c582f1a08be3a14845b913562077bfc35b3bf067ced2309b0ffc"; + version = "0.3.1"; + sha256 = "335e13554aa0a13c97b4f9258be904e3007c35a56e8131bdb363c5f7930fc521"; libraryHaskellDepends = [ attoparsec base extra mtl mwc-random text ]; @@ -18303,6 +18327,8 @@ self: { pname = "YamlReference"; version = "0.10.0"; sha256 = "4d89cd7714f25c82c6a49a99e8d8b1789640222a1b5863da0a7aa3f4566b9205"; + revision = "1"; + editedCabalFile = "987331ab821e7171c21f2b79eb678f2ece44759d4eb1155e5ca93ac2396a99dd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32983,7 +33009,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bitcoin-payment-channel_0_6_0_0" = callPackage + "bitcoin-payment-channel_0_6_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck , scientific, string-conversions, tagged, test-framework @@ -32991,8 +33017,8 @@ self: { }: mkDerivation { pname = "bitcoin-payment-channel"; - version = "0.6.0.0"; - sha256 = "487e5bb74a3a6c6829971d1071576b302c70298160f9b03654911e2094bcc011"; + version = "0.6.0.1"; + sha256 = "10085ef9254d88a4494986f372b07d4109d1767196cc6d230c02ffe18f5f1abd"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cereal errors haskoin-core hexstring QuickCheck scientific string-conversions tagged text time @@ -34858,6 +34884,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bower-json_1_0_0_1" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, base, bytestring + , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "bower-json"; + version = "1.0.0.1"; + sha256 = "7aa954e2b1bf79307db710c158108bd9ddb45b333ca96072cdbfaf96c77b7e73"; + libraryHaskellDepends = [ + aeson aeson-better-errors base bytestring deepseq ghc-prim mtl + scientific text transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring tasty tasty-hunit text unordered-containers + ]; + homepage = "https://github.com/hdgarrood/bower-json"; + description = "Read bower.json from Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bowntz" = callPackage ({ mkDerivation, base, containers, GLUT, hosc, hsc3, random }: mkDerivation { @@ -38964,6 +39012,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cayley-client_0_3_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.3.0"; + sha256 = "6c2d35f5c70df4744c3cac4a3cda952bd6a36f0f40cbdcf79ec54670ab1c5e1a"; + revision = "1"; + editedCabalFile = "7bc68d5b02fa41ebd7652a4e0d080417f4a66e179f24e6cc70845dac0fbb9f63"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + homepage = "https://github.com/MichelBoucey/cayley-client"; + description = "A Haskell client for the Cayley graph database"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cayley-dickson" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -45057,14 +45128,14 @@ self: { }) {}; "constraint-classes" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, constraints, transformers }: mkDerivation { pname = "constraint-classes"; - version = "0.4.0"; - sha256 = "0a5dda19ad7688081e43ec1445eac7a1ae0c4ae54139c4b92fd91e5f872a45b8"; - libraryHaskellDepends = [ base ]; + version = "0.5.1"; + sha256 = "5e26e76d7d1bcbdf77a384ffc74eb36a39f82e23a29d3ee80b6bf29ab7ce6921"; + libraryHaskellDepends = [ base constraints transformers ]; homepage = "http://github.com/guaraqe/constraint-classes#readme"; - description = "Prelude classes using ConstraintKinds"; + description = "Various typeclasses using ConstraintKinds"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -47542,8 +47613,8 @@ self: { pname = "crypto-enigma"; version = "0.0.2.6"; sha256 = "eb162e2b4ea2d73bb3594e12438f02988e338ae58c602e817a31970163533142"; - revision = "1"; - editedCabalFile = "4cc74c0744e15e1149d7419e47232db6f0bf53a56360f35d71665b180c2f2a53"; + revision = "3"; + editedCabalFile = "c94ac05824b4eb891ee0351c533f6b7a12586437b58c4615538903bfd807317c"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; homepage = "https://github.com/orome/crypto-enigma-hs"; @@ -50128,8 +50199,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "data-flags"; - version = "0.0.3.2"; - sha256 = "9e8944d63a314a116d1cc8ecb115ad0ea8dabd5ccb84dbbefd332e641430794a"; + version = "0.0.3.3"; + sha256 = "a1e390d6a58b45c5f9a193c8244badf31f104fad26d5178298c8043ad136faaa"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/mvv/data-flags"; description = "A package for working with bit masks and flags in general"; @@ -50700,14 +50771,14 @@ self: { "data-serializer" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, data-endian - , parsers, tasty, tasty-quickcheck + , parsers, semigroups, tasty, tasty-quickcheck }: mkDerivation { pname = "data-serializer"; - version = "0.2"; - sha256 = "1e134ab268125d0202ed95c723cd903283e8dc111918498cf27696820285a584"; + version = "0.3"; + sha256 = "c8befa7acf0293b0a367bf8100d19e8cf1ad4b4b48358394daa578103a505e2e"; libraryHaskellDepends = [ - base binary bytestring cereal data-endian parsers + base binary bytestring cereal data-endian parsers semigroups ]; testHaskellDepends = [ base binary bytestring cereal tasty tasty-quickcheck @@ -50810,8 +50881,8 @@ self: { }: mkDerivation { pname = "data-sword"; - version = "0.2"; - sha256 = "57db4db48eb3bda4a8b70c781c64342241ee7d7b53f020262dc3c7506f8eec95"; + version = "0.2.0.1"; + sha256 = "d2348ed2515a484866d92185640db0d20991ec9b0c6a891ed229ff41d5f304d1"; libraryHaskellDepends = [ base data-bword hashable template-haskell ]; @@ -60873,6 +60944,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eths-rlp" = callPackage + ({ mkDerivation, base, binary, binary-strict, bytestring, doctest + , hspec, QuickCheck, quickcheck-instances + }: + mkDerivation { + pname = "eths-rlp"; + version = "0.1.0.0"; + sha256 = "aa24e8f30bbb1eff7bd4cbfc635224f772d5bdba26a1db6ef346415b8d2ea09b"; + libraryHaskellDepends = [ base binary binary-strict bytestring ]; + testHaskellDepends = [ + base bytestring doctest hspec QuickCheck quickcheck-instances + ]; + description = "Ethereum Recursive Length Prefix Encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "ety" = callPackage ({ mkDerivation, base, bytestring, curl, random, text-icu , utf8-string, xml @@ -62417,6 +62504,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fast-nats" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fast-nats"; + version = "0.1.0.1"; + sha256 = "8197f83252621182c32350c20f995fb3ad3549499e2fbf2687235ff80024e3ce"; + libraryHaskellDepends = [ base ]; + description = "Natural Numbers with no overhead"; + license = stdenv.lib.licenses.mit; + }) {}; + "fast-tags" = callPackage ({ mkDerivation, array, async, base, bytestring, containers, cpphs , deepseq, directory, filepath, mtl, tasty, tasty-hunit, text @@ -62557,6 +62655,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fastpbkdf2" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, openssl + , tasty, tasty-hunit + }: + mkDerivation { + pname = "fastpbkdf2"; + version = "0.1.0.0"; + sha256 = "843103419b79f8fc21062e6842dace2a6e0c214f20c496a4268e1377c512f2f9"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ + base base16-bytestring bytestring tasty tasty-hunit + ]; + homepage = "https://github.com/adinapoli/fastpbkdf2-hs#readme"; + description = "Haskell bindings to the fastpbkdf2 C library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) openssl;}; + "fathead-util" = callPackage ({ mkDerivation, base, bytestring, cassava, hxt, network-uri, text }: @@ -70293,18 +70409,18 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; - "gi-atk_2_0_9" = callPackage + "gi-atk_2_0_11" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-atk"; - version = "2.0.9"; - sha256 = "246b50192e25a6f125cb51b2c57a38cb76702fe02c7b87b89e548851479598bf"; + version = "2.0.11"; + sha256 = "32594ce32ab70fcf7b7e4d2fd212a4714c72d28776be7649f88a989b40632d9b"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi-base text - transformers + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ atk ]; doHaddock = false; @@ -70339,18 +70455,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; - "gi-cairo_1_0_9" = callPackage + "gi-cairo_1_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers }: mkDerivation { pname = "gi-cairo"; - version = "1.0.9"; - sha256 = "acdc06c2543aae4462dee525b7fb806fd974e58d3d1b3482167f5bde2eb14a99"; + version = "1.0.11"; + sha256 = "a70bbb9b120d10c95e1bc603511d542b38cecf1025bed870e6dbe2bd2d7e552f"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi-base text transformers + base bytestring containers haskell-gi haskell-gi-base text + transformers ]; libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; doHaddock = false; @@ -70387,19 +70504,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; - "gi-gdk_3_0_9" = callPackage + "gi-gdk_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gdk"; - version = "3.0.9"; - sha256 = "6a908ed5be0a79c0d25a82ddcad4c910e2e65f756696141aaac970ac853fee22"; + version = "3.0.11"; + sha256 = "b1947f5abad3e500ac748ccea44275050c8a7261d0f81e49aee21a4266cf34b1"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-pango haskell-gi-base text transformers + gi-gobject gi-pango haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; @@ -70435,18 +70552,18 @@ self: { }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gobjectIntrospection;}; - "gi-gdkpixbuf_2_0_9" = callPackage + "gi-gdkpixbuf_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.9"; - sha256 = "880089ae75884e8e89b2ebba3d524c9f07864b37f3dc8475fea14ed18a01efb0"; + version = "2.0.11"; + sha256 = "068c4e9df68a03180dc0f174414af010877ffc781d35d2776e01a63bd1a80149"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ]; @@ -70483,19 +70600,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "gi-gio_2_0_9" = callPackage + "gi-gio_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, gobjectIntrospection, haskell-gi , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gio"; - version = "2.0.9"; - sha256 = "fb08fb617f7d845d8e6f50802ad6f30e6063ee71c05dc10da29f581227f16bb8"; + version = "2.0.11"; + sha256 = "d63f1c32a935cb818f8f2c1d70dbf4f71cc65a23e200744a93dee66ade50f039"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi-base text - transformers + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; doHaddock = false; @@ -70513,12 +70630,12 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.9"; - sha256 = "773fc9bb6d55006f12f68fdb4a68edc25fdc74448549a819ecb4f88a2f0b0efb"; + version = "1.0.11"; + sha256 = "3779ee7c9e97a96b05f43607adbde81addf0451b0a1f21e94a9a4353cec1fde2"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gobject haskell-gi-base text - transformers + base bytestring containers gi-gobject haskell-gi haskell-gi-base + text transformers ]; libraryPkgconfigDepends = [ gobjectIntrospection ]; doHaddock = false; @@ -70549,18 +70666,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "gi-glib_2_0_9" = callPackage + "gi-glib_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers }: mkDerivation { pname = "gi-glib"; - version = "2.0.9"; - sha256 = "1b295151c9d5f83c13c01204f67c10d071173377a67d6c1d4e8093a253c86555"; + version = "2.0.11"; + sha256 = "f707cc142c6c7a202b86a5804af38c53fd74c99ee2092946e3f39451220d94e9"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi-base text transformers + base bytestring containers haskell-gi haskell-gi-base text + transformers ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; doHaddock = false; @@ -70592,18 +70710,18 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "gi-gobject_2_0_9" = callPackage + "gi-gobject_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers }: mkDerivation { pname = "gi-gobject"; - version = "2.0.9"; - sha256 = "8525c707a7f6569ac57da4c16fc5c2ea174f4282c8436ba789d36d22cdbe7f1a"; + version = "2.0.11"; + sha256 = "fcfe35af13e118db109b9b0d969b89bb5c2a0162a1c3d1fc9413cafcd173058c"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi-base text + base bytestring containers gi-glib haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; @@ -70622,12 +70740,12 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.9"; - sha256 = "4ed3756052c41b4198d7c3cfd5d179f2d0f49d2a43d20f2be320d85c0a61b22e"; + version = "1.0.11"; + sha256 = "36e63c2330cb274ac6ac8b1a5d4b06a590e10d91ed4209555a72a85dc0c2591a"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi-base text - transformers + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ gstreamer ]; doHaddock = false; @@ -70644,12 +70762,12 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.9"; - sha256 = "c6021390e020c2d5c21b003bffb6340059feca7ea416fcad60d5c6bb0c0841c8"; + version = "1.0.11"; + sha256 = "faca30e17c95fc5fc00e72bbaef20bbb9edf2a4785f6bad6f6b4a742006d2f5d"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi-base text transformers + haskell-gi haskell-gi-base text transformers ]; librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; @@ -70668,11 +70786,11 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.9"; - sha256 = "5e86bc44fcc16d4009a5cd881169d29abffbd08e8ff0a07098b9e54729137e5d"; + version = "1.0.11"; + sha256 = "ca1cf846609ee3a340161747df48885432304b4a4339d3328d3f8b5e683ff577"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject gi-gst + base bytestring containers gi-glib gi-gobject gi-gst haskell-gi haskell-gi-base text transformers ]; librarySystemDepends = [ gobjectIntrospection ]; @@ -70692,12 +70810,12 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.9"; - sha256 = "1d36e8f907c6ece57c1db76b9a3ebf866b2ce57f9312c0153ab2e1259356c6ab"; + version = "1.0.11"; + sha256 = "9f2b49fc2ee31fb4ee4f2bf82f509a8b9d4dc963eff0da62efa6b60e760f42e7"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase - haskell-gi-base text transformers + haskell-gi haskell-gi-base text transformers ]; librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gst_plugins_base ]; @@ -70732,19 +70850,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk3 = pkgs.gnome3.gtk;}; - "gi-gtk_3_0_9" = callPackage + "gi-gtk_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gtk"; - version = "3.0.9"; - sha256 = "5b7b6d064b97066c058288a366e37dffa0b330a4a1d15f3018ed46d2b3a877f3"; + version = "3.0.11"; + sha256 = "a4bce9a9ea706a880bb9e8f6a2f8eb872b66acf550f8f42dd13a552b4d725f3f"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ gtk3 ]; @@ -70782,12 +70900,12 @@ self: { }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.9"; - sha256 = "d4661ae492916d4fc16f34b234e6c22917f3fc8bf37aef0ae6f2dd17123b7834"; + version = "2.0.11"; + sha256 = "4d64ad35431052f221a37998b8ca7fa8850a9a98d2741133f64f978b2e3bcad7"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk - haskell-gi-base text transformers + haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; doHaddock = false; @@ -70805,13 +70923,13 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.9"; - sha256 = "3ba4e8d8b446c4c37248748535951e31803140a69cf53a69bdb0e68e254b5090"; + version = "3.0.11"; + sha256 = "fb130bc4894aa689ecccb01be94ef246585ddba296fef5145a688e9c14027646"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi-base text - transformers + gi-gio gi-glib gi-gobject gi-gtk gi-pango haskell-gi + haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ gtksourceview ]; doHaddock = false; @@ -70842,17 +70960,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;}; - "gi-javascriptcore_4_0_9" = callPackage + "gi-javascriptcore_4_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "4.0.9"; - sha256 = "9acd59b75799a572919c3a65541de73296b6f33f54572902c91eeb93ee7a5375"; + version = "4.0.11"; + sha256 = "d67899269ffeba7fa266644fb6d540c74d36fa9e15ca1890fc2c6bb1fa19e066"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers haskell-gi-base text transformers + base bytestring containers haskell-gi haskell-gi-base text + transformers ]; libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; doHaddock = false; @@ -70870,12 +70989,12 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.9"; - sha256 = "7c87c5003d96303398ccca3c2e256d409c8853a7007158e052469ac650aa0221"; + version = "0.7.11"; + sha256 = "206eaf4d06e5837e21f665212517c27c201e48bb306ea0ea77e05ce9e8d059ce"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject - haskell-gi-base text transformers + haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ libnotify ]; doHaddock = false; @@ -70912,19 +71031,19 @@ self: { }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; inherit (pkgs.gnome2) pango;}; - "gi-pango_1_0_9" = callPackage + "gi-pango_1_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi , haskell-gi-base, pango, text, transformers }: mkDerivation { pname = "gi-pango"; - version = "1.0.9"; - sha256 = "2410b013c336f70b0711aa52b2ff9145945b5fd4b246b09703adac86ca00df1b"; + version = "1.0.11"; + sha256 = "8e709c61b8e6a8d2973d7206b15e324327d79ec4b6c301b949837d33d1f7ec66"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi-base text - transformers + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ]; doHaddock = false; @@ -70947,12 +71066,12 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.9"; - sha256 = "7c9e3c78703852ab5e879f8b3ecbb3e6898389d10d1458e3b6341ada252464a4"; + version = "1.0.11"; + sha256 = "604c2759510e6987fb2ca63c4b20940147fd07fcf56f701c221bf836de0481ad"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango - haskell-gi-base text transformers + haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ pango ]; doHaddock = false; @@ -70969,12 +71088,12 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.9"; - sha256 = "6566f9698ff21dc0eac6b8fb79db191ad48044b424a8d7a2b931ca69a1d517a8"; + version = "0.18.11"; + sha256 = "76ec68a35a83c99d3c8fd3374b02b0fede275ced4c21d4c967d817411a8c581b"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject - haskell-gi-base text transformers + haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ poppler ]; doHaddock = false; @@ -71004,18 +71123,18 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs.gnome2) libsoup;}; - "gi-soup_2_4_9" = callPackage + "gi-soup_2_4_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text , transformers }: mkDerivation { pname = "gi-soup"; - version = "2.4.9"; - sha256 = "e4e45ac1d877e1334ee6b57154422dad87e3e03c2f453f34c05e75aafb7a5daa"; + version = "2.4.11"; + sha256 = "5488104e98b7a295b44990d0063b162c951b8a1eec5df35a42bd4ba828dbd0ad"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ libsoup ]; @@ -71033,12 +71152,12 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.10"; - sha256 = "8da2e88e7b00ac3f7ab1523836415a53cb92f3c6da576d48fc9fd363f88b3bf0"; + version = "2.91.12"; + sha256 = "c286d581ad3f3e25dc4f7b5b8439d4e6a0e2d6312218e5cc528c490c07573670"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject - gi-gtk gi-pango haskell-gi-base text transformers + gi-gtk gi-pango haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ vte ]; doHaddock = false; @@ -71071,7 +71190,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; - "gi-webkit_3_0_9" = callPackage + "gi-webkit_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base @@ -71079,13 +71198,13 @@ self: { }: mkDerivation { pname = "gi-webkit"; - version = "3.0.9"; - sha256 = "5cd7b6d244b3aeb9eba3f437d40e3b3fbc2fcb253d84d1d5e1e105e7deefc976"; + version = "3.0.11"; + sha256 = "d707c10a9f758d5bee1fe59639fb6773a1fcdb596bc86b46c7ce19639556ff3f"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup - haskell-gi-base text transformers + haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ webkit ]; doHaddock = false; @@ -71103,13 +71222,13 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.9"; - sha256 = "982635e1c9f7f726100ed980eb12f7bee523d4b8aae14889c10024409f112be5"; + version = "4.0.11"; + sha256 = "bc43fb893695cd0395ffdd3381e857d5201e2a7209feb6f6024e0d832219070b"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib - gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text - transformers + gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi + haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ webkit2gtk webkitgtk ]; doHaddock = false; @@ -71127,12 +71246,12 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.9"; - sha256 = "df4bac3557c8b29c1fd6b8e7da859a394eef2df5bed12dab5491a57b585835ac"; + version = "4.0.11"; + sha256 = "b16b5b2f54bceaa777c64bb5ed19244815892dafcd8b4ce949c6a858ccf19033"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject gi-gtk gi-javascriptcore - gi-soup haskell-gi-base text transformers + gi-soup haskell-gi haskell-gi-base text transformers ]; libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ]; doHaddock = false; @@ -71602,15 +71721,17 @@ self: { }: mkDerivation { pname = "git-mediate"; - version = "1.0"; - sha256 = "0ec4f74b30997f05059ac4dc1433a3618cd40240bbb93b6ec434d90f40390790"; + version = "1.0.1"; + sha256 = "12320be6a3a0c8f982346c3fdb15e2102339ca2ae454b413d2664124f08c3c57"; + revision = "1"; + editedCabalFile = "208ad1540eab41d7530395ef31095f6aa8a1c0e415f6e9f6236418f6d4ebb32d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal base base-compat Diff directory filepath mtl optparse-applicative process unix ]; - homepage = "https://github.com/ElastiLotem/git-mediate"; + homepage = "https://github.com/Peaker/git-mediate"; description = "Remove trivial conflict markers in a git repository"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -72254,8 +72375,8 @@ self: { }: mkDerivation { pname = "gitter"; - version = "0.0.0.1"; - sha256 = "cc755243b8be4a235aaf8ed3dc4aa6d1b5dcecf602c3457131ac96e6bd665a97"; + version = "0.1"; + sha256 = "640371046315d609811e3062edc202e386722165f84fbe1f15e22a5e2d66324a"; libraryHaskellDepends = [ aeson base bytestring exceptions lens lens-aeson mtl text wreq ]; @@ -72342,15 +72463,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glabrous_0_2_0_1" = callPackage + "glabrous_0_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text , unordered-containers }: mkDerivation { pname = "glabrous"; - version = "0.2.0.1"; - sha256 = "cb2f9a9f60395f0abc062311a7cbea8505ecd546f1cb71e51b01291aea323327"; + version = "0.2.1"; + sha256 = "79793394c25a1f7bdb0c57e634a8ad37824a2a108272d521cf9fe78bdf9a70a4"; libraryHaskellDepends = [ aeson aeson-pretty attoparsec base bytestring cereal cereal-text either text unordered-containers @@ -76046,6 +76167,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "google-oauth2-jwt_0_1_3" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, HsOpenSSL + , RSA, text, unix-time + }: + mkDerivation { + pname = "google-oauth2-jwt"; + version = "0.1.3"; + sha256 = "1597575b4d03fea87e7411dd905b2db59221a6050986bd4cffadf4473da1c00b"; + libraryHaskellDepends = [ + base base64-bytestring bytestring HsOpenSSL RSA text unix-time + ]; + homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; + description = "Get a signed JWT for Google Service Accounts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "google-search" = callPackage ({ mkDerivation, base, free, nats, text, time }: mkDerivation { @@ -82097,8 +82235,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.0.2"; - sha256 = "0ef9006c38adb2d4caf4de88c1ac9b3ad26175fc2c4c54ac70ac5e4750062462"; + version = "0.1.0.4"; + sha256 = "d17bffafa4c729eab2e9b288c636d201013dd05ed04656e40de5a5fb7bc052a4"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 data-default hex network network-simple text transformers @@ -82407,8 +82545,8 @@ self: { pname = "hashing"; version = "0.1.0.1"; sha256 = "e5a4a19c6cd6f0a0adda381db76d608d23f8d303e68f1d744735433f91f49410"; - revision = "1"; - editedCabalFile = "a50b8538d365ef9fbdc0083c3de91fbdbcebe5e630f36330475e0d10243e2596"; + revision = "2"; + editedCabalFile = "98861f16791946cdf28e3c7a6ee9ac8b72d546d6e33c569c7087ef18253294e7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring ]; @@ -87258,6 +87396,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "helf" = callPackage + ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty + , QuickCheck + }: + mkDerivation { + pname = "helf"; + version = "0.2016.12.25"; + sha256 = "7d96b7bb7716b16d0b7b744629b3702766ec5e825cdd9b5015ada24d34a71a0e"; + revision = "1"; + editedCabalFile = "a3d5ffe78978b357890472700f2c0d5ac796f312909777476d89941753994385"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base containers mtl pretty QuickCheck + ]; + executableToolDepends = [ alex happy ]; + homepage = "http://www2.tcs.ifi.lmu.de/~abel/projects.html#helf"; + description = "Typechecking terms of the Edinburgh Logical Framework (LF)"; + license = "unknown"; + }) {}; + "helics" = callPackage ({ mkDerivation, base, bytestring, bytestring-show , data-default-class, newrelic-collector-client, newrelic-common @@ -88055,8 +88214,8 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.3"; - sha256 = "ace36d4b3a6ca44dad0b4c2f1ab008252acd281e4ff97c3b08c9af41cafb7386"; + version = "0.3.1"; + sha256 = "90d31d91beb87bfb9c0f1b867061b3db6d14dcbf9da87a483d620617aca0b1b0"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ndmitchell/hexml#readme"; @@ -92001,8 +92160,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.6"; - sha256 = "fd151310dcdb4fc8c317aabe0faf0b9563ccd59471de12ea3f10136c6f134712"; + version = "5.0.7"; + sha256 = "a6ef18db8d3e10707771c216af33e166130ba664eae380b060a1669e44454409"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97869,7 +98028,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_4" = callPackage + "http-client_0_5_5" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -97878,8 +98037,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.4"; - sha256 = "f226b9dd4b7a6b5ef3becddd02baeabe3429b88584a42609ca3733c84bfe7300"; + version = "0.5.5"; + sha256 = "d1fdda6035e0bab95d3294f5175ac8c3629f9cd1d32e1bce5d0aa27226751c85"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -102931,6 +103090,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inflections_0_3_0_0" = callPackage + ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec + , megaparsec, QuickCheck, text, unordered-containers + }: + mkDerivation { + pname = "inflections"; + version = "0.3.0.0"; + sha256 = "0391cb804f012fb27edc9d11c45bb60412bd703b5a7ebca5ccbf776d338926f1"; + libraryHaskellDepends = [ + base exceptions megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base hspec hspec-megaparsec megaparsec QuickCheck text + ]; + homepage = "https://github.com/stackbuilders/inflections-hs"; + description = "Inflections library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inflist" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -103138,8 +103317,8 @@ self: { }: mkDerivation { pname = "inline-java"; - version = "0.6"; - sha256 = "364c14c0003b6bdbb6338c017ff706ca2bd57dde828c801a1b588356ce15a4c1"; + version = "0.6.1"; + sha256 = "f722733b43839d12f936c5d2e3e8f2d33aae6752a605d4582959a7ad71ce2045"; libraryHaskellDepends = [ base binary bytestring Cabal containers directory distributed-closure filepath ghc-heap-view inline-c jni jvm @@ -103839,6 +104018,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "intro" = callPackage + ({ mkDerivation, base, bifunctors, binary, bytestring, containers + , deepseq, dlist, extra, hashable, mtl, safe, string-conversions + , tagged, text, transformers, unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.0.2.0"; + sha256 = "21cab2d2d744ace03a892f06970db52f9f12294b9e04aa8dfca1c91d3ccef1c4"; + libraryHaskellDepends = [ + base bifunctors binary bytestring containers deepseq dlist extra + hashable mtl safe string-conversions tagged text transformers + unordered-containers writer-cps-mtl + ]; + homepage = "https://github.com/minad/intro#readme"; + description = "Total Prelude with Text and Monad transformers"; + license = stdenv.lib.licenses.mit; + }) {}; + "introduction" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl @@ -104277,6 +104475,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip6addr_0_5_2" = callPackage + ({ mkDerivation, base, cmdargs, IPv6Addr, text }: + mkDerivation { + pname = "ip6addr"; + version = "0.5.2"; + sha256 = "ad460bf7d2765aa050968154188ba51a1b8483b6a27b179042528058b0e9549f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base cmdargs IPv6Addr text ]; + homepage = "https://github.com/MichelBoucey/ip6addr"; + description = "Commandline tool to generate IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ipatch" = callPackage ({ mkDerivation, base, bytestring, darcs, directory, filepath , hashed-storage, process, unix @@ -106050,8 +106263,8 @@ self: { }: mkDerivation { pname = "jni"; - version = "0.2"; - sha256 = "f98f57417cc015219446f2439c543dc0accd45a4bfdd87004c4c5be1b0b862bf"; + version = "0.2.2"; + sha256 = "67c1dc21d8f8a3d85e7b4ced2834d1bac4857e9102bb39f3c9d78618c1e72ea4"; libraryHaskellDepends = [ base bytestring containers inline-c singletons thread-local-storage ]; @@ -106231,6 +106444,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jose-jwt_0_7_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , cryptonite, doctest, either, hspec, HUnit, memory, mtl + , QuickCheck, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "jose-jwt"; + version = "0.7.4"; + sha256 = "747088658aee2b57bce8dc27fa921f9c4181f2f01677dde9a4c17de18bd3febd"; + libraryHaskellDepends = [ + aeson base bytestring cereal containers cryptonite either memory + mtl text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring cryptonite doctest either hspec HUnit memory + mtl QuickCheck text unordered-containers vector + ]; + homepage = "http://github.com/tekul/jose-jwt"; + description = "JSON Object Signing and Encryption Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jpeg" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -106308,8 +106544,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.7.0.3"; - sha256 = "3ee57a6d2640833a511ac1b0aadbfa46bd0be09efabde9bb5e32ddb6d330a2df"; + version = "0.7.1.0"; + sha256 = "e93ea7dccd9aa640226a162fb6674b0c71c7acebf0ce9b85d76b0d388f06d53a"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -107396,6 +107632,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jvm-streaming" = callPackage + ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni + , jvm, singletons, streaming + }: + mkDerivation { + pname = "jvm-streaming"; + version = "0.1"; + sha256 = "45788461c552dc2cdcbbe389f3783c67942341e38fa7ba17bd0a906db573d256"; + revision = "1"; + editedCabalFile = "f0e204ab4b6d0a8aedb7105800727d22a990a4761787d5abfaa70d016832b184"; + libraryHaskellDepends = [ + base distributed-closure inline-java jni jvm singletons streaming + ]; + testHaskellDepends = [ base hspec inline-java jvm streaming ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; + description = "Expose Java iterators as streams from the streaming package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jwt" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, cryptonite , data-default, doctest, http-types, HUnit, lens, lens-aeson @@ -111712,22 +111967,21 @@ self: { "legion" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, binary-conduit - , bytestring, canteven-http, canteven-log, conduit, conduit-extra - , containers, data-default-class, data-dword, directory, exceptions - , http-types, monad-logger, network, Ranged-sets, scotty - , scotty-resource, stm, text, time, transformers, unix, uuid, wai - , wai-extra, warp + , bytestring, canteven-http, conduit, conduit-extra, containers + , data-default-class, data-dword, directory, exceptions, http-types + , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm + , text, transformers, unix, uuid, wai, wai-extra, warp }: mkDerivation { pname = "legion"; - version = "0.7.0.0"; - sha256 = "c2dddc486653344bfe1c5c38c279f5fe8800f725d8778d8df4ef25856d6aed27"; + version = "0.8.0.1"; + sha256 = "5756a0ca948e17db7d6d5a904e2e444c9f0e74108e2a5ed139453a650e84f7f7"; libraryHaskellDepends = [ aeson attoparsec base binary binary-conduit bytestring - canteven-http canteven-log conduit conduit-extra containers - data-default-class data-dword directory exceptions http-types - monad-logger network Ranged-sets scotty scotty-resource stm text - time transformers unix uuid wai wai-extra warp + canteven-http conduit conduit-extra containers data-default-class + data-dword directory exceptions http-types monad-logger network + Ranged-sets scotty scotty-resource stm text transformers unix uuid + wai wai-extra warp ]; homepage = "https://github.com/owensmurray/legion#readme"; description = "Distributed, stateful, homogeneous microservice framework"; @@ -111736,23 +111990,23 @@ self: { }) {}; "legion-discovery" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, Cabal + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal , canteven-http, canteven-log, conduit, containers - , data-default-class, http-types, legion, legion-extra - , monad-logger, scotty, scotty-resource, SHA, text, time - , transformers, wai, wai-extra, warp + , data-default-class, graphviz, http-types, legion, legion-extra + , monad-logger, scotty, scotty-format, scotty-resource, SHA, text + , time, transformers, wai, wai-extra, warp }: mkDerivation { pname = "legion-discovery"; - version = "0.2.1.1"; - sha256 = "9ecb4471cf9a52fd973d95c356d35542e4b12306eb7078f43e4a279d0c478131"; + version = "0.2.2.1"; + sha256 = "5338e9ffb14ced8f1ec8bde7c9138e769ef643da8930937fc79cdbac970d6096"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring Cabal canteven-http canteven-log - conduit containers data-default-class http-types legion - legion-extra monad-logger scotty scotty-resource SHA text time - transformers wai wai-extra warp + aeson attoparsec base binary bytestring Cabal canteven-http + canteven-log conduit containers data-default-class graphviz + http-types legion legion-extra monad-logger scotty scotty-format + scotty-resource SHA text time transformers wai wai-extra warp ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; @@ -111769,8 +112023,8 @@ self: { }: mkDerivation { pname = "legion-discovery-client"; - version = "0.1.0.1"; - sha256 = "6235b5f23411bfe0807274e4e31b5e9f805045b214f63a2cfbefed29d9fe27f1"; + version = "0.1.0.2"; + sha256 = "d9f8b1f24d90b3711ec81555c21e722280bcb59914c2341bb89e21f9b699dd5d"; libraryHaskellDepends = [ aeson base bytestring Cabal containers data-default-class http-client http-types load-balancing network text @@ -111787,8 +112041,8 @@ self: { }: mkDerivation { pname = "legion-extra"; - version = "0.1.0.5"; - sha256 = "f61dc20ac3380725dbf34b934623131c37c4072f081d6d649ffb2a6d4be007f6"; + version = "0.1.0.6"; + sha256 = "e9471ff2b1d50596bbe86fd414e78bcd31aa78b867ac3439fddd58e21d24c0c5"; libraryHaskellDepends = [ aeson base bytestring canteven-log containers data-default-class legion network safe split yaml @@ -112247,8 +112501,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.0.4.0"; - sha256 = "e990aad8168d8e106ef35a0e8dc1fc707d467dfd87db8127f8ec568a47100f8b"; + version = "1.0.6.0"; + sha256 = "9a55ddd34f6e41ba274fa1b303262dc883868ffcb0e24810b432441e5ebe220a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127810,8 +128064,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.5.0"; - sha256 = "160e9f29ddc659a39c96de3971de7086528f608e372912a3f4e5b5f11a94590b"; + version = "0.2.5.1"; + sha256 = "d61e25c00736a33cd5f16555751047fb5e1d79cdc606622f4cba400c6f3df008"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -128777,22 +129031,20 @@ self: { }) {}; "numerals" = callPackage - ({ mkDerivation, base, base-unicode-symbols, containers - , containers-unicode-symbols, fingertree, HUnit, integer-gmp + ({ mkDerivation, base, containers, fingertree, HUnit, integer-gmp , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text }: mkDerivation { pname = "numerals"; - version = "0.4"; - sha256 = "15139b63ec44ce2c308176c96184b3b2d94537f64298a1e128c32e641ca77dba"; + version = "0.4.1"; + sha256 = "d2a46b9535bd57ed386adad95e145da4c3e72f595328ebd61302e3887583e1d2"; libraryHaskellDepends = [ - base base-unicode-symbols containers containers-unicode-symbols - fingertree integer-gmp text + base containers fingertree integer-gmp text ]; testHaskellDepends = [ - base base-unicode-symbols HUnit integer-gmp QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text ]; homepage = "https://github.com/roelvandijk/numerals"; description = "Convert numbers to number words"; @@ -129073,6 +129325,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nvim-hs-ghcid" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , ghcid, nvim-hs, nvim-hs-contrib, resourcet, yaml + }: + mkDerivation { + pname = "nvim-hs-ghcid"; + version = "0.1.0"; + sha256 = "c0f900633873759e49a08be61d8c91c1507f95b2e108d39d1d517adf9adc7bde"; + libraryHaskellDepends = [ + base bytestring containers directory filepath ghcid nvim-hs + nvim-hs-contrib resourcet yaml + ]; + homepage = "https://github.com/saep/nvim-hs-ghcid"; + description = "Neovim plugin that runs ghcid to update the quickfix list"; + license = stdenv.lib.licenses.asl20; + }) {}; + "nvvm" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory , filepath, template-haskell @@ -131293,10 +131562,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; - version = "0.0"; - sha256 = "ea40528ec95f2424bd7231da44b9d96a80b46b4116b2cdfbb57269c88f2419cb"; - revision = "1"; - editedCabalFile = "a8de69537c43ab967f7f512466a5a0e32000e9179239b4c10adf3cd3cfd1e524"; + version = "0.1.0"; + sha256 = "cb089747cfffd5affedcd08a7e7fed02e5dd90defb513e84440b76f307f35587"; libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = stdenv.lib.licenses.bsd3; @@ -133487,8 +133754,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.4.5.0"; - sha256 = "d60fb0d72ad518e3f3cf49fe6576ad5f2c1f371d75884394791fe2dcf417c5c9"; + version = "0.4.6.0"; + sha256 = "166d22f0e1cc2c3e965b84556c07a8ce51537b36aa5ff07d7fd4893a5bcdfd01"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -136265,6 +136532,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-cacophony_0_4_1" = callPackage + ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes + }: + mkDerivation { + pname = "pipes-cacophony"; + version = "0.4.1"; + sha256 = "bcf15287c4ae951ed12e83c41795dfe212b87cc9b93420dc74783b44e54c5360"; + libraryHaskellDepends = [ base bytestring cacophony memory pipes ]; + testHaskellDepends = [ base hlint ]; + homepage = "https://github.com/centromere/pipes-cacophony"; + description = "Pipes for Noise-secured network connections"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-cellular" = callPackage ({ mkDerivation, base, bytestring, data-cell, pipes }: mkDerivation { @@ -139463,8 +139745,8 @@ self: { }: mkDerivation { pname = "praglude"; - version = "0.2.1.0"; - sha256 = "6d0a637bccc13464149d75482e61ed8f10caf93d721d43f49e583032aad6d776"; + version = "0.3.0.0"; + sha256 = "8c5c2cdbff18b89b61b28680d92ad9c8204abcf9ef264b5b4622f1ee21f744da"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring casing containers data-default deepseq directory filepath hashable lens mtl random @@ -139480,18 +139762,18 @@ self: { ({ mkDerivation, aeson, base, basic-prelude, exceptions , fast-logger, lens, monad-control, monad-logger, mtl, resourcet , safe, shakers, template-haskell, text, text-manipulate, time - , transformers-base, unordered-containers + , transformers-base, unordered-containers, uuid }: mkDerivation { pname = "preamble"; - version = "0.0.8"; - sha256 = "2827df5cd7df280b1ca9092e0a17b585341f758ec91d490be7287483f623b374"; + version = "0.0.13"; + sha256 = "12d47c88d2ea714d58cd4527fb2826d49e2b5d49bc3d8dda8f6fd52bd4dd830a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base basic-prelude exceptions fast-logger lens monad-control monad-logger mtl resourcet safe template-haskell text - text-manipulate time transformers-base unordered-containers + text-manipulate time transformers-base unordered-containers uuid ]; executableHaskellDepends = [ base shakers ]; homepage = "https://github.com/swift-nav/preamble"; @@ -142331,6 +142613,8 @@ self: { pname = "purescript"; version = "0.10.3"; sha256 = "261e2afde8bf1d58a9c9c23296b37b57dfcd47d4f25cc7798a36a6e73978c5c2"; + revision = "2"; + editedCabalFile = "cd4a6818028652cb5c630372f872072197ef5822edf1814eaf8cd672c75683b7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146685,6 +146969,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "refresht" = callPackage + ({ mkDerivation, base, data-default, exceptions, lens, mtl }: + mkDerivation { + pname = "refresht"; + version = "0.1.0.1"; + sha256 = "5c910830cc9ee1272602d84ef8545f31120bf456205d18553e2e7cb8fc9c223e"; + libraryHaskellDepends = [ base data-default exceptions lens mtl ]; + homepage = "https://github.com/konn/refresht#readme"; + description = "Environment Monad with automatic resource refreshment"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "regex-applicative" = callPackage ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit , tasty-smallcheck, transformers @@ -146789,10 +147085,8 @@ self: { }: mkDerivation { pname = "regex-do"; - version = "3.1"; - sha256 = "487ab5968208a0d7ad7b37016145e4a864dc35ae36976ea77328ae3d6b9d590b"; - revision = "3"; - editedCabalFile = "ca32ec1c90923370783cfe79bbdae877f4f98f8e816a32dde618874842c2f178"; + version = "3.2"; + sha256 = "a7e8a864ee66c2a37fbf4574153dd42ee727283f8f5d0d142f7946172131977b"; libraryHaskellDepends = [ array base bytestring regex-base regex-pcre stringsearch tagged text @@ -148481,6 +148775,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "resolve" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bv + , bytestring, hashable, hashmap, hslogger, iproute, network, parsec + , stm, stm-containers, transformers + }: + mkDerivation { + pname = "resolve"; + version = "0.1.0.0"; + sha256 = "4c011446e1cd2865abbcb3d4979f6bbd65d5bd4f54d11819b5a5777cb4b6aa39"; + libraryHaskellDepends = [ + attoparsec attoparsec-binary base bv bytestring hashable hashmap + hslogger iproute network parsec stm stm-containers transformers + ]; + homepage = "https://github.com/riaqn/resolve#readme"; + description = "A name resolusion library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "resolve-trivial-conflicts" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory , filepath, mtl, optparse-applicative, process, unix @@ -151134,6 +151446,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "safe-money" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cereal + , constraints, deepseq, hashable, store, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "safe-money"; + version = "0.2"; + sha256 = "c328e6c36589ad133c8172ce82e64103ad1efd475b311b65a1e7e708dd651636"; + libraryHaskellDepends = [ + aeson base binary cereal constraints deepseq hashable store + ]; + testHaskellDepends = [ + aeson base binary bytestring cereal constraints deepseq hashable + store tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/k0001/safe-money"; + description = "Type-safe and lossless encoding and manipulation of money, world currencies and precious metals"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "safe-plugins" = callPackage ({ mkDerivation, base, directory, filepath, haskell-src-exts , plugins, Unixutils @@ -152725,10 +153058,8 @@ self: { }: mkDerivation { pname = "scotty-format"; - version = "0.1.0.2"; - sha256 = "848a326a18445c1c7f39a7aa5a46d3f042c2e9abfd1ef8f972751f51b4c00968"; - revision = "1"; - editedCabalFile = "64c796f66dd445224f06820feec9d91717a1de9d2d24d993d5db1d6021240d32"; + version = "0.1.1.0"; + sha256 = "cb6da220c05c95b8deb0fb8cc1505447d462456dbb36bfacee6467d8207f3599"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base http-media http-types scotty text ]; @@ -156546,6 +156877,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_12_1" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.12.1"; + sha256 = "057d7153a19a4f28a012f30b5d54b9e1296695ff94ccdfa23c28fa82bd3488ac"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -157152,6 +157510,18 @@ self: { license = "GPL"; }) {}; + "show-please" = callPackage + ({ mkDerivation, base, mtl, parsec, template-haskell }: + mkDerivation { + pname = "show-please"; + version = "0.3"; + sha256 = "1abd203bf8f0ac863f38f1be813594e0ab30ad5b79aa31730926586c40db642e"; + libraryHaskellDepends = [ base mtl parsec template-haskell ]; + homepage = "https://github.com/ddssff/show-please"; + description = "A wrapper type V with improved Show instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "show-prettyprint" = callPackage ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }: mkDerivation { @@ -163209,8 +163579,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "1.3.0"; - sha256 = "060ed345ee724b916427430004548c519eb0219242a019ee06c8afd9a793497b"; + version = "1.3.2"; + sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165279,6 +165649,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_1_4_5" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl + , resourcet, smallcheck, streaming, tasty, tasty-smallcheck + , transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.1.4.5"; + sha256 = "e77047f4027ac7dc4128fdbf651c8a288dab34e580c944bd8eef23e5a236d84e"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions mmorph mtl resourcet streaming + transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring smallcheck streaming tasty tasty-smallcheck + transformers + ]; + homepage = "https://github.com/michaelt/streaming-bytestring"; + description = "effectful byte steams, or: bytestring io done right"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, hspec, network, process, QuickCheck, random @@ -169811,8 +170204,8 @@ self: { }: mkDerivation { pname = "telegram-bot"; - version = "0.5.1.0"; - sha256 = "525fc12654179fa7c57ae062741bb236f5821dc1b5c0c8b9a5c62946d8817fd3"; + version = "0.5.4.0"; + sha256 = "a163600c8b5bca5b545f7701d14165961ce499263e3a27dac8acdca3fe29b072"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171457,8 +171850,8 @@ self: { }: mkDerivation { pname = "text-printer"; - version = "0.4"; - sha256 = "b878db9dfb786368324c35cb3e1070264eaa6b1d0f1459bf1581114bfbeb9149"; + version = "0.5"; + sha256 = "8f0c01a6a15b4314c2d47ab5f0772d176ec38f1c1fe190b9fa7db5149a6c4a0b"; libraryHaskellDepends = [ base bytestring pretty semigroups text text-latin1 ]; @@ -171782,8 +172175,8 @@ self: { }: mkDerivation { pname = "textlocal"; - version = "0.1.0.3"; - sha256 = "56237c4982513680358a13d5bba261e55ce4ec2346e402b8ba438f7a11d06e1c"; + version = "0.1.0.5"; + sha256 = "8954ff6270c9920fc390be6b9f398975ea06dd6808a411cbf8fa5fb4a9cf3087"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-conduit text unix-time @@ -173413,42 +173806,50 @@ self: { }) {}; "time-warp" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , data-default, data-msgpack, exceptions, formatting, hslogger - , hspec, lens, lifted-base, monad-control, monad-loops, MonadRandom - , mtl, network-msgpack-rpc, pqueue, QuickCheck - , quickcheck-instances, random, safe, serokell-util, stm - , template-haskell, text, text-format, time, time-units - , transformers, transformers-base + ({ mkDerivation, ansi-terminal, array, async, attoparsec, base + , binary, binary-conduit, bytestring, conduit, conduit-extra + , containers, data-default, data-msgpack, deepseq, exceptions + , extra, formatting, hashable, hspec, lens, lifted-base, log-warper + , mmorph, monad-control, monad-loops, MonadRandom, mtl, network + , pqueue, QuickCheck, quickcheck-instances, random, safe + , semigroups, serokell-util, slave-thread, stm, stm-chans + , stm-conduit, streaming-commons, template-haskell, text + , text-format, time, time-units, transformers, transformers-base + , unordered-containers }: mkDerivation { pname = "time-warp"; - version = "0.1.1.2"; - sha256 = "8a919958cbef95ff3960046f5854801b649b60c8e1fbd187ce1ae298c3c11187"; + version = "1.1.1.0"; + sha256 = "4e9fa28d8c67801fc302a7eec2457a2dda41b556129aebf0821bc250307ded4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base bytestring containers data-default data-msgpack - exceptions formatting hslogger lens lifted-base monad-control - monad-loops MonadRandom mtl network-msgpack-rpc pqueue QuickCheck - quickcheck-instances random safe serokell-util stm template-haskell - text text-format time time-units transformers transformers-base + ansi-terminal array attoparsec base binary binary-conduit + bytestring conduit conduit-extra containers data-default + data-msgpack deepseq exceptions extra formatting hashable lens + lifted-base log-warper mmorph monad-control monad-loops MonadRandom + mtl network pqueue QuickCheck quickcheck-instances random safe + semigroups serokell-util slave-thread stm stm-chans stm-conduit + streaming-commons template-haskell text text-format time time-units + transformers transformers-base unordered-containers ]; executableHaskellDepends = [ - async base data-default data-msgpack exceptions formatting hspec - lens MonadRandom mtl network-msgpack-rpc QuickCheck random - serokell-util stm text text-format time-units transformers + async base binary binary-conduit conduit data-default data-msgpack + exceptions formatting hspec lens log-warper MonadRandom mtl + QuickCheck random serokell-util stm text text-format time-units + transformers ]; testHaskellDepends = [ - async base data-default data-msgpack exceptions hspec lens mtl - network-msgpack-rpc QuickCheck random serokell-util stm text - text-format time-units transformers + async base data-default data-msgpack exceptions hspec lens + log-warper mtl QuickCheck random serokell-util stm text text-format + time-units transformers ]; homepage = "https://github.com/serokell/time-warp"; description = "Distributed systems execution emulation"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {log-warper = null;}; "timecalc" = callPackage ({ mkDerivation, base, haskeline, uu-parsinglib }: @@ -173737,8 +174138,8 @@ self: { }: mkDerivation { pname = "timeseries"; - version = "0.4.0"; - sha256 = "a073a252dcdb671e57a784f4b37f2009f6e0890579bf705869c572923047af51"; + version = "0.4.1"; + sha256 = "4e7a17717484225b904c5511152087b6ff9cb1d155fde7277b4bcc9b58c5151e"; libraryHaskellDepends = [ base bytestring cassava statistics text text-time time vector ]; @@ -173756,8 +174157,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "timespan"; - version = "0.2.0.0"; - sha256 = "4e6ce1f32725700c4b78ed4806d90a5ce1275dce9504f78164a454a4ef4b8fe6"; + version = "0.3.0.0"; + sha256 = "46a51e1e0d776d65d0094bf8158c938255491fbaa4d4f39b0a1477806312851f"; libraryHaskellDepends = [ base time ]; homepage = "https://github.com/agrafix/timespan#readme"; description = "Useful timespan datatype and functions"; @@ -180573,6 +180974,8 @@ self: { pname = "validity"; version = "0.3.0.4"; sha256 = "9ae590d34aeb41f096bd7432ff8c8cb07a4da010825c0190d4ef630ef6370f7f"; + revision = "1"; + editedCabalFile = "73bff6370f4e90101291fb3904f388ea57013a6a45997b273b578332149a8d19"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -183984,8 +184387,8 @@ self: { }: mkDerivation { pname = "wave"; - version = "0.1.1"; - sha256 = "13d5475356efc3ae95c971e930d5e4bf18f9395dc1bd7b63e8bb8e7ed26ddf23"; + version = "0.1.2"; + sha256 = "930d16bc03779c42bdf117ba2a2ac30b3ab08f9d214d9ca52526150d9eec07e3"; libraryHaskellDepends = [ base bytestring cereal containers data-default-class transformers ]; @@ -185744,8 +186147,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.3"; - sha256 = "2982a25dbdb4bcbfe563cc49f1bae58d8b837014ad28365eb09405222165f311"; + version = "0.3.4"; + sha256 = "8d22d044f67a1edf37cbb59cc3226585dcaa15f1c2b83696d7e191d50053aea2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192293,6 +192696,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zip_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, exceptions + , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck + , resourcet, text, time, transformers + }: + mkDerivation { + pname = "zip"; + version = "0.1.5"; + sha256 = "92ea1f4b28f89f77e065046095f0d7c1fedadef402ccd4f04ee09bac68556974"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest exceptions filepath mtl path + path-io plan-b resourcet text time transformers + ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions filepath hspec path + path-io QuickCheck text time transformers + ]; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9486d030a8b..d5f3a6d3990 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -113,6 +113,7 @@ let configureFlags = ["--enable-shared" "--enable-pthread"] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" + ++ op (!docSupport) "--disable-install-doc" ++ ops stdenv.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects # that tk is installed @@ -154,7 +155,7 @@ let license = stdenv.lib.licenses.ruby; homepage = http://www.ruby-lang.org/en/; description = "The Ruby language"; - maintainers = [ stdenv.lib.maintainers.vrthra ]; + maintainers = with stdenv.lib.maintainers; [ vrthra manveru ]; platforms = stdenv.lib.platforms.all; }; @@ -218,4 +219,12 @@ in { git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; }; }; + + ruby_2_4_0 = generic { + version = rubyVersion "2" "4" "0" ""; + sha256 = { + src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm"; + git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3"; + }; + }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index d21e7d669dc..a3aeaf6a8ba 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -65,4 +65,9 @@ rec { "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; + "2.4.0" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch" + ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index bbe1038bab2..51db26b7823 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -1,8 +1,8 @@ { fetchFromGitHub }: fetchFromGitHub { - owner = "skaes"; + owner = "manveru"; repo = "rvm-patchsets"; - rev = "951e47ca1022cd1e41de9177fa87438cfb72d127"; - sha256 = "18n2frwmn6lcnjywysyjam1zfzfad0r50141xs2h9kifsyak5xcf"; + rev = "46e04f230ce91a786f5e583389443efec0ecd594"; + sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693"; } diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index 6e8a8cd8d7f..f66e7befeb0 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,7 +2,10 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; - revision = "13"; - sha256 = "144vl65z7bys43sxgb09mbisyf2nmh49wh0d957y0ksa9cyrgv13"; + revision = "14"; + sha256 = "072czy26vfjcqjww4qccsd29fzkb6mb8czamr4x76rdi9lwhpv8h"; extraConfigureFlags = "--with-gnump"; + postPatch = '' + sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt + ''; }) diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index 71366ed32ad..6ae151dcc64 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "32"; - sha256 = "0b4wgqyv6accsdh7fgr9as34r38f8r9024i6s3vhah6wiah7kddn"; + revision = "34"; + sha256 = "05hzffp0dxac7414a84z0fgv980cnfx55ch2y4vpg5nvin7m9bar"; openssl = null; postPatch = "sed '1i#include ' -i src/tests/test_bigint.cpp"; }) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index d1476df2b60..c1bf789c59b 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,22 +1,21 @@ -{ fetchurl, stdenv, unzip }: +{ fetchurl, fetchFromGitHub, stdenv }: stdenv.mkDerivation rec { name = "crypto++-${version}"; majorVersion = "5.6"; - version = "${majorVersion}.4"; + version = "${majorVersion}.5"; - src = fetchurl { - url = "mirror://sourceforge/cryptopp/cryptopp564.zip"; - sha256 = "1msar24a38rxzq0xgmjf09hzaw2lv6s48vnbbhfrf5awn1vh6hxy"; + src = fetchFromGitHub { + owner = "weidai11"; + repo = "cryptopp"; + rev = "CRYPTOPP_5_6_5"; + sha256 = "1yk7jyf4va9425cg05llskpls2jm7n3jwy2hj5jm74zkr4mwpvl7"; }; patches = with stdenv; lib.optional (system != "i686-cygwin") ./dll.patch ++ lib.optional isDarwin ./GNUmakefile-darwin.patch; - buildInputs = [ unzip ]; - - sourceRoot = "."; configurePhase = let marchflags = diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f3db9bf5977..736014d665c 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -3,18 +3,17 @@ let ver_maj = "2.36"; - ver_min = "0"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c"; + sha256 = "3a082ad67d68b55970aed0b2034a06618167be98a42d5c70de736756b45d325d"; }; outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; setupHook = ./setup-hook.sh; @@ -27,14 +26,21 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; + configureFlags = "--with-libjasper --with-x11" + + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" + ; + # on darwin, tests don't link preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' substituteInPlace Makefile --replace "docs tests" "docs" ''; - configureFlags = "--with-libjasper --with-x11" - + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" - ; + postInstall = + # All except one utility seem to be only useful during building. + '' + moveToOutput "bin" "$dev" + moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" + ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). inherit (doCheck); diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index 91407e556c0..ba12b4eea93 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -38,9 +38,13 @@ stdenv.mkDerivation rec { ++ optional xineramaSupport libXinerama ++ optionals cupsSupport [ cups ]; - configureFlags = if stdenv.isDarwin - then "--disable-glibtest --disable-introspection --disable-visibility" - else "--with-xinput=yes"; + configureFlags = [ + "--with-xinput=yes" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "--disable-glibtest" + "--disable-introspection" + "--disable-visibility" + ]; postInstall = '' moveToOutput share/gtk-2.0/demo "$devdoc" diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 8975c4fa074..fd6e4a7aa48 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig }: +{ stdenv, fetchsvn, autoconf, automake, libsndfile, libtool, pkgconfig, libuuid }: stdenv.mkDerivation rec { name = "libgig-svn-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0i7sj3zm6banl5avjdxblx0mlbxxzbsbr4x5hsl2fhrdsv5dnxhc"; }; - buildInputs = [ autoconf automake libsndfile libtool pkgconfig ]; + buildInputs = [ autoconf automake libsndfile libtool pkgconfig libuuid ]; preConfigure = "make -f Makefile.cvs"; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 8e2a659b3f0..d9e438da131 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -3,16 +3,18 @@ stdenv.mkDerivation rec { name = "libivykis-${version}"; - version = "0.39"; + version = "0.40"; src = fetchurl { url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; - sha256 = "11d7sjbhcll932rlvx9sf3vk60b5bazmjf4vlr4qd9cz0cashizz"; + sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj"; }; - buildInputs = [ autoreconfHook pkgconfig file protobufc ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ file protobufc ]; meta = with stdenv.lib; { + homepage = "http://libivykis.sourceforge.net/"; description = '' A thin wrapper over various OS'es implementation of I/O readiness notification facilities diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index a5db2d23572..bd0cd9fe904 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -1,14 +1,15 @@ -{stdenv, fetchurl, m4}: +{ stdenv, fetchurl, m4 }: stdenv.mkDerivation rec { - name = "libmilter-8.14.8"; - + name = "libmilter-${version}"; + version = "8.15.2"; + src = fetchurl { - url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.8.14.8.tar.gz"; - sha256 = "1zmhzkj3gzx8022hsrysr3nzlcmv1qisb5i4jbx91661bw96ksq2"; + url = "ftp://ftp.sendmail.org/pub/sendmail/sendmail.${version}.tar.gz"; + sha256 = "0fdl9ndmspqspdlmghzxlaqk56j3yajk52d7jxcg21b7sxglpy94"; }; - buildPhase = '' + buildPhase = '' mkdir -p $out/lib cd libmilter cat > a.m4 <= 2.6 +, swig2 # 2.0 +}: stdenv.mkDerivation rec { - name = "pocketsphinx-0.8"; + name = "pocketsphinx-5prealpha"; src = fetchurl { url = "mirror://sourceforge/cmusphinx/${name}.tar.gz"; - sha256 = "0ynf5ik4ib2d3ha3r4i8ywpr2dz5i6v51hmfl8kgzj4i7l44qk47"; + sha256 = "1n9yazzdgvpqgnfzsbl96ch9cirayh74jmpjf7svs4i7grabanzg"; }; propagatedBuildInputs = [ sphinxbase ]; - buildInputs = [ pkgconfig ]; + buildInputs = [ pkgconfig python27 swig2 ]; meta = { description = "Voice recognition library written in C"; @@ -19,3 +25,22 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } + +/* Example usage: + + +1. + +$ cat << EOF > vocabulary.txt +oh mighty computer /1e-40/ +hello world /1e-30/ +EOF + +2. + +$ pocketsphinx_continuous -inmic yes -kws vocabulary.txt 2> /dev/null +# after you say "hello world": +hello world +... + +*/ diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix new file mode 100644 index 00000000000..7774ab7df9e --- /dev/null +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, qt4, qmake4Hook }: + +stdenv.mkDerivation rec { + name = "qwt-6.1.2"; + + src = fetchurl { + url = "mirror://sourceforge/qwt/${name}.tar.bz2"; + sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b"; + }; + + buildInputs = [ qt4 ]; + nativeBuildInputs = [ qmake4Hook ]; + + postPatch = '' + sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri + ''; + + qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; + + meta = with stdenv.lib; { + description = "Qt widgets for technical applications"; + homepage = http://qwt.sourceforge.net/; + # LGPL 2.1 plus a few exceptions (more liberal) + license = stdenv.lib.licenses.qwt; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + branch = "6"; + }; +} diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 1b4cf69f704..e82b2fe045b 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -2,18 +2,20 @@ , fetchurl , bison , pkgconfig +, python27 # >= 2.6 +, swig2 # 2.0 , multipleOutputs ? false #Uses incomplete features of nix! }: stdenv.mkDerivation (rec { - name = "sphinxbase-0.8"; + name = "sphinxbase-5prealpha"; src = fetchurl { url = "mirror://sourceforge/cmusphinx/${name}.tar.gz"; - sha256 = "1a3c91g6rcfb2k8qyfhnd7s68ds6pxwv61xfp0ai1arbhx28jw2m"; + sha256 = "0vr4k8pv5a8nvq9yja7kl13b5lh0f9vha8fc8znqnm8bwmcxnazp"; }; - buildInputs = [ pkgconfig bison ]; + buildInputs = [ swig2 python27 pkgconfig bison ]; meta = { description = "Support Library for Pocketsphinx"; diff --git a/pkgs/development/python-modules/pygame/git.nix b/pkgs/development/python-modules/pygame/git.nix index 7f815454713..3140f93aeb4 100644 --- a/pkgs/development/python-modules/pygame/git.nix +++ b/pkgs/development/python-modules/pygame/git.nix @@ -41,5 +41,6 @@ buildPythonPackage rec { homepage = "http://www.pygame.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 706b9bde327..539a5bd845d 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }: stdenv.mkDerivation rec { - name = "libsigrokdecode-0.4.0"; + name = "libsigrokdecode-0.4.1"; src = fetchurl { url = "http://sigrok.org/download/source/libsigrokdecode/${name}.tar.gz"; - sha256 = "0drmxjc2xavccjl2i6vcjipijrn7459nv8cpmm788pi4fcdrszpx"; + sha256 = "15aabl9p4586v2bkj4bm4xi7l3309r9zb31sw233s5vi170p0pq6"; }; buildInputs = [ pkgconfig glib python3 libsigrok check ]; diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 2dff98a212d..b737bb7a7da 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index b5619644bd8..608b1a01120 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk2 -, server ? true, readline }: +, server ? true, readline +, enableSqlite ? true, sqlite +}: let inherit (stdenv.lib) optional optionals; @@ -10,14 +12,15 @@ let gtkName = if gtkClient then "-gtk" else ""; name = "freeciv"; - version = "2.5.3"; + version = "2.5.6"; in stdenv.mkDerivation { name = "${name}${sdlName}${gtkName}-${version}"; + inherit version; src = fetchurl { url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2"; - sha256 = "0p40bpkhbldsnlqdvfn3qd2vzadxfrfsf1r57x1akwabqs0h62s8"; + sha256 = "16wrnsx5rmbz6rjs03bhy0vn20i6n6g73lx7fjpai98ixhzc5bfg"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,10 +28,12 @@ stdenv.mkDerivation { buildInputs = [ zlib bzip2 curl lzma gettext ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] ++ optionals gtkClient [ gtk2 ] - ++ optional server readline; + ++ optional server readline + ++ optional enableSqlite sqlite; - configureFlags = [] + configureFlags = [ "--enable-shared" ] ++ optional sdlClient "--enable-client=sdl" + ++ optional enableSqlite "--enable-fcdb=sqlite3" ++ optional (!gtkClient) "--enable-fcmp=cli" ++ optional (!server) "--disable-server"; diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 00d4fbf8451..71c7e300a63 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }: +{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }: let libnbt = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation { rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50"; sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds"; }; - buildInputs = [ cmake qt5Full jdk7 zlib file makeWrapper ]; + buildInputs = [ cmake qt5Full jdk zlib file makeWrapper ]; libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; postUnpack = '' @@ -42,7 +42,7 @@ stdenv.mkDerivation { cp -v MultiMC $out/bin/ cp -v jars/*.jar $out/bin/jars/ #*/ cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib - wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/ + wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index f9be01aa928..8b3998aa619 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -11,14 +11,14 @@ let }; }); in stdenv.mkDerivation rec { - version = "0.40.0"; + version = "0.41.0"; name = "openmw-${version}"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0mqd4gpwvczwqfkw5zvnw7cl1nzv9lkiqq2yc2a0qasaby8qv94w"; + sha256 = "1qay278965i7ja2rjllhcqfq7zpbapd7w57xly02apniadyfg0yz"; }; enableParallelBuilding = true; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 38d73f59dee..d9d6e0ecf0d 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -44,7 +44,7 @@ let libav atk # Only libraries are needed from those two - udev182 + libudev0-shim networkmanager098 # Verified games requirements diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 5e028ffc74a..f61a5497c4b 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -5,11 +5,11 @@ assert enablePython -> python2 != null; stdenv.mkDerivation rec { - name = "cryptsetup-1.7.0"; + name = "cryptsetup-1.7.3"; src = fetchurl { url = "mirror://kernel/linux/utils/cryptsetup/v1.7/${name}.tar.xz"; - sha256 = "0j6iwf64pdrl4nm5ypc2r33b3k0aflb939wz2496vcqdrjkj8m87"; + sha256 = "00nwd96m9yq4k3cayc04i5y7iakkzana35zxky6hpx2w8zl08axg"; }; configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" ] diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 46f242b2ea0..34b6aa1378c 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,13 +1,10 @@ { stdenv, fetchFromGitHub, utillinux - ,autoconf, automake, libtool, gettext }: +, autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { name = "fuse-${version}"; - version = "2.9.7"; - #builder = ./builder.sh; - src = fetchFromGitHub { owner = "libfuse"; repo = "libfuse"; @@ -17,8 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ utillinux autoconf automake libtool gettext ]; - inherit utillinux; - preConfigure = '' export MOUNT_FUSE_PATH=$out/sbin @@ -32,7 +27,7 @@ stdenv.mkDerivation rec { sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh - + ./makeconf.sh ''; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 6f6c0c66cc3..1ff68fc0408 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.7.0"; + version = "4.9.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "14kvpdlxq8204f5ayfdfb6mc0423mbf3px9q0spdly9sng7xnq4g"; + sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0"; }; patches = lib.optionals enableFan [ diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 394469d06fa..10bea69a3c4 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9-rc8"; - modDirVersion = "4.9.0-rc8"; - extraMeta.branch = "4.9"; + version = "4.10-rc1"; + modDirVersion = "4.10.0-rc1"; + extraMeta.branch = "4.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1xyham8by966mavk5wxy6va5cq2lf2d1jiqps70kcc4064v365r7"; + sha256 = "1s7axcii6jzm77ivmy26llf4z6dprfp3sb1v35fchl9bkzaivaly"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 74cf8d156af..1ad1155f8c3 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -165,4 +165,14 @@ rec { sha256 = "19viqjjgq8j8jiz5yhgmzwhqvhwv175q645qdazd1k69d25nv2ki"; }; }; + + panic_on_icmp6_frag_CVE_2016_9919 = rec + { name = "panic_on_icmp6_frag_CVE_2016_9919.patch"; + patch = fetchpatch { + inherit name; + url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=79dc7e3f1cd323be4c81aa1a94faa1b3ed987fb2"; + sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p"; + }; + }; + } diff --git a/pkgs/os-specific/linux/kexectools/arm.patch b/pkgs/os-specific/linux/kexectools/arm.patch deleted file mode 100644 index 9c1d482c81a..00000000000 --- a/pkgs/os-specific/linux/kexectools/arm.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream kexec-tools 2.0.13 does not pack arm phys_to_virt.h and iomem.h, -include them here for a temporary fix - -diff -uprN kexec-tools/kexec/arch/arm/iomem.h kexec-tools.1/kexec/arch/arm/iomem.h ---- kexec-tools/kexec/arch/arm/iomem.h 1970-01-01 08:00:00.000000000 +0800 -+++ kexec-tools.1/kexec/arch/arm/iomem.h 2016-08-09 15:38:26.938594379 +0800 -@@ -0,0 +1,9 @@ -+#ifndef IOMEM_H -+#define IOMEM_H -+ -+#define SYSTEM_RAM "System RAM\n" -+#define SYSTEM_RAM_BOOT "System RAM (boot alias)\n" -+#define CRASH_KERNEL "Crash kernel\n" -+#define CRASH_KERNEL_BOOT "Crash kernel (boot alias)\n" -+ -+#endif -diff -uprN kexec-tools/kexec/arch/arm/phys_to_virt.h kexec-tools.1/kexec/arch/arm/phys_to_virt.h ---- kexec-tools/kexec/arch/arm/phys_to_virt.h 1970-01-01 08:00:00.000000000 +0800 -+++ kexec-tools.1/kexec/arch/arm/phys_to_virt.h 2016-08-09 14:50:30.104143361 +0800 -@@ -0,0 +1,8 @@ -+#ifndef PHYS_TO_VIRT_H -+#define PHYS_TO_VIRT_H -+ -+#include -+ -+extern uint64_t phys_offset; -+ -+#endif diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index cd2833617b9..206dc6889e8 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -2,18 +2,16 @@ stdenv.mkDerivation rec { name = "kexec-tools-${version}"; - version = "2.0.13"; + version = "2.0.14"; src = fetchurl { urls = [ "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz" "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz" ]; - sha256 = "1k75p9h29xx57l1c69ravm4pg9pmriqxmwja12hgrnvi251ayjw7"; + sha256 = "1ihd3kzw8xnc5skq4pb633rr80007knjm4n1dd67a24xkplygcpz"; }; - patches = [ ./arm.patch ]; - hardeningDisable = [ "format" "pic" "relro" ]; buildInputs = [ zlib ]; diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix new file mode 100644 index 00000000000..203d1defa28 --- /dev/null +++ b/pkgs/os-specific/linux/libudev0-shim/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, udev }: + +stdenv.mkDerivation rec { + name = "libudev0-shim-${version}"; + version = "1"; + + src = fetchFromGitHub { + owner = "archlinux"; + repo = "libudev0-shim"; + rev = "v${version}"; + sha256 = "1460qm6rp1cqnns39lj24z7191m8sbpvbjabqbzb55dkdd2kw50z"; + }; + + buildInputs = [ udev ]; + + installPhase = '' + name="$(echo libudev.so.*)" + install -Dm755 "$name" "$out/lib/$name" + ln -s "$name" "$out/lib/libudev.so.0" + ''; + + meta = with stdenv.lib; { + description = "Shim to preserve libudev.so.0 compatibility"; + homepage = "https://github.com/archlinux/libudev0-shim"; + platforms = platforms.linux; + license = licenses.lgpl21; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix deleted file mode 100644 index 6dd551e1ce1..00000000000 --- a/pkgs/os-specific/linux/udev/145.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, gperf, pkgconfig, glib, acl, libusb, usbutils, pciutils }: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - name = "udev-145"; - - src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv"; - }; - - buildInputs = [gperf pkgconfig glib acl libusb usbutils]; - - configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids"; - - preConfigure = - '' - substituteInPlace extras/keymap/Makefile.in \ - --replace /usr/include ${stdenv.glibc.dev}/include - ''; - - postInstall = - '' - # Install some rules that really should be installed by default. - 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 - cp rules/packages/$i $out/libexec/rules.d/ - done - - # The path to rule_generator.functions in write_cd_rules and - # write_net_rules is broken. Also, don't store the mutable - # persistant rules in /etc/udev/rules.d but in - # /var/lib/udev/rules.d. - for i in $out/libexec/write_cd_rules $out/libexec/write_net_rules; do - substituteInPlace $i \ - --replace /lib/udev $out/libexec \ - --replace /etc/udev/rules.d /var/lib/udev/rules.d - done - - # Don't set PATH to /bin:/sbin; won't work in NixOS. - substituteInPlace $out/libexec/rule_generator.functions \ - --replace 'PATH=' '#PATH=' - - # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the - # environment of the caller. - sed '3,4d' -i $out/libexec/firmware.sh - ''; - - meta = { - homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html; - description = "Udev manages the /dev filesystem"; - }; -} diff --git a/pkgs/os-specific/linux/udev/182.nix b/pkgs/os-specific/linux/udev/182.nix deleted file mode 100644 index 33a4907c7ca..00000000000 --- a/pkgs/os-specific/linux/udev/182.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, pkgconfig -, pciutils, utillinux, kmod, usbutils, gperf -}: - -assert stdenv ? glibc; - -stdenv.mkDerivation rec { - name = "udev-182"; - - src = fetchurl { - url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2"; - sha256 = "143qvm0kij26j2l5icnch4x38fajys6li7j0c5mpwi6kqmc8hqx0"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - buildInputs = [ utillinux kmod usbutils #glib gobjectIntrospection - gperf - ]; - - configureFlags = [ "--with-pci-ids-path=${pciutils}/share/pci.ids" - "--disable-gudev" - "--disable-introspection" - ]; - - postPatch = '' - sed -i 's:input.h:input-event-codes.h:' Makefile.in - sed -i '20a#include ' src/mtd_probe/mtd_probe.h - ''; - - NIX_LDFLAGS = [ "-lrt" ]; - - meta = with stdenv.lib; { - homepage = http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html; - description = "Udev manages the /dev filesystem"; - platforms = platforms.linux; - license = licenses.gpl2; - }; -} diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index ed772e7b247..2433750ce45 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux }: - +{ stdenv, pkgs, fetchurl, fetchgit, + jansson, libxml2, libxslt, ncurses, openssl, sqlite, + utillinux, dmidecode, libuuid, binutils, newt, + lua, + srtp, wget, curl, + subversionClient +}: stdenv.mkDerivation rec { name = "asterisk-${version}"; - version = "13.6.0"; + version = "14.1.2"; src = fetchurl { url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; - sha256 = "0nh0fnqx84as92kk9d73s0386cndd17l06y1c72jl2bdjhyba0ca"; + sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8"; }; # Note that these sounds are included with the release tarball. They are # provided here verbatim for the convenience of anyone wanting to build # Asterisk from other sources. coreSounds = fetchurl { - url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.26.tar.gz; - sha256 = "2300e3ed1d2ded6808a30a6ba71191e7784710613a5431afebbd0162eb4d5d73"; + url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; + sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; }; mohSounds = fetchurl { url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; @@ -22,7 +27,7 @@ stdenv.mkDerivation rec { }; # TODO: Sounds for other languages could be added here - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux ]; + buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ]; patches = [ # Disable downloading of sound files (we will fetch them @@ -38,14 +43,24 @@ stdenv.mkDerivation rec { # Use the following preConfigure section when building Asterisk from sources # other than the release tarball. -# preConfigure = '' -# ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz -# ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz -# ''; + # preConfigure = '' + # ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz + # ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz + #''; # The default libdir is $PREFIX/usr/lib, which causes problems when paths # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib. - configureFlags = "--libdir=\${out}/lib"; + configureFlags = [ + "--libdir=\${out}/lib" + "--with-lua=${lua}/lib" + "--with-pjproject-bundled" + ]; + + preBuild = '' + make menuselect.makeopts + substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" + ./contrib/scripts/get_mp3_source.sh + ''; postInstall = '' # Install sample configuration files for this version of Asterisk @@ -56,9 +71,6 @@ stdenv.mkDerivation rec { description = "Software implementation of a telephone private branch exchange (PBX)"; homepage = http://www.asterisk.org/; license = licenses.gpl2; - maintainers = with maintainers; [ auntie ]; - # Marked as broken due to needing an update for security issues. - # See: https://github.com/NixOS/nixpkgs/issues/18856 - broken = true; + maintainers = with maintainers; [ auntie DerTim1 ]; }; } diff --git a/pkgs/servers/asterisk/disable-download.patch b/pkgs/servers/asterisk/disable-download.patch index 8b15ecdfaaa..670886bfe3c 100644 --- a/pkgs/servers/asterisk/disable-download.patch +++ b/pkgs/servers/asterisk/disable-download.patch @@ -1,7 +1,7 @@ -diff -ruN asterisk-13.2.0/sounds/Makefile asterisk-13.2.0-patched/sounds/Makefile ---- asterisk-13.2.0/sounds/Makefile 2014-09-09 14:01:11.000000000 -0600 -+++ asterisk-13.2.0-patched/sounds/Makefile 2015-03-31 16:12:00.549133670 -0600 -@@ -89,7 +89,7 @@ +diff -ruN asterisk-14.1.2/sounds/Makefile asterisk-14.1.2-patched/sounds/Makefile +--- asterisk-14.1.2/sounds/Makefile 2016-11-10 20:43:02.000000000 +0100 ++++ asterisk-14.1.2-patched/sounds/Makefile 2016-11-16 10:08:46.591615147 +0100 +@@ -90,7 +90,7 @@ ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \ fi diff --git a/pkgs/servers/asterisk/runtime-vardirs.patch b/pkgs/servers/asterisk/runtime-vardirs.patch index dfc00186d13..17959bac9a0 100644 --- a/pkgs/servers/asterisk/runtime-vardirs.patch +++ b/pkgs/servers/asterisk/runtime-vardirs.patch @@ -1,6 +1,6 @@ -diff -rupN asterisk-13.3.2/build_tools/make_defaults_h asterisk-13.3.2-patched/build_tools/make_defaults_h ---- asterisk-13.3.2/build_tools/make_defaults_h 2012-01-30 14:21:16.000000000 -0700 -+++ asterisk-13.3.2-patched/build_tools/make_defaults_h 2015-04-15 19:07:46.760351155 -0600 +diff -rupN asterisk-14.1.2/build_tools/make_defaults_h asterisk-14.1.2-patched/build_tools/make_defaults_h +--- asterisk-14.1.2/build_tools/make_defaults_h 2016-11-10 20:43:02.000000000 +0100 ++++ asterisk-14.1.2-patched/build_tools/make_defaults_h 2016-11-16 10:09:04.189625495 +0100 @@ -1,4 +1,13 @@ #!/bin/sh + diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index d84ddd00882..05b88cf9cf3 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, home ? "/var/lib/crowd" }: +{ stdenv, fetchurl, home ? "/var/lib/crowd" +, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; @@ -18,9 +19,22 @@ stdenv.mkDerivation rec { rm -rf apache-tomcat/work ln -s /run/atlassian-crowd/work apache-tomcat/work + ln -s /run/atlassian-crowd/database database + substituteInPlace apache-tomcat/bin/startup.sh --replace start run echo "crowd.home=${home}" > crowd-webapp/WEB-INF/classes/crowd-init.properties + substituteInPlace build.properties \ + --replace "openidserver.url=http://localhost:8095/openidserver" \ + "openidserver.url=http://localhost:${toString port}/openidserver" + substituteInPlace crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ + --replace "http://localhost:8095/" \ + "http://localhost:${toString port}/" + sed -r -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ + -e 's,application.password\s+password,application.password ${openidPassword},' + '' + stdenv.lib.optionalString (proxyUrl != null) '' + sed -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ + -e 's,http://localhost:${toString port}/openidserver,${proxyUrl}/openidserver,' ''; installPhase = '' diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 5e87164c1b1..e9c1ec8b724 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.23"; + version = "2.4.25"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0n2yx3gjlpr4kgqx845fj6amnmg25r2l6a7rzab5hxnpmar985hc"; + sha256 = "1cl0bkqg6srb1sypga0cn8dcmdyxldavij73zmmkxvlz3kgw4zpq"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 549c401fec7..c6f88c24509 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.41"; + name = "lighttpd-1.4.44"; src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "0v3b6hp8hfwg7kmmxs64hdn9iqkql5qjv2389wl7pp6nyqz3ik2b"; + sha256 = "08jlgcy08w1gd8hkmz0bccipv4dzxdairj89nbz5f6b5hnlnrdmd"; }; buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index b1d70907e28..5d5a98ad8a8 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation { "--with-http_realip_module" "--with-http_addition_module" "--with-http_xslt_module" - "--with-http_image_filter_module" "--with-http_geoip_module" "--with-http_sub_module" "--with-http_dav_module" @@ -44,6 +43,7 @@ stdenv.mkDerivation { # Install destination problems # "--with-http_perl_module" ] ++ optional withStream "--with-stream" + ++ optional (gd != null) "--with-http_image_filter_module" ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio" ++ map (mod: "--add-module=${mod.src}") modules; diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch index 66059cff6f7..1914933c558 100644 --- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch +++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch @@ -98,15 +98,15 @@ diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream index a0659ab..dba3729 100644 --- a/src/lib-ssl-iostream/iostream-ssl.c +++ b/src/lib-ssl-iostream/iostream-ssl.c -@@ -29,7 +29,7 @@ static int ssl_module_load(const char **error_r) - memset(&mod_set, 0, sizeof(mod_set)); +@@ -34,7 +34,7 @@ static int ssl_module_load(const char **error_r) mod_set.abi_version = DOVECOT_ABI_VERSION; mod_set.setting_name = ""; + mod_set.require_init_funcs = TRUE; - ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set); + ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set); - - ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs"); - if (ssl_vfuncs == NULL) { + if (module_dir_try_load_missing(&ssl_module, MODULE_DIR, plugin_name, + &mod_set, error_r) < 0) + return -1; diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c index e2233bf..bbf981e 100644 --- a/src/lib-storage/mail-storage-settings.c diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 2be20323f25..36d45672150 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.2.25"; + name = "dovecot-2.2.27"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ] @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "0rwn5wc5b8j9fzqcjggdgpzmb77myrf4ra294z1gg5v3hhng7nfq"; + sha256 = "1s8qvr6fa9d0n179kdwgpsi72zkvpbh9q57q8fr2fjysgjl94zw9"; }; preConfigure = '' diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix new file mode 100644 index 00000000000..a52e1abad87 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, go, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "snmp_exporter-${version}"; + version = "0.1.0"; + rev = "v${version}"; + + goPackagePath = "github.com/prometheus/snmp_exporter"; + + src = fetchFromGitHub { + inherit rev; + owner = "prometheus"; + repo = "snmp_exporter"; + sha256 = "1faa1gla5nqkhf1kq60v22bcph41qix3dn9db0w0fh2pkxpdxvrp"; + }; + + doCheck = true; + + meta = with stdenv.lib; { + description = "SNMP Exporter for Prometheus"; + homepage = https://github.com/prometheus/snmp_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ oida ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index c9f4e2d253f..cad349c4b51 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pam, openssl, openssh, shadow, makeWrapper }: stdenv.mkDerivation rec { - version = "2.19"; + version = "2.20"; name = "shellinabox-${version}"; src = fetchFromGitHub { owner = "shellinabox"; repo = "shellinabox"; - rev = "1a8010f2c94a62e7398c4fa130dfe9e099dc55cd"; - sha256 = "16cr7gbnh6vzsxlhg9j9avqrxbhbkqhsbvh197b0ccdwbb04ysan"; + rev = "v${version}"; + sha256 = "1hmfayh21cks2lyj572944ll0mmgsxbnj981b3hq3nhdg8ywzjfr"; }; patches = [ ./shellinabox-minus.patch ]; diff --git a/pkgs/servers/sql/postgresql/pg_similarity/default.nix b/pkgs/servers/sql/postgresql/pg_similarity/default.nix new file mode 100644 index 00000000000..32945c9fa62 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pg_similarity/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, gcc, postgresql }: + +stdenv.mkDerivation { + + name = "pg_similarity-1.0"; + src = fetchFromGitHub { + owner = "eulerto"; + repo = "pg_similarity"; + rev = "be1a8b08c8716e59b89982557da9ea68cdf868c5"; + sha256 = "1z4v4r2yccdr8kz3935fnk1bc5vj0qj0apscldyap4wxlyi89xim"; + }; + + buildInputs = [ postgresql gcc ]; + buildPhase = "USE_PGXS=1 make"; + installPhase = '' + mkdir -p $out/bin # for buildEnv to setup proper symlinks + install -D pg_similarity.so -t $out/lib/ + install -D ./{pg_similarity--unpackaged--1.0.sql,pg_similarity--1.0.sql,pg_similarity.control} -t $out/share/extension + ''; + + meta = { + description = '' + pg_similarity is an extension to support similarity queries on PostgreSQL. The implementation + is tightly integrated in the RDBMS in the sense that it defines operators so instead of the traditional + operators (= and <>) you can use ~~~ and ~!~ (any of these operators represents a similarity function). + ''; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + maintainers = with lib.maintainers; [ danbst ]; + }; +} diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 4f5601501e9..b08bb0768f2 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -32,6 +32,6 @@ in python2Packages.buildPythonApplication { homepage = "http://www.nongnu.org/duplicity"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric peti]; - platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index a055b87c263..7917403a915 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { homepage = http://duply.net/; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 1cadf393a8e..193f1d5cb0b 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { meta = { homepage = "http://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index 8572221572c..5ce79cbf412 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = ''A parallel compressor/decompressor for xz format''; license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix new file mode 100644 index 00000000000..b4ee1f2f5c0 --- /dev/null +++ b/pkgs/tools/misc/hhpc/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchFromGitHub, xorg, pkgconfig}: + +stdenv.mkDerivation rec { + name = "hhpc-${version}"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "aktau"; + repo = "hhpc"; + rev = "v${version}"; + sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ xorg.libX11 ]; + + installPhase = '' + mkdir -p $out/bin + cp hhpc $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Hides the mouse pointer in X11"; + maintainers = with maintainers; [ nico202 ]; + platforms = platforms.unix; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix new file mode 100644 index 00000000000..6dbd0bcc439 --- /dev/null +++ b/pkgs/tools/misc/mlocate/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "mlocate-${version}"; + version = "0.26"; + + src = fetchurl { + url = "http://fedorahosted.org/releases/m/l/mlocate/${name}.tar.xz"; + sha256 = "0gi6y52gkakhhlnzy0p6izc36nqhyfx5830qirhvk3qrzrwxyqrh"; + }; + + buildInputs = [ ]; + + meta = with stdenv.lib; { + description = "Merging locate is an utility to index and quickly search for files"; + homepage = https://fedorahosted.org/mlocate/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index a8468f8387f..84546985f72 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { ''; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; + license = stdenv.lib.licenses.publicDomain; }; } diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 47d1dbbcbe6..6f3aab3082f 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl +{ stdenv, fetchurl, libressl , privsepPath ? "/var/empty" , privsepUser ? "ntp" }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - buildInputs = [ openssl ]; + buildInputs = [ libressl ]; installFlags = [ "sysconfdir=\${out}/etc" diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 4f8717e9a11..ff96509e15c 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index d97a6049745..76385312385 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.1.12"; + version = "1.1.14"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "0mji6bmxjvxy2mhvzfz4vpdz62n1wv6a02rapzbiad8zr2c869cm"; + sha256 = "1brlyqk2p5h9sws15nbkmm4qhx911aib1v7crmcm2rhwsad0c1nj"; }; preConfigure = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; license = licenses.gpl3; - maintainers = with maintainers; [ sjmackenzie ]; + maintainers = with maintainers; [ sjmackenzie zimbatm ]; platforms = platforms.allBut [ "i686-linux" ]; }; } diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json index 4e245d1c80f..b3625d928b5 100644 --- a/pkgs/tools/security/enpass/data.json +++ b/pkgs/tools/security/enpass/data.json @@ -1,12 +1,12 @@ { "amd64": { - "path": "pool/main/e/enpass/enpass_5.3.0_amd64.deb", - "sha256": "d9da061c6456281da836bdd78bdb7baeced4b7f1805bb2495e4f1d15038cf86b", - "version": "5.3.0" + "path": "pool/main/e/enpass/enpass_5.4.0-4_amd64.deb", + "sha256": "6b460fed2d7d8473e2b5d069dbe60263195b916c8b79a8fc7c2e8cb953134579", + "version": "5.4.0.post4" }, "i386": { - "path": "pool/main/e/enpass/enpass_5.3.0_i386.deb", - "sha256": "58d9f3b83c2da477c13976e1826d112236eabd46a389de7e8767ee99ac41f469", - "version": "5.3.0" + "path": "pool/main/e/enpass/enpass_5.4.0-4_i386.deb", + "sha256": "1ec8088d5c3b2906d6820f96e1868c473e78dbe882f04e74a7816d19d43e3692", + "version": "5.4.0.post4" } } \ No newline at end of file diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index b7f7282d292..f2e73e2749e 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -44,16 +44,6 @@ let inherit (data) version; name = "enpass-${version}"; - desktopItem = makeDesktopItem { - name = "Enpass"; - exec = "$out/bin/Enpass"; - #icon = "Enpass"; - desktopName = "Enpass"; - genericName = "Password manager"; - categories = "Application;Security;"; - }; - - src = fetchurl { inherit (data) sha256; url = "${baseUrl}/${data.path}"; @@ -74,11 +64,12 @@ let installPhase='' mkdir $out cp -r opt/Enpass/* $out + cp -r usr/* $out + rm $out/bin/runenpass.sh - # Make desktop item - mkdir -p "$out"/share/applications - cp "$desktopItem"/share/applications/* "$out"/share/applications/ - mkdir -p "$out"/share/icons + sed \ + -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \ + $out/share/applications/enpass.desktop patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ @@ -88,7 +79,8 @@ let --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ --set QT_PLUGIN_PATH "$out/plugins" \ --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ - --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" + --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" \ + --set HIDE_TOOLBAR_LINE 0 ''; }; updater = { diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index e91f91dbdea..b96226d5c3f 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth -, gettext, texinfo, pcsclite +, gettext, texinfo, pcsclite, sqlite # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libgcrypt libassuan libksba libiconv npth gettext texinfo - readline libusb gnutls adns openldap zlib bzip2 + readline libusb gnutls adns openldap zlib bzip2 sqlite ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 88b7316e9d8..7b6720a2139 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Stores, retrieves, generates, and synchronizes passwords securely"; homepage = "https://github.com/lastpass/lastpass-cli"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix new file mode 100644 index 00000000000..ccb3f1d9ed9 --- /dev/null +++ b/pkgs/tools/text/codesearch/default.nix @@ -0,0 +1,26 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "codesearch-${version}"; + version = "20150617-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; + + goPackagePath = "github.com/google/codesearch"; + + src = fetchgit { + inherit rev; + url = "https://github.com/google/codesearch"; + sha256 = "12bv3yz0l3bmsxbasfgv7scm9j719ch6pmlspv4bd4ix7wjpyhny"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "Fast, indexed regexp search over large file trees"; + homepage = "https://github.com/google/codesearch"; + license = [ stdenv.lib.licenses.bsd3 ]; + maintainers = [ stdenv.lib.maintainers.bennofs ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/text/codesearch/deps.nix b/pkgs/tools/text/codesearch/deps.nix new file mode 100644 index 00000000000..2d1dad70634 --- /dev/null +++ b/pkgs/tools/text/codesearch/deps.nix @@ -0,0 +1,3 @@ +# This file was generated by go2nix. +[ +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95b8baf7be2..73b2510122e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -779,6 +779,8 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; + codesearch = callPackage ../tools/text/codesearch { }; + contacts = callPackage ../tools/misc/contacts { inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; }; @@ -865,6 +867,7 @@ in f3 = callPackage ../tools/filesystems/f3 { }; facter = callPackage ../tools/system/facter { + boost = boost160; ruby = ruby_2_1; }; @@ -2150,6 +2153,8 @@ in hevea = callPackage ../tools/typesetting/hevea { }; + hhpc = callPackage ../tools/misc/hhpc { }; + hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; @@ -5135,6 +5140,8 @@ in lizardfs = callPackage ../tools/filesystems/lizardfs { }; + lldb = llvmPackages.lldb; + llvm = llvmPackages.llvm; llvm_39 = llvmPackages_39.llvm; @@ -5772,7 +5779,8 @@ in ruby_2_0_0 ruby_2_1_10 ruby_2_2_5 - ruby_2_3_3; + ruby_2_3_3 + ruby_2_4_0; # Ruby aliases ruby = ruby_2_3; @@ -5781,6 +5789,7 @@ in ruby_2_1 = ruby_2_1_10; ruby_2_2 = ruby_2_2_5; ruby_2_3 = ruby_2_3_3; + ruby_2_4 = ruby_2_4_0; scsh = callPackage ../development/interpreters/scsh { }; @@ -8919,6 +8928,8 @@ in pg_repack = callPackage ../servers/sql/postgresql/pg_repack {}; + pg_similarity = callPackage ../servers/sql/postgresql/pg_similarity {}; + phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; @@ -9150,6 +9161,8 @@ in qwt = callPackage ../development/libraries/qwt {}; + qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { }; + qxt = callPackage ../development/libraries/qxt {}; rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; @@ -10422,6 +10435,7 @@ in prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { }; prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { }; + prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; @@ -11072,6 +11086,7 @@ in # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long + kernelPatches.panic_on_icmp6_frag_CVE_2016_9919 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11655,8 +11670,7 @@ in eudev = callPackage ../os-specific/linux/eudev {}; - # libudev.so.0 - udev182 = callPackage ../os-specific/linux/udev/182.nix { }; + libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { }; udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; @@ -12328,15 +12342,15 @@ in ffmpeg = ffmpeg_2; }; - awesome-3-4 = callPackage ../applications/window-managers/awesome/3.4.nix { - cairo = cairo.override { xcbSupport = true; }; - lua = lua5_1; - }; - awesome-3-5 = callPackage ../applications/window-managers/awesome { + awesome-3-5 = callPackage ../applications/window-managers/awesome/3.5.nix { cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; }; - awesome = awesome-3-5; + awesome-4-0 = callPackage ../applications/window-managers/awesome { + cairo = cairo.override { xcbSupport = true; }; + luaPackages = luaPackages.override { inherit lua; }; + }; + awesome = awesome-4-0; awesomebump = qt5.callPackage ../applications/graphics/awesomebump { }; @@ -12533,6 +12547,8 @@ in inherit (gnome2) GConf ORBit2 metacity; }; + confclerk = callPackage ../applications/misc/confclerk { }; + copyq = callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { @@ -13557,6 +13573,32 @@ in imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; + imagemagick7_light = lowPrio (imagemagick.override { + bzip2 = null; + zlib = null; + libX11 = null; + libXext = null; + libXt = null; + fontconfig = null; + freetype = null; + ghostscript = null; + libjpeg = null; + lcms2 = null; + openexr = null; + libpng = null; + librsvg = null; + libtiff = null; + libxml2 = null; + openjpeg = null; + libwebp = null; + }); + + imagemagick7 = lowPrio (imagemagickBig.override { + ghostscript = null; + }); + + imagemagick7Big = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix { }); + # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; @@ -14007,6 +14049,8 @@ in normalize = callPackage ../applications/audio/normalize { }; + mm = callPackage ../applications/networking/instant-messengers/mm { }; + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; libdvdnav = libdvdnav_4_2_1; @@ -14157,6 +14201,8 @@ in diffpdf = callPackage ../applications/misc/diffpdf { }; + mlocate = callPackage ../tools/misc/mlocate { }; + mypaint = callPackage ../applications/graphics/mypaint { }; mythtv = callPackage ../applications/video/mythtv { }; @@ -14437,6 +14483,11 @@ in inherit (darwin.stubs) rez setfile; }; + qemu_28 = callPackage ../applications/virtualization/qemu/2.8.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa; + inherit (darwin.stubs) rez setfile; + }; + qgis = callPackage ../applications/gis/qgis {}; qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { }; @@ -14458,6 +14509,8 @@ in qscreenshot = callPackage ../applications/graphics/qscreenshot { qt = qt4; }; + + qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { }; qsynth = callPackage ../applications/audio/qsynth { }; @@ -17046,6 +17099,8 @@ in fityk = callPackage ../applications/science/misc/fityk { }; + gplates = callPackage ../applications/science/misc/gplates { }; + gravit = callPackage ../applications/science/astronomy/gravit { }; golly = callPackage ../applications/science/misc/golly { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 430da89fc22..092f352ec5b 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -238,6 +238,22 @@ let }; }; + haskell-unicode-input-method = melpaBuild rec { + pname = "emacs-haskell-unicode-input-method"; + version = "20110905.2307"; + src = fetchFromGitHub { + owner = "roelvandijk"; + repo = "emacs-haskell-unicode-input-method"; + rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; + sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#haskell-unicode-input-method/"; + license = lib.licenses.free; + }; + }; + hindent = melpaBuild rec { pname = "hindent"; version = external.hindent.version; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4cdc70fed4f..f229fb8a35c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -45,10 +45,12 @@ rec { ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) hscolour; + sphinx = pkgs.python27Packages.sphinx; }; ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) hscolour; + sphinx = pkgs.python27Packages.sphinx; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc7103; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc3024a9fb2..115345e7c20 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2808,17 +2808,39 @@ in { }; }; + # Needed for bleach 1.5.0 + html5lib_0_9999999 = self.html5lib.override rec { + name = "html5lib-${version}"; + buildInputs = with self; [ nose flake8 ]; + propagatedBuildInputs = with self; [ six ]; + checkPhase = '' + nosetests + ''; + + version = "0.9999999"; + src = pkgs.fetchurl { + url = "https://github.com/html5lib/html5lib-python/archive/0.9999999.tar.gz"; + sha256 = "1s6wdbrjzw5jhyfbskf4nj1i5bjpjqq9f89a7r1rl59rhpwmfhhq"; + }; + }; + bleach = buildPythonPackage rec { - version = "v1.4.3"; - name = "bleach-${version}"; + pname = "bleach"; + version = "1.5.0"; + name = "${pname}-${version}"; src = pkgs.fetchurl { - url = "http://github.com/jsocol/bleach/archive/${version}.tar.gz"; - sha256 = "0mk8780ilip0m890rapbckngw8k42gca3551kri297pyylr06l5m"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65"; }; - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ six html5lib ]; + buildInputs = with self; [ pytest pytestrunner ]; + propagatedBuildInputs = with self; [ six html5lib_0_9999999 ]; + + postPatch = '' + substituteInPlace setup.py --replace "==3.0.3" "" + substituteInPlace setup.py --replace ">=0.999,!=0.9999,!=0.99999,<0.99999999" "" + ''; meta = { description = "An easy, HTML5, whitelisting HTML sanitizer"; @@ -3759,15 +3781,23 @@ in { }; click-threading = buildPythonPackage rec { - version = "0.4.0"; + version = "0.4.2"; name = "click-threading-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/c/click-threading/${name}.tar.gz"; - sha256 = "1lrn2inlzz5lr8ay36dz9gmlnqqvdnh14rcm2nmhaxvbbz0gl8qq"; + sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609"; }; - propagatedBuildInputs = with self; [ click ]; + checkInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures; + + checkPhase = '' + py.test + ''; + + # Tests are broken on 3.x + doCheck = !isPy3k; meta = { homepage = https://github.com/click-contrib/click-threading/; @@ -9296,27 +9326,48 @@ in { librosa = buildPythonPackage rec { - name = "librosa-${version}"; - version = "0.4.0"; + pname = "librosa"; + name = "${pname}-${version}"; + version = "0.4.3"; src = pkgs.fetchurl { - url = "mirror://pypi/l/librosa/librosa-0.4.0.tar.gz"; - sha256 = "cc11dcc41f51c08e442292e8a2fc7d7ee77e0d47ff771259eb63f57fcee6f6e7"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "209626c53556ca3922e52d2fae767bf5b398948c867fcc8898f948695dacb247"; }; - propagatedBuildInputs = with self; - [ joblib matplotlib six scikitlearn decorator audioread samplerate ]; + propagatedBuildInputs = with self; [ joblib matplotlib six scikitlearn + decorator audioread resampy ]; + + # No tests + doCheck = false; + + meta = { + description = "Python module for audio and music processing"; + homepage = http://librosa.github.io/; + license = licenses.isc; + }; }; joblib = buildPythonPackage rec { - name = "joblib-${version}"; - version = "0.9.4"; + pname = "joblib"; + name = "${pname}-${version}"; + version = "0.10.3"; src = pkgs.fetchurl { - url = "mirror://pypi/j/joblib/${name}.tar.gz"; - sha256 = "e5faacf0da7b3035dbca9d56210962b86564aafca71a25f4ea376a405455cd60"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "29b2965a9efbc90a5fe66a389ae35ac5b5b0c1feabfc7cab7fd5d19f429a071d"; }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose sphinx numpydoc ]; + # Failing test on Python 3.x + postPatch = '''' + optionalString isPy3k '' + sed -i -e '70,84d' joblib/test/test_format_stack.py + ''; + + meta = { + description = "Lightweight pipelining: using Python functions as pipeline jobs"; + homepage = http://pythonhosted.org/joblib/; + license = licenses.bsd3; + }; }; samplerate = buildPythonPackage rec { @@ -9961,15 +10012,16 @@ in { }; deluge = buildPythonPackage rec { - name = "deluge-1.3.12"; + name = "deluge-${version}"; + version = "1.3.13"; src = pkgs.fetchurl { url = "http://download.deluge-torrent.org/source/${name}.tar.bz2"; - sha256 = "14rwc5k7q0d36b4jxnmxgnyvx9lnmaifxpyv0z07ymphlfr4amsn"; + sha256 = "1ig8kv22009f0ny6n77a4lcfddhdsxrdklpmhdqvis1wx8na5crp"; }; propagatedBuildInputs = with self; [ - pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl service-identity + pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl service-identity ]; nativeBuildInputs = [ pkgs.intltool ]; @@ -11052,13 +11104,13 @@ in { }; docker_compose = buildPythonPackage rec { - version = "1.8.0"; + version = "1.9.0"; name = "docker-compose-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; - sha256 = "1ad28x3marfmyrbibbkzy46bpbgc29k20ik661l8r49nr0m6px35"; + sha256 = "0zz2jqpxz69q34bp97pbwxda1ik3m8zbhh15mxvhfsn0g566dywq"; }; # lots of networking and other fails @@ -14365,13 +14417,16 @@ in { memory_profiler = buildPythonPackage rec { name = "memory_profiler-${version}"; - version = "0.39"; + version = "0.41"; src = pkgs.fetchurl { url = "mirror://pypi/m/memory_profiler/${name}.tar.gz"; - sha256 = "61021f2dade7edd6cc09d7924bfdccc453bd1949608412a3e021d44a410d3a23"; + sha256 = "dce6e931c281662a500b142595517d095267216472c2926e5ec8edab89898d10"; }; + # Tests don't import profile + doCheck = false; + meta = { description = "A module for monitoring memory usage of a python program"; homepage = http://pypi.python.org/pypi/memory_profiler; @@ -15174,14 +15229,15 @@ in { }; pygraphviz = buildPythonPackage rec { - name = "pygraphviz-1.3.1"; + name = "pygraphviz-${version}"; + version = "1.4rc1"; src = pkgs.fetchurl { url = "mirror://pypi/p/pygraphviz/${name}.tar.gz"; - sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408"; + sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a"; }; - buildInputs = with self; [ doctest-ignore-unicode ]; + buildInputs = with self; [ doctest-ignore-unicode mock nose ]; propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ]; meta = { @@ -16094,12 +16150,13 @@ in { }; numpydoc = buildPythonPackage rec { - name = "numpydoc-${version}"; - version = "0.5"; + pname = "numpydoc"; + name = "${pname}-${version}"; + version = "0.6.0"; src = pkgs.fetchurl { - url = "mirror://pypi/n/numpydoc/${name}.tar.gz"; - sha256 = "0d4dnifaxkll50jx6czj05y8cb4ny60njd2wz299sj2jxfy51w4k"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "1ec573e91f6d868a9940d90a6599f3e834a2d6c064030fbe078d922ee21dcfa1"; }; buildInputs = [ self.nose ]; @@ -22482,6 +22539,28 @@ in { }; }; + resampy = buildPythonPackage rec { + pname = "resampy"; + version = "0.1.4"; + name = "${pname}-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "cf4f149d8699af70a1b4b0769fa16fab21835d936ea7ff25e98446aa49e743d4"; + }; + + checkInputs = with self; [ pytest pytestcov ]; + # No tests included + doCheck = false; + propagatedBuildInputs = with self; [ numpy scipy cython six ]; + + meta = { + homepage = https://github.com/bmcfee/resampy; + description = "Efficient signal resampling"; + license = licenses.isc; + }; + }; + robomachine = buildPythonPackage rec { name = "robomachine-0.6"; @@ -26436,16 +26515,20 @@ EOF websockets = callPackage ../development/python-modules/websockets { }; - wand = buildPythonPackage rec { - name = "Wand-0.3.5"; + Wand = buildPythonPackage rec { + pname = "Wand"; + version = "0.4.4"; + name = "${pname}-${version}"; src = pkgs.fetchurl { - url = "mirror://pypi/W/Wand/${name}.tar.gz"; - sha256 = "31e2186ce8d1da0d2ea84d1428fc4d441c2e9d0e25156cc746b35b781026bcff"; + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; + sha256 = "28e0454c9d16d69c5d5034918d96320d8f9f1377b4fdaf4944eec2f938c74704"; }; buildInputs = with self; [ pkgs.imagemagick pytest psutil memory_profiler pytest_xdist ]; + # No tests + doCheck = false; meta = { description = "Ctypes-based simple MagickWand API binding for Python"; homepage = http://wand-py.org/; @@ -28292,14 +28375,14 @@ EOF }; graphite_beacon = buildPythonPackage rec { - name = "graphite_beacon-0.22.1"; + name = "graphite_beacon-0.27.0"; src = pkgs.fetchurl { url = "mirror://pypi/g/graphite_beacon/${name}.tar.gz"; - sha256 = "ebde1aba8030c8aeffaeea39f9d44a2be464b198583ad4a390a2bff5f4172543"; + sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; }; - propagatedBuildInputs = [ self.tornado ]; + propagatedBuildInputs = [ self.tornado self.pyyaml self.funcparserlib ]; preBuild = "> requirements.txt"; @@ -31660,6 +31743,8 @@ EOF }; }; + urlscan = callPackage ../applications/misc/urlscan { }; + wp_export_parser = buildPythonPackage rec { name = "${pname}-${version}"; pname = "wp_export_parser";