diff options
141 files changed, 2733 insertions, 1435 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index b9d5b2b903e..a20910353f3 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -32,7 +32,6 @@ with lib; networkmanager-l2tp = pkgs.networkmanager-l2tp.override { withGnome = false; }; networkmanager-openconnect = pkgs.networkmanager-openconnect.override { withGnome = false; }; networkmanager-openvpn = pkgs.networkmanager-openvpn.override { withGnome = false; }; - networkmanager-pptp = pkgs.networkmanager-pptp.override { withGnome = false; }; networkmanager-vpnc = pkgs.networkmanager-vpnc.override { withGnome = false; }; networkmanager-iodine = pkgs.networkmanager-iodine.override { withGnome = false; }; pinentry = pkgs.pinentry_ncurses; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f83fb7a6d5d..10e96eb4036 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -135,8 +135,7 @@ in { default = { inherit networkmanager modemmanager wpa_supplicant networkmanager-openvpn networkmanager-vpnc networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-pptp networkmanager-l2tp - networkmanager-iodine; }; + networkmanager-l2tp networkmanager-iodine; }; internal = true; }; @@ -267,8 +266,6 @@ in { message = "You can not use networking.networkmanager with networking.wireless"; }]; - boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. - environment.etc = with cfg.basePackages; [ { source = configFile; target = "NetworkManager/NetworkManager.conf"; @@ -285,9 +282,6 @@ in { { source = "${networkmanager-fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name"; target = "NetworkManager/VPN/nm-fortisslvpn-service.name"; } - { source = "${networkmanager-pptp}/etc/NetworkManager/VPN/nm-pptp-service.name"; - target = "NetworkManager/VPN/nm-pptp-service.name"; - } { source = "${networkmanager-l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name"; target = "NetworkManager/VPN/nm-l2tp-service.name"; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 7256013d5d8..10e8ef0ed38 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -182,8 +182,7 @@ in { { inherit (pkgs) networkmanager modemmanager wpa_supplicant; inherit (pkgs.gnome3) networkmanager-openvpn networkmanager-vpnc networkmanager-openconnect networkmanager-fortisslvpn - networkmanager-pptp networkmanager-iodine - networkmanager-l2tp; }; + networkmanager-iodine networkmanager-l2tp; }; # Needed for themes and backgrounds environment.pathsToLink = [ "/share" ]; diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index 1178701c609..1bef867c57b 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -28,8 +28,8 @@ import ./make-test.nix { }; testScript = '' - $machine->succeed('systemctl status openldap.service'); $machine->waitForUnit('openldap.service'); + $machine->succeed('systemctl status openldap.service'); $machine->succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"'); ''; } diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 545e7c5047a..246e02c53c7 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "3.23.15"; + version = "4.0.16"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1nxafk99fr6yb09cq3vdpzjcd85mnjwwl8rzccx21kla1ysihl5m"; + sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index 39cd1a444fa..e0e620bd05f 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, makeWrapper, intltool, libgpod, curl, flac, - gnome, gtk3, glib, gettext, perl, perlXMLParser, flex, libglade, libid3tag, +{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac, + gnome3, gtk3, glib, gettext, perl, perlXMLParser, flex, libid3tag, libvorbis, hicolor-icon-theme, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -11,24 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0xisrpx069f7bjkyc8vqxb4k0480jmx1wscqxr6cpq1qj6pchzd5"; }; - propagatedUserEnvPkgs = [ gnome.gnome-themes-standard ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser - flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta - gnome.gdl gnome.defaultIconTheme - hicolor-icon-theme ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + buildInputs = [ + curl gettext perl perlXMLParser + flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf + gnome3.gdl gnome3.defaultIconTheme gnome3.anjuta + ]; patchPhase = '' sed -i 's/which/type -P/' scripts/*.sh ''; - preFixup = '' - wrapProgram "$out/bin/gtkpod" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome.gnome-themes-standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 779374aaa08..5cecdc8187d 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.8.6"; + version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "1mikab2f9n5q1sfgnp3sbm1rf3v57k4085lsgh0a5gzga2h4hwxq"; + sha256 = "0c519qk2g0dk8gqf9ywqfp7dnr4b25lsnxxbf2l1spnnvf8nysvh"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index c2c24c29a13..4eeb893ee96 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.8.6"; + version = "0.9.0"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "035bq7yfg1yirsqk63zwkzjw9dxl52lrzq9y0w7nga0vb11xdfij"; + sha256 = "0g67vm9ilmq5nlvk0f3abia9pbinr4ck5v4mll6igni1rxz2n7wk"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 1afb36571bd..55c3dfa92e3 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -19,7 +19,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool wrapGAppsHook - gnome3.gnome-themes-standard gnome3.defaultIconTheme + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; @@ -28,8 +28,6 @@ in buildPythonApplication rec { sed -i '/localmpd/d' sonata/consts.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gobjectIntrospection gtk3 pygobject3 ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index c68f2cd4a35..e38f38dad78 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,41 +1,33 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool, itstool, libxml2, brasero +{ stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, makeWrapper }: +, wrapGAppsHook }: let - major = "3.16"; - minor = "1"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "sound-juicer-${version}"; + pname = "sound-juicer"; + version = "3.16.1"; +in stdenv.mkDerivation rec{ + name = "${pname}-${version}"; src = fetchurl { - url = "http://download.gnome.org/sources/sound-juicer/${major}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra-gtk3 - gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes - makeWrapper (stdenv.lib.getLib gnome3.dconf) - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-libav - ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" - done - ''; + nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; + buildInputs = [ + glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes + gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-libav + ]; - postInstall = '' - rm $out/share/icons/hicolor/icon-theme.cache - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { description = "A Gnome CD Ripper"; diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 0fb1b77e708..39d1c266a37 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis }: +{ stdenv, fetchurl , glib, pkgconfig, libogg, libvorbis, libmad }: stdenv.mkDerivation rec { name = "streamripper-${version}"; @@ -10,13 +10,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libogg libvorbis ]; + buildInputs = [ glib libogg libvorbis libmad ]; meta = with stdenv.lib; { homepage = http://streamripper.sourceforge.net/; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 0db93f78781..2af6e93bcfc 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { libselinux ]; + postPatch = '' + patchShebangs ./configure + ''; + LUA_CPATH="${lpeg}/lib/lua/${lua.luaversion}/?.so;"; LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index a845bc63a38..9984c0222a0 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,15 +1,15 @@ {buildPythonPackage, stdenv, fetchurl, pkgconfig - , libXext, libXxf86vm, libX11, libXrandr, libXinerama + , libXext, libXxf86vm, libX11, libXrandr, libXinerama, libXScrnSaver , argyllcms, wxPython, numpy }: buildPythonPackage { - name = "displaycal-3.2.4.0"; + name = "displaycal-3.5.0.0"; enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/project/dispcalgui/release/3.2.4.0/DisplayCAL-3.2.4.0.tar.gz; - sha256 = "0swkhv338d1kmfxyf30zzdjs5xpbha40pg2zysiipcbasc0xhlb8"; + url = mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz; + sha256 = "1j496sv8pbhby5hkkbp07k6bs3f7mb1l3dijmn2iga3kmix0fn5q"; }; propagatedBuildInputs = [ @@ -18,6 +18,7 @@ buildPythonPackage { libX11 libXrandr libXinerama + libXScrnSaver argyllcms wxPython numpy diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 8fd65770afd..2555fe409f2 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -130,6 +130,7 @@ let krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; + ksystemlog = callPackage ./ksystemlog.nix {}; ktnef = callPackage ./ktnef.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; libgravatar = callPackage ./libgravatar.nix {}; diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix new file mode 100644 index 00000000000..bec92d55966 --- /dev/null +++ b/pkgs/applications/kde/ksystemlog.nix @@ -0,0 +1,17 @@ +{ + mkDerivation, lib, + extra-cmake-modules, gettext, kdoctools, + karchive, kconfig, kio +}: + +mkDerivation { + name = "ksystemlog"; + + nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; + propagatedBuildInputs = [ karchive kconfig kio ]; + + meta = with lib; { + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 6aba4e75150..5b5c5757989 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "1.9.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "02jq2jas6gm08z4l09azi6dcsydaaaqbxfv4mb7pnrc1w8m593zr"; + sha256 = "0s8nbrkqcb4q3m8w17sqijbds5irk4xpzhjpwkkakzs0rm5g10sk"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 61c7b11f208..53d427e61c2 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yate-${version}"; - version = "5.4.2-1"; + version = "6.0.0-1"; src = fetchurl { - url = "http://voip.null.ro/tarballs/yate5/${name}.tar.gz"; - sha256 = "08gwz0gipc5v75jv46p2yg8hg31xjp6x7jssd0rrgsa3szi5697n"; + url = "http://voip.null.ro/tarballs/yate${lib.versions.major version}/${name}.tar.gz"; + sha256 = "05qqdhi3rp5660gq1484jkmxkm9vq81j0yr765h0gf0xclan1dqa"; }; # TODO zaptel ? postgres ? diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8d08eceb169..cf5405a4a07 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -130,9 +130,11 @@ let mkdir -p "$out/share" ln -s "${browser}/share/icons" "$out/share/icons" else - mkdir -p "$out/share/icons/hicolor/128x128/apps" - ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \ - "$out/share/icons/hicolor/128x128/apps/${browserName}.png" + for res in 16 32 48 64 128; do + mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps" + ln -s "${browser}/lib/${browserName}/browser/chrome/icons/default/default''${res}.png" \ + "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png" + done fi install -D -t $out/share/applications $desktopItem/share/applications/* diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 8dbf0e774e4..74f784a1ba1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.5.2"; + version = "1.6.1"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1h4qa5i7axkmsai854yvlyh5r038mmjl4pj2rd27mz11if7yf067"; + sha256 = "0q2qzl84ifnhcn1qbq38fdpj8ry748h6dlzp2mdpkslsh8mc46as"; } else throw "Signal for Desktop is not currently supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 5e94106a48f..46de1d532dd 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.5.2"; + version = "2.5.12"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "15gji5zqs1py92bpwvvq0r1spl0yynbrsnh4ajphwq17bqys3192"; - "i686-linux" = "1y67bd63b95va7g2676rgp2clvcy09pnmivy00r2w46y7kwwwbj8"; + "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7"; + "i686-linux" = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh"; }.${stdenv.system}; }; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index ccd08e2844e..fae838a7d5f 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -3,7 +3,7 @@ let inherit (python3Packages) python dbus-python keyring; in stdenv.mkDerivation rec { - version = "1.1.12"; + version = "1.1.24"; name = "backintime-common-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a"; + sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18"; }; buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 88d1ae7fae1..b1e2258271b 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "znc-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "http://znc.in/releases/archive/${name}.tar.gz"; - sha256 = "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig"; + sha256 = "09cmsnxvi7jg9a0dicf60fxnxdff4aprw7h8vjqlj5ywf6y43f3z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index 32abab8abf8..b1aa10800d6 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "5"; minor = "4"; - patch = "5"; - tweak = "1"; + patch = "6"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb"; + sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 8726d5130d7..866b8e92337 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0max423hdlr4j6y6ymng15awilh2aq8gly1hsf16lnk1pxihgr54"; + sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "14ziy02qq092x8h29f9dlwvvk2scd5v385zhln4848lf3q5cnifl"; + sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc"; }; }; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index de9bfe64e5c..ba136f415f2 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { name = "skrooge-${version}"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "11ns0j3ss09aqd8snfzd52xf0cgsjjcgzalb031p7v17rn14yqaq"; + sha256 = "0f7jwl05y4gjwasjcbsx2rrva81abyf0hgdbkh7h3dl7nxz9h6g1"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index e26471de576..520510698e3 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -6,6 +6,7 @@ , gtk3 , granite , gnome3 +, gobjectIntrospection , json-glib , cmake , ninja @@ -26,11 +27,6 @@ stdenv.mkDerivation rec { }; USER = "nix-build-user"; - XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [ - "${granite}/share" - "${gnome3.libgee}/share" - ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook @@ -39,6 +35,7 @@ stdenv.mkDerivation rec { ninja gettext libxml2 + gobjectIntrospection # For setup hook ]; buildInputs = [ gtk3 @@ -47,7 +44,6 @@ stdenv.mkDerivation rec { json-glib libgudev libevdev - gnome3.gnome-themes-standard ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index fb75a9dc609..2c785472114 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -22,6 +22,7 @@ let "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; "8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w"; + "8.8+beta1" = "19ipmx6bf8wjpk8y29hcginxk7hps4jh1bbihn5icx4qysm81165"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; @@ -37,7 +38,7 @@ self = stdenv.mkDerivation { inherit camlp5; inherit (ocamlPackages) ocaml; passthru = { - inherit (ocamlPackages) findlib; + inherit (ocamlPackages) findlib num; emacsBufferSetup = pkgs: '' ; Propagate coq paths to children (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") @@ -92,7 +93,7 @@ self = stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ] + buildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib camlp5 ncurses ocamlPackages.num ] ++ stdenv.lib.optional buildIde ocamlPackages.lablgtk; postPatch = '' @@ -116,7 +117,6 @@ self = stdenv.mkDerivation { preConfigure = '' configureFlagsArray=( - -opt ${ideFlags} ) ''; diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index db252f97916..638996e853b 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; + makeFlags = stdenv.lib.optional stdenv.isDarwin + "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so"; + installPhase = '' mkdir -p $out/bin $out/lib $out/share $out/include/picosat cp picomus picomcs picosat picogcnf "$out"/bin diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 80ca213c06c..559972d9e79 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpc-qt-${version}"; - version = "17.11"; + version = "18.03"; src = fetchFromGitHub { owner = "cmdrkotori"; repo = "mpc-qt"; rev = "v${version}"; - sha256 = "1vi4zsmbzxj6ms8wls9zv15vrskdrhgnj6l41m1fk4scs4jzvbkm"; + sha256 = "0mhzdgjgv08cvnscbfndpr0s8ndbcf91b61zfqspa1qv4wlqd716"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 6f7ebb8c20a..1be4fc252fd 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,27 +1,32 @@ -{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec -, lame, zlib, libGLU_combined, alsaLib, freetype, perl, pkgconfig -, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu -, yasm, libuuid, taglib, libtool, autoconf, automake, file +{ stdenv, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper +, libpulseaudio, fftwSinglePrec , lame, zlib, libGLU_combined, alsaLib, freetype +, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2 +, linuxHeaders }: stdenv.mkDerivation rec { name = "mythtv-${version}"; - version = "0.27.4"; + version = "29.1"; - src = fetchurl { - url = "https://github.com/MythTV/mythtv/archive/v${version}.tar.gz"; - sha256 = "0nrn4fbkkzh43n7jgbv21i92sb4z4yacwj9yj6m3hjbffzy4ywqz"; + src = fetchFromGitHub { + owner = "MythTV"; + repo = "mythtv"; + rev = "v${version}"; + sha256 = "0pjxv4bmq8h285jsr02svgaa03614arsyk12fn9d4rndjsi2cc3x"; }; - sourceRoot = "${name}/mythtv"; + setSourceRoot = ''sourceRoot=$(echo */mythtv)''; buildInputs = [ - freetype qt4 lame zlib xlibsWrapper libGLU_combined perl alsaLib libpulseaudio fftwSinglePrec - libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu - libuuid taglib + freetype qtbase qtwebkit qtscript lame zlib xlibsWrapper libGLU_combined + perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC + libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; + configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; + meta = with stdenv.lib; { homepage = https://www.mythtv.org/; description = "Open Source DVR"; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 5b9ae011903..0ae9de04680 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "simplescreenrecorder-${version}"; - version = "0.3.9"; + version = "0.3.10"; src = fetchurl { url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "1gnf9wbiq2fcbqcn1a5nfmp8r0nxrrlgh2wly2mfkkwymynhx0pk"; + sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g"; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 9e547a791a4..ef614d41d00 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-18.2.2"; + name = "smplayer-18.3.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0q0m9q643z6ih5gkf1fq3d6y99d62yxkhfgap98h251q6kd7dhis"; + sha256 = "0y7kwcngd0d2d863wnppfvjm1n1l60nn6lsf9r0g4hsf19gkrd46"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index bd40a73d264..2ea0480cc5e 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--enable-weston-launch" "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor" - ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder" + ++ stdenv.lib.optional (vaapi != null) "--enable-vaapi-recorder" ++ stdenv.lib.optionals (xwayland != null) [ "--enable-xwayland" "--with-xserver-path=${xwayland.out}/bin/Xwayland" diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index c38097abde9..bbcc55f9bc5 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }: stdenv.mkDerivation rec { - name = "osinfo-db-20170813"; + name = "osinfo-db-20180311"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${name}.tar.xz"; - sha256 = "0v9i325aaflzj2y5780mj9b0jv5ysb1bn90bm3s4f2ck5n124ffw"; + sha256 = "0pzm9vsr2f5943nlp2ljm19czcys5pvq6hjxh0ja2vx74pwhylb6"; }; nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 864535794f8..7c90b16d86a 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,7 +1,7 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes +{ stdenv, intltool, fetchurl , pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, gspell }: +, wrapGAppsHook, itstool, libsoup, libxml2 +, gnome3, gspell }: stdenv.mkDerivation rec { name = "gedit-${version}"; @@ -12,24 +12,23 @@ stdenv.mkDerivation rec { sha256 = "0pyam0zi44xq776x20ycqnvmf86l98jns8ldv4m81gnp9wnhmycv"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gedit"; attrPath = "gnome3.gedit"; }; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - gnome3.gsettings-desktop-schemas gnome3.dconf file gspell ]; + buildInputs = [ + gtk3 glib + gnome3.defaultIconTheme libsoup + gnome3.libpeas gnome3.gtksourceview + gnome3.gsettings-desktop-schemas gspell + ]; enableParallelBuilding = true; - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gnome3.libpeas gnome3.gtksourceview ]}") - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gedit"; + attrPath = "gnome3.gedit"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Gedit; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 1a8c2f55b1b..60e8822135c 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -4,37 +4,36 @@ , gnome3, librsvg, gdk_pixbuf, gpgme , libsecret, avahi, p11-kit, openssh }: -stdenv.mkDerivation rec { - name = "seahorse-${version}"; +let + pname = "seahorse"; version = "3.20.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/seahorse/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "e2b07461ed54a8333e5628e9b8e517ec2b731068377bf376570aad998274c6df"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "seahorse"; attrPath = "gnome3.seahorse"; }; - }; - doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings-desktop-schemas wrapGAppsHook gnupg - gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11-kit vala - openssh ]; + nativeBuildInputs = [ pkgconfig vala intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gnome3.gcr + gnome3.gsettings-desktop-schemas gnupg + gnome3.defaultIconTheme gpgme + libsecret avahi libsoup p11-kit + openssh + ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Seahorse; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 3bc32f99f3e..6877b20df44 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -1,8 +1,8 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu , wrapGAppsHook, gnome3, libxml2, libxslt, itstool , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit -, sqlite, gcr, isocodes, desktop-file-utils, file -, gdk_pixbuf, gnome-common, gst_all_1, json-glib }: +, sqlite, gcr, isocodes, desktop-file-utils +, gdk_pixbuf, gst_all_1, json-glib }: stdenv.mkDerivation rec { name = "epiphany-${version}"; @@ -13,31 +13,33 @@ stdenv.mkDerivation rec { sha256 = "023q6xnwsafac38lavxwgph5lcd2igxpiwqb4kr72mv56xlb0m3i"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "epiphany"; }; - }; - # Tests need an X display mesonFlags = [ "-Dunit_tests=false" ]; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop-file-utils ]; + nativeBuildInputs = [ + meson ninja libxslt pkgconfig itstool gettext wrapGAppsHook desktop-file-utils + ]; - buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify - sqlite isocodes p11-kit icu gnome3.yelp-tools - gdk_pixbuf gnome3.defaultIconTheme gnome-common gcr - glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav json-glib ]; - - enableParallelBuilding = true; + buildInputs = [ + gtk glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify + sqlite isocodes p11-kit icu + gdk_pixbuf gnome3.defaultIconTheme gcr + glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav json-glib + ]; postPatch = '' chmod +x post_install.py # patchShebangs requires executable file patchShebangs post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "epiphany"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; description = "WebKit based web browser for GNOME"; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index 8966893bde7..5f6ed213e3e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-themes-standard}/share:${sound-theme-freedesktop}/share" + --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" # Thumbnailers (for setting user profile pictures) --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 95fcfac1d75..ee1feb6ddae 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -11,18 +11,20 @@ stdenv.mkDerivation rec { sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-dictionary"; attrPath = "gnome3.gnome-dictionary"; }; - }; - doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gnome3.defaultIconTheme ]; + nativeBuildInputs = [ + meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool + desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; - nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool - desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; - buildInputs = [ gtk glib gnome3.gsettings-desktop-schemas ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-dictionary"; + attrPath = "gnome3.gnome-dictionary"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 4dde871ec70..0478877acb4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk, glib, wrapGAppsHook, libnotify -, itstool, gnome3, gdk_pixbuf, libxml2 +, itstool, gnome3, libxml2 , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-disk-utility"; attrPath = "gnome3.gnome-disk-utility"; }; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl - wrapGAppsHook libxml2 ]; - buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 - gdk_pixbuf udisks2 gnome3.defaultIconTheme - gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas ]; + nativeBuildInputs = [ + meson ninja pkgconfig gettext itstool libxslt docbook_xsl + wrapGAppsHook libxml2 + ]; + buildInputs = [ + gtk glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 + udisks2 gnome3.defaultIconTheme + gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas + ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 1f7aa4d874a..f5b33c88f57 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,20 +1,18 @@ { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 -, bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib -, gnome3, librsvg, gdk_pixbuf }: +, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib, desktop-file-utils +, gnome3 }: -stdenv.mkDerivation rec { - name = "gnome-screenshot-${version}"; +let + pname = "gnome-screenshot"; version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-screenshot/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-screenshot"; attrPath = "gnome3.gnome-screenshot"; }; - }; - doCheck = true; postPatch = '' @@ -22,17 +20,19 @@ stdenv.mkDerivation rec { patchShebangs build-aux/postinstall.py ''; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; - buildInputs = [ bash gtk3 glib libcanberra-gtk3 - gnome3.gsettings-desktop-schemas ]; - - patches = [ - ./prevent-cache-updates.patch + nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils wrapGAppsHook ]; + buildInputs = [ + gtk3 glib libcanberra-gtk3 gnome3.defaultIconTheme + gnome3.gsettings-desktop-schemas ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "${pname}"; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; description = "Utility used in the GNOME desktop environment for taking screenshots"; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch b/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch deleted file mode 100644 index 370d09cd2f0..00000000000 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/build-aux/postinstall.py -+++ b/build-aux/postinstall.py -@@ -8,18 +8,6 @@ - - # Packaging tools define DESTDIR and this isn't needed for them - if 'DESTDIR' not in os.environ: -- print('Updating icon cache...') -- icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor') -- if not os.path.exists(icon_cache_dir): -- os.makedirs(icon_cache_dir) -- subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir]) -- -- print('Updating desktop database...') -- desktop_database_dir = os.path.join(datadir, 'applications') -- if not os.path.exists(desktop_database_dir): -- os.makedirs(desktop_database_dir) -- subprocess.call(['update-desktop-database', '-q', desktop_database_dir]) -- - print('Compiling GSettings schemas...') - schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas') - if not os.path.exists(schemas_dir): diff --git a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix index 673140c3e1b..23a41b6d6ae 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-log/default.nix @@ -1,34 +1,31 @@ { stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: +, gtk3, glib, wrapGAppsHook +, itstool, gnome3, libxml2 }: -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; +let + pname = "gnome-system-log"; + version = "3.9.90"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; }; doCheck = true; - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook libxml2 ]; + buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ bash gtk3 glib intltool itstool - gnome3.gsettings-desktop-schemas wrapGAppsHook libxml2 ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share" - ) - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index a9d8b2ad11c..49bd43e6195 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter , clutter-gtk, clutter-gst, python3Packages, shared-mime-info , pkgconfig, gtk3, glib, gobjectIntrospection -, bash, wrapGAppsHook, itstool, libxml2, dbus-glib, vala, gnome3, librsvg -, gdk_pixbuf, file, tracker, nautilus }: +, bash, wrapGAppsHook, itstool, libxml2, vala, gnome3, librsvg +, gdk_pixbuf, tracker, nautilus }: stdenv.mkDerivation rec { name = "totem-${version}"; @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "totem"; attrPath = "gnome3.totem"; }; - }; - doCheck = true; # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 @@ -26,14 +22,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; - buildInputs = [ gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info dbus-glib - gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop - gnome3.gsettings-desktop-schemas tracker nautilus ]; + nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib gnome3.grilo clutter-gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared-mime-info + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome-desktop + gnome3.gsettings-desktop-schemas tracker nautilus + ]; propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; @@ -50,11 +46,17 @@ stdenv.mkDerivation rec { patchShebangs . ''; - mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; + mesonFlags = [ "-Dwith-nautilusdir=${placeholder "out"}/lib/nautilus/extensions-3.0" ]; - GI_TYPELIB_PATH = "$out/lib/girepository-1.0"; wrapPrefixVariables = [ "PYTHONPATH" ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "totem"; + attrPath = "gnome3.totem"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; description = "Movie player for the GNOME desktop based on GStreamer"; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 60b91aaa04a..691ec2fdb94 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,6 +1,6 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff -, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 +, gnome3, sqlite +, itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,21 +12,20 @@ stdenv.mkDerivation rec { sha256 = "05qzczxnxk374cp4an166gv60nkbd0jq3pp2fwy7s9rnkm55jz6v"; }; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 glib webkitgtk sqlite + libxml2 libxslt gnome3.yelp-xsl + gnome3.defaultIconTheme + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + ]; + passthru = { - updateScript = gnome3.updateScript { packageName = "yelp"; }; + updateScript = gnome3.updateScript { + packageName = "yelp"; + }; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp-xsl - librsvg gdk_pixbuf gnome3.defaultIconTheme groff - gnome3.gsettings-desktop-schemas wrapGAppsHook - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; description = "The help viewer in Gnome"; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index c28695ed8e2..f3568888899 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -206,10 +206,6 @@ let inherit gnome3; }; - networkmanager-pptp = pkgs.networkmanager-pptp.override { - inherit gnome3; - }; - networkmanager-vpnc = pkgs.networkmanager-vpnc.override { inherit gnome3; }; @@ -436,7 +432,6 @@ let networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_pptp = networkmanager-pptp; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 yelp_xsl = yelp-xsl; # added 2018-02-25 yelp_tools = yelp-tools; # added 2018-02-25 diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 5a95802b81a..1994b587fbd 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -5,18 +5,17 @@ , gnome3, librsvg, gnome-doc-utils, webkitgtk }: let - majorVersion = "0.12"; + pname = "geary"; + version = "0.12.1"; in stdenv.mkDerivation rec { - name = "geary-${majorVersion}.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite @@ -28,15 +27,21 @@ stdenv.mkDerivation rec { "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes" ]; - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' - ''; + # TODO: This is bad, upstream should fix their code. + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0"; preFixup = '' # Add geary to path for geary-attach gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Geary; description = "Mail client for GNOME 3"; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 314539b7f9e..32da3a9a4b8 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -3,37 +3,49 @@ , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret , libsoup }: -stdenv.mkDerivation rec { - name = "gitg-${version}"; +let + pname = "gitg"; version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gitg/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gitg"; }; - }; - preCheck = '' substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" ''; doCheck = true; - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + enableParallelBuilding = true; - propagatedUserEnvPkgs = [ shared-mime-info - gnome3.gnome-themes-standard ]; + makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup - libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas - librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; + buildInputs = [ + gtk3 glib json-glib libgee libpeas gnome3.libsoup + libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas + libsecret gobjectIntrospection gnome3.adwaita-icon-theme + ]; nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; + homepage = https://wiki.gnome.org/Apps/Gitg; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl2; diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 02f58f81200..7920c8e1f45 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -8,13 +8,13 @@ , libXmu }: let - version = "0.25.0"; + version = "0.26.2"; in gsmakeDerivation { name = "gnustep-back-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; - sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; + sha256 = "012gsc7x66gmsw6r5w65a64krcigf7rzqzd5x86d4gv94344knlf"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cairo base gui freetype x11 libXmu ]; diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 4d9f763acc4..40c79274aae 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -11,13 +11,13 @@ , pkgconfig, portaudio }: let - version = "1.24.9"; + version = "1.25.1"; in gsmakeDerivation { name = "gnustep-base-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; - sha256 = "1vvjlbqmlwr82b4pf8c62rxjgz475bmg0x2yd0bbkia6yvwhk585"; + sha256 = "17mnilg28by74wc08nkwp6gi06x3j2nrcf05wg64nrw5ljffp2zj"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix index 5075ec5500c..9f1b0ef47fe 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/desktops/gnustep/gorm/default.nix @@ -1,13 +1,13 @@ { fetchurl, base, back, gsmakeDerivation, gui }: let - version = "1.2.22"; + version = "1.2.23"; in gsmakeDerivation { name = "gorm-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; - sha256 = "1mq5n65xd9bc4kppx19iijsgpz4crvhg7bfwbi9k78j159vclnmi"; + sha256 = "18pf9vvzvdk8bg4lhjb96y1kdkmb9ahmvrqv2581vn45pjxmmlnb"; }; buildInputs = [ base back gui ]; diff --git a/pkgs/development/compilers/openjdk/9.nix b/pkgs/development/compilers/openjdk/9.nix index 0a9be04ebb2..7ac3931c93d 100644 --- a/pkgs/development/compilers/openjdk/9.nix +++ b/pkgs/development/compilers/openjdk/9.nix @@ -22,41 +22,41 @@ let throw "openjdk requires i686-linux or x86_64 linux"; update = "9.0.4"; - build = "11"; + build = "12"; baseurl = "http://hg.openjdk.java.net/jdk-updates/jdk9u"; repover = "jdk-${update}+${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk9 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "1y8sq0fxvj5s5gx5qm2mbr710xqrgv3d200k6bv71bawjh57v3xx"; + sha256 = "06hnrzkwxgrfq26il1mjyl6wgb7x3qym69pjbddhl9m29n2si3jh"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "1n6aqmph6a9spxyfi40k8g5hy2bnfd499gr6jkmq49phdb2qg7wy"; + sha256 = "16xqnqn773p6ywcdjx801vbng2skjal7svydn0s7wf3ldqzx64mi"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "1i34k3pc2slnjk469zskqq1z0jna1xg2zzjdk7zjrhrfgsrgvfsh"; + sha256 = "0g5ddffl2qykrjf17ac9as60rd4sfyv7s2fpgjn86k4a69gkx93v"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "1k6r5yxf5h1m451vlwzk9zqkmdlln3ky3kir5qjgan4hz892f297"; + sha256 = "14585dzs2mfzgzrnbvc062pigngs35hajwpr22m6fzbm7580vnqk"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0gafc0jx8fx13y6iir9zxmqrsw1a3w71xgdvjx9rk64acc24piy2"; + sha256 = "16595jdg3y9zy70q8i615a7d6w0zzbydfxylvaq42wrsc7jw733h"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1bw3z346mna6pgz76phcmfm0ykydcwagqxhffj0mzbdll7ysw25p"; + sha256 = "1m1aspc1hq74w0bkasrfvp8ygs6psbc1l61vfw9244j2vgfahjgn"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "063fhnmm2g83jrdv2bl968glr46vvgjpyk9rjmh2fwfplzclb51s"; + sha256 = "06ns2giw366vjivb6d46gqwfvfzkaddrgd1x6y8w37ywygp50lxm"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "0wyx76nd4v6xy4vmp94anxwk9bfqyb0l4n3hqhfqyz6azi8pqk66"; + sha256 = "0z6mlzvz1hh1yzli69qjlrcwqdjnivbjbqqrqi4hhpls6z0a2ch7"; }; openjdk9 = stdenv.mkDerivation { name = "openjdk-${update}-b${build}"; diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix new file mode 100644 index 00000000000..1d06f122b23 --- /dev/null +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -0,0 +1,158 @@ +{ swingSupport ? true +, stdenv +, requireFile +, makeWrapper +, unzip +, file +, xorg ? null +, packageType ? "JDK" # JDK, JRE, or ServerJRE +, pluginSupport ? true +, glib +, libxml2 +, ffmpeg_2 +, libxslt +, libGL +, freetype +, fontconfig +, gtk2 +, pango +, cairo +, alsaLib +, atk +, gdk_pixbuf +, zlib +, elfutils +, setJavaClassPath +}: + +assert stdenv.system == "x86_64-linux"; +assert swingSupport -> xorg != null; + +let + version = "10"; + + downloadUrlBase = http://www.oracle.com/technetwork/java/javase/downloads; + + rSubPaths = [ + "lib/jli" + "lib/server" + "lib" + ]; + +in + +let result = stdenv.mkDerivation rec { + name = if packageType == "JDK" then "oraclejdk-${version}" + else if packageType == "JRE" then "oraclejre-${version}" + else if packageType == "ServerJRE" then "oracleserverjre-${version}" + else abort "unknown package Type ${packageType}"; + + src = + if packageType == "JDK" then + requireFile { + name = "jdk-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/jdk10-downloads-4416644.html"; + sha256 = "0338m0x5lka0xjsbcll70r1i308bjw3m42cm9dx9zmfk70kplj5c"; + } + else if packageType == "JRE" then + requireFile { + name = "jre-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/jre10-downloads-4417026.html"; + sha256 = "1clawcahkla1h9pxnqfqzcgv51aqgq78v1ws5jygbk6fbbi7l54w"; + } + else if packageType == "ServerJRE" then + requireFile { + name = "serverjre-${version}_linux-x64_bin.tar.gz"; + url = "${downloadUrlBase}/sjre10-downloads-4417025.html"; + sha256 = "0kiyg33fv29ad0nyl35r7y0bhyxivb2hxlds44m9l0259s55nwhw"; + } + else abort "unknown package Type ${packageType}"; + + nativeBuildInputs = [ file ]; + + buildInputs = [ makeWrapper ]; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + # Set PaX markings + exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + for file in $exes; do + paxmark m "$file" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + done + + mv $sourceRoot $out + + shopt -s extglob + for file in $out/* + do + if test -f $file ; then + rm $file + fi + done + + if test -z "$pluginSupport"; then + rm -f $out/bin/javaws + fi + + mkdir $out/lib/plugins + ln -s $out/lib/libnpjp2.so $out/lib/plugins + + # for backward compatibility + ln -s $out $out/jre + + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}" + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + + # Oracle Java Mission Control needs to know where libgtk-x11 and related is + if test -x $out/bin/jmc; then + wrapProgram "$out/bin/jmc" \ + --suffix-each LD_LIBRARY_PATH ':' "$rpath" + fi + ''; + + /** + * libXt is only needed on amd64 + */ + libraries = + [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ + (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); + + rpath = stdenv.lib.strings.makeLibraryPath libraries; + + passthru.mozillaPlugin = "/lib/plugins"; + + passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + }; + +}; in result diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index 3f5ec69235f..82c6e58a7b0 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6"; + compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ]; }; } diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 72603ad4485..35cf63af862 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, coq, ssreflect }: -let param = +let params = { "8.5" = { version = "20170512"; @@ -19,9 +19,9 @@ let param = rev = "195e550a1cf0810497734356437a1720ebb6d744"; sha256 = "0zm23y89z0h4iamy74qk9qi2pz2cj3ga6ygav0w79n0qyqwhxcq1"; }; - - }."${coq.coq-version}" -; in + }; + param = params."${coq.coq-version}"; +in stdenv.mkDerivation rec { @@ -49,4 +49,8 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; + } diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index a27a247c9d0..75e78d8ac44 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -24,4 +24,6 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { inherit (mathcomp) compatibleCoqVersions; }; + } diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index 9d035fec9f9..45786c5a955 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -10,6 +10,10 @@ let param = rev = "V8.7.0"; sha256 = "11c4sdmpd3l6jjl4v6k213z9fhrmmm1xnly3zmzam1wrrdif4ghl"; }; + "8.8" = { + rev = "V8.8+beta1"; + sha256 = "1ymxyrvjygscxkfj3qkq66skl3vdjhb670rzvsvgmwrjkrakjnfg"; + }; }."${coq.coq-version}" ; in diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 374979f1d15..877331383a7 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchFromGitHub, coq }: -let param = +let params = { "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - }."${coq.coq-version}"; + }; + param = params."${coq.coq-version}"; in stdenv.mkDerivation rec { @@ -34,4 +35,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; } diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index b27fbcc1587..a66e941a8c9 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, coq, ssreflect }: -let param = +let params = { "8.5" = { version = "20171215"; @@ -19,9 +19,9 @@ let param = rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; }; - - }."${coq.coq-version}" -; in + }; + param = params."${coq.coq-version}"; +in stdenv.mkDerivation rec { @@ -48,4 +48,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; } diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 7f5111462bd..2e6c95bfe3c 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -22,4 +22,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (coq.meta) platforms; }; + + passthru = { inherit (ssreflect) compatibleCoqVersions; }; + } diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 425ab408c8c..390ced8fdad 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }: -let param = { +let params = { "8.7" = { version = "0.6.2"; rev = "d76ddde37d918569945774733b7997e8b24daf51"; @@ -16,7 +16,9 @@ let param = { rev = "v0.6"; sha256 = "0qvar8gfbrcs9fmvkph5asqz4l5fi63caykx3bsn8zf0xllkwv0n"; }; -}."${coq.coq-version}"; in +}; +param = params."${coq.coq-version}"; +in stdenv.mkDerivation { name = "coq${coq.coq-version}-dpdgraph-${param.version}"; @@ -46,4 +48,9 @@ stdenv.mkDerivation { maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = coq.meta.platforms; }; + + passthru = { + compatibleCoqVersions = v: builtins.hasAttr v params; + }; + } diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index 5f31fe6dc34..bf441562b14 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -24,4 +24,7 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: !stdenv.lib.versionAtLeast v "8.8"; + }; } diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 5faf8093b15..b1036e61f1b 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -24,4 +24,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ vbgl ]; platforms = coq.meta.platforms; }; + + passthru = { inherit (mathcomp) compatibleCoqVersions; }; + } diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 564cb6f6571..5d39f9b3b0c 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -35,4 +35,8 @@ stdenv.mkDerivation { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 93ef7c14f1f..94a24eb7085 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -28,4 +28,8 @@ stdenv.mkDerivation rec { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix index c598345403d..ca20e17dd50 100644 --- a/pkgs/development/coq-modules/ssreflect/generic.nix +++ b/pkgs/development/coq-modules/ssreflect/generic.nix @@ -42,4 +42,8 @@ stdenv.mkDerivation { platforms = coq.meta.platforms; }; + passthru = { + compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ]; + }; + } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48fa8c0e303..4d85a26227e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -344,7 +344,6 @@ self: super: { orgmode-parse = dontCheck super.orgmode-parse; os-release = dontCheck super.os-release; persistent-redis = dontCheck super.persistent-redis; - pure-zlib = dontCheck super.pure-zlib; # https://github.com/NixOS/nixpkgs/issues/37499 pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server @@ -1006,4 +1005,7 @@ self: super: { # https://github.com/fpco/inline-c/issues/72 inline-c = dontCheck super.inline-c; + # https://github.com/GaloisInc/pure-zlib/issues/6 + pure-zlib = doJailbreak super.pure-zlib; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index b39efcbde77..d953236784e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -659,31 +659,14 @@ self: super: { sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a"; }); - # https://github.com/jgm/pandoc-types/issues/37 - pandoc-types = self.pandoc-types_1_17_4_2; - - ## Need latest git version to support current haddock-library versions. - pandoc = overrideSrc super.pandoc { - version = "2.1.2-git"; - src = pkgs.fetchFromGitHub { - owner = "jgm"; - repo = "pandoc"; - rev = "fad8d0d67ff4736e1af554d2bfcf1688aa28c8ec"; - sha256 = "1sgfnyi2ma8vf91dw9ax9xbbjfcja1q5q9vcwa1rhh05jv8j036a"; - }; - }; - - # Fix missing semigroup instance. - json = appendPatch super.json (pkgs.fetchpatch - { url = https://github.com/GaloisInc/json/commit/9292150bbe02c2d126ad6a876242578b1a9d1bf2.patch; - sha256 = "1xw2gab0wzhszgcbjhg98kkzgnbfn9n3bx1qlk6g7ir6hhwppm9z"; - }); - # Older versions don't compile. brick = self.brick_0_35; - timezone-olson = self.timezone-olson_0_1_9; - matrix = self.matrix_0_3_6_1; getopt-generics = self.getopt-generics_0_13_0_2; + HaTeX = self.HaTeX_3_19_0_0; + json = self.json_0_9_2; + matrix = self.matrix_0_3_6_1; + pandoc = self.pandoc_2_1_3; + pandoc-types = self.pandoc-types_1_17_4_2; # https://github.com/xmonad/xmonad/issues/155 xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch @@ -691,4 +674,7 @@ self: super: { sha256 = "1mj3k0w8aqyy71kmc71vzhgxmr4h6i5b3sykwflzays50grjm5jp"; })) self.semigroups; + # https://github.com/xmonad/xmonad-contrib/issues/235 + xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch); + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 901d49a4fae..00505f31b46 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2957,6 +2957,7 @@ dont-distribute-packages: ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] + asciidiagram: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] asn1-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2975,6 +2976,7 @@ dont-distribute-packages: atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] atmos-dimensional-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] atndapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + atom-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3023,6 +3025,7 @@ dont-distribute-packages: aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2-knownhosts: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3073,6 +3076,7 @@ dont-distribute-packages: barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + base-noprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-bytestring-type: [ i686-linux, x86_64-linux, x86_64-darwin ] base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3081,6 +3085,7 @@ dont-distribute-packages: batchd: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] + battleplace-api: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3149,6 +3154,7 @@ dont-distribute-packages: bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libg15: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3244,6 +3250,7 @@ dont-distribute-packages: bond: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + bookkeeping-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] Bookshelf: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3552,6 +3559,7 @@ dont-distribute-packages: cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] coalpit: [ i686-linux, x86_64-linux, x86_64-darwin ] + codec-beam: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] codec-rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3707,6 +3715,7 @@ dont-distribute-packages: CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] + corenlp-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-object: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3775,6 +3784,7 @@ dont-distribute-packages: cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + csg: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3803,6 +3813,7 @@ dont-distribute-packages: dag: [ i686-linux, x86_64-linux, x86_64-darwin ] damnpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] + danibot: [ i686-linux, x86_64-linux, x86_64-darwin ] dao: [ i686-linux, x86_64-linux, x86_64-darwin ] Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] dapi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3858,6 +3869,7 @@ dont-distribute-packages: data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-stringmap: [ i686-linux, x86_64-linux, x86_64-darwin ] data-structure-inferrer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3899,6 +3911,7 @@ dont-distribute-packages: ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + dde: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4106,6 +4119,7 @@ dont-distribute-packages: dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] dtw: [ i686-linux, x86_64-linux, x86_64-darwin ] dual: [ i686-linux, x86_64-linux, x86_64-darwin ] + dublincore-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] duckling: [ i686-linux, x86_64-linux, x86_64-darwin ] duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4507,9 +4521,11 @@ dont-distribute-packages: friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] frown: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] + frpnow-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] + fsnotify-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] fswait: [ i686-linux, x86_64-linux, x86_64-darwin ] fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4540,6 +4556,7 @@ dont-distribute-packages: futun: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] + fuzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4635,6 +4652,7 @@ dont-distribute-packages: gf: [ i686-linux, x86_64-linux, x86_64-darwin ] GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-datasize: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dump-util: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4642,6 +4660,7 @@ dont-distribute-packages: ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-heap-view: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-justdoit: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4667,12 +4686,18 @@ dont-distribute-packages: ghcjs-xhr: [ i686-linux, x86_64-linux, x86_64-darwin ] ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-atk: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-dbusmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-dbusmenugtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdk: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdkpixbuf: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gdkx11: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-ggit: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-girepository: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gobject: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4750,6 +4775,7 @@ dont-distribute-packages: GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5188,10 +5214,12 @@ dont-distribute-packages: haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-conll: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-dap: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-gi: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-go-checkers: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-holes-th: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5546,6 +5574,7 @@ dont-distribute-packages: HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlrdb: [ i686-linux, x86_64-linux, x86_64-darwin ] hls: [ i686-linux, x86_64-linux, x86_64-darwin ] hlwm: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5757,6 +5786,7 @@ dont-distribute-packages: HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHTSLib: [ i686-linux, x86_64-linux, x86_64-darwin ] HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsignal: [ i686-linux, x86_64-linux, x86_64-darwin ] hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] hsimport: [ i686-linux, x86_64-linux, x86_64-darwin ] HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5977,6 +6007,7 @@ dont-distribute-packages: imapget: [ i686-linux, x86_64-linux, x86_64-darwin ] imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] + imm: [ i686-linux, x86_64-linux, x86_64-darwin ] imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5992,6 +6023,7 @@ dont-distribute-packages: inch: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] + incremental-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ] indents: [ i686-linux, x86_64-linux, x86_64-darwin ] indexed-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6478,6 +6510,7 @@ dont-distribute-packages: loch: [ i686-linux, x86_64-linux, x86_64-darwin ] lock-file: [ i686-linux, x86_64-linux, x86_64-darwin ] locked-poll: [ i686-linux, x86_64-linux, x86_64-darwin ] + lockpool: [ i686-linux, x86_64-linux, x86_64-darwin ] log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] log-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6790,6 +6823,7 @@ dont-distribute-packages: mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoid-subclasses: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7104,6 +7138,7 @@ dont-distribute-packages: open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] open-signals: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-symbology: [ i686-linux, x86_64-linux, x86_64-darwin ] open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7130,6 +7165,7 @@ dont-distribute-packages: OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] openweathermap: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] + opml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] optional: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7316,6 +7352,7 @@ dont-distribute-packages: pia-forward: [ i686-linux, x86_64-linux, x86_64-darwin ] pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] + picoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] pictikz: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7377,6 +7414,7 @@ dont-distribute-packages: plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] Plot-ho-matic: [ i686-linux, x86_64-linux, x86_64-darwin ] plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-light-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] plots: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7677,6 +7715,7 @@ dont-distribute-packages: rasa: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] + rasterific-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7847,6 +7886,7 @@ dont-distribute-packages: rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + rfc3339: [ i686-linux, x86_64-linux, x86_64-darwin ] rfc: [ i686-linux, x86_64-linux, x86_64-darwin ] rhine-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7911,6 +7951,7 @@ dont-distribute-packages: rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] + rss-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] rss: [ i686-linux, x86_64-linux, x86_64-darwin ] RtMidi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7973,6 +8014,7 @@ dont-distribute-packages: scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + scc: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8348,6 +8390,7 @@ dont-distribute-packages: spake2: [ i686-linux, x86_64-linux, x86_64-darwin ] spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] sparkle: [ i686-linux, x86_64-linux, x86_64-darwin ] + sparrow: [ i686-linux, x86_64-linux, x86_64-darwin ] sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8522,12 +8565,14 @@ dont-distribute-packages: superconstraints: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] superevent: [ i686-linux, x86_64-linux, x86_64-darwin ] + supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] superrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] supplemented: [ i686-linux, x86_64-linux, x86_64-darwin ] sv: [ i686-linux, x86_64-linux, x86_64-darwin ] SVD2HS: [ i686-linux, x86_64-linux, x86_64-darwin ] + svg-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] SVGFonts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8771,6 +8816,7 @@ dont-distribute-packages: timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + timerep: [ i686-linux, x86_64-linux, x86_64-darwin ] timers-tick: [ i686-linux, x86_64-linux, x86_64-darwin ] timeseries: [ i686-linux, x86_64-linux, x86_64-darwin ] timezone-unix: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9042,6 +9088,7 @@ dont-distribute-packages: vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vcatt: [ i686-linux, x86_64-linux, x86_64-darwin ] + vcf: [ i686-linux, x86_64-linux, x86_64-darwin ] vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -9486,5 +9533,7 @@ dont-distribute-packages: zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] zstd: [ i686-linux, x86_64-linux, x86_64-darwin ] + ztail: [ i686-linux, x86_64-linux, x86_64-darwin ] zuramaru: [ i686-linux, x86_64-linux, x86_64-darwin ] Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] + zxcvbn-c: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index be3d3ae673f..ac04f2d7cea 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3393,8 +3393,8 @@ self: { ({ mkDerivation, base, parsec, pretty }: mkDerivation { pname = "CoreErlang"; - version = "0.0.3"; - sha256 = "111012wpnfa3bm9r5xnfhm5xjq8ppsnwx01a6njbvmqi9hcba3nc"; + version = "0.0.4"; + sha256 = "034g6c7dxdp13v1x16gvwgagpc7mw33hwd16cbb8yd3i91vf1w8z"; libraryHaskellDepends = [ base parsec pretty ]; homepage = "http://github.com/amtal/CoreErlang"; description = "Manipulating Core Erlang source code"; @@ -6643,8 +6643,8 @@ self: { }: mkDerivation { pname = "Gifcurry"; - version = "3.0.0.0"; - sha256 = "1x7hbfjcly41sk3bins3z522651v1fqybb64dj1a6f6lvglx6ms8"; + version = "3.0.0.1"; + sha256 = "0c6wk6kngrpmjwxwixynxfvr92ycvxmivvcvbk171x4a47zcg4sq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -12735,6 +12735,8 @@ self: { pname = "MonadRandom"; version = "0.5.1"; sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy"; + revision = "1"; + editedCabalFile = "19242r11a7iqr8dnbxsac04c3ylh7xkan70pdv5k3jzcmfwn4shd"; libraryHaskellDepends = [ base fail mtl primitive random transformers transformers-compat ]; @@ -14008,6 +14010,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libGL;}; + "OpenGLRaw_3_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, libGL + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.3.0.0"; + sha256 = "145j4fa4vs7x5r6x5i0733qc9aw27ggzax3xpjc7pmibmrkri20p"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ libGL ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libGL;}; + "OpenGLRaw21" = callPackage ({ mkDerivation, OpenGLRaw }: mkDerivation { @@ -27188,14 +27208,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "apecs_0_3_0_1" = callPackage + "apecs_0_3_0_2" = callPackage ({ mkDerivation, async, base, containers, criterion, linear, mtl , QuickCheck, template-haskell, vector }: mkDerivation { pname = "apecs"; - version = "0.3.0.1"; - sha256 = "04vqhkikyxgyzm61jlw21ycg3iv5fsx24q31a7gy5cxh5fqmw76k"; + version = "0.3.0.2"; + sha256 = "1j9vw55z9igpjmll99x0pxz792m0w0n1r8w1sy96kj0jqk5y2l5i"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -29012,6 +29032,7 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -29541,6 +29562,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh_0_3_0_0" = callPackage + ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async + , microlens, microlens-th, monad-logger, safe-exceptions, stm + , test-framework, test-framework-hunit, text, unliftio + , unliftio-core + }: + mkDerivation { + pname = "async-refresh"; + version = "0.3.0.0"; + sha256 = "1j9llc84f93srw80pyldcglzmssl0l961bzlwsrvbaa84ldhcs6s"; + libraryHaskellDepends = [ + base formatting lifted-async microlens microlens-th monad-logger + safe-exceptions stm text unliftio unliftio-core + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger stm test-framework + test-framework-hunit text + ]; + homepage = "https://github.com/mtesseract/async-refresh"; + description = "Package implementing core logic for refreshing of expiring data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-refresh-tokens" = callPackage ({ mkDerivation, async-refresh, base, bytestring, criterion , formatting, HUnit, lifted-async, microlens, microlens-th @@ -29564,6 +29609,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh-tokens_0_4_0_0" = callPackage + ({ mkDerivation, async-refresh, base, bytestring, criterion + , formatting, HUnit, microlens, microlens-th, monad-logger + , safe-exceptions, test-framework, test-framework-hunit, text + , unliftio, unliftio-core + }: + mkDerivation { + pname = "async-refresh-tokens"; + version = "0.4.0.0"; + sha256 = "1py7ips87gbwdhxdfv0xh4hkgw0my4nkkz4w1vwcb3s296a439v7"; + libraryHaskellDepends = [ + async-refresh base bytestring formatting microlens microlens-th + monad-logger safe-exceptions text unliftio unliftio-core + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger test-framework + test-framework-hunit unliftio + ]; + homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; + description = "Package implementing core logic for refreshing of expiring access tokens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-timer" = callPackage ({ mkDerivation, base, containers, criterion, HUnit, lifted-async , lifted-base, monad-control, safe-exceptions, test-framework @@ -29824,6 +29893,7 @@ self: { ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atom-msp430" = callPackage @@ -31318,6 +31388,7 @@ self: { homepage = "https://github.com/rcook/aws-easy#readme"; description = "AWS Easy: Helper functions for working with amazonka"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-ec2" = callPackage @@ -32538,6 +32609,7 @@ self: { homepage = "https://github.com/hvr/base-noprelude"; description = "\"base\" package sans \"Prelude\" module"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-orphans" = callPackage @@ -33004,6 +33076,7 @@ self: { ]; description = "Public API definitions of BattlePlace.io service"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "battleship-combinatorics" = callPackage @@ -34105,6 +34178,8 @@ self: { pname = "binary"; version = "0.7.6.1"; sha256 = "0rqhz349w72h1bi79lga5x1d95g59h15srlahxbhfrmy2pycm1cg"; + revision = "1"; + editedCabalFile = "0lq4zn0wzfh7pwc163l2fain297njpd82jgjwkylbza3qs0nfx9m"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -35070,6 +35145,7 @@ self: { homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "bindings-libcddb" = callPackage @@ -35643,21 +35719,19 @@ self: { }) {}; "biohazard" = callPackage - ({ mkDerivation, async, attoparsec, base, base-prelude, binary - , bytestring, containers, directory, exceptions, filepath, hashable - , primitive, random, scientific, stm, text, transformers, unix - , unordered-containers, vector, vector-algorithms, vector-th-unbox - , zlib + ({ mkDerivation, async, attoparsec, base, base-prelude, bytestring + , containers, exceptions, hashable, primitive, stm, text + , transformers, unix, unordered-containers, vector + , vector-algorithms, vector-th-unbox, zlib }: mkDerivation { pname = "biohazard"; - version = "1.0.0"; - sha256 = "0cc855d3h1fh52ldvqzwf3f834g8singavvpk1ir157fgg8qjz3g"; + version = "1.0.1"; + sha256 = "0gzsrrapv3ih598qqacnipqgxxzxmci98rzvc54jxv3hajsnxkqb"; libraryHaskellDepends = [ - async attoparsec base base-prelude binary bytestring containers - directory exceptions filepath hashable primitive random scientific - stm text transformers unix unordered-containers vector - vector-algorithms vector-th-unbox zlib + async attoparsec base base-prelude bytestring containers exceptions + hashable primitive stm text transformers unix unordered-containers + vector vector-algorithms vector-th-unbox zlib ]; homepage = "https://bitbucket.org/ustenzel/biohazard"; description = "bioinformatics support library"; @@ -37864,6 +37938,7 @@ self: { homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; description = "Helper functions for Japanese bookkeeping"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bool-extras" = callPackage @@ -39586,8 +39661,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.3.0.0"; - sha256 = "03z27wx9g8pmx07r2cc5mzp3p7qpzq7gp590k9kd3kq1q9dx2096"; + version = "0.3.1.0"; + sha256 = "11kchyzm908ld3s3k8jh8phbryhp4zj5d3aq4sflfd8pkrns321d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40187,6 +40262,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; + "bzlib-conduit_0_3_0_1" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit + , data-default-class, hspec, mtl, random, resourcet + }: + mkDerivation { + pname = "bzlib-conduit"; + version = "0.3.0.1"; + sha256 = "0fd2hnr782s7qgipazg2yxwia9qqhkvm9bcm90773c3zkxa13n23"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + librarySystemDepends = [ bzip2 ]; + testHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class hspec mtl + random resourcet + ]; + benchmarkHaskellDepends = [ + base bindings-DSL bytestring conduit data-default-class mtl + resourcet + ]; + homepage = "https://github.com/snoyberg/bzlib-conduit#readme"; + description = "Streaming compression/decompression via conduits"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) bzip2;}; + "c-dsl" = callPackage ({ mkDerivation, base, language-c }: mkDerivation { @@ -43011,10 +43114,8 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.3.0.1"; - sha256 = "178d1sbfvscbmgwm5basbzciflrj6i6w55w1pmm6wyiibfbcwapf"; - revision = "1"; - editedCabalFile = "0wik7fy8qs1971bxziap6lkc8pxl83mz642gprh07qrx3kfx0qs1"; + version = "0.3.0.2"; + sha256 = "09aiwcc9q768jz7xd7hxymrj3hw6g21imsh6ka4rrw059hi4lzna"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44918,10 +45019,11 @@ self: { }: mkDerivation { pname = "chronologique"; - version = "0.3.0.0"; - sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9"; + version = "0.3.0.1"; + sha256 = "1l3964zp7c4pj3izdcknnvsbn3avyvfychlxs9rl9hr251qbcf14"; libraryHaskellDepends = [ base hourglass time vector ]; testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; + homepage = "https://github.com/afcowie/chronologique/"; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -46287,14 +46389,12 @@ self: { }) {}; "cld2" = callPackage - ({ mkDerivation, base, bytestring, text }: + ({ mkDerivation, base, bytestring, hashable, text }: mkDerivation { pname = "cld2"; - version = "0.1.0.1"; - sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd"; - revision = "1"; - editedCabalFile = "1gfgnhy9ahyq7y74mpc6gsmir8v0c2d6z81klw1zhack6pmnql30"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.1.1.1"; + sha256 = "04sh2077pn67y1apgzx6rp4z15dw7qbvwg6yrwg416k40ilz7nbd"; + libraryHaskellDepends = [ base bytestring hashable text ]; homepage = "https://github.com/dfoxfranke/haskell-cld2"; description = "Haskell bindings to Google's Compact Language Detector 2"; license = stdenv.lib.licenses.asl20; @@ -47550,6 +47650,7 @@ self: { homepage = "https://github.com/hkgumbs/codec-beam#readme"; description = "Erlang VM byte code assembler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "codec-libevent" = callPackage @@ -47588,25 +47689,26 @@ self: { "codec-rpm" = callPackage ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring - , conduit, conduit-combinators, conduit-extra, cpio-conduit, hspec + , conduit, conduit-extra, cpio-conduit, exceptions, hspec , hspec-attoparsec, HUnit, lzma-conduit, mtl, parsec, pretty , resourcet, text }: mkDerivation { pname = "codec-rpm"; - version = "0.2.0"; - sha256 = "1n977xndg2ii866a868rvbi581p0gbz5zpy1glrg6n9znm6y9l4h"; + version = "0.2.1"; + sha256 = "00ywr4frndvw3chlxpqdx2rimd7jjdyzmjlm1kvw23qbgfyd60is"; libraryHaskellDepends = [ - attoparsec attoparsec-binary base bytestring conduit - conduit-combinators conduit-extra cpio-conduit lzma-conduit mtl - parsec pretty resourcet text + attoparsec attoparsec-binary base bytestring conduit conduit-extra + cpio-conduit exceptions lzma-conduit mtl parsec pretty resourcet + text ]; testHaskellDepends = [ - attoparsec base bytestring hspec hspec-attoparsec HUnit text + attoparsec attoparsec-binary base bytestring hspec hspec-attoparsec + HUnit parsec pretty text ]; homepage = "https://github.com/weldr/codec-rpm"; description = "A library for manipulating RPM files"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -48855,8 +48957,8 @@ self: { }: mkDerivation { pname = "compactable"; - version = "0.1.1.1"; - sha256 = "0dbjwsbn5wgwwzl90wvcqf2c6968j5bkg1nzdll03nxklqnv3m9b"; + version = "0.1.2.0"; + sha256 = "0kh36h1zfdlhvcz8xzf3c4af0rbypa7p421rl0xsig914r5z519j"; libraryHaskellDepends = [ base bifunctors containers transformers vector ]; @@ -50139,6 +50241,8 @@ self: { pname = "conduit-audio"; version = "0.2.0.3"; sha256 = "089k7l197xbxva0h281hr3p4v8pww1im7r111q7jrq7aqfgifrb1"; + revision = "1"; + editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx"; libraryHaskellDepends = [ base conduit vector ]; homepage = "http://github.com/mtolly/conduit-audio"; description = "Combinators to efficiently slice and dice audio streams"; @@ -50153,6 +50257,8 @@ self: { pname = "conduit-audio-lame"; version = "0.1.2.1"; sha256 = "1zyq0m5lblphp892ljvg6ix75rxa1ds5ksfk3cvj7kf074jw66za"; + revision = "1"; + editedCabalFile = "0b4d8n0lbsivpc0j17xl0vm6gp0sm7jjiysyxwh0m2xncx9l57nr"; libraryHaskellDepends = [ base bytestring conduit conduit-audio resourcet transformers vector ]; @@ -50172,6 +50278,8 @@ self: { pname = "conduit-audio-samplerate"; version = "0.1.0.3"; sha256 = "07hbqf7is7010ibp2k5fh4lx3s22vp6c4ihsid05ismk0sdpdypi"; + revision = "1"; + editedCabalFile = "03546czh1jn04kc7df3lrbpjf5pnssh555chjij8b6h25qrx8jrw"; libraryHaskellDepends = [ base conduit conduit-audio resourcet transformers vector ]; @@ -50191,6 +50299,8 @@ self: { pname = "conduit-audio-sndfile"; version = "0.1.2.1"; sha256 = "0b326pdvqpiawqnjkmwfgf5ghvg9jn1afini0ihw8cpc7znx846z"; + revision = "1"; + editedCabalFile = "1v0zcagmgr80wfqs328pd7m7z54q834yw0vn218jl6ld5fv581mg"; libraryHaskellDepends = [ base conduit conduit-audio hsndfile hsndfile-vector resourcet transformers @@ -51168,6 +51278,18 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "constrictor" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "constrictor"; + version = "0.1.0.1"; + sha256 = "05km6cxk5c9k2m22x6379jnlvcxr9j6m52y3xqvjjvxkps2ppc9c"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/chessai/constrictor.git"; + description = "strict versions of many things in base"; + license = stdenv.lib.licenses.mit; + }) {}; + "constructible" = callPackage ({ mkDerivation, arithmoi, base, binary-search, complex-generic }: mkDerivation { @@ -51392,8 +51514,8 @@ self: { }: mkDerivation { pname = "content-store"; - version = "0.2.0"; - sha256 = "1xdv572mq2nc7nckq79c5bw64ldqrqahd0y8wiffwywbcwi8gyi9"; + version = "0.2.1"; + sha256 = "1c3l2fmznx3f1853scnpf6c60bbm1z99lkpxx36ldxrxizj2lmaj"; libraryHaskellDepends = [ aeson base bytestring cond conduit conduit-combinators conduit-extra cryptonite directory filepath htoml lzma-conduit @@ -51406,7 +51528,7 @@ self: { ]; homepage = "https://github.com/weldr/content-store"; description = "Store and retrieve data from an on-disk store"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -52277,23 +52399,26 @@ self: { }) {}; "corenlp-parser" = callPackage - ({ mkDerivation, aeson, base, cryptonite, data-default, directory - , process, raw-strings-qq, rocksdb-haskell, safe-exceptions, store - , string-class, temporary, text, unordered-containers + ({ mkDerivation, aeson, async, base, cryptonite, data-default + , directory, process, raw-strings-qq, rocksdb, rocksdb-haskell + , safe-exceptions, split, store, string-class, temporary, text + , unordered-containers }: mkDerivation { pname = "corenlp-parser"; - version = "0.3.0.0"; - sha256 = "1mcw9nw74lca0p5kdr4mva6mz165dyipfqgc7i46kjk6pxlpcp0n"; + version = "0.3.0.1"; + sha256 = "14xjfcnk58mwgxywdlzdl53xdzf91scx0hmx8arhxkn6vr04akwp"; libraryHaskellDepends = [ - aeson base cryptonite data-default directory process raw-strings-qq - rocksdb-haskell safe-exceptions store string-class temporary text - unordered-containers + aeson async base cryptonite data-default directory process + raw-strings-qq rocksdb-haskell safe-exceptions split store + string-class temporary text unordered-containers ]; + librarySystemDepends = [ rocksdb ]; homepage = "https://github.com/k-bx/corenlp-parser#readme"; description = "Launches CoreNLP and parses the JSON output"; license = stdenv.lib.licenses.bsd3; - }) {}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) rocksdb;}; "coroutine-enumerator" = callPackage ({ mkDerivation, base, enumerator, monad-coroutine }: @@ -54566,6 +54691,7 @@ self: { homepage = "https://github.com/dzhus/csg#readme"; description = "Analytical CSG (Constructive Solid Geometry) library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "csound-catalog" = callPackage @@ -55532,6 +55658,18 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "cve" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "cve"; + version = "0.1.0.0"; + sha256 = "0ywwkwm3sfm8dx447512jm57pdy8sr29z6bvnd3q58h5prz3r2nm"; + libraryHaskellDepends = [ aeson base text ]; + homepage = "github.com/chessai/cve.git"; + description = "simple and efficient cve datatype"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cyclotomic" = callPackage ({ mkDerivation, arithmoi, base, containers, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -55748,6 +55886,7 @@ self: { executableHaskellDepends = [ base optparse-applicative ]; description = "Basic Slack bot framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dao" = callPackage @@ -56465,6 +56604,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-clist_0_1_2_1" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck }: + mkDerivation { + pname = "data-clist"; + version = "0.1.2.1"; + sha256 = "05l4gkb9k9p7cykx831n9w8i5yy6qffi4pip2y2l5xg2hvi8464s"; + libraryHaskellDepends = [ base deepseq QuickCheck ]; + homepage = "https://github.com/sw17ch/data-clist"; + description = "Simple functional ring type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-concurrent-queue" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -57757,6 +57909,7 @@ self: { ]; description = "An efficient implementation of maps from strings to arbitrary values"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-structure-inferrer" = callPackage @@ -58922,19 +59075,31 @@ self: { }) {}; "dde" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, criterion, free-vector-spaces, lens, linear + , vector + }: mkDerivation { pname = "dde"; - version = "0.0.1"; - sha256 = "1mv3i56l3al386g6jr1dpkjx0mwpq25maqkw7zv8qdnshkg1x33f"; + version = "0.1.0"; + sha256 = "0kqcs758rdv186mqk17i66lmzzb34a4fd125669sh9gx255lbwya"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base vector ]; - executableHaskellDepends = [ base vector ]; - testHaskellDepends = [ base vector ]; + libraryHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + executableHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + testHaskellDepends = [ + base free-vector-spaces lens linear vector + ]; + benchmarkHaskellDepends = [ + base criterion free-vector-spaces lens linear vector + ]; homepage = "https://github.com/masterdezign/dde#readme"; description = "Delay differential equations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dead-code-detection" = callPackage @@ -60148,6 +60313,8 @@ self: { pname = "derive-storable"; version = "0.1.1.1"; sha256 = "0rb60s5wznlqqq2s8l2wrvbgzalk719x550h321vf1xx6ck6g8g2"; + revision = "1"; + editedCabalFile = "1rf8k42k35lq7rq4g506s06cn3fn94m39934gn0mcbznbqhmvd8v"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://www.github.com/mkloczko/derive-storable/"; @@ -60161,8 +60328,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.0.0"; - sha256 = "1s0pm6crwbp3j4dfv5mf3lr75l0cvzy019968gbi4hml8v9wd6iw"; + version = "0.2.1.0"; + sha256 = "1138pkkzkzj4vmh6cnc152fhf50mirys0c9nvyd4n5xi5227rihi"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghc-paths ghci hspec QuickCheck @@ -61629,8 +61796,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.23"; - sha256 = "14mzv2bc7ndqqkx1nqb3km78h1ysjmry9d6s40nic8r2qgf9y2an"; + version = "1.1.24"; + sha256 = "01zizzhq9abyka21600234wj8yy9crx4n8qywiry4gjmq7l8gzm5"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -63983,6 +64150,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "doctest-driver-gen_0_2_0_1" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "doctest-driver-gen"; + version = "0.2.0.1"; + sha256 = "0snlfs2cmra11q2xhgwrbjxazr5dhq84vx5n13491545iknhg0ld"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base doctest ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/Hexirp/doctest-driver-gen#readme"; + description = "Generate driver file for doctest's cabal integration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest-prop" = callPackage ({ mkDerivation, base, doctest, HUnit, QuickCheck }: mkDerivation { @@ -64098,6 +64282,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dom-parser_3_1_0" = callPackage + ({ mkDerivation, base, case-insensitive, containers, data-default + , hspec, lens, mtl, scientific, semigroups, shakespeare, text + , transformers, xml-conduit, xml-lens + }: + mkDerivation { + pname = "dom-parser"; + version = "3.1.0"; + sha256 = "1hra4sh34dr1gv4z55dg3f8s2g9l2qb7nlb0j4w0imr71fp5rqfp"; + libraryHaskellDepends = [ + base case-insensitive containers lens mtl scientific semigroups + text transformers xml-conduit xml-lens + ]; + testHaskellDepends = [ + base data-default hspec lens semigroups shakespeare text + xml-conduit + ]; + homepage = "https://github.com/typeable/dom-parser"; + description = "Simple monadic DOM parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dom-selector" = callPackage ({ mkDerivation, base, blaze-html, containers, html-conduit, parsec , QuickCheck, template-haskell, text, th-lift, xml-conduit @@ -64793,8 +65000,8 @@ self: { }: mkDerivation { pname = "drinkery"; - version = "0.2"; - sha256 = "0bfdd916ab27fqhsly2z2dmjhfvyz9q5w78qpdryi69d0gimfb8g"; + version = "0.2.2"; + sha256 = "1cw8jq1j2yirrk80rk2n1m17avxf3xqln96gnih8xzip248q9bjj"; libraryHaskellDepends = [ base exceptions mtl transformers ]; benchmarkHaskellDepends = [ base conduit conduit-combinators exceptions gauge list-t ListT @@ -65170,6 +65377,7 @@ self: { homepage = "https://github.com/k0ral/dublincore-xml-conduit"; description = "XML streaming parser/renderer for the Dublin Core standard elements"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "duckling" = callPackage @@ -66761,8 +66969,29 @@ self: { pname = "ekg"; version = "0.4.0.14"; sha256 = "1n0l5lpkgkln9jmwwx2p2m2mbm7pr66w7lggj0yw4ay7ipjxjrrd"; + revision = "3"; + editedCabalFile = "1llpsbki0v9p0c820qwv6m4433wfrxfhv8yxrg2xyrrxr8g0p42a"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring ekg-core ekg-json filepath network snap-core + snap-server text time transformers unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg"; + description = "Remote monitoring of processes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "ekg_0_4_0_15" = callPackage + ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json + , filepath, network, snap-core, snap-server, text, time + , transformers, unordered-containers + }: + mkDerivation { + pname = "ekg"; + version = "0.4.0.15"; + sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8"; revision = "1"; - editedCabalFile = "152b4w3qld6jmwir3a06h6sc1girahla8cc1y2g23bwv6nnhxapp"; + editedCabalFile = "05995gywwysmfhrvalvqnkvw7gh6z85jrb91a1knnvi0jwq4c6m3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core @@ -66771,6 +67000,7 @@ self: { homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-bosun" = callPackage @@ -66780,8 +67010,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.11"; - sha256 = "0663m2riq23dwhsvgqi0mcy6h7hb24fgk315h7mi656bj5lzllx6"; + version = "1.0.12"; + sha256 = "1ashmmm5icv4q3808a5bg64cl4rmcjksm1hcf7ajgn3lggrkbxpq"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -66907,6 +67137,8 @@ self: { pname = "ekg-json"; version = "0.1.0.6"; sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; + revision = "2"; + editedCabalFile = "02lx17l8dch793n83dgalv2r77nrlcj6k4xgpxaxzwr3nyprk2vj"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -67001,6 +67233,8 @@ self: { pname = "ekg-statsd"; version = "0.2.2.0"; sha256 = "1z1si5zglmwq0qxhd4s8zmp8rps8z4xqnk4l8wlal79f1qkz9862"; + revision = "1"; + editedCabalFile = "1fnazaqdp0d7w5mfx038yv8isyw00dahis66dkyrigd57vrj3f8f"; libraryHaskellDepends = [ base bytestring ekg-core network text time unordered-containers ]; @@ -68009,8 +68243,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.19"; - sha256 = "1z3gnd3cfgp3mlbxlbaqv5m21fv0qqjyzzqi3qkrrggy0y71yq0b"; + version = "1.2.20"; + sha256 = "1kx16zpfbish8mcpr6j5s7c63w277kyhcykvcfq2xgh1npg4p0z7"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring errors free monad-loops mwc-random stm stm-delay text transformers @@ -68049,8 +68283,8 @@ self: { }: mkDerivation { pname = "engine-io-snap"; - version = "1.0.5"; - sha256 = "03pbdc2pbhrabnbnxcrwlby3z84p7fn9k4h1l3pbx6969m6qn7xa"; + version = "1.0.6"; + sha256 = "1lv9gzz61fcba2y0mqmcml1shk8qjxlw8c1fis4w7xs2xgrwbjbm"; libraryHaskellDepends = [ base bytestring containers engine-io io-streams lifted-base snap-core unordered-containers websockets websockets-snap @@ -70121,6 +70355,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "except-exceptions" = callPackage + ({ mkDerivation, base, exceptions, transformers }: + mkDerivation { + pname = "except-exceptions"; + version = "0.1"; + sha256 = "03d94arrq8ynkbchv8w2vp4q3wka81hkrmkll6bd9p5kwhq28nzs"; + libraryHaskellDepends = [ base exceptions transformers ]; + homepage = "https://github.com/thumphries/except-exceptions"; + description = "Safely deal with exceptions in ExceptT"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "exception-hierarchy" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -75804,6 +76050,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "formatting_6_3_2" = callPackage + ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec + , integer-gmp, old-locale, scientific, semigroups, text, time + , transformers + }: + mkDerivation { + pname = "formatting"; + version = "6.3.2"; + sha256 = "1h5jy7y2cd1qaymypw8hfr52924szas0jd2hvjpbr5mrwssvhkqf"; + libraryHaskellDepends = [ + array base bytestring clock ghc-prim integer-gmp old-locale + scientific semigroups text time transformers + ]; + testHaskellDepends = [ base hspec semigroups ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -77096,6 +77361,7 @@ self: { homepage = "https://github.com/noughtmare/frpnow-vty"; description = "Program terminal applications with vty and frpnow!"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "frquotes" = callPackage @@ -77204,6 +77470,7 @@ self: { homepage = "https://github.com/fpco/fsnotify-conduit#readme"; description = "Get filesystem notifications as a stream of events"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fst" = callPackage @@ -77946,6 +78213,7 @@ self: { homepage = "http://github.com/joom/fuzzy"; description = "Filters a list based on a fuzzy string search"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzy-timings" = callPackage @@ -80392,6 +80660,7 @@ self: { homepage = "http://felsin9.de/nnis/ghc-datasize"; description = "Determine the size of data structures in GHC's memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-dump-core" = callPackage @@ -80603,6 +80872,7 @@ self: { testHaskellDepends = [ base deepseq ]; description = "Extract the heap representation of Haskell values and thunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-imported-from" = callPackage @@ -81710,6 +81980,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage @@ -81735,6 +82006,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "gi-dbusmenu" = callPackage @@ -81756,6 +82028,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {dbusmenu-glib = null;}; "gi-dbusmenugtk3" = callPackage @@ -81779,6 +82052,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {dbusmenu-gtk3 = null;}; "gi-gdk" = callPackage @@ -81934,6 +82208,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage @@ -81955,6 +82230,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gst" = callPackage @@ -84120,10 +84396,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.25"; - sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb"; - revision = "2"; - editedCabalFile = "10n3vhnb77ai3qw2xdkwlhjr3wa6146djk6780l2nc8yfg4axi9j"; + version = "2.26"; + sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -84402,6 +84676,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-game" = callPackage @@ -91251,8 +91526,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.5.0"; - sha256 = "05xhiwrq6v8v0hy08mhxbslj3ncvyi1jm8m5lv8xqngwcn3yax44"; + version = "1.6.0"; + sha256 = "1ajwzyh3x185lvn22vi3wnfprf9fq0k1kxjxz575h87xwnq46y4v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92285,6 +92560,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hamilton_0_1_0_3" = callPackage + ({ mkDerivation, ad, ansi-wl-pprint, base, containers + , finite-typelits, ghc-typelits-knownnat, hmatrix, hmatrix-gsl + , hmatrix-vector-sized, optparse-applicative, typelits-witnesses + , vector, vector-sized, vty + }: + mkDerivation { + pname = "hamilton"; + version = "0.1.0.3"; + sha256 = "06yvmm9641v74kd265csycwp6ywyc19mx0r0csycljcfghhj6xiw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ad base hmatrix hmatrix-gsl hmatrix-vector-sized typelits-witnesses + vector-sized + ]; + executableHaskellDepends = [ + ansi-wl-pprint base containers finite-typelits + ghc-typelits-knownnat hmatrix optparse-applicative vector + vector-sized vty + ]; + homepage = "https://github.com/mstksg/hamilton#readme"; + description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hamlet" = callPackage ({ mkDerivation, base, shakespeare }: mkDerivation { @@ -94716,6 +95018,7 @@ self: { homepage = "https://github.com/phoityne/haskell-dap"; description = "haskell-dap is a GHCi having DAP interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-disque" = callPackage @@ -94921,6 +95224,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs.gnome3) gobjectIntrospection;}; @@ -100373,6 +100677,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "herms_1_8_2_1" = callPackage + ({ mkDerivation, ansi-terminal, base, brick, directory, microlens + , microlens-th, optparse-applicative, semigroups, split, vty + }: + mkDerivation { + pname = "herms"; + version = "1.8.2.1"; + sha256 = "0njp1jsz4clb6qyz00xrpw7av4109gx5wd4h180q794vi8xw6v4j"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ + ansi-terminal base brick directory microlens microlens-th + optparse-applicative semigroups split vty + ]; + homepage = "https://github.com/JackKiefer/herms"; + description = "A command-line manager for delicious kitchen recipes"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hero-club-five-tenets" = callPackage ({ mkDerivation, base, random, text }: mkDerivation { @@ -102017,6 +102342,8 @@ self: { pname = "hills"; version = "0.1.2.6"; sha256 = "0ggdppg7mbq3ljrb4hvracdv81m9jqnsrl6iqy56sba118k7m0jh"; + revision = "1"; + editedCabalFile = "1qdn733rdn4c15avgncgns10j2hw0bvnzdkd5f9yzm3s8vq8sqv9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102920,6 +103247,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hjsonschema_1_8_0" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, file-embed, filepath, hashable, hjsonpointer, hspec + , http-client, http-client-tls, http-types, pcre-heavy, profunctors + , protolude, QuickCheck, safe-exceptions, scientific, semigroups + , text, unordered-containers, vector, wai-app-static, warp + }: + mkDerivation { + pname = "hjsonschema"; + version = "1.8.0"; + sha256 = "06jf3f7samp5mq3771ywv6r458kkyav4psagkkdqavrx53s4y4xl"; + revision = "1"; + editedCabalFile = "0c0y28js9jj10hmbk2syqfv681jp3px2ps02b1n99sz84va70h4i"; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed filepath hashable + hjsonpointer http-client http-client-tls http-types pcre-heavy + profunctors protolude QuickCheck safe-exceptions scientific + semigroups text unordered-containers vector + ]; + testHaskellDepends = [ + aeson async base bytestring directory filepath hjsonpointer hspec + profunctors protolude QuickCheck semigroups text + unordered-containers vector wai-app-static warp + ]; + homepage = "https://github.com/seagreen/hjsonschema"; + description = "JSON Schema library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hjugement" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, text, transformers @@ -103501,6 +103858,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlrdb" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite + , hashable, hedis, hlrdb-core, memory, random, store, time-exts + , unordered-containers + }: + mkDerivation { + pname = "hlrdb"; + version = "0.1.0.0"; + sha256 = "1kqm14kd5app34438b3w9h1nxr6fp1dvrf58xrbv2xn2y65jb5jc"; + libraryHaskellDepends = [ + base base64-bytestring bytestring cryptonite hashable hedis + hlrdb-core memory random store time-exts unordered-containers + ]; + homepage = "https://github.com/identicalsnowflake/hlrdb"; + description = "High-level Redis Database"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hlrdb-core" = callPackage + ({ mkDerivation, base, bytestring, hashable, hedis, lens, mtl + , profunctors, random, unordered-containers + }: + mkDerivation { + pname = "hlrdb-core"; + version = "0.1.0.0"; + sha256 = "1gy5sycr4han0i0lk8m3rl99pagd9slfry0b94c05cj6kai6c9ss"; + libraryHaskellDepends = [ + base bytestring hashable hedis lens mtl profunctors random + unordered-containers + ]; + homepage = "https://github.com/identicalsnowflake/hlrdb-core"; + description = "High-level Redis Database Core API"; + license = stdenv.lib.licenses.mit; + }) {}; + "hls" = callPackage ({ mkDerivation, base, containers, hcg-minus, hps }: mkDerivation { @@ -108716,6 +109109,7 @@ self: { homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; @@ -111004,13 +111398,34 @@ self: { pname = "htaglib"; version = "1.1.1"; sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3"; + revision = "1"; + editedCabalFile = "0znih19z9ly4m1nadwkalq28xz0vy6pc0yyamyz2fz5s5nv69lr0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring text transformers ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ base directory filepath hspec ]; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) taglib;}; + + "htaglib_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , hspec-discover, taglib, text, transformers + }: + mkDerivation { + pname = "htaglib"; + version = "1.2.0"; + sha256 = "0ph04j1ysjzzrcyllgibzrzfv5g5mgpa6s0ksxww15aryipw65sa"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring text transformers ]; librarySystemDepends = [ taglib ]; testHaskellDepends = [ base directory filepath hspec ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; "htags" = callPackage @@ -113380,6 +113795,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-fingertree_0_1_0_1" = callPackage + ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit + , hw-hspec-hedgehog, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree"; + version = "0.1.0.1"; + sha256 = "1nlla161156w21g3kdcv42bm5rfz9aslh5lw7rmlw8pdrgg6g3f3"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/haskell-works/hw-fingertree#readme"; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-fingertree-strict" = callPackage ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog , QuickCheck, test-framework, test-framework-hunit @@ -113399,6 +113834,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-fingertree-strict_0_1_0_2" = callPackage + ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree-strict"; + version = "0.1.0.2"; + sha256 = "1ixkzdis47ic76g8cvwnigcr49256jbcpvqdrr6y8a7cvdvd41fv"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme"; + description = "Generic strict finger-tree structure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, vector }: mkDerivation { @@ -116448,6 +116903,7 @@ self: { homepage = "https://github.com/k0ral/imm"; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "immortal" = callPackage @@ -116887,6 +117343,7 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -118843,6 +119300,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip_1_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , doctest, hashable, hspec, HUnit, primitive, QuickCheck + , quickcheck-classes, semigroups, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, vector + }: + mkDerivation { + pname = "ip"; + version = "1.2.0"; + sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive semigroups text + vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest hspec HUnit QuickCheck + quickcheck-classes test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion text + ]; + homepage = "https://github.com/andrewthad/haskell-ip#readme"; + description = "Library for IP and MAC addresses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ip-quoter" = callPackage ({ mkDerivation, base, cpu, network, tasty, tasty-hunit , template-haskell @@ -121392,8 +121877,8 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.10"; - sha256 = "1rhg6hrk0pzy9xx6hhy39xmnpz931a6wq93sjgpvlzlm3hyfwq0x"; + version = "1.0.11"; + sha256 = "000a528gmkb25zcl7am6qh8fjrq2v2l71c27fxzm6wpf0ml0vv7z"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -122862,16 +123347,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "kanji_3_2_1" = callPackage + "kanji_3_3_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion , deepseq, hashable, HUnit-approx, microlens, microlens-aeson - , microlens-platform, optparse-applicative, protolude, tasty - , tasty-hunit, text + , optparse-applicative, tasty, tasty-hunit, text, transformers }: mkDerivation { pname = "kanji"; - version = "3.2.1"; - sha256 = "1x9mrjsj73kwk0y7m1j9n9d4pbcrjg066njpasb1vi69w6h2flbs"; + version = "3.3.0"; + sha256 = "0wapqdrh18344j0dz3y3g08vcfharc43xlcgkk8ksj5r30zq1vff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122879,7 +123363,7 @@ self: { ]; executableHaskellDepends = [ aeson aeson-pretty base containers microlens microlens-aeson - microlens-platform optparse-applicative protolude text + optparse-applicative text transformers ]; testHaskellDepends = [ aeson base containers HUnit-approx tasty tasty-hunit text @@ -123927,8 +124411,8 @@ self: { pname = "keys"; version = "3.12"; sha256 = "0may9nrlfji2mmypl9q47lcpg4r793hmm4i22x7j4l6zz67sggyl"; - revision = "1"; - editedCabalFile = "1lbl62y3alhpgkf2knh4q5pcby54kblb68cbx2i77fbdwz8jbka7"; + revision = "2"; + editedCabalFile = "0cy2fdxxqg0bgkb8xhnw6zws00d78bpk48xv7zzmvnj549l819ib"; libraryHaskellDepends = [ array base comonad containers free hashable semigroupoids semigroups tagged transformers transformers-compat @@ -125557,8 +126041,8 @@ self: { pname = "lame"; version = "0.1.1"; sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; - revision = "1"; - editedCabalFile = "0p7nwbn22bmk2p7vpcpqs89dxxshjg3cbdx1qc1h8pczgaz3c1dl"; + revision = "3"; + editedCabalFile = "041hv4z4xxqidnlr5jgkwp13vj4lr9dvqlrgavl3dmsd07vfj0bc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath @@ -130794,8 +131278,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.4"; - sha256 = "0l1qm1n3sh6shzcl4g00w705gx0xy8qwnj68dlm18hsa9y0z572h"; + version = "0.6.5"; + sha256 = "1bdqja3favvxxlqxyh4r07xhkgsxan7lg8vb0nrahkfbifa4m6by"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -131611,6 +132095,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "load-font" = callPackage + ({ mkDerivation, base, c2hs, fltkhs, text }: + mkDerivation { + pname = "load-font"; + version = "0.1.0.0"; + sha256 = "1xva9cxwscjyqpx5yvbicyizk4y439wdv8gzxir2jwkangpvrby5"; + revision = "2"; + editedCabalFile = "0qmz9kmb1cc3cvidxvspa186nkby4m060f6y9v23s3dqp3wd93mm"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base fltkhs text ]; + homepage = "https://github.com/deech/load-font#load-font"; + description = "A cross platform library for loading bundled fonts into your application"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "loadavg" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -131751,8 +132254,8 @@ self: { }: mkDerivation { pname = "locators"; - version = "0.2.4.2"; - sha256 = "172fbxb51p09afsgp9g28zpbisxnf0wxdr3bwi6hwp40ac3363g4"; + version = "0.2.4.3"; + sha256 = "0wcp56hy8zs7sngspzywyq4j39y0pji0xwqj7x1i26rg77wi7xw4"; libraryHaskellDepends = [ base bytestring cereal containers cryptohash ]; @@ -131860,6 +132363,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lockpool" = callPackage + ({ mkDerivation, base, clock, stm }: + mkDerivation { + pname = "lockpool"; + version = "0.1.0.0"; + sha256 = "004lipzc3rbvixhmx4ssngmpsp3pcrdd1hw9byqmi0jp4xm17xxi"; + libraryHaskellDepends = [ base clock stm ]; + homepage = "https://github.com/chessai/lockpool.git"; + description = "set a maximum on the number of concurrent actions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log" = callPackage ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg , exceptions, hpqtypes, http-client, http-types, log-base @@ -132180,6 +132696,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_5" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.5"; + sha256 = "1db8x2rihkddww54cyzww0c65vk90nlnp82xrw226wliknbikri3"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -132238,6 +132778,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "logging-effect-extra-handler_1_1_4" = callPackage + ({ mkDerivation, base, exceptions, logging-effect, time + , wl-pprint-text + }: + mkDerivation { + pname = "logging-effect-extra-handler"; + version = "1.1.4"; + sha256 = "0932i0qrwrr2j7w40bf3q5dlazz4800drc0chvr1kpbpk6b4njim"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base exceptions logging-effect time wl-pprint-text + ]; + executableHaskellDepends = [ base logging-effect wl-pprint-text ]; + homepage = "https://github.com/jship/logging-effect-extra#readme"; + description = "Handy logging handler combinators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-facade" = callPackage ({ mkDerivation, base, call-stack, hspec, transformers }: mkDerivation { @@ -135564,14 +136124,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_1_3_0" = callPackage + "massiv_0_1_4_0" = callPackage ({ mkDerivation, base, data-default, data-default-class, deepseq , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector }: mkDerivation { pname = "massiv"; - version = "0.1.3.0"; - sha256 = "0bpy370004rvsz7qq41x7cdim8l4rj79zlz7jzpw7casm6ly0473"; + version = "0.1.4.0"; + sha256 = "0hp0dvc9qr0px3x2w28wvks3918jc5z1ib2c0n2bfz0isi11gs1s"; libraryHaskellDepends = [ base data-default-class deepseq ghc-prim primitive vector ]; @@ -141063,6 +141623,8 @@ self: { pname = "mongoDB"; version = "2.3.0.5"; sha256 = "13pa30qgk08846hngh9gy1w6ay0amchwr8aj32558i41nnrhl9j9"; + revision = "2"; + editedCabalFile = "0bx2vdwp53c9dgil09qg22hd1j1dilwqcg6ighp28ajmnxkyl8j0"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -141316,6 +141878,7 @@ self: { homepage = "https://github.com/blamario/monoid-subclasses/"; description = "Subclasses of Monoid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -141640,7 +142203,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "morte_1_6_17" = callPackage + "morte_1_6_18" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, formatting, http-client , http-client-tls, microlens, microlens-mtl, mtl @@ -141650,8 +142213,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.6.17"; - sha256 = "1sw986mprhlbgzz3zgjlr3mynj4caj3dyl7b6ln7y6y8jb567h3n"; + version = "1.6.18"; + sha256 = "1cnwk2rihbywwkpxw7bd22zh33hkffpaza7d4crr5x2p7rdvhmjp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -142311,8 +142874,8 @@ self: { pname = "mtl-compat"; version = "0.2.1.3"; sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34"; - revision = "3"; - editedCabalFile = "0igfsrc7q326ggvw47xwq1xffa4r225akla0nwgmqhd7y1n5753c"; + revision = "4"; + editedCabalFile = "1mfrx8cpx0502sjv0bmlfkl0h46c4krldg8m89k4fj6iawwg2ab5"; libraryHaskellDepends = [ base mtl ]; doHaddock = false; homepage = "https://github.com/haskell-compat/mtl-compat"; @@ -143956,6 +144519,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mysql;}; + "mysql_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, hspec, mysql + }: + mkDerivation { + pname = "mysql"; + version = "0.1.5"; + sha256 = "0x9hdwg94s0baw7jn7ba2mk0rr7qpf1hyf88pm6gv4vdgz86gcs9"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring containers ]; + librarySystemDepends = [ mysql ]; + testHaskellDepends = [ base bytestring hspec ]; + homepage = "https://github.com/paul-rouse/mysql"; + description = "A low-level MySQL client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mysql;}; + "mysql-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, mysql , mysql-simple @@ -144056,6 +144636,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mysql-simple_0_4_5" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , blaze-textual, bytestring, containers, hspec, mysql, old-locale + , pcre-light, text, time + }: + mkDerivation { + pname = "mysql-simple"; + version = "0.4.5"; + sha256 = "1cbwdsxysz6a4182fgkkd869hm44v834lqv2igwsfbx6v0p44g5h"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder blaze-textual + bytestring containers mysql old-locale pcre-light text time + ]; + testHaskellDepends = [ base blaze-builder hspec text ]; + homepage = "https://github.com/paul-rouse/mysql-simple"; + description = "A mid-level MySQL client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mysql-simple-quasi" = callPackage ({ mkDerivation, base, haskell-src-meta, mysql-simple , template-haskell @@ -145520,8 +146120,8 @@ self: { pname = "netrc"; version = "0.2.0.0"; sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls"; - revision = "3"; - editedCabalFile = "1j0s7r9hzisi8zacs505rxh9pk05m5hrrcxn8jnh7w8yphyqbv4j"; + revision = "4"; + editedCabalFile = "0g1c3nbalpb7qh6kddir5b84wwg57j2852al2fg5xza3akdd8jsr"; libraryHaskellDepends = [ base bytestring deepseq parsec ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-quickcheck @@ -150016,6 +150616,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_6_1_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, semigroups, text + , time, time-locale-compat, transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.6.1.0"; + sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid void + ]; + testHaskellDepends = [ + aeson base containers contravariant dotenv hspec hspec-discover + multiset postgresql-simple product-profunctors profunctors + QuickCheck semigroups text time transformers + ]; + homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -150160,6 +150788,7 @@ self: { libraryHaskellDepends = [ attoparsec base conduit mtl text ]; homepage = "https://github.com/alphaHeavy/open-symbology"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-typerep" = callPackage @@ -151006,6 +151635,7 @@ self: { homepage = "https://github.com/k0ral/opml-conduit"; description = "Streaming parser/renderer for the OPML 2.0 format."; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opn" = callPackage @@ -152281,8 +152911,8 @@ self: { pname = "pagination"; version = "0.2.1"; sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; - revision = "1"; - editedCabalFile = "14sirfxb9qa8g57fxmpphg5hph7kp0lpgwxrmkjlj1x8xwh5x6d5"; + revision = "2"; + editedCabalFile = "0wvwi3hymp2vhhpzpycdc65zbsqmi2h0c6r0nf8p5nkgsk4pm1k2"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -152519,34 +153149,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , Cabal, containers, data-default, directory, filepath, hs-bibutils - , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml + "pandoc-citeproc_0_14_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat + , bytestring, Cabal, containers, data-default, directory, filepath + , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec + , process, rfc5051, setenv, split, syb, tagsoup, temporary, text + , time, unordered-containers, vector, xml-conduit, yaml }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.2"; - sha256 = "1dz3ybvi7bydpjfwpk72whmy9agz6g1xa60nazs1r9im97apfgw5"; + version = "0.14.3"; + sha256 = "1z27x8bd8zxmqrxlapzxkc0g65ix7ig96d0bwzq3i521fzig85bj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml + aeson base base-compat bytestring containers data-default directory + filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec + rfc5051 setenv split syb tagsoup text time unordered-containers + vector xml-conduit yaml ]; executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml + aeson aeson-pretty attoparsec base base-compat bytestring filepath + pandoc pandoc-types syb text yaml ]; testHaskellDepends = [ - aeson base bytestring containers directory filepath mtl pandoc - pandoc-types process temporary text yaml + aeson base base-compat bytestring containers directory filepath mtl + pandoc pandoc-types process temporary text yaml ]; doCheck = false; homepage = "https://github.com/jgm/pandoc-citeproc"; @@ -153450,6 +154080,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "papillon_0_1_0_6" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, monads-tf + , template-haskell, transformers + }: + mkDerivation { + pname = "papillon"; + version = "0.1.0.6"; + sha256 = "1j0sxac7pgwfbgb545ysjsw7haz6m41m6gz5z8v3xawjhx662nib"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring monads-tf template-haskell transformers + ]; + executableHaskellDepends = [ + base directory filepath monads-tf template-haskell transformers + ]; + homepage = "https://skami.iocikun.jp/haskell/packages/papillon"; + description = "packrat parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pappy" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -157388,6 +158040,7 @@ self: { homepage = "https://bitbucket.org/blamario/picoparsec"; description = "Fast combinator parsing for bytestrings and text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "picosat" = callPackage @@ -158517,6 +159170,8 @@ self: { pname = "pipes-random"; version = "1.0.0.4"; sha256 = "17k510v2f5ziysqh7sknyw3rgxf8iblw800z3hh8gymaszkhfajl"; + revision = "1"; + editedCabalFile = "0m32wz3rwxx9gdcl1chk64yspyd1ls13z03zcgjcn865mpbhz97h"; libraryHaskellDepends = [ base mwc-random pipes vector ]; homepage = "https://github.com/fosskers/pipes-random"; description = "Producers for handling randomness"; @@ -159098,8 +159753,8 @@ self: { }: mkDerivation { pname = "playlists-http"; - version = "0.2.0.0"; - sha256 = "0hx55vqcqfkfjds7hh4l1i60al9d65q55wg9jfns3qml5z8pqik1"; + version = "0.2.1.0"; + sha256 = "1kzc1awfqk979h2hmpqh2pjiy33v140pibbp703hqbq0fkrynj2k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159325,6 +159980,7 @@ self: { homepage = "https://github.com/ocramz/plot-light-examples"; description = "Example binaries for plot-light"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotfont" = callPackage @@ -159724,10 +160380,8 @@ self: { }: mkDerivation { pname = "pointful"; - version = "1.0.9"; - sha256 = "1mmc7kjspak2597d9jzkqgga4gh9v5dljkifbgminx8rchiq263a"; - revision = "1"; - editedCabalFile = "13lwn5zy44cbmax8ic1j8dhrzn7hxws5mcjrjyjwqcn2abmwc2js"; + version = "1.0.11.0"; + sha256 = "0kz786xp2sjl6ldbbfg3ln8l6nib6i8lw0d15hqr6yawrnf32qr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161245,6 +161899,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgresql-simple-url_0_2_1_0" = callPackage + ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "postgresql-simple-url"; + version = "0.2.1.0"; + sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; + libraryHaskellDepends = [ + base network-uri postgresql-simple split + ]; + testHaskellDepends = [ + base postgresql-simple tasty tasty-quickcheck + ]; + homepage = "https://github.com/futurice/postgresql-simple-url"; + description = "Parse postgres:// url into ConnectInfo"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-syntax" = callPackage ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase , text @@ -162743,6 +163417,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "prim-array_0_2_2" = callPackage + ({ mkDerivation, base, ghc-prim, primitive, semigroups }: + mkDerivation { + pname = "prim-array"; + version = "0.2.2"; + sha256 = "0lr7qni6wfiazn2gj6hnlkfzxdwvfhfqfkacj43w26s34irda4g3"; + libraryHaskellDepends = [ base ghc-prim primitive semigroups ]; + homepage = "https://github.com/andrewthad/prim-array#readme"; + description = "Primitive byte array with type variable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prim-spoon" = callPackage ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck , spoon @@ -164071,8 +164758,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.3"; - sha256 = "16gj3mc76ld19s58mldx3zsxn9z0xya543906x5hvr1qv6w1sw61"; + version = "5.3.4"; + sha256 = "0wzaca3hcvbdfb326srj6sivzkbyshxv6j0lvng6k8dqwiipnvwb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165269,8 +165956,8 @@ self: { }: mkDerivation { pname = "pure-zlib"; - version = "0.6"; - sha256 = "1igbg3d5l8sf53kpx0451dha5lr099hpqgwy7jfjkyjvxzxi8y5b"; + version = "0.6.1"; + sha256 = "0dqc35ca1668j2xfwmz8bqgbyld9gw3b0bld8s5gy6id7qfn7d26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165393,6 +166080,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "purescript-bridge_0_12_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers + }: + mkDerivation { + pname = "purescript-bridge"; + version = "0.12.0.0"; + sha256 = "1kh3ydqn7vs3ybda9ic8gbmzzjigiiibls9w1nh5ffgwf42dij7j"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving lens mtl text + transformers + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; + description = "Generate PureScript data types from Haskell data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "purescript-bundle-fast" = callPackage ({ mkDerivation, base, containers, directory, filepath , optparse-applicative, text, vector @@ -166723,6 +167431,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-classes_0_4_2" = callPackage + ({ mkDerivation, aeson, base, bifunctors, containers, primitive + , QuickCheck, semigroupoids, semigroups, tagged, transformers + , vector + }: + mkDerivation { + pname = "quickcheck-classes"; + version = "0.4.2"; + sha256 = "1whin052j39gdvqy1kvfrqiyfa76amclp6pschqd6xmmw2vly491"; + libraryHaskellDepends = [ + aeson base bifunctors containers primitive QuickCheck semigroupoids + semigroups tagged transformers + ]; + testHaskellDepends = [ + aeson base primitive QuickCheck tagged transformers vector + ]; + homepage = "https://github.com/andrewthad/quickcheck-classes#readme"; + description = "QuickCheck common typeclasses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -168669,6 +169399,7 @@ self: { ]; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rate-limit" = callPackage @@ -171000,8 +171731,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "1"; - editedCabalFile = "1w8aqqq6j1lhwpi2d0qj9h32cia3nr9l43a0mspqawb1nsmpjyic"; + revision = "2"; + editedCabalFile = "19sdafr0i252xyy017yxmz76ipl5bdg3hiv3ka8sjbwryj16gdwi"; libraryHaskellDepends = [ base regex-applicative text ]; homepage = "https://github.com/phadej/regex-applicative-text#readme"; description = "regex-applicative on text"; @@ -171986,6 +172717,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "relevant-time" = callPackage + ({ mkDerivation, aeson, base, chronos, text, torsor }: + mkDerivation { + pname = "relevant-time"; + version = "0.1.0.0"; + sha256 = "0i9g6rqq31y6y9jnc9bi0vfrpxmjr3vqfjz2w4q7jc87dplyd2qk"; + libraryHaskellDepends = [ aeson base chronos text torsor ]; + homepage = "https://github.com/chessai/relevant-time.git"; + description = "humanised relevant time"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "relit" = callPackage ({ mkDerivation, base, regex-base, template-haskell }: mkDerivation { @@ -173831,31 +174574,33 @@ self: { }) {}; "rfc" = callPackage - ({ mkDerivation, aeson, aeson-diff, base, bifunctors, binary - , blaze-html, classy-prelude, containers, data-default - , freer-simple, hedis, http-api-data, http-client, http-client-tls - , http-types, lens, lifted-async, markdown, monad-control - , natural-transformation, network-uri, postgresql-simple - , resource-pool, servant, servant-blaze, servant-client - , servant-docs, servant-server, servant-swagger, simple-logger - , string-conversions, swagger2, temporary, text, time-units - , unliftio, unliftio-core, unordered-containers, url, uuid-types - , vector, wai, wai-cors, wai-extra, wreq + ({ mkDerivation, aeson, aeson-diff, attoparsec, base, binary + , blaze-html, bytestring, classy-prelude, containers, data-default + , envy, hedis, http-api-data, http-client, http-client-tls + , http-types, lens, lifted-async, markdown, miso, monad-control + , mono-traversable, mtl, natural-transformation, network + , network-uri, postgresql-typed, resource-pool, servant + , servant-blaze, servant-client, servant-docs, servant-server + , servant-swagger, simple-logger, swagger2, temporary, text + , text-conversions, time, time-units, unliftio, unliftio-core + , unordered-containers, url, uuid-types, wai, wai-cli, wai-cors + , wai-extra, warp, wreq }: mkDerivation { pname = "rfc"; - version = "0.0.0.24"; - sha256 = "05spf71r2zyc9pyx5kr2jsamyzga1y46831n6fmhad98bjswgr6q"; + version = "0.0.0.25"; + sha256 = "1yzi8cb90iy54wi463cpk9h961k53cilgdjcf252yw4qsvxcqh5i"; libraryHaskellDepends = [ - aeson aeson-diff base bifunctors binary blaze-html classy-prelude - containers data-default freer-simple hedis http-api-data + aeson aeson-diff attoparsec base binary blaze-html bytestring + classy-prelude containers data-default envy hedis http-api-data http-client http-client-tls http-types lens lifted-async markdown - monad-control natural-transformation network-uri postgresql-simple - resource-pool servant servant-blaze servant-client servant-docs - servant-server servant-swagger simple-logger string-conversions - swagger2 temporary text time-units unliftio unliftio-core - unordered-containers url uuid-types vector wai wai-cors wai-extra - wreq + miso monad-control mono-traversable mtl natural-transformation + network network-uri postgresql-typed resource-pool servant + servant-blaze servant-client servant-docs servant-server + servant-swagger simple-logger swagger2 temporary text + text-conversions time time-units unliftio unliftio-core + unordered-containers url uuid-types wai wai-cli wai-cors wai-extra + warp wreq ]; homepage = "https://github.com/RobertFischer/rfc#README.md"; description = "Robert Fischer's Common library"; @@ -173897,6 +174642,7 @@ self: { doHaddock = false; description = "Parse and display time according to RFC3339 (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rfc5051" = callPackage @@ -175284,16 +176030,17 @@ self: { }) {}; "row-types" = callPackage - ({ mkDerivation, base, criterion, deepseq, hashable, text - , unordered-containers + ({ mkDerivation, base, constraints, criterion, deepseq, hashable + , text, unordered-containers }: mkDerivation { pname = "row-types"; - version = "0.2.0.0"; - sha256 = "158k4q6b1ca7d8fkznl09mdd29z7w5clxh48i3b3m1bcmhjmcfmh"; + version = "0.2.2.0"; + sha256 = "1xv42yzv0xrb1bwqlmpmk7wwmq2mcf6d73g91aycq99hjq18bmcq"; libraryHaskellDepends = [ - base deepseq hashable text unordered-containers + base constraints deepseq hashable text unordered-containers ]; + testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Open Records and Variants"; license = stdenv.lib.licenses.mit; @@ -175508,6 +176255,7 @@ self: { ]; description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rss2irc" = callPackage @@ -177016,6 +177764,34 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "sbp_2_3_13" = callPackage + ({ mkDerivation, aeson, array, base, base64-bytestring + , basic-prelude, binary, binary-conduit, bytestring, conduit + , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops + , resourcet, tasty, tasty-hunit, template-haskell, text, yaml + }: + mkDerivation { + pname = "sbp"; + version = "2.3.13"; + sha256 = "0gvjqddnvbr3vn7qaajqqbh23p17vavj0p97zwh6fbizkxpj25k9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array base base64-bytestring basic-prelude binary bytestring + data-binary-ieee754 lens lens-aeson monad-loops template-haskell + text + ]; + executableHaskellDepends = [ + aeson base basic-prelude binary-conduit bytestring conduit + conduit-extra resourcet yaml + ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + homepage = "https://github.com/swift-nav/libsbp"; + description = "SwiftNav's SBP Library"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbp2udp" = callPackage ({ mkDerivation, base, basic-prelude, binary, binary-conduit , bytestring, conduit, conduit-extra, network, optparse-generic @@ -177385,6 +178161,7 @@ self: { homepage = "http://trac.haskell.org/SCC/"; description = "Streaming component combinators"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scenegraph" = callPackage @@ -179400,8 +180177,8 @@ self: { }: mkDerivation { pname = "sentiwordnet-parser"; - version = "0.1.1.0"; - sha256 = "0mb5c0n2i0gyyk94j4lnfpxzh8v2vxlq7dbp1v5gmz5ws7s9pfll"; + version = "0.2.0.0"; + sha256 = "0gbzzrd5wivxrcha8w0ncgqz7qr29f4aclz4i7z607lz2lywrifm"; libraryHaskellDepends = [ base Decimal hashable parsers safe string-class text trifecta unordered-containers vector @@ -179896,6 +180673,8 @@ self: { pname = "servant"; version = "0.13"; sha256 = "0fmwcrkjlq1rnlbzdn918z54pqbwrjpgwy2isxmfykb31m2pn230"; + revision = "1"; + editedCabalFile = "1l1a52xard2ax9avh1ic893gykhlvrvgw0cncjsaqvi9rvkd047y"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive @@ -180354,6 +181133,8 @@ self: { pname = "servant-client"; version = "0.13"; sha256 = "0bfrc3j2b6mbsvbv66l7mh3klkrrfdjvaq5s834jiivaavc6zf93"; + revision = "1"; + editedCabalFile = "0kdymqs9k90ig840bbj58znmfzlgr81jk7pfj1ygdvikjz1k1lpk"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions http-client http-client-tls http-media http-types monad-control mtl @@ -180382,6 +181163,8 @@ self: { pname = "servant-client-core"; version = "0.13"; sha256 = "1n7s47cqvahzfyyb4cwnq72a0qyrk8ybx4yj3g4lw9va2zlj78vp"; + revision = "1"; + editedCabalFile = "0zxkc0p436clpmh1y30d3ybqw12q2pk2gzfyjjgh17yvhzxzddnb"; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions generics-sop http-api-data http-media http-types mtl network-uri @@ -180465,6 +181248,8 @@ self: { pname = "servant-docs"; version = "0.11.2"; sha256 = "1x6lvpvlm1lh51y2pmldrjdjjrs5qnq44m2abczr75fjjy6hla3b"; + revision = "1"; + editedCabalFile = "0pm5gclgwna9bw3avjfp1pghzbk0a32sbd9v3fh321gmsax1h4zi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180631,6 +181416,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-foreign_0_11_1" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text + }: + mkDerivation { + pname = "servant-foreign"; + version = "0.11.1"; + sha256 = "01cq938b4szvnapf8c4ir8j09aq25jwgnp3jbfxnja027c1v3735"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; + testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; + description = "Helpers for generating clients for servant APIs in any programming language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-generate" = callPackage + ({ mkDerivation, base, servant, servant-server }: + mkDerivation { + pname = "servant-generate"; + version = "0.1"; + sha256 = "0i71d95yfrlj5m5wr8ksxq8nkvwbsj81d4qm3j24pcgf6a32rrcw"; + revision = "1"; + editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4"; + libraryHaskellDepends = [ base servant servant-server ]; + homepage = "https://github.com/alpmestan/servant-generate"; + description = "Utilities for generating mock server implementations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-generic" = callPackage ({ mkDerivation, base, network-uri, servant, servant-server, text , warp @@ -180771,6 +181588,8 @@ self: { pname = "servant-js"; version = "0.9.3.2"; sha256 = "1p37520x85rg7rnhazby0x6qas2sh5d79gygmaa5f7jalhkyrq02"; + revision = "1"; + editedCabalFile = "11q54f0hx8ggfsrklaf8dk1gra597097gl60j667bmy8266l33ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181254,6 +182073,8 @@ self: { pname = "servant-server"; version = "0.13"; sha256 = "09hqihij87h031qcr4swsn82fsv8v1qklqc2hl0is8rd8bzi2cjy"; + revision = "1"; + editedCabalFile = "0kf88s2wkijfznp0sk3mrfyhr9rnq3kqpsl26di953ynxgd6z4yd"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -184103,8 +184924,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.10.0.0"; - sha256 = "00hspcdh7si0bykfdyxclklv622izl8jm6nwic4z5j15rmqa62b7"; + version = "0.10.0.1"; + sha256 = "1fixv7gymd03bnn8aysyyr7jwp1j943xyd69659xcjmljknd1h5m"; libraryHaskellDepends = [ array async base bytestring exceptions list-t monad-control MonadRandom mtl text transformers transformers-base @@ -184925,6 +185746,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-bool_0_1_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singleton-bool"; + version = "0.1.4"; + sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/phadej/singleton-bool#readme"; + description = "Type level booleans"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-dict" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { @@ -185657,8 +186491,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.8.1.0"; - sha256 = "1dzk9xcif3g14qqksj7h343ka3b19fcgijbnhmivpgjdgychkyk2"; + version = "0.9.0.0"; + sha256 = "19619ladqp1faqdn4z2yrxvffpcr9k0s942s6rjg73i229hccv8f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186547,6 +187381,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-core_1_0_3_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , case-insensitive, containers, deepseq, directory, filepath + , hashable, HUnit, io-streams, lifted-base, monad-control, mtl + , network, network-uri, old-locale, parallel, QuickCheck, random + , readable, regex-posix, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector + , zlib + }: + mkDerivation { + pname = "snap-core"; + version = "1.0.3.2"; + sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers directory filepath hashable HUnit io-streams lifted-base + monad-control mtl network network-uri old-locale random readable + regex-posix text time transformers transformers-base unix-compat + unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers deepseq directory filepath hashable HUnit io-streams + lifted-base monad-control mtl network network-uri old-locale + parallel QuickCheck random readable regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers transformers-base unix-compat unordered-containers + vector zlib + ]; + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework (core interfaces and types)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-cors" = callPackage ({ mkDerivation, snap-core }: mkDerivation { @@ -186763,6 +187633,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "snap-server_1_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, criterion, deepseq, directory, filepath, HsOpenSSL + , http-common, http-streams, HUnit, io-streams, io-streams-haproxy + , lifted-base, monad-control, mtl, network, old-locale + , openssl-streams, parallel, QuickCheck, random, snap-core + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, threads, time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.1.0.0"; + sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4"; + configureFlags = [ "-fopenssl" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time unix unix-compat vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + benchmarkHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + criterion io-streams io-streams-haproxy snap-core vector + ]; + homepage = "http://snapframework.com/"; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory , directory-tree, filepath, hashable, old-time, template-haskell @@ -188112,8 +189024,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.8"; - sha256 = "08zwn8p1nkizgs8spdkdmw1xkfsz6ryviv8shnbc8mnpxfs6wl7q"; + version = "1.3.9"; + sha256 = "1bn0x8l288rgq1x04a6xlaky8zwzqzs5zpbv80fvnnzqb4810035"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -188811,8 +189723,8 @@ self: { }: mkDerivation { pname = "sparrow"; - version = "0.0.0"; - sha256 = "1qjrzfwcscdaz828l1rm0nyr7965kj5bbk777n8l2ylk287xnyjb"; + version = "0.0.1.1"; + sha256 = "14apx9pxbl9s9i5d8i7x3y9wyzdyx3gspz4l4h4vaddg996pq0il"; libraryHaskellDepends = [ aeson aeson-attoparsec async attoparsec attoparsec-uri base bytestring deepseq exceptions extractable-singleton hashable @@ -188833,6 +189745,7 @@ self: { ]; description = "Unified streaming dependency management for web apps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparse" = callPackage @@ -194935,6 +195848,7 @@ self: { testHaskellDepends = [ base containers ghc QuickCheck ]; description = "Plugin and base library to support supermonads in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supero" = callPackage @@ -195132,6 +196046,7 @@ self: { ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svg2q" = callPackage @@ -195356,6 +196271,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_2_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob + , hashable, hspec, hspec-discover, http-media, HUnit + , insert-ordered-containers, lens, mtl, network, QuickCheck + , quickcheck-instances, scientific, template-haskell, text, time + , transformers, transformers-compat, unordered-containers + , uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.2.1"; + sha256 = "11i0yg2g4bw8pjz9p0w7qz7hpriji9zkiz3y5gr26pwb3fzab5qz"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers generics-sop hashable + http-media insert-ordered-containers lens mtl network scientific + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances text time unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -195452,6 +196399,33 @@ self: { license = "LGPL"; }) {}; + "swish_0_9_2_1" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , HUnit, intern, mtl, network-uri, old-locale, polyparse + , semigroups, test-framework, test-framework-hunit, text, time + }: + mkDerivation { + pname = "swish"; + version = "0.9.2.1"; + sha256 = "0zrzihgwn5lg23zmg2iqwilpfj6r77rh1am8g6rwkyf42bgvwhzg"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable intern mtl network-uri + old-locale polyparse semigroups text time + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hashable HUnit network-uri old-locale semigroups + test-framework test-framework-hunit text time + ]; + homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; + description = "A semantic web toolkit"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sws" = callPackage ({ mkDerivation, base, bytestring, cryptonite, directory, filepath , hourglass, http-types, network, resourcet, transformers, wai @@ -198455,8 +199429,8 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "tasty-travis"; - version = "0.2.0"; - sha256 = "1k0cgjbj2dgf5d8j13ns2nk9kw74ixa62bwk7wmj1gr1yfwv1klx"; + version = "0.2.0.1"; + sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; homepage = "https://github.com/merijn/tasty-travis"; @@ -201575,6 +202549,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "th-format" = callPackage + ({ mkDerivation, base, Earley, haskell-src-meta, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "th-format"; + version = "0.1.0.0"; + sha256 = "0vyvw9m28xb2playrzc533173p26jnlr8w1sbjc9w81y17676z3x"; + libraryHaskellDepends = [ + base Earley haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + homepage = "https://github.com/mtesseract/th-format#readme"; + description = "Template Haskell based support for format strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "th-inline-io-action" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -201931,20 +202922,19 @@ self: { }) {}; "themoviedb" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, either - , http-client, http-client-tls, http-types, mtl, tasty, tasty-hunit - , text, text-binary, time, time-locale-compat, transformers + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-types, mtl, tasty, tasty-hunit, text + , text-binary, time, time-locale-compat, transformers }: mkDerivation { pname = "themoviedb"; - version = "1.1.3.0"; - sha256 = "0bw3y1vlh36dnsc8npx3nf00n86qbz61xfkjvlp1knidda3q0d1c"; + version = "1.1.4.0"; + sha256 = "0sx59hi3cv5b71x6gdm8vpj5hchw52vndhksnshblndm8kgxnfa6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary bytestring either http-client http-client-tls - http-types mtl text text-binary time time-locale-compat - transformers + aeson base binary bytestring http-client http-client-tls http-types + mtl text text-binary time time-locale-compat transformers ]; executableHaskellDepends = [ base text time time-locale-compat transformers @@ -202340,6 +203330,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "threepenny-gui_0_8_2_3" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , data-default, deepseq, exceptions, file-embed, filepath, hashable + , network-uri, safe, snap-core, snap-server, stm, template-haskell + , text, transformers, unordered-containers, vault, vector + , websockets, websockets-snap + }: + mkDerivation { + pname = "threepenny-gui"; + version = "0.8.2.3"; + sha256 = "17lh51ifw29a641xhkpcclnpxl7jvp6dmx9rbxqn5wgqclvi5qwb"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async base bytestring containers data-default deepseq + exceptions file-embed filepath hashable network-uri safe snap-core + snap-server stm template-haskell text transformers + unordered-containers vault vector websockets websockets-snap + ]; + homepage = "http://wiki.haskell.org/Threepenny-gui"; + description = "GUI framework that uses the web browser as a display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threepenny-gui-contextmenu" = callPackage ({ mkDerivation, base, threepenny-gui }: mkDerivation { @@ -203497,6 +204513,7 @@ self: { homepage = "https://github.com/HugoDaniel/timerep"; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers" = callPackage @@ -205177,6 +206194,8 @@ self: { pname = "transformers-compat"; version = "0.6.0.6"; sha256 = "0fdnc8qnm42llp3nyfmg7ij6wscrigb43x3f2w1d38dvjkycyags"; + revision = "1"; + editedCabalFile = "0spzhq7c53vrgxlnakavq2fag3zjss76fbmz1hkzgk5bcmk7mlq7"; libraryHaskellDepends = [ base ghc-prim transformers ]; testHaskellDepends = [ base deriving-compat hspec QuickCheck tagged transformers @@ -205238,8 +206257,8 @@ self: { }: mkDerivation { pname = "transformers-eff"; - version = "0.2.0.0"; - sha256 = "1na8gvbhbsdfkxvhy57f3qi91rksjin10lr8nsar4nimrd7nmghn"; + version = "0.2.1.0"; + sha256 = "0miam7n85ch39v7pym8m53nxyymwwnc5v52lip4x4h0vffpnq8lx"; libraryHaskellDepends = [ base free list-transformer mmorph transformers ]; @@ -205264,6 +206283,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-either_0_1_0" = callPackage + ({ mkDerivation, base, exceptions, text, transformers }: + mkDerivation { + pname = "transformers-either"; + version = "0.1.0"; + sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm"; + libraryHaskellDepends = [ base exceptions text transformers ]; + homepage = "http://github.com/tmcgilchrist/transformers-either/"; + description = "An Either monad transformer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "transformers-fix" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -206677,6 +207709,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_5_7" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , containers, criterion, directory, doctest, exceptions, foldl + , hostname, managed, optional-args, optparse-applicative, process + , semigroups, stm, system-fileio, system-filepath, temporary, text + , time, transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.5.7"; + sha256 = "1qh33akv57wv11qg5bk8wa0gbjjq89gxakcg40b93qc8d0dd86wk"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock containers directory + exceptions foldl hostname managed optional-args + optparse-applicative process semigroups stm system-fileio + system-filepath temporary text time transformers unix unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -208434,6 +209490,35 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "tz_0_1_3_1" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, thyme, time, timezone-olson, timezone-series + , tzdata, vector + }: + mkDerivation { + pname = "tz"; + version = "0.1.3.1"; + sha256 = "1ygzrkx01y1x729y7x2fs81gpcw69q6ijy4fxq00xsb0gff74m0b"; + libraryHaskellDepends = [ + base binary bytestring containers data-default deepseq + template-haskell time tzdata vector + ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th time tzdata + ]; + benchmarkHaskellDepends = [ + base criterion lens thyme time timezone-olson timezone-series + ]; + preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; + homepage = "https://github.com/nilcons/haskell-tz"; + description = "Efficient time zone handling"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tzdata" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, HUnit , test-framework, test-framework-hunit, test-framework-th, unix @@ -212392,6 +213477,7 @@ self: { ]; description = "A package to parse VCF files inspired in similar python libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcs-revision" = callPackage @@ -212850,6 +213936,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "vector-shuffling" = callPackage + ({ mkDerivation, base, random, vector }: + mkDerivation { + pname = "vector-shuffling"; + version = "1"; + sha256 = "19brlcbxha2mpmciabjw1npdi2xcpvfhd8wjn2ssfcdl0pd2n2ln"; + libraryHaskellDepends = [ base random vector ]; + homepage = "https://github.com/metrix-ai/vector-shuffling"; + description = "Algorithms for vector shuffling"; + license = stdenv.lib.licenses.mit; + }) {}; + "vector-sized" = callPackage ({ mkDerivation, base, deepseq, finite-typelits, vector }: mkDerivation { @@ -212862,6 +213960,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-sized_1_0_0_0" = callPackage + ({ mkDerivation, base, deepseq, finite-typelits + , indexed-list-literals, primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.0.0.0"; + sha256 = "1jn00l5nw2ws4j6z8fd2h312003vpi8a4ygakmrdg4580cwnjmls"; + libraryHaskellDepends = [ + base deepseq finite-typelits indexed-list-literals primitive vector + ]; + homepage = "http://github.com/expipiplus1/vector-sized#readme"; + description = "Size tagged vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -212981,8 +214096,8 @@ self: { pname = "vectortiles"; version = "1.3.0"; sha256 = "1hvnk2b3g6dm58az7wyl8bcq4h8s0fkz0v0pig9gpad5smkmgjk0"; - revision = "1"; - editedCabalFile = "04h85s069i8sgh382h0j4vx6zlx15yi3q7xmb7pnq8vhfamszsaq"; + revision = "2"; + editedCabalFile = "0c3xkk3xks9c4kn1l6d58v0qsg7q3pdjwdwgpwd93npcjl3isc19"; libraryHaskellDepends = [ base bytestring containers deepseq hashable protocol-buffers protocol-buffers-descriptor text transformers unordered-containers @@ -213121,6 +214236,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_3_2" = callPackage + ({ mkDerivation, base, checkers, deepseq, hashable, megaparsec + , microlens, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.3.2"; + sha256 = "1w4b6a9dvl69bw132nic40a65y2142z1qzzg1qxgylwarfwqmsfg"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base checkers microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vgrep" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, cabal-file-th , containers, directory, doctest, fingertree, generic-deriving @@ -213211,8 +214344,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.14"; - sha256 = "19x112bpc7fw3dqfpgp0bi6cw01vr8csfyqixi68128ij3b6csm0"; + version = "0.0.0.15"; + sha256 = "10ihmdba4rbji13lihmxf2yw77nii63k4mz6a0d03lzcw2bppr1a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -213287,8 +214420,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.3.0"; - sha256 = "0023jrn5my1wgyspf4nq4m3xr7i4w277p4328j6l8hq7fda04ig4"; + version = "0.2.4.0"; + sha256 = "1pa1l1rirj19cnvdaqkf5jscsfkfyam60yk3gqiypbpd102zas6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215732,6 +216865,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-transformers_0_1_0" = callPackage + ({ mkDerivation, base, exceptions, extractable-singleton + , monad-control-aligned, transformers, wai, wai-websockets + , websockets + }: + mkDerivation { + pname = "wai-transformers"; + version = "0.1.0"; + sha256 = "14l5ihyvg2n0kmmkxy0r5mx1jk3p5jhv1vynsnnrb2md1g4318qp"; + libraryHaskellDepends = [ + base exceptions extractable-singleton monad-control-aligned + transformers wai wai-websockets websockets + ]; + homepage = "https://github.com/athanclark/wai-transformers#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-util" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , http-accept, http-types, network-uri, text, transformers, wai @@ -217733,6 +218884,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wilton-ffi" = callPackage + ({ mkDerivation, aeson, base, bytestring }: + mkDerivation { + pname = "wilton-ffi"; + version = "0.1.0.0"; + sha256 = "0l7smpizp4r59nfk73vyl1vrpgdnf8cfgny9r981bpn6bnv1iv7f"; + revision = "1"; + editedCabalFile = "0fkfffxfph1nip54j9f5hd05339mmg19hn7jwggsi4qmdpf2jd0y"; + libraryHaskellDepends = [ aeson base bytestring ]; + homepage = "https://github.com/wilton-iot/wilton-ffi#readme"; + description = "Haskell modules support for Wilton JavaScript runtime"; + license = stdenv.lib.licenses.mit; + }) {}; + "win-hp-path" = callPackage ({ mkDerivation, base, process, split }: mkDerivation { @@ -218019,6 +219184,8 @@ self: { pname = "wl-pprint"; version = "1.2"; sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r"; + revision = "1"; + editedCabalFile = "04w1mm6c0k39x3aglrz5rgqjxszxb6jld0s7qrl4zhndl92nzi5c"; libraryHaskellDepends = [ base ]; description = "The Wadler/Leijen Pretty Printer"; license = stdenv.lib.licenses.bsd3; @@ -226035,10 +227202,8 @@ self: { }: mkDerivation { pname = "zip-stream"; - version = "0.1.0.1"; - sha256 = "17ndw8a6br9bgkr5s2jn54kq69bg4hwi55dfh899dbyzyl0yzxaq"; - revision = "1"; - editedCabalFile = "1g3yr6ggcxgzzdpaj7zn48k7mqfdnnz697f3midw2br1dnhv7zdf"; + version = "0.1.1"; + sha256 = "1wnjj1sp5y24iqd1ffmz6lmsvh0527v05zhzygqaf65j8sny535q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226540,8 +227705,8 @@ self: { pname = "ztail"; version = "1.2"; sha256 = "0krs58c22bg4b2r5zlvvyw87j8v1y1p8c2zy3gg1hwarjb4i9cqk"; - revision = "3"; - editedCabalFile = "0j22pyi86qw5y4fgxygg9fndlwk8j9c2671bbbk3nws5xzkda1sm"; + revision = "4"; + editedCabalFile = "1x8vaflxrmkwqig8wvbbkc761l52y5h45sclnidm5zmwxrv1j3zd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -226550,6 +227715,26 @@ self: { ]; description = "Multi-file, colored, filtered log tailer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ztail_1_2_0_1" = callPackage + ({ mkDerivation, array, base, bytestring, filepath, hinotify + , process, regex-posix, time, unix, unordered-containers + }: + mkDerivation { + pname = "ztail"; + version = "1.2.0.1"; + sha256 = "1gnxjk48jlz988k9mk5mc9hrfqj9wq4v7fbkk648ifmassxyx6wb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bytestring filepath hinotify process regex-posix time + unix unordered-containers + ]; + description = "Multi-file, colored, filtered log tailer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zuramaru" = callPackage @@ -226600,6 +227785,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; } diff --git a/pkgs/development/haskell-modules/hie-packages.nix b/pkgs/development/haskell-modules/hie-packages.nix deleted file mode 100644 index 3f08f64b1e1..00000000000 --- a/pkgs/development/haskell-modules/hie-packages.nix +++ /dev/null @@ -1,502 +0,0 @@ -{ pkgs, stdenv, callPackage }: self: -let src = pkgs.fetchFromGitHub - { owner = "haskell"; - repo = "haskell-ide-engine"; - rev = "3ec8e93e9ca751cf282556998851ffa65f32e06b"; - sha256 = "1wzqzvsa39c1cngmmjryqrq4vqdg6d4wp5wdf17vp96ljvz1cczw"; - }; - cabal-helper-src = pkgs.fetchgit - { url = "https://gitlab.com/dxld/cabal-helper.git"; - rev = "4bfc6b916fcc696a5d82e7cd35713d6eabcb0533"; - sha256 = "1a8231as0wdvi0q73ha9lc0qrx23kmcwf910qaicvmdar5p2b15m"; - }; - ghc-dump-tree-src = pkgs.fetchgit - { url = "https://gitlab.com/alanz/ghc-dump-tree.git"; - rev = "50f8b28fda675cca4df53909667c740120060c49"; - sha256 = "0v3r81apdqp91sv7avy7f0s3im9icrakkggw8q5b7h0h4js6irqj"; - }; - ghc-mod-src = pkgs.fetchFromGitHub - { owner = "wz1000"; - repo = "ghc-mod"; - rev = "03c91ea53b6389e7a1fcf4e471171aa3d6c8de41"; - sha256 = "11iic93klsh5izp8v4mhl7vnnlib821cfhdymlpg4drx7zbm9il6"; - }; - HaRe-src = pkgs.fetchgit - { url = "https://gitlab.com/alanz/HaRe.git"; - rev = "e325975450ce89d790ed3f92de3ef675967d9538"; - sha256 = "0z7r3l4j5a1brz7zb2rgd985m58rs0ki2p59y1l9i46fcy8r9y4g"; - }; - cabal-helper = self.cabal-helper_hie; - haddock-library = self.haddock-library_1_4_4; - hoogle = self.hoogle_5_0_14; - ghc-dump-tree = self.ghc-dump-tree_hie; - ghc-mod = self.ghc-mod_hie; - HaRe = self.HaRe_hie; -in - { ### Overrides required by hie - cabal-helper_hie = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, containers - , directory, exceptions, filepath, ghc-prim, mtl, process - , semigroupoids, template-haskell, temporary, transformers - , unix, unix-compat, utf8-string - }: - mkDerivation { - pname = "cabal-helper"; - version = "0.8.0.0"; - src = cabal-helper-src; - isLibrary = true; - isExecutable = true; - jailbreak = true; - setupHaskellDepends = [ base Cabal directory filepath ]; - libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process semigroupoids - transformers unix unix-compat - ]; - executableHaskellDepends = [ - base bytestring Cabal containers directory exceptions filepath - ghc-prim mtl process template-haskell temporary transformers unix - unix-compat utf8-string - ]; - testHaskellDepends = [ - base bytestring Cabal directory exceptions filepath ghc-prim mtl - process template-haskell temporary transformers unix unix-compat - utf8-string - ]; - testToolDepends = [ cabal-install ]; - postInstall = - '' - libexec="$out/libexec/$(basename $out/lib/ghc*/*ghc*)/$name" - mkdir -p "$libexec" - ln -sv $out/bin/cabal-helper-wrapper "$libexec" - ''; - doCheck = false; - description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - ghc-dump-tree_hie = callPackage - ({ mkDerivation, aeson, base, bytestring, ghc, optparse-applicative - , pretty, pretty-show, process, unordered-containers - , vector - }: - mkDerivation { - pname = "ghc-dump-tree"; - version = "0.2.0.1"; - src = ghc-dump-tree-src; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring ghc pretty pretty-show process - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring ghc optparse-applicative pretty pretty-show - process unordered-containers vector - ]; - homepage = "https://github.com/edsko/ghc-dump-tree"; - description = "Dump GHC's parsed, renamed, and type checked ASTs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - ghc-mod-core = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper - , containers, deepseq, directory, djinn-ghc, extra, fclabels - , filepath, fingertree, ghc, ghc-boot, ghc-paths, ghc-syb-utils - , haskell-src-exts, hlint, monad-control, monad-journal, mtl - , old-time, optparse-applicative, pipes, process, safe, semigroups - , split, syb, template-haskell, temporary, text, time - , transformers, transformers-base - }: - mkDerivation { - pname = "ghc-mod-core"; - version = "5.9.0.0"; - src = "${ghc-mod-src}/core"; - setupHaskellDepends = [ - base Cabal containers directory filepath process template-haskell - transformers - ]; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath fingertree ghc ghc-boot ghc-paths - ghc-syb-utils haskell-src-exts hlint monad-control monad-journal - mtl old-time optparse-applicative pipes process safe semigroups - split syb template-haskell temporary text time transformers - transformers-base - ]; - homepage = "https://github.com/DanielG/ghc-mod"; - description = "Happy Haskell Hacking"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit cabal-helper; }; - ghc-mod_hie = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest - , cabal-helper, containers, criterion, deepseq, directory - , djinn-ghc, doctest, extra, fclabels, filepath, ghc, ghc-boot - , ghc-mod-core, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint - , hspec, monad-control, monad-journal, mtl, old-time - , optparse-applicative, pipes, process, safe, semigroups, shelltest - , split, syb, template-haskell, temporary, text, time - , transformers, transformers-base - }: - mkDerivation { - pname = "ghc-mod"; - version = "5.9.0.0"; - src = ghc-mod-src; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ - base Cabal cabal-doctest containers directory filepath process - template-haskell transformers - ]; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath ghc ghc-boot ghc-mod-core - ghc-paths ghc-syb-utils haskell-src-exts hlint monad-control - monad-journal mtl old-time optparse-applicative pipes process safe - semigroups split syb template-haskell temporary text time - transformers transformers-base - ]; - executableHaskellDepends = [ - base binary deepseq directory fclabels filepath ghc ghc-mod-core - monad-control mtl old-time optparse-applicative process semigroups - split time - ]; - testHaskellDepends = [ - base cabal-helper containers directory doctest fclabels filepath - ghc ghc-boot ghc-mod-core hspec monad-journal mtl process split - temporary transformers - ]; - testToolDepends = [ shelltest ]; - # Doesn't work with our doctest - doCheck = false; - benchmarkHaskellDepends = [ - base criterion directory filepath ghc-mod-core temporary - ]; - homepage = "https://github.com/DanielG/ghc-mod"; - description = "Happy Haskell Hacking"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { shelltest = null; inherit cabal-helper; }; - HaRe_hie = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, Cabal, cabal-helper - , case-insensitive, containers, conversion - , conversion-case-insensitive, conversion-text, Diff, directory - , filepath, foldl, ghc, ghc-exactprint, ghc-mod-core, ghc-syb-utils - , gitrev, hslogger, hspec, HUnit, monad-control, mtl - , optparse-applicative, optparse-simple, parsec, stdenv - , Strafunski-StrategyLib, syb, syz, turtle - }: - mkDerivation { - pname = "HaRe"; - version = "0.8.4.1"; - src = HaRe-src; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base cabal-helper containers directory filepath ghc ghc-exactprint - ghc-mod-core ghc-syb-utils hslogger monad-control mtl - Strafunski-StrategyLib syb syz - ]; - executableHaskellDepends = [ - base Cabal ghc-mod-core gitrev mtl optparse-applicative - optparse-simple - ]; - testHaskellDepends = [ - attoparsec base base-prelude cabal-helper case-insensitive - containers conversion conversion-case-insensitive conversion-text - Diff directory filepath foldl ghc ghc-exactprint ghc-mod-core - ghc-syb-utils hslogger hspec HUnit monad-control mtl parsec - Strafunski-StrategyLib syb syz turtle - ]; - # Test directory doesn't exist - doCheck = false; - homepage = "https://github.com/RefactoringTools/HaRe/wiki"; - description = "the Haskell Refactorer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit cabal-helper; }; - ### hie packages - haskell-ide-engine = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, cabal-install - , containers, data-default, Diff, directory, either, ekg, filepath, ghc - , ghc-mod-core, gitrev, haskell-lsp, hie-apply-refact, hie-base - , hie-brittany, hie-build-plugin, hie-eg-plugin-async - , hie-example-plugin2, hie-ghc-mod, hie-ghc-tree, hie-haddock - , hie-hare, hie-hoogle, hie-plugin-api, hoogle, hoogleLocal, hslogger, hspec - , lens, mtl, optparse-simple, QuickCheck, quickcheck-instances - , sorted-list, stm, text, time, transformers - , unordered-containers, vector, vinyl, yaml, yi-rope - }: - mkDerivation { - pname = "haskell-ide-engine"; - version = "0.1.0.0"; - inherit src; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bytestring Cabal containers data-default directory - either filepath ghc ghc-mod-core gitrev haskell-lsp - hie-apply-refact hie-base hie-brittany hie-ghc-mod hie-haddock - hie-hare hie-hoogle hie-plugin-api hslogger lens mtl - optparse-simple sorted-list stm text transformers - unordered-containers vector yi-rope - ]; - executableHaskellDepends = [ - base Cabal containers directory ekg ghc-mod-core gitrev haskell-lsp - hie-apply-refact hie-build-plugin hie-eg-plugin-async - hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle - hie-plugin-api hslogger optparse-simple stm text time transformers - unordered-containers vinyl - ]; - testHaskellDepends = [ - aeson base containers Diff directory filepath ghc-mod-core - haskell-lsp hie-apply-refact hie-base hie-eg-plugin-async - hie-example-plugin2 hie-ghc-mod hie-ghc-tree hie-hare hie-hoogle - hie-plugin-api hoogle hslogger hspec QuickCheck - quickcheck-instances stm text transformers unordered-containers - vector vinyl yaml - ]; - - preCheck = - '' - export HOME=$NIX_BUILD_TOP/home - mkdir -p $HOME/.hoogle - ln -sv ${hoogleLocal}/share/doc/hoogle/default.hoo $HOME/.hoogle/default-haskell-${hoogle.version}.hoo - ''; - # https://github.com/haskell/haskell-ide-engine/issues/425 - # The disabled tests do work in a local nix-shell with cabal available. - patches = [ ./patches/hie-testsuite.patch ]; - homepage = "http://github.com/githubuser/haskell-ide-engine#readme"; - description = "Provide a common engine to power any Haskell IDE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit hoogle; hoogleLocal = (self.hoogleLocal {}).override { inherit hoogle; }; }; - hie-apply-refact = callPackage - ({ mkDerivation, aeson, apply-refact, base, either, extra, ghc-mod - , ghc-mod-core, haskell-src-exts, hie-base, hie-plugin-api, hlint - , text, transformers - }: - mkDerivation { - pname = "hie-apply-refact"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-apply-refact"; - libraryHaskellDepends = [ - aeson apply-refact base either extra ghc-mod ghc-mod-core - haskell-src-exts hie-base hie-plugin-api hlint text transformers - ]; - description = "Haskell IDE Apply Refact plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod; }; - hie-base = callPackage - ({ mkDerivation, aeson, base, haskell-lsp, text }: - mkDerivation { - pname = "hie-base"; - version = "0.1.0.0"; - inherit src; - preUnpack = "sourceRoot=source/hie-base"; - libraryHaskellDepends = [ aeson base haskell-lsp text ]; - description = "Haskell IDE API base types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - hie-brittany = callPackage - ({ mkDerivation, aeson, base, brittany, ghc-mod, ghc-mod-core - , haskell-lsp, hie-plugin-api, lens, text - }: - mkDerivation { - pname = "hie-brittany"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-brittany"; - libraryHaskellDepends = [ - aeson base brittany ghc-mod ghc-mod-core haskell-lsp hie-plugin-api - lens text - ]; - description = "Haskell IDE Hoogle plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod; }; - hie-build-plugin = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-helper - , containers, directory, filepath, haskell-lsp, hie-plugin-api - , process, stm, text, transformers, yaml - }: - mkDerivation { - pname = "hie-build-plugin"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-build-plugin"; - libraryHaskellDepends = [ - aeson base bytestring Cabal cabal-helper containers directory - filepath haskell-lsp hie-plugin-api process stm text transformers - yaml - ]; - description = "Haskell IDE build plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit cabal-helper; }; - hie-eg-plugin-async = callPackage - ({ mkDerivation, base, ghc-mod-core, hie-plugin-api, stm - , text - }: - mkDerivation { - pname = "hie-eg-plugin-async"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-eg-plugin-async"; - libraryHaskellDepends = [ - base ghc-mod-core hie-plugin-api stm text - ]; - description = "Haskell IDE example plugin, using async processes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - hie-example-plugin2 = callPackage - ({ mkDerivation, base, hie-plugin-api, text }: - mkDerivation { - pname = "hie-example-plugin2"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-example-plugin2"; - libraryHaskellDepends = [ base hie-plugin-api text ]; - description = "Haskell IDE example plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - hie-ghc-mod = callPackage - ({ mkDerivation, aeson, base, containers, ghc, ghc-mod, ghc-mod-core - , hie-base, hie-plugin-api, text, transformers - }: - mkDerivation { - pname = "hie-ghc-mod"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-ghc-mod"; - libraryHaskellDepends = [ - aeson base containers ghc ghc-mod ghc-mod-core hie-base - hie-plugin-api text transformers - ]; - description = "Haskell IDE ghc-mod plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod; }; - hie-ghc-tree = callPackage - ({ mkDerivation, aeson, base, ghc-dump-tree, ghc-mod, ghc-mod-core - , hie-base, hie-plugin-api, text - }: - mkDerivation { - pname = "hie-ghc-tree"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-ghc-tree"; - libraryHaskellDepends = [ - aeson base ghc-dump-tree ghc-mod ghc-mod-core hie-base - hie-plugin-api text - ]; - description = "Haskell IDE GHC Tree plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-dump-tree ghc-mod; }; - hie-haddock = callPackage - ({ mkDerivation, aeson, base, containers, directory, either - , filepath, ghc, ghc-exactprint, ghc-mod, ghc-mod-core, haddock-api - , haddock-library, HaRe, haskell-lsp, hie-base, hie-ghc-mod - , hie-hare, hie-plugin-api, lens, monad-control, mtl, text - , transformers - }: - mkDerivation { - pname = "hie-haddock"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-haddock"; - libraryHaskellDepends = [ - aeson base containers directory either filepath ghc ghc-exactprint - ghc-mod ghc-mod-core haddock-api haddock-library HaRe haskell-lsp - hie-base hie-ghc-mod hie-hare hie-plugin-api lens monad-control mtl - text transformers - ]; - description = "Haskell IDE Haddock plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit haddock-library HaRe ghc-mod; }; - hie-hare = callPackage - ({ mkDerivation, aeson, base, containers, Diff, either, ghc - , ghc-exactprint, ghc-mod, ghc-mod-core, HaRe, haskell-lsp - , hie-base, hie-ghc-mod, hie-plugin-api, lens, monad-control, mtl - , text, transformers - }: - mkDerivation { - pname = "hie-hare"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-hare"; - libraryHaskellDepends = [ - aeson base containers Diff either ghc ghc-exactprint ghc-mod - ghc-mod-core HaRe haskell-lsp hie-base hie-ghc-mod hie-plugin-api - lens monad-control mtl text transformers - ]; - description = "Haskell IDE HaRe plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod HaRe; }; - hie-hoogle = callPackage - ({ mkDerivation, aeson, base, directory, filepath, ghc-mod - , ghc-mod-core, hie-plugin-api, hoogle, tagsoup, text - }: - mkDerivation { - pname = "hie-hoogle"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-hoogle"; - libraryHaskellDepends = [ - aeson base directory filepath ghc-mod ghc-mod-core hie-plugin-api - hoogle tagsoup text - ]; - description = "Haskell IDE Hoogle plugin"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) { inherit ghc-mod hoogle; }; - hie-plugin-api = callPackage - ({ mkDerivation, aeson, base, containers, Diff, directory, either - , filepath, fingertree, ghc, ghc-mod-core, haskell-lsp, hie-base - , hslogger, lifted-base, monad-control, mtl, stdenv, stm, syb, text - , time, transformers, unordered-containers - }: - mkDerivation { - pname = "hie-plugin-api"; - version = "0.1.0.0"; - inherit src; - postUnpack = "sourceRoot=source/hie-plugin-api"; - libraryHaskellDepends = [ - aeson base containers Diff directory either filepath fingertree ghc - ghc-mod-core haskell-lsp hie-base hslogger lifted-base - monad-control mtl stm syb text time transformers - unordered-containers - ]; - description = "Haskell IDE API for plugin communication"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - } diff --git a/pkgs/development/haskell-modules/initial-packages.nix b/pkgs/development/haskell-modules/initial-packages.nix index 8e8712d9096..6ab7da96911 100644 --- a/pkgs/development/haskell-modules/initial-packages.nix +++ b/pkgs/development/haskell-modules/initial-packages.nix @@ -1,2 +1,2 @@ args@{ pkgs, stdenv, callPackage }: self: - (import ./hie-packages.nix args self) // (import ./hackage-packages.nix args self) + (import ./hackage-packages.nix args self) diff --git a/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch new file mode 100644 index 00000000000..3917c2f0afd --- /dev/null +++ b/pkgs/development/haskell-modules/patches/xmonad-contrib-ghc-8.4.1-fix.patch @@ -0,0 +1,107 @@ +From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001 +From: Michiel Derhaeg <derhaeg.michiel@gmail.com> +Date: Tue, 20 Mar 2018 22:06:18 +0100 +Subject: [PATCH] update to work with GHC 8.4.1 + +--- + XMonad/Hooks/FadeWindows.hs | 6 +++++- + XMonad/Hooks/WallpaperSetter.hs | 6 +++++- + XMonad/Layout/Mosaic.hs | 6 +++++- + xmonad-contrib.cabal | 5 +++-- + 5 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs +index 4b8e62b6..01d06792 100644 +--- a/XMonad/Hooks/FadeWindows.hs ++++ b/XMonad/Hooks/FadeWindows.hs +@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask + ,asks) + import Control.Monad.State (gets) + import qualified Data.Map as M +-import Data.Monoid ++import Data.Monoid hiding ((<>)) ++import Data.Semigroup + + import Graphics.X11.Xlib.Extras (Event(..)) + +@@ -134,6 +135,9 @@ instance Monoid Opacity where + r `mappend` OEmpty = r + _ `mappend` r = r + ++instance Semigroup Opacity where ++ (<>) = mappend ++ + -- | A FadeHook is similar to a ManageHook, but records window opacity. + type FadeHook = Query Opacity + +diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs +index 00a3b1c3..d4f5ccb2 100644 +--- a/XMonad/Hooks/WallpaperSetter.hs ++++ b/XMonad/Hooks/WallpaperSetter.hs +@@ -41,7 +41,8 @@ import Data.Ord (comparing) + import Control.Monad + import Control.Applicative + import Data.Maybe +-import Data.Monoid ++import Data.Monoid hiding ((<>)) ++import Data.Semigroup + + -- $usage + -- This module requires imagemagick and feh to be installed, as these are utilized +@@ -86,6 +87,9 @@ instance Monoid WallpaperList where + mappend (WallpaperList w1) (WallpaperList w2) = + WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1) + ++instance Semigroup WallpaperList where ++ (<>) = mappend ++ + -- | Complete wallpaper configuration passed to the hook + data WallpaperConf = WallpaperConf { + wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/) +diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs +index 05655d4c..da44fc50 100644 +--- a/XMonad/Layout/Mosaic.hs ++++ b/XMonad/Layout/Mosaic.hs +@@ -38,7 +38,8 @@ import Control.Monad(mplus) + import Data.Foldable(Foldable,foldMap, sum) + import Data.Function(on) + import Data.List(sortBy) +-import Data.Monoid(Monoid,mempty, mappend) ++import Data.Monoid(Monoid,mempty, mappend, (<>)) ++import Data.Semigroup + + + -- $usage +@@ -202,6 +203,9 @@ instance Monoid (Tree a) where + mappend x Empty = x + mappend x y = Branch x y + ++instance Semigroup (Tree a) where ++ (<>) = mappend ++ + makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a + makeTree _ [] = Empty + makeTree _ [x] = Leaf x +diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal +index dde3ccda..c401c6e6 100644 +--- a/xmonad-contrib.cabal ++++ b/xmonad-contrib.cabal +@@ -36,7 +36,7 @@ cabal-version: >= 1.6 + build-type: Simple + bug-reports: https://github.com/xmonad/xmonad-contrib/issues + +-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1 ++tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1 + + source-repository head + type: git +@@ -66,7 +66,8 @@ library + unix, + X11>=1.6.1 && < 1.9, + xmonad>=0.13 && < 0.14, +- utf8-string ++ utf8-string, ++ semigroups + + if flag(use_xft) + build-depends: X11-xft >= 0.2 diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 1d2b79074fb..6ea3ac73a4b 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -65,9 +65,9 @@ in stdenv.mkDerivation ({ ''; postPatch = '' - ${postPatch} - patchShebangs make + + ${postPatch} ''; preConfigure = '' @@ -88,9 +88,9 @@ in stdenv.mkDerivation ({ # (PDFs are generated only when fop is available). postInstall = '' - ${postInstall} - ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call + + ${postInstall} ''; # Some erlang bin/ scripts run sed and awk diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index bcf819702da..3d90eb36f3d 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "alembic-${version}"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = "${version}"; - sha256 = "1p5zd9kdwnrwg604bq79ianc5bw6mx6i5d7yc4r11xrbphlc9m1g"; + sha256 = "0vz7pda7n50d490vv9i044xpi8rhrvs6qxcapwd49wzwrvkg67dk"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index b3ead726cba..63fd7a4986f 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,9 +1,12 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, glib +, fixDarwinDylibNames, gobjectIntrospection, gnome3 +}: let pname = "atk"; version = "2.28.1"; in + stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -22,6 +25,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobjectIntrospection ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 0d62656e6e7..a0ba9548012 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -3,7 +3,7 @@ , CoreServices }: let - version = "1.6.49"; + version = "1.6.56"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz"; - sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; + sha256 = "1ckcb12gblz1ad1371ah1qirxn3r9zdngh9w0357hsqfmkyfa5y5"; }; buildInputs = [ diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 08e94648e7d..6bfa6bdc2fb 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,46 +1,40 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl -, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, jasper, shared-mime-info, libintl, gobjectIntrospection, doCheck ? false, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3 +, jasper, gobjectIntrospection, doCheck ? false }: let pname = "gdk-pixbuf"; - version = "2.36.11"; + version = "2.36.7"; + # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing, + # which apparently requires access to shared-mime-info files during runtime. in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1wz2vpciwdpdv612s8kbww08q80hgcs5dxrfsxp1a4q44n3snqmf"; + sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8"; }; - outputs = [ "out" "dev" "man" "devdoc" ]; + outputs = [ "out" "dev" "devdoc" ]; setupHook = ./setup-hook.sh; enableParallelBuilding = true; # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ libX11 libintl ] ++ stdenv.lib.optional (!stdenv.isDarwin) shared-mime-info; + buildInputs = [ libX11 gobjectIntrospection ]; - nativeBuildInputs = [ - meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - gtk-doc gobjectIntrospection makeWrapper - ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ]; - mesonFlags = [ - # with_ & enable_will be removed in the future - "-Dwith_docs=true" - "-Denable_jasper=true" - "-Dx11=true" # will be added in the future (default atm) - "-Dwith_gir=${if gobjectIntrospection != null then "true" else "false"}" - ]; + configureFlags = "--with-libjasper --with-x11" + + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes" + ; - postPatch = '' - chmod +x build-aux/* # patchShebangs only applies to executables - patchShebangs build-aux + # on darwin, tests don't link + preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) '' + substituteInPlace Makefile --replace "docs tests" "docs" ''; postInstall = @@ -48,17 +42,6 @@ stdenv.mkDerivation rec { '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - - # We require runtime access to shared-mime-info - ${stdenv.lib.optionalString (!stdenv.isDarwin) '' - for f in $dev/bin/*; do - wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - done - wrapProgram $out/bin/gdk-pixbuf-thumbnailer --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ''} - - # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ - $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB). diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index f3c58baf5a1..6e9b033a976 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "1dlmcqsb43269z4pa3xmqb1gf1jsji82sk5yyibq0ndhk326iyck"; + sha256 = "0dbpmvd2p9bdqdyiijmsc1hd9d6l36migk79smw7fpfvh0y6ldsk"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index fb0c2e789f3..7c7cd1c3aae 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "0i5kmv8grsnh2igvlkgjr8lz3h3yrxh82yxbbdsjfpslv61l0gpi"; + sha256 = "1iwzf0y5f25g5hgdkmv6qf3k5mzlazrpx5sj3m2pvrl9jg9wn4s1"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index a26b927a883..42321b2f866 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdvdnav-${version}"; - version = "5.0.3"; + version = "6.0.0"; src = fetchurl { url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2"; - sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d"; + sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index be7e20f00eb..95815f4abcd 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libdvdread-${version}"; - version = "5.0.3"; + version = "6.0.0"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2"; - sha256 = "0ayqiq0psq18rcp6f5pz82sxsq66v0kwv0y55dbrcg68plnxy71j"; + sha256 = "0dgr23fzcjhb7ck54xkr9zmf4jcq3ph0dz3fbyvla1c6ni9ijfxk"; }; buildInputs = [libdvdcss]; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 8b75f85852e..d54b05b1c82 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "A library to talk to FTDI chips using libusb"; homepage = https://www.intra2net.com/en/developer/libftdi/; license = with licenses; [ lgpl2 gpl2 ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 7999cc1dff4..36343faa0f9 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "17.12"; + version = "18.03"; name = "libmediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0lm4454ynp0msgqm3s0mnxqxql6i1ank35jvff5swnaxvwsbp0ml"; + sha256 = "1d4zqik9sm8fsr26w5jsp0rgczlh5vh3gwknxy4g3gd6pqri4igv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 0f2ca371297..80acaf57d62 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "librsync-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "0wihjinqbjl4hnvrgsk4ca1zy5v6bj7vjm6wlygwvgbn5yh3yq0x"; + sha256 = "1qnr4rk93mhggqjh2025clmlhhgnjhq983p1vbh8i1g8aiqdnapi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index e1c50bee75a..df160f3405a 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libsass-${version}"; - version = "3.4.9"; + version = "3.5.1"; src = fetchurl { url = "https://github.com/sass/libsass/archive/${version}.tar.gz"; - sha256 = "0f4mj91zzdzah7fxkdg3dnrimk9ip7czl4g26f32zgifz1nrqgjs"; + sha256 = "0qy5hsglrdwzlb1x83v40pnm52hrjbdrc5zardp89i3vwcdzkrq8"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index b0d6598fc63..2def14b1c10 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.4"; + name = "libu2f-host-1.1.5"; src = fetchurl { url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "0vvs2p3b25cbybccv3f4ridnp7sg5i4hkzx3hx48ldcn1l1fqhv0"; + sha256 = "159slvjfq4bqslx5amjkk90xnkiv3x0yzvbi54pl2vnzbr1p2azk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index 35f675a305a..d43519f4a2f 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, netcdf, hdf5, curl, gfortran }: stdenv.mkDerivation rec { name = "netcdf-fortran-${version}"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { url = "https://github.com/Unidata/netcdf-fortran/archive/v${version}.tar.gz"; - sha256 = "4170fc018c9ee8222e317215c6a273542623185f5f6ee00d37bbb4e024e4e998"; + sha256 = "0rwybszj1jjb25cx8vfyrd77x5qsdjzwspcjz56n12br89n9ica4"; }; buildInputs = [ netcdf hdf5 curl gfortran ]; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index d4699b1c506..59cc9438a9f 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "0s5xiyvnvxc2k0zkyb12mm5cwn61lavyxlfpknlx5f243g1xi6f6"; + sha256 = "1mpr781fb2dfbyscrr7nil75lkxsazg4wkm749168lcf2ksrrbfi"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ntbtls/default.nix b/pkgs/development/libraries/ntbtls/default.nix index 59c12e53ed2..dac65e1c2f9 100644 --- a/pkgs/development/libraries/ntbtls/default.nix +++ b/pkgs/development/libraries/ntbtls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, libgcrypt, libksba, zlib }: +{ stdenv, fetchurl, gettext, libgpgerror, libgcrypt, libksba, zlib }: with stdenv.lib; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - buildInputs = [ libgcrypt libgpgerror libksba zlib ]; + buildInputs = [ libgcrypt libgpgerror libksba zlib ] + ++ stdenv.lib.optional stdenv.isDarwin gettext; postInstall = '' moveToOutput "bin/ntbtls-config" $dev diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index d8198357c64..099bd8d1e97 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec patches = [ ./openexrid.patch ]; + postPatch = '' + substituteInPlace openexrid/makefile \ + --replace g++ c++ + ''; + NIX_CFLAGS_COMPILE=''-I${ilmbase.dev}/include/OpenEXR -I${openexr.dev}/include/OpenEXR -I${openfx.dev}/include/OpenFX @@ -38,7 +43,7 @@ stdenv.mkDerivation rec find $out mv $out/include $dev/ mv $out/lib $lib/ - ''; + ''; meta = with stdenv.lib; { description = "OpenEXR files able to isolate any object of a CG image with a perfect antialiazing"; diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix new file mode 100644 index 00000000000..072de0f9fa0 --- /dev/null +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -0,0 +1,56 @@ +{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty +, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg +, withData ? true, poppler_data +, qt5Support ? false, qtbase ? null +, introspectionSupport ? false, gobjectIntrospection ? null +, utils ? false +, minimal ? false, suffix ? "glib" +}: + +let + version = "0.61.0"; + mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}"; +in +stdenv.mkDerivation rec { + name = "poppler-${suffix}-${version}"; + + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.xz"; + sha256 = "0zrbb1b77k6bm2qdnra08jnbyllv6vj29790igmp6fzs59xf3kak"; + }; + + outputs = [ "out" "dev" ]; + + buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; + + # TODO: reduce propagation to necessary libs + propagatedBuildInputs = with lib; + [ zlib freetype fontconfig libjpeg openjpeg ] + ++ optionals (!minimal) [ cairo lcms curl ] + ++ optional qt5Support qtbase + ++ optional introspectionSupport gobjectIntrospection; + + nativeBuildInputs = [ cmake ninja pkgconfig ]; + + cmakeFlags = [ + (mkFlag true "XPDF_HEADERS") + (mkFlag (!minimal) "GLIB") + (mkFlag (!minimal) "CPP") + (mkFlag (!minimal) "LIBCURL") + (mkFlag utils "UTILS") + (mkFlag qt5Support "QT5") + ]; + + meta = with lib; { + homepage = https://poppler.freedesktop.org/; + description = "A PDF rendering library"; + + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. + ''; + + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3f95e2187dd..faeadeb5b4e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkgconfig ]; + CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; + cmakeFlags = [ (mkFlag true "XPDF_HEADERS") (mkFlag (!minimal) "GLIB") diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index ef0f5d4014e..5baeb76820a 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -1,31 +1,43 @@ { stdenv, fetchFromGitHub, cmake, qt4 ? null , withQt5 ? false, qtbase ? null, qttools ? null +, darwin ? null }: assert withQt5 -> qtbase != null; assert withQt5 -> qttools != null; +assert stdenv.isDarwin -> darwin != null; stdenv.mkDerivation rec { name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}"; - version = "0.7.0"; + version = "0.8.0"; # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/` src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = "v${version}"; - sha256 = "04v6ymkw7qd1pf9lwijgqrl89w2hhsnqgz7dm4cdrh8i8dffpn52"; + sha256 = "1r6qp9l2lp5jpc6ciklbg1swvvzcpc37rg9py46hk0wxy6klnm0b"; # v0.8.0 }; - cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; + cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] + ++ stdenv.lib.optional stdenv.isDarwin [ + # correctly detect the compiler + # for details see cmake --help-policy CMP0025 + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ] + ; nativeBuildInputs = [ cmake ]; - buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]; + buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ] + ++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + CoreFoundation Security + ]) + ; meta = { description = "Platform-independent Qt API for storing passwords securely"; homepage = https://github.com/frankosterfeld/qtkeychain; license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index c5c064142db..154db61894f 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.35"; + name = "tevent-0.9.36"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "1s8nbkmqz8dzdlsd6qynhvyl05pw93r151f3i2kgjfpbck9ak8r5"; + sha256 = "0k1v4vnlzpf7h3p4khaw8a7damrc68g136bf2xzys08nzpinnaxx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix new file mode 100644 index 00000000000..3b9a2c15b6e --- /dev/null +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, fetchFromGitHub, pillow, click, dlib, numpy +, face_recognition_models, scipy, stdenv, flake8, tox, pytest, glibcLocales +}: + +buildPythonPackage rec { + pname = "face_recognition"; + version = "1.2.1"; + + src = fetchFromGitHub { + repo = pname; + owner = "ageitgey"; + rev = "fe421d4acd76e8a19098e942b7bd9c3bbef6ebc4"; # no tags available in Git, pure revs are pushed to pypi + sha256 = "0wv5qxkg7xv1cr43zhhbixaqgj08xw2l7yvwl8g3fb2kdxyndw1c"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "flake8==2.6.0" "flake8" + ''; + + propagatedBuildInputs = [ pillow click dlib numpy face_recognition_models scipy ]; + + checkInputs = [ flake8 tox pytest glibcLocales ]; + checkPhase = '' + LC_ALL="en_US.UTF-8" py.test + ''; + + meta = with stdenv.lib; { + license = licenses.mit; + homepage = https://github.com/ageitgey/face_recognition; + maintainers = with maintainers; [ ma27 ]; + description = "The world's simplest facial recognition api for Python and the command line"; + }; +} diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix new file mode 100644 index 00000000000..960bffb903d --- /dev/null +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, stdenv, fetchPypi }: + +buildPythonPackage rec { + pname = "face_recognition_models"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kwnv3qpy5bhspk780bkyg8jd9n5f6p91ja6sjlwk1wcm00d56xp"; + }; + + # no module named `tests` as no tests are available + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/ageitgey/face_recognition_models; + license = licenses.cc0; + maintainers = with maintainers; [ ma27 ]; + description = "Trained models for the face_recognition python library"; + }; +} diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index cdf59cd867c..a8d4c517a90 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pmd-${version}"; - version = "6.0.1"; + version = "6.1.0"; buildInputs = [ unzip ]; src = fetchurl { url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "13wmmy345p8bzvxdb8ldpkv85m3m8x9qs5f0jjhn0gkn65a988iq"; + sha256 = "1d2hbsnyvwvawhfh832yy3w93kr4whrk99zpg4q5ws2b2hhdvzv8"; }; installPhase = '' diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 65501b2b935..000943f117f 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "waf-${version}"; - version = "2.0.4"; + version = "2.0.6"; src = fetchurl { url = "https://waf.io/waf-${version}.tar.bz2"; - sha256 = "0zmnwgccq5j7ipfi2j0k5s40q27krp1m6v2bd650axgzdbpa7ain"; + sha256 = "1wyl0jl10i0p2rj49sig5riyppgkqlkqmbvv35d5bqxri3y4r38q"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 7a28f86562f..fbae0a76f25 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,36 +1,46 @@ { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, libGLU, Cocoa +, libX11, libGLU, python2Packages, ensureNewerSourcesForZipFilesHook +, Cocoa }: stdenv.mkDerivation rec { name = "glslviewer-${version}"; - version = "1.2"; + version = "2018-01-31"; src = fetchFromGitHub { owner = "patriciogonzalezvivo"; repo = "glslViewer"; - rev = version; - sha256 = "05ya821l2pd58anyx21mgmlm2bv78rz8cnbvqw4d9pfhq40z9psw"; + rev = "cac40f6984dbeb638950744c9508aa88591fea6c"; + sha256 = "1bykpp68hdxjlxvi1xicyb6822mz69q0adz24faaac372pls4bk0"; }; + nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + glfw libGLU glfw libXrandr libXdamage + libXext libXrender libXinerama libXcursor libXxf86vm + libXi libX11 + ] ++ (with python2Packages; [ python setuptools wrapPython ]) + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + pythonPath = with python2Packages; [ requests.dev ]; + # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' substituteInPlace Makefile \ --replace '/usr/local' "$out" \ --replace '/usr/bin/clang++' 'clang++' + substituteInPlace Makefile \ + --replace 'python setup.py install' "python setup.py install --prefix=$out" ''; preInstall = '' - mkdir -p $out/bin + mkdir -p $out/bin $(toPythonPath "$out") + export PYTHONPATH=$PYTHONPATH:$(toPythonPath "$out") ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - glfw libGLU glfw libXrandr libXdamage - libXext libXrender libXinerama libXcursor libXxf86vm - libXi libX11 - ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + postInstall = '' + wrapPythonPrograms + ''; meta = with stdenv.lib; { description = "Live GLSL coding renderer"; diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix new file mode 100644 index 00000000000..03aa841dc7b --- /dev/null +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchzip }: + +stdenv.mkDerivation rec { + name = "jhiccup-${version}"; + version = "2.0.8"; + + src = fetchzip { + url = "https://www.azul.com/files/jHiccup-${version}-dist.zip"; + sha256 = "1q4wd5ywisgh0f4ic7iglxai0gc8mnl1pkjw1hm1xdij8j5i488g"; + }; + + configurePhase = ":"; + buildPhase = ":"; + installPhase = '' + mkdir -p $out/bin $out/share/java + cp *.jar $out/share/java + + # Fix version number (out of date at time of import), and path to + # jHiccup.jar + for x in ./jHiccup ./jHiccupLogProcessor; do + substituteInPlace $x \ + --replace 'JHICCUP_Version=2.0.5' 'JHICCUP_Version=${version}' \ + --replace '$INSTALLED_PATH' $out/share/java + done + + mv jHiccup jHiccupLogProcessor $out/bin/ + ''; + + meta = { + description = "Measure JVM application stalls and GC pauses"; + homepage = https://www.azul.com/jhiccup/; + license = stdenv.lib.licenses.cc0; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index e7d5aaceb2b..66b0467657a 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/avrdude/; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 19be3f64045..29bf399087b 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "trackballs-${version}"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "trackballs"; repo = "trackballs"; rev = "v${version}"; - sha256 = "0y5y8xzfsjd0rxl5wnxdq7m9n97s5xvcqyjsckz4qxrjcc3lk297"; + sha256 = "1rahqsydpbh8nmh41fxggzj5f6s3ldf7p5krik5fnhpy0civfsxd"; }; buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ]; diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index b4fa3662675..868d60d6d32 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -10,13 +10,13 @@ let stdenv.mkDerivation (rec { name = "arm-trusted-firmware-${platform}-${version}"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "ARM-software"; repo = "arm-trusted-firmware"; - rev = "b762fc7481c66b64eb98b6ff694d569e66253973"; - sha256 = "15m10dfgqkgw6rmzgfg1xzp1si9d5jwzyrcb7cp3y9ckj6mvp3i3"; + rev = "refs/tags/v${version}"; + sha256 = "1gm0bn2llzfzz9bfsz11fhwxj5lxvyrq7bc13fjj033nljzxn7k8"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -38,7 +38,8 @@ let hardeningDisable = [ "all" ]; dontStrip = true; - enableParallelBuilding = true; + # Fatal error: can't create build/sun50iw1p1/release/bl31/sunxi_clocks.o: No such file or directory + enableParallelBuilding = false; meta = with stdenv.lib; { homepage = https://github.com/ARM-software/arm-trusted-firmware; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 6eb1841d1c7..9af5c889c42 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -103,6 +103,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { enableParallelBuilding = true; + # https://bugs.winehq.org/show_bug.cgi?id=43530 + # https://github.com/NixOS/nixpkgs/issues/31989 + hardeningDisable = [ "bindnow" ]; + passthru = { inherit pkgArches; }; meta = { inherit version platforms; diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index b605b9715d4..d4705dd9dd7 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -36,6 +36,7 @@ in stdenv.mkDerivation { description = "RISC-V Proxy Kernel and Bootloader."; homepage = https://github.com/riscv/riscv-pk; license = stdenv.lib.licenses.bsd3; + platforms = [ "riscv-linux" ]; maintainers = [ stdenv.lib.maintainers.shlevy ]; }; } diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 4c393a0f326..c4c49515f04 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "18.01.00"; + version = "18.02.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "043wkq4hz5pz79masppya67b8i5jw61p1j8dw17jwc8w6gp8csfb"; + sha256 = "0z8yvicp4qk1xi8xmbrngnc294fjdnb9qn5d9lnyls4i6mmvpr2d"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/kernel/linux-riscv.nix b/pkgs/os-specific/linux/kernel/linux-riscv.nix index 45795e24c54..60370311865 100644 --- a/pkgs/os-specific/linux/kernel/linux-riscv.nix +++ b/pkgs/os-specific/linux/kernel/linux-riscv.nix @@ -1,15 +1,15 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.16-rc2"; - modDirVersion = "4.16.0-rc2"; + version = "4.16-rc6"; + modDirVersion = "4.16.0-rc6"; extraMeta.branch = "4.16"; src = fetchFromGitHub { owner = "shlevy"; repo ="riscv-linux"; - rev = "f0c42cff9292c0a8e6ca702a54aafa04b35758a6"; - sha256 = "050mdciyz1595z81zsss0v9vqsaysppyzqaqpfs5figackifv3iv"; + rev = "a54f259c2adce68e3bd7600be8989bf1ddf9ea3a"; + sha256 = "140w6mj4hm1vf4zsmcr2w5cghcaalbvw5d4m9z57dmq1z5plsl4q"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 0f8f088945a..005a12f5b94 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -33,6 +33,14 @@ stdenv.mkDerivation rec { # so musl can selectively disable as needed hardeningDisable = [ "stackprotector" ]; + # Leave these, be friendlier to debuggers/perf tools + # Don't force them on, but don't force off either + postPatch = '' + substituteInPlace configure \ + --replace -fno-unwind-tables "" \ + --replace -fno-asynchronous-unwind-tables "" + ''; + preConfigure = '' configureFlagsArray+=("--syslibdir=$out/lib") ''; @@ -40,6 +48,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-static" + "--enable-debug" "CFLAGS=-fstack-protector-strong" # Fix cycle between outputs "--disable-wrapper" @@ -48,15 +57,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; dontDisableStatic = true; - dontStrip = true; + separateDebugInfo = true; postInstall = '' # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do. # Apparently glibc provides scsi itself? (cd $dev/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .) - '' + - '' + '' + '' + # Strip debug out of the static library + $STRIP -S $out/lib/libc.a + '' + '' mkdir -p $out/bin # Create 'ldd' symlink, builtin ln -s $out/lib/libc.so $out/bin/ldd diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 8a5171824d0..93e2c097ff7 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -8,11 +8,11 @@ # FIXME: should add an option to choose between hotplug and udev. stdenv.mkDerivation rec { - name = "pcmciautils-017"; + name = "pcmciautils-018"; src = fetchurl { url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/${name}.tar.gz"; - sha256 = "5d8e2efad8a7f692129610603da232f2144851753d8d49a70eeb8eb1be6f6bc3"; + sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; }; buildInputs = [udev yacc sysfsutils kmod flex]; diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 4d45f70a9fd..007cfc96779 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; - version = "4.5.24"; + version = "4.6.2"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "1anxml8i3q90x8n30xfydpmv41cxlwqrg3vr98ayzaak02maxr99"; + sha256 = "0gviv9x4w4i8d26d8vyrr8zk4p5hdx63rxpzqw769cmhvvy8r3g2"; }; buildInputs = [ apacheHttpd python2 ]; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 238cd20d75e..75ba1f6a940 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -3,14 +3,14 @@ let in stdenv.mkDerivation rec { - version = "3.3.3"; + version = "3.3.4"; name = "arangodb-${version}"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0hw6yzxmhmnb7qz30pqjdbgin41w892pbf1xbl2821nsz9b290sd"; + sha256 = "0gfjmva043f9nhqjpa0qy2cdbz84z7b1c2wgcy77i3wnskicy0pc"; }; buildInputs = [ diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 8815ca3e210..c2ec4b9ff17 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.16.0"; + version = "5.16.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "14vf0av63zizz1knjzhj34hxadxwcza2zakhaj6si3kb8zhihmaf"; + sha256 = "0dmcp5s5kjnvdd7sn53sbjawfhiwjs30fr7iwi9h6ssz6188x0jp"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index dc3bc22af49..5fd23476d7d 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.980"; + version = "0.2.0.995"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "1939mmlp9hsmw0hd4c8m8p5fk6igvml30gk9ffi9mfhankas6fnf"; + sha256 = "04sgs292qz65fcg5vsps0fk2669xzvyfw1rbc5sbbk3hig5lhlns"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/aws-auth/default.nix b/pkgs/tools/admin/aws-auth/default.nix deleted file mode 100644 index 9f36a6403a1..00000000000 --- a/pkgs/tools/admin/aws-auth/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, makeWrapper, jq, awscli }: - -stdenv.mkDerivation rec { - version = "unstable-2017-07-24"; - name = "aws-auth-${version}"; - - src = fetchFromGitHub { - owner = "alphagov"; - repo = "aws-auth"; - rev = "5a4c9673f9f00ebaa4bb538827e1c2f277c475e1"; - sha256 = "095j9zqxra8hi2iyz0y4azs9yigy5f6alqkfmv180pm75nbc031g"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontBuild = true; - - # copy script and set $PATH - installPhase = '' - install -D $src/aws-auth.sh $out/bin/aws-auth - wrapProgram $out/bin/aws-auth \ - --prefix PATH : ${stdenv.lib.makeBinPath [ awscli jq ]} - ''; - - meta = { - homepage = https://github.com/alphagov/aws-auth; - description = "AWS authentication wrapper to handle MFA and IAM roles"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ ris ]; - }; -} diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 4af20f76449..691568673df 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -12,14 +12,14 @@ let in stdenv.mkDerivation rec { name = "bareos-${version}"; - version = "15.2.4"; + version = "17.2.5"; src = fetchFromGitHub { owner = "bareos"; repo = "bareos"; rev = "Release/${version}"; name = "${name}-src"; - sha256 = "02k6wmr2n12dc6vwda8xczmbqidg6fs8nfg9n2cwwpm3k1a21qnd"; + sha256 = "1mgh25lhd05m26sq1sj5ir2b4n7560x93ib25cvf9vmmypm1c7pn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 6ac152cb7b8..cbfdd56cca1 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.9"; + version = "2.2.0"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0cvi5kmcrrg5pm774ligyy33fasgsfp3mr6ingjzd99rn4710bqm"; + sha256 = "0yvb9iwwmjxvck2in3ymqszaddz502v2ryk50qs0wskhbhdh96c7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 53b2a3abf28..c7f7369ba88 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; - version = "1.5.9"; + version = "1.5.10"; meta = with stdenv.lib; { isIbusEngine = true; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; - sha256 = "1y8sf837rmp662bv6zakny0xcm7c9c5qda7f9kq9riv9ywpcbw6x"; + sha256 = "0jpqz7pb9brlqiwrbr3i6wvj3b39a9bs9lljl3qa3r77mz8y0cyc"; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index 328c803e7db..ff01c841926 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ibus-table-others-${version}"; - version = "1.3.7"; + version = "1.3.9"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${name}.tar.gz"; - sha256 = "0vmz82il796062jbla5pawsr5dqyhs7ald7xjp84zfccc09dg9kx"; + sha256 = "0270a9njyzb1f8nw5w9ghwxcl3m6f13d8p8a01fjm8rnjs04mcb3"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 8c552799432..04a0a1e36db 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "ibus-table-${version}"; - version = "1.9.16"; + version = "1.9.18"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb"; + sha256 = "0isxgz7f6xhrcv5qrdd6gm3ysmqp3mi5ngnbqz08f7pclllaridp"; }; postPatch = '' diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index bed07bc8448..0a7073f4d48 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -1,19 +1,33 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "lf-unstable-${version}"; - version = "2018-03-19"; + name = "lf-${version}"; + version = "1"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "c76ad181f5753984e39608628ac4def4183b53a4"; # nightly - sha256 = "1wsmljina9n2zij7gzh7b4zbzi7sdsa6hnyaj75nsmqn9lshngap"; + rev = "r${version}"; + sha256 = "0mq83m7mvavd0dzhk8g6ffldy57i22n0846yzqnlz733chiy3anz"; }; goPackagePath = "github.com/gokcehan/lf"; goDeps = ./deps.nix; + # TODO: Setting buildFlags probably isn't working properly. I've tried a few + # variants, e.g.: + # - buildFlags = "-ldflags \"-s -w -X 'main.gVersion=${version}'\""; + # - buildFlags = "-ldflags \\\"-X ${goPackagePath}/main.gVersion=${version}\\\""; + + # Override the build phase (to set buildFlags): + buildPhase = '' + runHook preBuild + runHook renameImports + cd go/src/${goPackagePath} + go install -ldflags="-s -w -X main.gVersion=${version}" + runHook postBuild + ''; + meta = with stdenv.lib; { description = "A terminal file manager written in Go and heavily inspired by ranger"; longDescription = '' diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index d2f988396ca..8d55b2cdc00 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin-client"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "1vdp6qgpxshh6nhdvr81z3nvh42wgmsm4prli4ajigwp970y8p56"; + sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index e9f4c977779..e49614834ae 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin-explorer"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "0rxiimklzqyp9vswznz9aia71dn6jxm2pxx5ljlhzs5rs583cj00"; + sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 5fbc2f40308..fbfcfc10074 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin-protocol"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "1wrlzani3wdjkmxqwjh30i8lg3clrzwcx2di7c9sdpnsbda985gb"; + sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 623f34e8b61..f8910f83ec5 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -3,7 +3,7 @@ let pname = "libbitcoin"; - version = "3.4.0"; + version = "3.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1h6h7cxbwkdk8bzbkfvnrrdzajw1d4lr8wqs66is735bksh6gk1y"; + sha256 = "1qy637hpv6kkhf602yxxi5b9j0qhsp644fazljcqbnxzp7vv2qyd"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock index d85f5a1a752..6506d32b0ce 100644 --- a/pkgs/tools/misc/t/Gemfile.lock +++ b/pkgs/tools/misc/t/Gemfile.lock @@ -1,52 +1,63 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.7) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) buftok (0.2.0) - equalizer (0.0.9) - faraday (0.9.1) - multipart-post (>= 1.2, < 3) - geokit (1.9.0) - multi_json (>= 1.3.2) - htmlentities (4.3.3) - http (0.6.3) + domain_name (0.5.20170404) + unf (>= 0.0.5, < 1.0.0) + equalizer (0.0.11) + geokit (1.11.0) + htmlentities (4.3.4) + http (3.0.0) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (>= 2.0.0.pre.pre2, < 3) http_parser.rb (~> 0.6.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (2.1.0) http_parser.rb (0.6.0) - json (1.8.2) launchy (2.4.3) addressable (~> 2.3) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) - multi_json (1.11.0) multipart-post (2.0.0) - naught (1.0.0) - oauth (0.4.7) - retryable (2.0.1) + naught (1.1.0) + oauth (0.5.4) + public_suffix (3.0.2) + retryable (2.0.4) simple_oauth (0.3.1) - t (2.9.0) - geokit (>= 1.8.3, < 2) + t (3.1.0) + geokit (~> 1.9) htmlentities (~> 4.3) launchy (~> 2.4) - oauth (~> 0.4.7) + oauth (~> 0.5.1) retryable (~> 2.0) thor (>= 0.19.1, < 2) - twitter (~> 5.13) - thor (0.19.1) - thread_safe (0.3.5) - twitter (5.14.0) + twitter (~> 6.0) + thor (0.20.0) + thread_safe (0.3.6) + twitter (6.2.0) addressable (~> 2.3) buftok (~> 0.2.0) - equalizer (~> 0.0.9) - faraday (~> 0.9.0) - http (~> 0.6.0) + equalizer (~> 0.0.11) + http (~> 3.0) + http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) - json (~> 1.8) memoizable (~> 0.4.0) + multipart-post (~> 2.0) naught (~> 1.0) simple_oauth (~> 0.3.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.5) PLATFORMS ruby DEPENDENCIES t + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index ad9e0949ce8..b9c93c63954 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, ruby }: bundlerEnv { - name = "t-2.9.0"; + name = "t-3.1.0"; inherit ruby; gemfile = ./Gemfile; diff --git a/pkgs/tools/misc/t/gemset.nix b/pkgs/tools/misc/t/gemset.nix index 6c721111c67..268cbae5e80 100644 --- a/pkgs/tools/misc/t/gemset.nix +++ b/pkgs/tools/misc/t/gemset.nix @@ -1,185 +1,203 @@ { - "addressable" = { - version = "2.3.7"; + addressable = { + dependencies = ["public_suffix"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; type = "gem"; - sha256 = "1x1401m59snw59c2bxr10jj10z1n4r4jvz8c55d0c3sh2smbl8kh"; }; + version = "2.5.2"; }; - "buftok" = { + buftok = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; + type = "gem"; + }; version = "0.2.0"; + }; + domain_name = { + dependencies = ["unf"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf"; type = "gem"; - sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs"; }; + version = "0.5.20170404"; }; - "equalizer" = { - version = "0.0.9"; + equalizer = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; type = "gem"; - sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr"; }; + version = "0.0.11"; }; - "faraday" = { - version = "0.9.1"; + geokit = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iryy9gcrayd4c2xfxnb0acnmqcz5bv7pp6ilaifwlwl6jnc40dm"; type = "gem"; - sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn"; }; - dependencies = [ - "multipart-post" - ]; + version = "1.11.0"; }; - "geokit" = { - version = "1.9.0"; + htmlentities = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; type = "gem"; - sha256 = "1bpkjz2q8hm7i4mrrp1if51zq6fz3qkqj55qwlb7jh9jlgyvjmqy"; }; - dependencies = [ - "multi_json" - ]; + version = "4.3.4"; }; - "htmlentities" = { - version = "4.3.3"; + http = { + dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mqjjqgdq83rz3nvq69bn0n5x45hnwd4794fmfbi0wrd1n47syfs"; type = "gem"; - sha256 = "0v4m2pn6q2h7iqdkxk9z3j4828harcjgk1h77v9i4x87avv5130p"; }; + version = "3.0.0"; }; - "http" = { - version = "0.6.3"; + http-cookie = { + dependencies = ["domain_name"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; type = "gem"; - sha256 = "0wmj5i1l0f6ajhs8wi1h3sdwhrl00llrpsmh6xs9dwjm2amvdvxv"; }; - dependencies = [ - "http_parser.rb" - ]; + version = "1.0.3"; + }; + http-form_data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j90dydw36h9s09n760aid8asabigqcgi7agsyqh53iz5s3qv9v0"; + type = "gem"; + }; + version = "2.1.0"; }; "http_parser.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; version = "0.6.0"; + }; + launchy = { + dependencies = ["addressable"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; type = "gem"; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; }; + version = "2.4.3"; }; - "json" = { - version = "1.8.2"; + memoizable = { + dependencies = ["thread_safe"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; type = "gem"; - sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5"; }; + version = "0.4.2"; }; - "launchy" = { - version = "2.4.3"; + multipart-post = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; type = "gem"; - sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; }; - dependencies = [ - "addressable" - ]; + version = "2.0.0"; }; - "memoizable" = { - version = "0.4.2"; + naught = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wwjx35zgbc0nplp8a866iafk4zsrbhwwz4pav5gydr2wm26nksg"; type = "gem"; - sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; }; - dependencies = [ - "thread_safe" - ]; + version = "1.1.0"; }; - "multi_json" = { - version = "1.11.0"; + oauth = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; type = "gem"; - sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl"; }; + version = "0.5.4"; }; - "multipart-post" = { - version = "2.0.0"; + public_suffix = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; type = "gem"; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; }; + version = "3.0.2"; }; - "naught" = { - version = "1.0.0"; + retryable = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pxv5xgr08s9gv5npj7h3raxibywznrv2wcrb85ibhlhzgzcxggf"; type = "gem"; - sha256 = "04m6hh63c96kcnzwy5mpl826yn6sm465zz1z87mmsig86gqi1izd"; }; + version = "2.0.4"; }; - "oauth" = { - version = "0.4.7"; + simple_oauth = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l"; type = "gem"; - sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w"; }; + version = "0.3.1"; }; - "retryable" = { - version = "2.0.1"; + t = { + dependencies = ["geokit" "htmlentities" "launchy" "oauth" "retryable" "thor" "twitter"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qj5zqc819yiscqbyb93alxillyli5ajvrr4gzq52clgkvyap7bd"; type = "gem"; - sha256 = "0wg4vh76cmhwzwrgd0k6kbx4dlp4r98l8yizr72lmzph187dg48f"; }; + version = "3.1.0"; }; - "simple_oauth" = { - version = "0.3.1"; + thor = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl"; type = "gem"; - sha256 = "0dw9ii6m7wckml100xhjc6vxpjcry174lbi9jz5v7ibjr3i94y8l"; }; + version = "0.20.0"; }; - "t" = { - version = "2.9.0"; + thread_safe = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; type = "gem"; - sha256 = "0qdsyblnnan2wcvql2mzg10jaj3gfv5pbfac54b1y7qkr56dc4dv"; }; - dependencies = [ - "geokit" - "htmlentities" - "launchy" - "oauth" - "retryable" - "thor" - "twitter" - ]; + version = "0.3.6"; }; - "thor" = { - version = "0.19.1"; + twitter = { + dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fjyz3viabz3xs5d9aad18zgdbhfwm51jsnzigc8kxk77p1x58n5"; type = "gem"; - sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; }; + version = "6.2.0"; }; - "thread_safe" = { - version = "0.3.5"; + unf = { + dependencies = ["unf_ext"]; source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; type = "gem"; - sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr"; }; + version = "0.1.4"; }; - "twitter" = { - version = "5.14.0"; + unf_ext = { source = { + remotes = ["https://rubygems.org"]; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; type = "gem"; - sha256 = "0vx7x3fmwgk3axqyw9hyf6yh99kx3ssdy14w2686hz7c4v3qwlc5"; }; - dependencies = [ - "addressable" - "buftok" - "equalizer" - "faraday" - "http" - "http_parser.rb" - "json" - "memoizable" - "naught" - "simple_oauth" - ]; + version = "0.0.7.5"; }; } \ No newline at end of file diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index e008c9183c9..1b306bc5e36 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,26 +1,30 @@ -{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}: +{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, wrapGAppsHook}: + +let + pname = "gupnp-tools"; + version = "0.8.13"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; -stdenv.mkDerivation rec { - name = "gupnp-tools-${version}"; - majorVersion = "0.8"; - version = "${majorVersion}.13"; src = fetchurl { - url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av - gnome2.gnome_icon_theme makeWrapper]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gnome3.defaultIconTheme ]; - postInstall = '' - for program in gupnp-av-cp gupnp-universal-cp; do - wrapProgram "$out/bin/$program" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share:${gnome2.gnome_icon_theme}/share:$out/share" - done - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Set of utilities and demos to work with UPnP"; + homepage = https://wiki.gnome.org/Projects/GUPnP; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index a451750503a..9809b330fab 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "minissdpd-${version}"; - version = "1.5.20180203"; + version = "1.5.20180223"; src = fetchurl { - sha256 = "1yiri887s8wxh4zrjc5dw19gyypqg63962aimcgd19blvpbwnfcv"; + sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv"; url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 1e020079430..a9e67701eb0 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180203"; + name = "miniupnpd-2.0.20180222"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1djb0w76yd5jyqm5mzmxlxikxzzwqzjgy75h8saxc3rlz3r1a346"; + sha256 = "1hdpyvz1z6crpa7as3srmbl64fx0k4wjra57jw7qaysdsb1b2kqr"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 064364e37ac..e9af9dc980e 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, udev, libgudev, polkit, dbus-glib, ppp, gettext, pkgconfig -, libmbim, libqmi, systemd }: +, libmbim, libqmi, systemd, fetchpatch }: stdenv.mkDerivation rec { - name = "ModemManager-${version}"; + name = "modem-manager-${version}"; + pname = "ModemManager"; version = "1.7.990"; src = fetchurl { - url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; + url = "http://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; sha256 = "1v4hixmghlrw7w4ajq2x4k62js0594h223d0yma365zwqr7hjrfl"; }; @@ -14,6 +15,14 @@ stdenv.mkDerivation rec { buildInputs = [ udev libgudev polkit dbus-glib ppp libmbim libqmi systemd ]; + patches = [ + # Patch dependency on glib headers, this breaks packages using core headers (networkmanager-qt) + (fetchpatch { + url = "https://cgit.freedesktop.org/ModemManager/ModemManager/patch/?id=0f377f943eeb81472fd73189f2c3d8fc65b8c609"; + sha256 = "0av0sqdvbhwjnhqqylkc7rmqcj6awqmz5693l9x93nlwp7zya95j"; + }) + ]; + configureFlags = [ "--with-polkit" "--with-udev-base-dir=$(out)/lib/udev" @@ -30,7 +39,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system + # rename to modem-manager to be in style + mv $out/$out/etc/systemd/system/ModemManager.service $out/etc/systemd/system/modem-manager.service rm -rf $out/$out/etc mv $out/$out/* $out DIR=$out/$out @@ -40,7 +50,7 @@ stdenv.mkDerivation rec { # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. - ln -s $out/etc/systemd/system/ModemManager.service \ + ln -s $out/etc/systemd/system/modem-manager.service \ $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service ''; diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix deleted file mode 100644 index 6844ca53456..00000000000 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig -, libsecret, withGnome ? true, gnome3 }: - -let - pname = "NetworkManager-pptp"; - version = "1.2.4"; -in stdenv.mkDerivation rec { - name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e"; - }; - - buildInputs = [ networkmanager pptp ppp libsecret ] - ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring - gnome3.networkmanagerapplet ]; - - nativeBuildInputs = [ intltool pkgconfig ]; - - postPatch = '' - sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-pptp-service.c - - substituteInPlace ./src/nm-pptp-service.c \ - --replace /sbin/pptp ${pptp}/bin/pptp \ - --replace /sbin/pppd ${ppp}/bin/pppd - ''; - - configureFlags = - if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "networkmanager-pptp"; - }; - }; - - meta = { - description = "PPtP plugin for NetworkManager"; - inherit (networkmanager.meta) maintainers platforms; - }; -} diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix new file mode 100644 index 00000000000..5caad0874f7 --- /dev/null +++ b/pkgs/tools/networking/wrk2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, luajit, openssl, zlib }: + +stdenv.mkDerivation rec { + name = "wrk2-${version}"; + version = "4.0.0-${builtins.substring 0 7 src.rev}"; + + src = fetchFromGitHub { + owner = "giltene"; + repo = "wrk2"; + rev = "e0109df5b9de09251adb5f5848f223fbee2aa9f5"; + sha256 = "1aqdwmgdd74wq73f1zp28yqj91gd6p6nf9nbdfibl7mlklbzvak8"; + }; + + buildInputs = [ luajit openssl zlib ]; + + patchPhase = '' + rm -rf deps/luajit && mkdir deps/luajit + + substituteInPlace ./Makefile \ + --replace '-lluajit' '-lluajit-5.1' \ + --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' \ + --replace 'cd $(LDIR) && ./luajit' '${luajit}/bin/luajit' \ + --replace 'config.h Makefile $(LDIR)/libluajit.a' 'config.h Makefile' + + substituteInPlace ./src/script.c \ + --replace 'struct luaL_reg ' 'struct luaL_Reg ' + ''; + + configurePhase = ":"; + installPhase = '' + mkdir -p $out/bin + mv ./wrk $out/bin/wrk2 + ''; + + meta = { + description = "Constant throughput, correct latency recording variant of wrk"; + homepage = https://github.com/giltene/wrk2; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index cbbb9b4dd3c..e0a11f57418 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.2"; + version = "2.6.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "0jymp44dmc22cdrsd5hfyv9wc8a5sq92yh9p9c0rg22g53733910"; + sha256 = "17xfs0jr0rf8xvk860l2wpxg0h1m2c1dq41lqnq6wga9jifxmzqd"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix new file mode 100644 index 00000000000..10efe0e7f21 --- /dev/null +++ b/pkgs/tools/security/neopg/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchgit +, cmake +, sqlite +, botan2 +, boost164 +, curl +, gettext +, pkgconfig +, libusb +, gnutls }: + +stdenv.mkDerivation rec { + name = "neopg"; + version = "0.0.4"; + + # no fetchFromGitHub, as repo contains submodules + src = fetchgit { + url = "https://github.com/das-labor/neopg.git"; + rev = "refs/tags/v${version}"; + sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; + + doCheck = true; + checkTarget = "test"; + + postInstall = '' + mkdir -p $out/bin + cp src/neopg $out/bin/neopg + ''; + + meta = with stdenv.lib; { + homepage = https://neopg.io/; + description = "Modern replacement for GnuPG 2"; + license = licenses.gpl3; + longDescription = '' + NeoPG starts as an opiniated fork of GnuPG 2 to clean up the code and make it easier to develop. + It is written in C++11. + ''; + maintainers = with maintainers; [ erictapen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index fa5df06dae3..75e25bcc673 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "logrotate-${version}"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "0b7dnch74pddml3ysavizq26jgwdv0rjmwc8lf6zfvn9fjz19vvs"; + sha256 = "1wdjqbly97y1i11nl6cmlfpld3yqak270ixf29wixjgrjn8p4xzh"; }; # Logrotate wants to access the 'mail' program; to be done. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 48bad91d2fe..729bc91c774 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -149,7 +149,6 @@ mapAliases (rec { networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 - networkmanager_pptp = networkmanager-pptp; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 nmap_graphical = nmap-graphical; # added 2017-01-19 nfsUtils = nfs-utils; # added 2014-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8e4f521772..281076aecd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -573,8 +573,6 @@ with pkgs; awless = callPackage ../tools/virtualization/awless { }; - aws-auth = callPackage ../tools/admin/aws-auth { }; - ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -3685,7 +3683,7 @@ with pkgs; mmake = callPackage ../tools/misc/mmake { }; - modemmanager = callPackage ../tools/networking/modemmanager {}; + modemmanager = callPackage ../tools/networking/modem-manager {}; modsecurity_standalone = callPackage ../tools/security/modsecurity { }; @@ -3812,6 +3810,8 @@ with pkgs; ndisc6 = callPackage ../tools/networking/ndisc6 { }; + neopg = callPackage ../tools/security/neopg { }; + netboot = callPackage ../tools/networking/netboot {}; netcat = netcat-openbsd; @@ -3839,8 +3839,6 @@ with pkgs; networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; - networkmanager-pptp = callPackage ../tools/networking/network-manager/pptp.nix { }; - networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; networkmanager-vpnc = callPackage ../tools/networking/network-manager/vpnc.nix { }; @@ -5568,6 +5566,8 @@ with pkgs; wrk = callPackage ../tools/networking/wrk { }; + wrk2 = callPackage ../tools/networking/wrk2 { }; + wuzz = callPackage ../tools/networking/wuzz { }; wv = callPackage ../tools/misc/wv { }; @@ -6430,6 +6430,8 @@ with pkgs; oraclejdk9 = pkgs.oraclejdk9distro "JDK" false; + oraclejdk10 = pkgs.oraclejdk10distro "JDK" false; + oraclejre = lowPrio (pkgs.jdkdistro false false); oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); @@ -6438,8 +6440,12 @@ with pkgs; oraclejre9 = lowPrio (pkgs.oraclejdk9distro "JRE" false); + oraclejre10 = lowPrio (pkgs.oraclejdk10distro "JRE" false); + oracleserverjre9 = lowPrio (pkgs.oraclejdk9distro "ServerJRE" false); + oracleserverjre10 = lowPrio (pkgs.oraclejdk10distro "ServerJRE" false); + jrePlugin = jre8Plugin; jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); @@ -6458,6 +6464,10 @@ with pkgs; (if pluginSupport then appendToName "with-plugin" else x: x) (callPackage ../development/compilers/oraclejdk/jdk9-linux.nix { inherit packageType pluginSupport; }); + oraclejdk10distro = packageType: pluginSupport: + (if pluginSupport then appendToName "with-plugin" else x: x) + (callPackage ../development/compilers/oraclejdk/jdk10-linux.nix { inherit packageType pluginSupport; }); + jikes = callPackage ../development/compilers/jikes { }; julia_04 = callPackage ../development/compilers/julia { @@ -8132,7 +8142,7 @@ with pkgs; shards = callPackage ../development/tools/build-managers/shards { }; - shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck; + shellcheck = haskellPackages.ShellCheck; schemaspy = callPackage ../development/tools/database/schemaspy { }; @@ -8232,6 +8242,8 @@ with pkgs; inherit (gnu) mig; }; + jhiccup = callPackage ../development/tools/java/jhiccup { }; + valgrind = callPackage ../development/tools/analysis/valgrind { inherit (darwin) xnu bootstrap_cmds cctools; llvm = llvm_39; @@ -10892,6 +10904,7 @@ with pkgs; polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { }; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; }; + poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { lcms = lcms2; }; poppler_gi = lowPrio (poppler.override { introspectionSupport = true; @@ -15902,10 +15915,7 @@ with pkgs; grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; - gtkpod = callPackage ../applications/audio/gtkpod { - gnome = gnome3; - inherit (gnome2) libglade; - }; + gtkpod = callPackage ../applications/audio/gtkpod { }; jbidwatcher = callPackage ../applications/misc/jbidwatcher { java = if stdenv.isLinux then jre else jdk; @@ -16280,7 +16290,7 @@ with pkgs; akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole - kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle; + kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okteta okular spectacle; kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; @@ -16429,6 +16439,7 @@ with pkgs; inherit (gnome3) defaultIconTheme; zip = zip.override { enableNLS = false; }; bluez5 = bluez5_28; + poppler = poppler_0_61; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc @@ -16914,7 +16925,7 @@ with pkgs; mypaint = callPackage ../applications/graphics/mypaint { }; - mythtv = callPackage ../applications/video/mythtv { }; + mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; @@ -19778,8 +19789,8 @@ with pkgs; inherit (callPackage ./coq-packages.nix {}) mkCoqPackages - coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 - coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 + coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 + coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 419fc485dd0..43d6d8d2dd5 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -71,10 +71,14 @@ in rec { coq_8_7 = callPackage ../applications/science/logic/coq { version = "8.7.2"; }; + coq_8_8 = callPackage ../applications/science/logic/coq { + version = "8.8+beta1"; + }; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; coqPackages_8_7 = mkCoqPackages coq_8_7; + coqPackages_8_8 = mkCoqPackages coq_8_8; coqPackages = coqPackages_8_7; coq = coqPackages.coq; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0beece2982..a769fa7a76d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4184,6 +4184,10 @@ in { }; }; + face_recognition = callPackage ../development/python-modules/face_recognition { }; + + face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; + faker = callPackage ../development/python-modules/faker { }; fake_factory = buildPythonPackage rec { |