diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml
index dcf4d17fa57d..1acea6a7547a 100644
--- a/doc/languages-frameworks/java.xml
+++ b/doc/languages-frameworks/java.xml
@@ -15,13 +15,17 @@ stdenv.mkDerivation {
buildPhase = "ant";
}
- Note that jdk is an alias for the OpenJDK.
-
+ Note that jdk is an alias for the OpenJDK (self-built
+ where available, or pre-built via Zulu).
+ Platforms with OpenJDK not (yet) in Nixpkgs (Aarch32,
+ Aarch64) point to the (unfree)
+ oraclejdk.
+
JAR files that are intended to be used by other packages should be installed
- in $out/share/java. The OpenJDK has a stdenv setup hook
- that adds any JARs in the share/java directories of the
+ in $out/share/java. JDKs have a stdenv setup hook
+ that add any JARs in the share/java directories of the
build inputs to the CLASSPATH environment variable. For
instance, if the package libfoo installs a JAR named
foo.jar in its share/java
@@ -57,7 +61,18 @@ installPhase =
${jre}/bin/java instead of
${jdk}/bin/java, you prevent your package from depending
on the JDK at runtime.
-
+
+
+
+ Note all JDKs passthru home, so if your application
+ requires environment variables like JAVA_HOME being set, that
+ can be done in a generic fashion with the --set argument
+ of makeWrapper:
+
+
+ --set JAVA_HOME ${jdk.home}
+
+
It is possible to use a different Java compiler than javac
diff --git a/lib/licenses.nix b/lib/licenses.nix
index a5f1fc0f0f21..c442d74c857c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -654,6 +654,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "wxWindows Library Licence, Version 3.1";
};
+ xfig = {
+ fullName = "xfig";
+ url = "http://mcj.sourceforge.net/authors.html#xfig";
+ };
+
zlib = spdx {
spdxId = "Zlib";
fullName = "zlib License";
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c5d68eea4c16..7f15d80a778c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1590,6 +1590,11 @@
github = "havvy";
name = "Ryan Scheel";
};
+ hax404 = {
+ email = "hax404foogit@hax404.de";
+ github = "hax404";
+ name = "Georg Haas";
+ };
hbunke = {
email = "bunke.hendrik@gmail.com";
github = "hbunke";
@@ -1935,6 +1940,11 @@
github = "jonafato";
name = "Jon Banafato";
};
+ jonathanreeve = {
+ email = "jon.reeve@gmail.com";
+ github = "JonathanReeve";
+ name = "Jonathan Reeve";
+ };
joncojonathan = {
email = "joncojonathan@gmail.com";
github = "joncojonathan";
diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix
index 88c3f99aed4e..69577bbe0181 100644
--- a/nixos/modules/services/hardware/thermald.nix
+++ b/nixos/modules/services/hardware/thermald.nix
@@ -6,16 +6,30 @@ let
cfg = config.services.thermald;
in {
###### interface
- options = {
- services.thermald = {
+ options = {
+ services.thermald = {
enable = mkOption {
default = false;
description = ''
Whether to enable thermald, the temperature management daemon.
- '';
- };
- };
- };
+ '';
+ };
+
+ debug = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable debug logging.
+ '';
+ };
+
+ configFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ description = "the thermald manual configuration file.";
+ };
+ };
+ };
###### implementation
config = mkIf cfg.enable {
@@ -24,7 +38,15 @@ in {
systemd.services.thermald = {
description = "Thermal Daemon Service";
wantedBy = [ "multi-user.target" ];
- script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable";
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.thermald}/sbin/thermald \
+ --no-daemon \
+ ${optionalString cfg.debug "--loglevel=debug"} \
+ ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
+ --dbus-enable
+ '';
+ };
};
};
}
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 5ca879bf2664..c0eb882c58f3 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -88,7 +88,7 @@ in
};
maxJobs = mkOption {
- type = types.int;
+ type = types.either types.int (types.enum ["auto"]);
default = 1;
example = 64;
description = ''
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index e004e8c847cb..18673a2186cc 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -3,12 +3,12 @@
}:
stdenv.mkDerivation rec {
- version = "0.9.14";
+ version = "0.9.15";
name = "drumgizmo-${version}";
src = fetchurl {
url = "https://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
- sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4";
+ sha256 = "13bgqyw74pq3ss63zd9bjmgr4dah792pcphyqmr7bnvrgfjr6bx6";
};
configureFlags = [ "--enable-lv2" ];
diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index fc01a543e285..fb4454269d78 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 = "4.0.17";
+ version = "4.0.18";
pname = "fldigi";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.gz";
- sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q";
+ sha256 = "0a3z9xj9gsa6fskiai9410kwqfb6156km59y36a31mhyddzk27p7";
};
buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index cc613541a256..84be6b866fae 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "ir.lv2-${version}";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "tomszilagyi";
repo = "ir.lv2";
rev = "${version}";
- sha256 = "16vy06qb0vgwg4yx15grzh5m2q3cbzm3jd0p37g2qb8rgvjhladg";
+ sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6";
};
buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
mkdir "$out/include"
mkdir -p "$out/share/doc"
- make PREFIX="$out" install
+ make PREFIX="$out" INSTDIR="$out/lib/lv2" install
install -Dm755 convert4chan "$out/bin/convert4chan"
'';
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index a5c38a477415..28381fcfee62 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "musescore-${version}";
- version = "2.3.1";
+ version = "2.3.2";
src = fetchFromGitHub {
owner = "musescore";
repo = "MuseScore";
rev = "v${version}";
- sha256 = "00inrw9g8g34g74bhg5gp0rr5nydhjraiyn7vpl7kaqi5yzmhawd";
+ sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1";
};
cmakeFlags = [
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 6431a50ddd9a..37677cc211cc 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
- version = "0.5.1";
+ version = "0.5.2";
name = "qmidinet-${version}";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
- sha256 = "1cvz8y63vdqfpxh7lq5qadqjcyhahbyq0py0qz6xrmpk5sxvy7ml";
+ sha256 = "0y2w3rymvc35r291sp2qaxn36wjwvxzk2iaw9y30q9fqc0vlpdns";
};
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index cb581bc83033..7c57b884c8eb 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,12 +3,12 @@
, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
- version = "20180803";
+ version = "20180812";
name = "x42-plugins-${version}";
src = fetchurl {
url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz";
- sha256 = "1v7p6vnkcbzyvmcysabhmn603cndzx9mwzaw5dppy4wd687vhgis";
+ sha256 = "0gzwzxpa2k2w9c6j3pspwi9slfyd57wb192d6yqcg92pfmnxy9dz";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 54373ef50dd6..2ae7d421bba1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9";
};
latestVersion = { # canary & dev
- version = "3.3.0.4"; # "Android Studio 3.3 Canary 5"
- build = "182.4928781";
- sha256Hash = "110gh5ylgf1p8z0rdnvc6clkq3v721v6pjvll66a8v4zgz9ay8b4";
+ version = "3.3.0.5"; # "Android Studio 3.3 Canary 6"
+ build = "182.4954005";
+ sha256Hash = "0b8ias75f3p5nrmgp7iqz4n4r4dbwhgagqmyc1fqfd36wbglyaf4";
};
in rec {
# Old alias
diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix
index 29c0b665aa35..36259593463d 100644
--- a/pkgs/applications/editors/ghostwriter/default.nix
+++ b/pkgs/applications/editors/ghostwriter/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "ghostwriter";
- version = "1.7.2";
+ version = "1.7.3";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "wereturtle";
repo = pname;
rev = "v${version}";
- sha256 = "1zhzibn4g79i98mjfqspf3iac2biz3r18jf29g0izq5snn7xj0fc";
+ sha256 = "1xkxd59rw2dn6xphgcl06zzmfgs1zna2w0pxrk0f49ywffvkvs72";
};
nativeBuildInputs = [ qmake pkgconfig ];
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index a0a14e89860b..6690e4c9c1b9 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv
+{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv
, libuv, luaPackages, ncurses, pkgconfig
, unibilium, xsel, gperf
, libvterm-neovim
@@ -25,7 +25,7 @@ let
buildInputs = [
libtermkey
libuv
- libmsgpack
+ msgpack
ncurses
libvterm-neovim
unibilium
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 48f7b29f407f..d17d5c1e85df 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper
-, libmsgpack, neovim, pythonPackages, qtbase }:
+, msgpack, neovim, pythonPackages, qtbase }:
stdenv.mkDerivation rec {
name = "neovim-qt-${version}";
@@ -13,12 +13,11 @@ stdenv.mkDerivation rec {
};
cmakeFlags = [
- "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include"
- "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so"
+ "-DUSE_SYSTEM_MSGPACK=1"
];
buildInputs = with pythonPackages; [
- neovim qtbase libmsgpack
+ neovim qtbase msgpack
] ++ (with pythonPackages; [
jinja2 msgpack python
]);
@@ -28,13 +27,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preConfigure = ''
- # avoid cmake trying to download libmsgpack
- echo "" > third-party/CMakeLists.txt
# we rip out a number of tests that fail in the build env
# the GUI tests will never work but the others should - they did before neovim 0.2.0
# was released
sed -i test/CMakeLists.txt \
-e '/^add_xtest_gui/d' \
+ -e '/tst_neovimobject/d' \
-e '/tst_neovimconnector/d' \
-e '/tst_callallmethods/d' \
-e '/tst_encoding/d'
@@ -42,7 +40,14 @@ stdenv.mkDerivation rec {
doCheck = true;
- postInstall = ''
+ postInstall = if stdenv.isDarwin then ''
+ mkdir -p $out/Applications
+ mv $out/bin/nvim-qt.app $out/Applications
+ rmdir $out/bin || :
+
+ wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \
+ --prefix PATH : "${neovim}/bin"
+ '' else ''
wrapProgram "$out/bin/nvim-qt" \
--prefix PATH : "${neovim}/bin"
'';
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index abbffeb91807..efe728f68494 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -4,16 +4,16 @@
stdenv.mkDerivation rec {
name = "okteta-${version}";
- version = "17.12.3";
+ version = "0.25.2";
src = fetchurl {
- url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz";
- sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
+ url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
+ sha256 = "00mw8gdqvn6vn6ir6kqnp7xi3lpn6iyp4f5aknxwq6mdcxgjmh1p";
};
-
+
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
buildInputs = [ shared-mime-info ];
-
+
propagatedBuildInputs = [
kconfig
kinit
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
karchive
kcrash
];
-
+
meta = with stdenv.lib; {
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg bkchr ];
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 52733f267550..a775fb3bd79a 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchurl, unzip, atomEnv, makeDesktopItem,
- gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
+ gtk2, wrapGAppsHook, libXScrnSaver, libxkbfile, libsecret }:
let
- version = "1.26.0";
+ version = "1.26.1";
channel = "stable";
plat = {
@@ -12,9 +12,9 @@ let
}.${stdenv.system};
sha256 = {
- "i686-linux" = "fd150bee8e1be4f5461013b8fee19f855200d046643e4ea5387aad170ad5f12b";
- "x86_64-linux" = "618ca429e23777ef6b512c0cbd78bc711a7cf6f58752d9f805ced1dc62abb8f0";
- "x86_64-darwin" = "07c2d678596e4e1f0bdf35b7d72a6d46851bf169d89f134fa73ff4f9007efbc3";
+ "i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n";
+ "x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy";
+ "x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl";
}.${stdenv.system};
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
@@ -49,8 +49,8 @@ in
};
buildInputs = if stdenv.system == "x86_64-darwin"
- then [ unzip makeWrapper libXScrnSaver libsecret ]
- else [ makeWrapper libXScrnSaver libxkbfile libsecret ];
+ then [ unzip libXScrnSaver libsecret ]
+ else [ wrapGAppsHook libXScrnSaver libxkbfile libsecret ];
installPhase =
if stdenv.system == "x86_64-darwin" then ''
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 521f957ec1e9..e0aea87c90c3 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "avocode-${version}";
- version = "3.2.0";
+ version = "3.4.0";
src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
- sha256 = "111kcjqm8j2v941m2ly4ahhxalylnsvy5zmclj1f490japz2h1xy";
+ sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl";
};
libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix
new file mode 100644
index 000000000000..1e54152fff4d
--- /dev/null
+++ b/pkgs/applications/graphics/fig2dev/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, ghostscript, libpng } :
+
+let
+ version = "3.2.7a";
+
+in stdenv.mkDerivation {
+ name = "fig2dev-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz";
+ sha256 = "0a7vkfl38fvkhg3na5gr9c4fskas9wbs84y9djg85nzwbshik8mx";
+ };
+
+ buildInputs = [ libpng ];
+
+ GSEXE="${ghostscript}/bin/gs";
+
+ meta = with stdenv.lib; {
+ description = "Tool to convert Xfig files to other formats";
+ homepage = http://mcj.sourceforge.net/;
+ license = licenses.xfig;
+ platforms = platforms.linux;
+ };
+}
+
diff --git a/pkgs/applications/graphics/xfig/builder.sh b/pkgs/applications/graphics/xfig/builder.sh
deleted file mode 100644
index 9d95eca01226..000000000000
--- a/pkgs/applications/graphics/xfig/builder.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-source $stdenv/setup
-
-makeFlags="XAWLIB=-lXaw3d BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults LIBDIR=$out/lib/X11 XFIGDOCDIR=$out/share/doc/xfig MANPATH=$out/man"
-
-# We need chmod +wx on dirs, not just chmod +w
-dontMakeSourcesWritable=1
-postUnpack() {
- find . -type d -exec chmod +x '{}' \;
-}
-
-preBuild() {
- echo "#define XAW3D" >> Imakefile.tmp
- echo "#define XAW3D1_5E" >> Imakefile.tmp
- cat Imakefile >> Imakefile.tmp
- mv Imakefile.tmp Imakefile
- xmkmf
-
- sed -e 's@[$][$]m@-- &@g' -i Makefile
-}
-
-installPhase() {
- make install.all $makeFlags
-
- wrapProgram $out/bin/xfig \
- --set XAPPLRESDIR $out/etc/X11/app-defaults
-}
-
-genericBuild
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 545675ab1545..429af12b9bb3 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -1,47 +1,42 @@
-{ stdenv, fetchurl, makeWrapper, imake
-, xlibsWrapper, libXpm, libXmu, libXi, libXp, Xaw3d, libpng, libjpeg}:
+{ stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm
+, libXmu, libXi, libXp, Xaw3d, fig2dev
+}:
-let version = "3.2.5b"; in
-stdenv.mkDerivation {
+let
+ version = "3.2.7a";
+
+in stdenv.mkDerivation {
name = "xfig-${version}";
src = fetchurl {
- url = "mirror://sourceforge/mcj/xfig.${version}.full.tar.gz";
- sha256 = "1hl5x49sgc0vap411whhcq6qhvh4xbjg7jggv7ih9pplg5nwy0aw";
+ url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
+ sha256 = "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa";
};
- builder = ./builder.sh;
+ postPatch = ''
+ sed -i 's:"fig2dev":"${fig2dev}/bin/fig2dev":' src/main.c
+ '';
- buildInputs = [xlibsWrapper libXpm libXmu libXi libXp Xaw3d libpng libjpeg];
+ postInstall = ''
+ mkdir -p $out/share/X11/app-defaults
+ cp app-defaults/* $out/share/X11/app-defaults
- nativeBuildInputs = [ imake makeWrapper ];
+ wrapProgram $out/bin/xfig \
+ --set XAPPLRESDIR $out/share/X11/app-defaults
+ '';
- hardeningDisable = [ "format" ];
+ enableParallelBuilding = true;
- NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11";
+ nativeBuildInputs = [ makeWrapper ];
- patches =
- let
- debPrefix = "http://patch-tracker.debian.org/patch/series/dl/xfig/1:3.2.5.b-3";
- in
- [
- (fetchurl {
- url = "${debPrefix}/35_CVE-2010-4262.patch";
- sha256 = "1pj669sz49wzjvvm96gwbnani7wqi0ijh21imqdzqw47qxdv7zp5";
- })
- (fetchurl {
- url = "${debPrefix}/13_remove_extra_libs.patch";
- sha256 = "1qb14ay0c8xrjzhi21jl7sl8mdzxardldzpnflkzml774bbpn8av";
- })
- (fetchurl {
- url = "${debPrefix}/36_libpng15.patch";
- sha256 = "0jd5bqj7sj9bbnxg2d0y6zmv4ka4qif2x4zc84ngdqga5433anvn";
- })
- ];
+ buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d ];
- meta = {
+ meta = with stdenv.lib; {
description = "An interactive drawing tool for X11";
- homepage = http://xfig.org;
- platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
+ longDescription = ''
+ Note that you need to have the netpbm tools
+ in your path to export bitmaps.
+ '';
+ inherit (fig2dev.meta) license homepage platforms;
};
}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index d839a7141e3b..f995abf28361 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -77,6 +77,7 @@ let
calendarsupport = callPackage ./calendarsupport.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
+ dragon = callPackage ./dragon.nix {};
eventviews = callPackage ./eventviews.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix
new file mode 100644
index 000000000000..9dd55ec4b9c1
--- /dev/null
+++ b/pkgs/applications/kde/dragon.nix
@@ -0,0 +1,25 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, kdoctools,
+ baloo, baloo-widgets, kactivities, kbookmarks, kcmutils,
+ kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
+ kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
+ kparts, ktexteditor, kwindowsystem, phonon, solid, phonon-backend-gstreamer
+}:
+
+mkDerivation {
+ name = "dragon";
+ meta = {
+ license = with lib.licenses; [ gpl2 fdl12 ];
+ description = "A simple media player for KDE";
+ maintainers = [ lib.maintainers.jonathanreeve ];
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
+ kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
+ kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
+ phonon solid phonon-backend-gstreamer
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 8c57ebead6ae..8a26631d5c0d 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "chirp-daily-${version}";
- version = "20180707";
+ version = "20180815";
src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
- sha256 = "09siq74k0ss65ssck7i7h515dxp7fhdz5klc3y0yp9wajn706ic3";
+ sha256 = "0z3jh9sbszs8x0xjmkgxa3b1xnw3w9b13pml4i5apx3mj171npyv";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index b4b98909447e..b12b84d106dc 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -7,7 +7,7 @@
let
inherit (pythonPackages) python buildPythonApplication;
in buildPythonApplication rec {
- version = "4.2.8";
+ version = "5.0.0";
name = "gramps-${version}";
nativeBuildInputs = [ wrapGAppsHook ];
@@ -20,7 +20,7 @@ in buildPythonApplication rec {
owner = "gramps-project";
repo = "gramps";
rev = "v${version}";
- sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd";
+ sha256 = "056l4ihmd3gdsiv6wwv4ckgh8bfzd5nii6z4afsdn2nmjbj4hw9m";
};
pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ];
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 6ed956a1c1ba..8293e0434cdf 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hugo-${version}";
- version = "0.46";
+ version = "0.47";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "0w5xkb6s03hprb4v151gdk8zzsgvy0i406363j1w03bic8ajwgmj";
+ sha256 = "1h62ix285mx977mgawyanyvsqqic1xx0gmi1r5wn43w9yc29wr0z";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 64f252d27fd5..061a6612ee7e 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -14,8 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
- rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
- sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
+ rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
+ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
@@ -149,8 +149,8 @@
fetch = {
type = "git";
url = "https://github.com/gobwas/glob";
- rev = "f00a7392b43971b2fdb562418faab1f18da2067a";
- sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29";
+ rev = "f756513aec94125582ee6c0dc94179251ef87370";
+ sha256 = "1pyzlvb950864syf2safazv39s7rpi08r7x2vby82kj9ykqgvhc4";
};
}
{
@@ -158,8 +158,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
- rev = "5ed622c449da6d44c3c8329331ff47a9e5844f71";
- sha256 = "1yhcwraijdk6lx7f6m9p6i1b3zfh2hq80l1nfpnckfn10gh72aw7";
+ rev = "3ff3320c2a1756a3691521efc290b4701575147c";
+ sha256 = "1b0kpix2qxv3qiiq739nk9fjh453if0mcpr9gmlizicdpjp5alw2";
};
}
{
@@ -284,8 +284,8 @@
fetch = {
type = "git";
url = "https://github.com/nicksnyder/go-i18n";
- rev = "461e8b98df7454b4cb46a1611a6734f05ee331d0";
- sha256 = "0aq1q06y6azsi6mfmary5xs7gmmg8fh8lhx1wbpdlqk11asm9rq0";
+ rev = "04f547cc50da4c144c5fdfd4495aef143637a236";
+ sha256 = "1h4ndn822k7i04h9k5dxm6c29mhhhqhl63vzpmz2l1k0zpj7xyd1";
};
}
{
@@ -311,8 +311,8 @@
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
- rev = "11635eb403ff09dbc3a6b5a007ab5ab09151c229";
- sha256 = "14j8ibm6h9rydiwfp9b5c7rwhnx04yqyxv1a7p7rmfwyg4zd714n";
+ rev = "46c73eb196baff5bb07288f245b223bd1a30fba6";
+ sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj";
};
}
{
@@ -365,8 +365,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/jwalterweatherman";
- rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
- sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
+ rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2";
+ sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17";
};
}
{
@@ -383,8 +383,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "3ebe029320b2676d667ae88da602a5f854788a8a";
- sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
+ rev = "947b89bd1b7dabfed991ac30e1a56f5193f0c88b";
+ sha256 = "0n4h5cb07n96fcw9k8dwnj6yisf2x357lsiwjmrq6xr1vkzdlk8c";
};
}
{
@@ -392,8 +392,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
- rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793";
- sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh";
+ rev = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9";
+ sha256 = "177ziws6mwxdlvicmgpv7w7zy5ri2wgnw2f2v3789b5skv9d6a6b";
};
}
{
@@ -401,8 +401,8 @@
fetch = {
type = "git";
url = "https://github.com/tdewolff/minify";
- rev = "cf3a1790b606e292e4a0ee82e949a4f0d1c7617d";
- sha256 = "1r496149l5iqzxkfcbll5dqcqxy4a7jjxvzm62c8hrybmwj574kn";
+ rev = "948b6490cf3cacab5f4d7474104c3d21bf6eda46";
+ sha256 = "1js5l0405kbic53qgim0lj3crw7cc2a2sbga35h9qcnm8l3cx22f";
};
}
{
@@ -410,8 +410,8 @@
fetch = {
type = "git";
url = "https://github.com/tdewolff/parse";
- rev = "4ceb50b40fad068875f5b093c5df0619012dc544";
- sha256 = "1ap76hdiabn41r7zxc7nq3n3ld7zqf97jaf71zlzzjrphi3fwrg1";
+ rev = "dd9676af8dd934a61082c5b3038e79626847fa32";
+ sha256 = "1hp9qh8knx3q57aw5qavsf7ia3mxm8ka0bk6kjkqkqq8k9jq97qk";
};
}
{
@@ -446,8 +446,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "f4c29de78a2a91c00474a2e689954305c350adf9";
- sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x";
+ rev = "aaf60122140d3fcf75376d319f0554393160eb50";
+ sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv";
};
}
{
@@ -464,8 +464,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "3dc4335d56c789b04b0ba99b7a37249d9b614314";
- sha256 = "1105b7jqzz8g2bfkdbkj2pdzq4vhfmhm42khir88vjqfd1l7ha31";
+ rev = "1c9583448a9c3aa0f9a6a5241bf73c0bd8aafded";
+ sha256 = "0g0nc549pmdmvja4mdqh0kgvznnw6wliqmx5wrnj02l3a23vizmi";
};
}
{
@@ -473,8 +473,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "96e34ec0e18a62a1e59880c7bf617b655efecb66";
- sha256 = "1n1p5zz0vyvlhac40hxml6c5xwpsw8rjx1pbls9381a0s19ncbdg";
+ rev = "6e3c4e7365ddcc329f090f96e4348398f6310088";
+ sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4";
};
}
{
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 6dc448c6bf48..70915ca87073 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -6,13 +6,13 @@
let
pname = "krusader";
- version = "2.7.0";
+ version = "2.7.1";
in mkDerivation rec {
name = "krusader-${version}";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
- sha256 = "09ws3samxnjk0qi9pcfm2rmw0nr5mzn9pzpljgrdb5qj7cmm4hcb";
+ sha256 = "1svxj1qygyr3a4dkx0nh2d6r4q7pfj00brzghl94mf4q0rz4vhfm";
};
meta = with lib; {
diff --git a/pkgs/applications/misc/qsstv/default.nix b/pkgs/applications/misc/qsstv/default.nix
new file mode 100644
index 000000000000..c8401cdbf49e
--- /dev/null
+++ b/pkgs/applications/misc/qsstv/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchurl, qtbase, qmake, makeDesktopItem, openjpeg, pkgconfig, fftw,
+ libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }:
+
+stdenv.mkDerivation rec {
+ version = "9.2.6";
+ name = "qsstv-${version}";
+
+ src = fetchurl {
+ url = "http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz";
+ sha256 = "0sx70yk389fq5djvjwnam6ics5knmg9b5x608bk2sjbfxkila108";
+ };
+
+ enableParallelBuilding = true;
+
+ nativeBuildInputs = [
+ qmake
+ pkgconfig
+ ];
+
+ buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l
+ fftwFloat ];
+
+ desktopItem = makeDesktopItem {
+ name = "QSSTV";
+ exec = "qsstv";
+ icon = "qsstv.png";
+ comment = "Qt-based slow-scan TV and fax";
+ desktopName = "QSSTV";
+ genericName = "qsstv";
+ categories = "Application;HamRadio;";
+ };
+
+ installPhase = ''
+ # Install binary to the right location
+ make install INSTALL_ROOT=$out
+ mv $out/usr/bin $out/
+ rm -r $out/usr
+
+ # Install desktop icon
+ install -D qsstv/icons/qsstv.png $out/share/pixmaps/qsstv.png
+
+ # Install desktop item
+ cp -rv ${desktopItem}/share $out
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Qt-based slow-scan TV and fax";
+ homepage = http://users.telenet.be/on4qz/;
+ platforms = platforms.linux;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = with stdenv.lib.maintainers; [ hax404 ];
+ };
+}
+
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 7f2f4387da54..89b6a7ce3121 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57";
- sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv";
- version = "68.0.3440.68";
+ sha256 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw";
+ sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s";
+ version = "69.0.3497.32";
};
dev = {
- sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv";
- sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx";
- version = "69.0.3497.12";
+ sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c";
+ sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm";
+ version = "70.0.3521.2";
};
stable = {
- sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw";
- sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij";
- version = "68.0.3440.75";
+ sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh";
+ sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj";
+ version = "68.0.3440.106";
};
}
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 9123477bb3ed..5c66c5a5298b 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
{ callPackage, stdenv }:
let
- stableVersion = "2.1.7";
+ stableVersion = "2.1.9";
# Currently there is no preview version.
previewVersion = stableVersion;
addVersion = args:
@@ -10,8 +10,8 @@ let
in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
- guiSrcHash = "10zf429zjzf7v4y9r7mmkp42kh5ppmqinhvwqzb7jmsrpv2cnxj6";
- serverSrcHash = "056swz6ygqdi37asah51v1yy0ky8q0p32vf7dxs697hd7nv78aqj";
+ guiSrcHash = "0gpif6f7zqz2n8q3pkr8xv3fdc904hq69661w8f1fna360xvksd7";
+ serverSrcHash = "1y19jzyyz0sjjxkrpgr6z10irb47v7d8khdvk5nzmgnjfxv875yx";
in {
guiStable = mkGui {
stable = true;
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 24050314c413..7717862f6a0a 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -4,6 +4,16 @@
let
pythonPackages = python3Packages;
+ async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout
+ (oldAttrs:
+ rec {
+ pname = "async-timeout";
+ version = "2.0.1";
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
+ };
+ }));
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
(oldAttrs:
rec {
@@ -13,6 +23,9 @@ let
inherit pname version;
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
};
+ propagatedBuildInputs = [ async-timeout ]
+ ++ (with pythonPackages; [ attrs chardet multidict yarl ])
+ ++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl;
}));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs:
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 2e2489870ed1..983646fbad53 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
stdenv.mkDerivation rec {
name = "quaternion-${version}";
@@ -11,10 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib";
};
- buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
+ buildInputs = [ qtbase qtquickcontrols ];
nativeBuildInputs = [ cmake ];
+ patches = [
+ # https://github.com/QMatrixClient/Quaternion/pull/400
+ (fetchpatch {
+ url = "https://github.com/QMatrixClient/Quaternion/commit/6cb29834efc343dc2bcf1db62cfad2dc4c121c54.patch";
+ sha256 = "0n7mgzzrvx9sa657rfb99i0mjh1k0sn5br344mknqy3wgqdr7s3x";
+ })
+ ];
+
# libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet
# https://github.com/QMatrixClient/Quaternion/issues/239
postPatch = ''
@@ -22,7 +30,11 @@ stdenv.mkDerivation rec {
ln -s ${libqmatrixclient.src} lib
'';
- postInstall = ''
+ postInstall = if stdenv.isDarwin then ''
+ mkdir -p $out/Applications
+ mv $out/bin/quaternion.app $out/Applications
+ rmdir $out/bin || :
+ '' else ''
substituteInPlace $out/share/applications/quaternion.desktop \
--replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
'';
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index f858bb38dd19..168719bf0e4c 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -20,7 +20,7 @@
, speex
, boost
, opendht
-, libmsgpack
+, msgpack
, gnutls
, zlib
, jsoncpp
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
speex
boost
opendht
- libmsgpack
+ msgpack
gnutls
zlib
jsoncpp
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 37ce34f09df8..322ad020c9ad 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
- version = "0.15.7";
+ version = "0.16.0";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "09sa2qcmns4b9by3hzmyppc6fi3845vppkal2ylrf2vi9yczb2ch";
+ sha256 = "1nl0ih5flhp57k96hv6nl5pzrm3r9piqmwzirz9nz8k9803mqp5m";
};
installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 5899ca92eb0c..9fe03b274cff 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, dpkg, makeWrapper
+{ stdenv, fetchurl, dpkg
, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3
-, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
+, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }:
let
@@ -68,7 +68,12 @@ in stdenv.mkDerivation {
inherit src;
- buildInputs = [ dpkg makeWrapper ];
+ nativeBuildInputs = [
+ wrapGAppsHook
+ glib # For setup hook populating GSETTINGS_SCHEMA_PATH
+ ];
+
+ buildInputs = [ dpkg ];
unpackPhase = "true";
installPhase = ''
@@ -78,6 +83,8 @@ in stdenv.mkDerivation {
rm -rf $out/opt $out/usr
rm $out/bin/skypeforlinux
+ ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
+
# Otherwise it looks "suspicious"
chmod -R g-w $out
'';
@@ -88,8 +95,6 @@ in stdenv.mkDerivation {
patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
done
- ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
-
# Fix the desktop link
substituteInPlace $out/share/applications/skypeforlinux.desktop \
--replace /usr/bin/ $out/bin/ \
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 6df0817070c2..b0bc5edba844 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, pkgconfig
+{ stdenv, fetchFromGitHub, qmake, pkgconfig, makeWrapper
, qtbase, qttools, qtwebkit, sqlite
}:
@@ -13,9 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa";
};
- nativeBuildInputs = [ qmake pkgconfig ];
+ nativeBuildInputs = [ qmake pkgconfig makeWrapper ];
buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
+ postFixup = ''
+ wrapProgram $out/bin/quiterss \
+ --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}"
+ '';
+
meta = with stdenv.lib; {
description = "A Qt-based RSS/Atom news feed reader";
longDescription = ''
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 9bb266665a63..c142661fd033 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "owncloud-client-${version}";
- version = "2.4.2";
+ version = "2.4.3";
src = fetchurl {
url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
- sha256 = "0pxga45fi7iyayy278hgl8x099isz6d7x1jq57p2m9qlsvfx8ap5";
+ sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk";
};
patches = [ ./find-sql.patch ];
diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index 01672aa71a80..d1d3bf880cc5 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "6.7.0";
+ version = "6.7.1";
name = "frostwire-${version}";
src = fetchurl {
url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
- sha256 = "1qvk4w2ly2nz3ibsd6qdxaqb3g1a3l9f5a15b5zpzhsziln1fbxf";
+ sha256 = "1crhiksgky65wvb4fvqablsvixj04hbaacz23mskwrc63n4jaz0p";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 599e569d3eb6..b69906f8eb79 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
, debugSupport ? false # Debugging
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05";
};
+ patches = [
+ (fetchpatch {
+ name = "fix-desktop-file-regression.patch";
+ url = "https://github.com/qbittorrent/qBittorrent/commit/078325a3eb85c286b9a3454192ed2deadeda604c.patch";
+ sha256 = "1xhpd4ncy2m9zxsllizkry2013ij0ii9p8b8jbb35sazw5p50c96";
+ })
+ ];
+
# NOTE: 2018-05-31: CMake is working but it is not officially supported
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 46de1d532dd4..0db18e77bfa6 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.12";
+ version = "2.6.0";
src = fetchurl {
url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
sha256 = {
- "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7";
- "i686-linux" = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh";
+ "x86_64-linux" = "0041axi9carspkfaxvyirfvsa29zz55al01x90nh93nzxvpvywsz";
+ "i686-linux" = "1ar36lp4f6a1z9i82g3gpak4q4ny09faqxdd59q1pvfzq25ypdhs";
}.${stdenv.system};
};
diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix
index 7b804151d4a7..fdc6c58213a1 100644
--- a/pkgs/applications/office/jameica/default.nix
+++ b/pkgs/applications/office/jameica/default.nix
@@ -11,11 +11,6 @@ let
else if stdenv.system == "x86_64-darwin" then "macos64"
else throw "Unsupported system: ${stdenv.system}";
- launcher = ''
- #!${stdenv.shell}
- exec ${jre}/bin/java -Xmx512m ${ stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''} de.willuhn.jameica.Main "$@"
- '';
-
desktopItem = makeDesktopItem {
name = "jameica";
exec = "jameica";
@@ -56,24 +51,24 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
- mkdir -p $out/libexec $out/lib $out/bin $out/share/applications
+ mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,${name},java}/
# copy libraries except SWT
- cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/lib/
+ cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/${name}/
# copy platform-specific SWT
- cp lib/swt/${swtSystem}/swt.jar $out/lib
+ cp lib/swt/${swtSystem}/swt.jar $out/share/${name}/
- install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/libexec/
- install -Dm644 plugin.xml $out/libexec/
+ install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/
+ install -Dm644 plugin.xml $out/share/java/
install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
cp ${desktopItem}/share/applications/* $out/share/applications/
- echo "${launcher}" > $out/bin/jameica
- chmod +x $out/bin/jameica
- wrapProgram $out/bin/jameica --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \
- --set CLASSPATH "$out/libexec/jameica.jar:$out/lib/*" \
- --run "cd $out/libexec"
- # jameica expects its working dir set to the "program directory"
+ makeWrapper ${jre}/bin/java $out/bin/jameica \
+ --add-flags "-cp $out/share/java/jameica.jar:$out/share/${name}/* ${
+ stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread''
+ } de.willuhn.jameica.Main" \
+ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \
+ --run "cd $out/share/java/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 24d6246e90cd..cb7b2fbff3cb 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
name = "stellarium-${version}";
- version = "0.18.1";
+ version = "0.18.2";
src = fetchFromGitHub {
owner = "Stellarium";
repo = "stellarium";
rev = "v${version}";
- sha256 = "0srwi08azzzayf50dr4dr1zcdcc8hwribzv7xvb7hbp6xp51c813";
+ sha256 = "17764i52dmipaz62k5n23fyx07d7cjir0dgav0s5b6sjd8gbjwbf";
};
nativeBuildInputs = [ cmake perl ];
diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix
index 2df8b188f785..89e38104feb5 100644
--- a/pkgs/applications/science/biology/igv/default.nix
+++ b/pkgs/applications/science/biology/igv/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "igv-${version}";
- version = "2.4.13";
+ version = "2.4.14";
src = fetchurl {
url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip";
- sha256 = "0cl6fs1v9rqkzjq4syx0m1pr71hbhvidwa3ym57pvz8ardfs3qa1";
+ sha256 = "0z9hk01czkdgi55b0qdvvi43jsqkkx6gl7wglamv425c6rklcvhc";
};
buildInputs = [ unzip jre ];
diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix
new file mode 100644
index 000000000000..1527f5d3ddad
--- /dev/null
+++ b/pkgs/applications/science/biology/strelka/default.nix
@@ -0,0 +1,37 @@
+{stdenv, fetchFromGitHub, cmake, zlib, python2}:
+
+stdenv.mkDerivation rec {
+ name = "strelka-${version}";
+ version = "2.9.5";
+
+ src = fetchFromGitHub {
+ owner = "Illumina";
+ repo = "strelka";
+ rev = "v${version}";
+ sha256 = "0x4a6nkx1jnyag9svghsdjz1fz6q7qx5pn77wphdfnk81f9yspf8";
+ };
+
+ buildInputs = [ cmake zlib python2 ];
+
+ preConfigure = ''
+ sed -i 's|/usr/bin/env python|${python2}/bin/python|' src/python/lib/makeRunScript.py
+ patchShebangs .
+ '';
+
+ postFixup = ''
+ pushd $out/lib/python/pyflow
+ sed -i 's|/bin/bash|${stdenv.shell}|' pyflowTaskWrapper.py
+ rm pyflowTaskWrapper.pyc
+ echo "import pyflowTaskWrapper" | python2
+ popd
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Germline and small variant caller";
+ license = licenses.gpl3;
+ homepage = https://github.com/Illumina/strelka;
+ maintainers = with maintainers; [ jbedo ];
+ platforms = [ "x86_64-linux" ];
+ };
+
+}
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index 1472b4b2af9e..76a19d410ef8 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -1,17 +1,19 @@
{ stdenv, fetchurl, which, gfortran, libGLU, xorg } :
stdenv.mkDerivation rec {
- version = "5.7";
+ version = "5.8.2";
name = "molden-${version}";
src = fetchurl {
url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
- sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s";
+ sha256 = "1lhjx8fa8xynnlk5g6ipvchhfnz6j5lgqxlsifx82pbbnbm6mps4";
};
nativeBuildInputs = [ which ];
buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ];
+ patches = [ ./dont_register_file_types.patch ];
+
postPatch = ''
substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \
--replace '-I/usr/X11R6/include' "" \
diff --git a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
new file mode 100644
index 000000000000..75ce593ed29a
--- /dev/null
+++ b/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
@@ -0,0 +1,29 @@
+diff --git a/makefile b/makefile
+index 58a9e74..64615b6 100644
+--- a/makefile
++++ b/makefile
+@@ -32,8 +32,6 @@ os :=
+ ifeq ($(uname), Linux)
+ os := $(shell head -n 1 /etc/issue | cut -d" " -f1)
+ ifeq ($(os), Ubuntu)
+- EXTEN = exten
+- EXTENZ = exten2
+ LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm
+ endif
+ ifeq ($(os), Debian)
+@@ -278,7 +276,7 @@ LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
+ #
+ #LIBSG = -L/usr/X11R6/lib -Wl,-framework -Wl,GLUT -Wl,-framework -Wl,OpenGL -Wl,-framework -Wl,Cocoa -lGLU -lGL -lXmu -lX11 -lm
+
+-all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf $(EXTEN)
++all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf
+ xwin.o: xwin.c rots.h
+ xwingl.o: xwin.c rots.h
+
+@@ -344,5 +342,5 @@ exten:
+ exten2:
+ ./register_extension.sh /usr/local/bin
+
+-install: $(EXTENZ)
++install:
+ sudo install -t /usr/local/bin -m 755 molden gmolden ambfor/ambfor ambfor/ambmd surf/surf
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index 0ff8aa94c88f..e79e21707d4f 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -3,7 +3,7 @@
}:
let
- version = "8.1";
+ version = "8.2";
fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
- sha256 = "0rxwvcp22364nnhwhqlr38w4rwv1yl60snxi2f8nqdflx1143n10";
+ sha256 = "0z74q17lzyga44m5pbsr1hmq12ly96y44pcz7glfvc4vbaq3jd8p";
};
nativeBuildInputs = [ perl procps fftw.dev ];
diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index e7dd04377be7..7b482d82e2fa 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeDesktopItem
, python3, python3Packages
-, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }:
+, glew, freeglut, libpng, libxml2, tk, freetype, msgpack }:
with stdenv.lib;
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication {
sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s";
};
- buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ];
+ buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype msgpack ];
NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
installPhase = ''
diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 78c981ded56f..c0048740193f 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gtkwave-${version}";
- version = "3.3.92";
+ version = "3.3.93";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
- sha256 = "08916gv5vl7dgvlsq098mxljbciby9miyh8jqwn1q8sfdhzvmxak";
+ sha256 = "0a92zlwvshp75k7cv11rc4ab11fzsy0a5qfvxkh0bjvrq1k946ys";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index e4db75c8ad7a..1ea60272c338 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "git-extras-${version}";
- version = "4.5.0";
+ version = "4.6.0";
src = fetchurl {
url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
- sha256 = "059680bvblbhrlkybg1yisr5zq62pir1rnaxz5izhfsw2ng9s2fb";
+ sha256 = "1jp5wi2h4jqbrjv0iqa45s0f9h3n5k1dxs89jkhg5n5k9jjs7fp3";
};
dontBuild = true;
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 6c739b32c5fb..882ee3047f0b 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
name = "containerd-${version}";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
- sha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria";
+ sha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v";
};
hardeningDisable = [ "fortify" ];
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 244e00ec70ac..6d657472e66f 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
description = "Linux development manual pages";
homepage = https://www.kernel.org/doc/man-pages/;
repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
+ license = licenses.gpl2Plus;
platforms = with platforms; unix;
priority = 30; # if a package comes with its own man page, prefer it
};
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 0a086453244a..5d633ccb7ce9 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -86,14 +86,14 @@ rec {
maintainers = with maintainers; [ mathnerd314 ];
};
};
- noto-fonts-emoji = let version = "2017-09-13-design-refresh"; in stdenv.mkDerivation {
+ noto-fonts-emoji = let version = "2018-04-24-pistol-update"; in stdenv.mkDerivation {
name = "noto-fonts-emoji-${version}";
src = fetchFromGitHub {
owner = "googlei18n";
repo = "noto-emoji";
rev = "v${version}";
- sha256 = "1ixz03207kzh6jhmw8bpi77pxkfzq46dk26sr41m5kkvc14d14vl";
+ sha256 = "1f9k182j0619xvwk60gw2hng3lcd483sva2fabjdhznk8yf9f7jg";
};
buildInputs = [ cairo ];
diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix
new file mode 100644
index 000000000000..4bf28782a8a5
--- /dev/null
+++ b/pkgs/data/fonts/vegur/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, rpmextract, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+ version = "0.701";
+ name = "vegur-font-${version}";
+
+ # Upstream doesn't version their URLs.
+ # http://dotcolon.net/font/vegur/ → http://dotcolon.net/DL/font/vegur.zip
+ src = fetchurl {
+ url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm";
+ sha256 = "0ra3fds3b352rpzn0015km539c3l2ik2lqd5x6fr65ss9fg2xn34";
+ };
+
+ nativeBuildInputs = [ rpmextract unzip ];
+
+ unpackPhase = ''
+ rpmextract $src
+ unzip vegur.zip
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/fonts/Vegur
+ cp *.otf $out/share/fonts/Vegur
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://dotcolon.net/font/vegur/;
+ description = "A humanist sans serif font.";
+ platforms = platforms.all;
+ maintainers = [ maintainers.samueldr ];
+ license = licenses.cc0;
+ };
+}
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 631597263482..fce8f44bd3ff 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
- url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ed2029405786768b4c0f8bdbbd7aee8193394eb9.tar.gz";
- sha256 = "0s6cbz7ylflpnqhxlpch48zb0l6xcp5501dj1qzvzldvwh46r8dc";
+ url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz";
+ sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk";
}
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 5daf4c296012..dd8162382023 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
- version = "1.20.7";
+ version = "1.21.0";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
- sha256 = "1zkn5ix81xck3n84dxvkjh4alwc6zj8x989d0zqi5c6ppijvgadh";
+ sha256 = "0jxfrcz2aq1synxzd6sh9nhxz7fg9qgz0idr8zj6gaiplmwbwrby";
};
nativeBuildInputs = [ pkgconfig ];
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
libinput utillinux fribidi SDL2 ];
+ # as of 1.21.0 compilation will fail due to -Werror=format-security
+ hardeningDisable = [ "format" ];
+
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
configureFlags = [
"--enable-sdl"
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 24eff547fe98..6c810eb46342 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gdm-${version}";
- version = "3.28.2";
+ version = "3.28.3";
src = fetchurl {
url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
- sha256 = "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0";
+ sha256 = "12d1cp2dyca8rwh9y9cg8xn6grdp8nmxkkqwg4xpkr8i8ml65n88";
};
# Only needed to make it build
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index bdf5ac29ca61..44d07231d2eb 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "mate-themes-${version}";
- version = "3.22.17";
+ version = "3.22.18";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz";
- sha256 = "1bf1swyrr5dkfsp1ihc0svr5nnwv22zxjwgmf6zhxl638ng9f41h";
+ sha256 = "0538bw8qismp16ymxbjk0ww7yjw1ch5v3f3d4vib3770xvgmmcfm";
};
nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 3dc6c4197bbe..63b31c60d986 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "closure-compiler-${version}";
- version = "20180716";
+ version = "20180805";
src = fetchurl {
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
- sha256 = "06yc85pbcw1v36j12qwxkk0pbhziglp3zjkv3xza2v68zvyqy6hd";
+ sha256 = "1jis9ykbbynq6pa8sl1jy8888l2bk9g4xsiiiab51zn62shqnq26";
};
sourceRoot = ".";
diff --git a/pkgs/development/compilers/mono/5.14.nix b/pkgs/development/compilers/mono/5.14.nix
new file mode 100644
index 000000000000..dcf587a5fa41
--- /dev/null
+++ b/pkgs/development/compilers/mono/5.14.nix
@@ -0,0 +1,8 @@
+{ callPackage, Foundation, libobjc }:
+
+callPackage ./generic-cmake.nix (rec {
+ inherit Foundation libobjc;
+ version = "5.14.0.177";
+ sha256 = "164l30fkvfgs1rh663h7dnm1yp7425bi9x2lh2y6zml8h4pgmxfl";
+ enableParallelBuilding = false;
+})
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 20e228a43657..61c2da2b4195 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1073,16 +1073,15 @@ self: super: {
# cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
# Lets remove this once the LTS has upraded to 0.29.6.
- hpack = super.hpack_0_29_6;
+ hpack = super.hpack_0_29_7;
- cabal2nix =
- # The test suite does not know how to find the 'cabal2nix' binary.
- overrideCabal super.cabal2nix (drv: {
- preCheck = ''
- export PATH="$PWD/dist/build/cabal2nix:$PATH"
- export HOME="$TMPDIR/home"
- '';
- });
+ # The test suite does not know how to find the 'cabal2nix' binary.
+ cabal2nix = overrideCabal super.cabal2nix (drv: {
+ preCheck = ''
+ export PATH="$PWD/dist/build/cabal2nix:$PATH"
+ export HOME="$TMPDIR/home"
+ '';
+ });
# Break out of "aeson <1.3, temporary <1.3".
stack = doJailbreak super.stack;
@@ -1122,4 +1121,10 @@ self: super: {
# https://github.com/MarcWeber/hasktags/issues/52
hasktags = dontCheck super.hasktags;
+
+ # https://github.com/haskell/hoopl/issues/50
+ hoopl = dontCheck super.hoopl;
+
+ # https://github.com/snapframework/xmlhtml/pull/37
+ xmlhtml = doJailbreak super.xmlhtml;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
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 23dde9093324..49c3623d5d6b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -46,4 +46,14 @@ self: super: {
xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; });
hinotify_0_3_9 = dontCheck (doJailbreak super.hinotify_0_3_9); # allow async 2.2.x
+ # Reduction stack overflow; size = 38
+ # https://github.com/jystic/hadoop-tools/issues/31
+ hadoop-rpc =
+ let patch = pkgs.fetchpatch
+ { url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch;
+ sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp";
+ stripLen = 1;
+ };
+ in appendPatch super.hadoop-rpc patch;
+
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4ab28169cf7e..6057538125ab 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
default-package-overrides:
# Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
- base-compat-batteries ==0.10.1
- # LTS Haskell 12.5
+ # LTS Haskell 12.6
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -219,7 +219,7 @@ default-package-overrides:
- auto ==0.4.3.1
- autoexporter ==1.1.10
- auto-update ==0.1.4
- - avro ==0.3.3.1
+ - avro ==0.3.4.2
- avwx ==0.3.0.2
- backprop ==0.2.5.0
- bank-holidays-england ==0.1.0.7
@@ -244,7 +244,7 @@ default-package-overrides:
- bench ==1.0.11
- bencode ==0.6.0.0
- between ==0.11.0.0
- - bhoogle ==0.1.3.2
+ - bhoogle ==0.1.3.4
- bibtex ==0.1.0.6
- bifunctors ==5.5.3
- bimap ==0.3.3
@@ -351,7 +351,7 @@ default-package-overrides:
- cast ==0.1.0.2
- category ==0.2.0.1
- cborg ==0.2.0.0
- - cereal ==0.5.5.0
+ - cereal ==0.5.7.0
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
- cereal-time ==0.1.0.0
@@ -364,7 +364,7 @@ default-package-overrides:
- chart-unit ==0.7.0.0
- chaselev-deque ==0.5.0.5
- ChasingBottoms ==1.3.1.4
- - chatwork ==0.1.3.4
+ - chatwork ==0.1.3.5
- cheapskate ==0.1.1
- cheapskate-highlight ==0.1.0.0
- cheapskate-lucid ==0.1.0.0
@@ -586,7 +586,7 @@ default-package-overrides:
- diagrams-rasterific ==1.4.1
- diagrams-solve ==0.1.1
- diagrams-svg ==1.4.2
- - di-core ==1.0.2
+ - di-core ==1.0.3
- dictionary-sharing ==0.1.0.0
- di-df1 ==1.0.2
- Diff ==0.3.4
@@ -787,7 +787,7 @@ default-package-overrides:
- generic-aeson ==0.2.0.9
- generic-arbitrary ==0.1.0
- generic-deriving ==1.12.2
- - generic-lens ==1.0.0.1
+ - generic-lens ==1.0.0.2
- GenericPretty ==1.2.2
- generic-random ==1.2.0.0
- generics-eot ==0.4
@@ -944,7 +944,7 @@ default-package-overrides:
- hebrew-time ==0.1.1
- hedgehog ==0.6
- hedgehog-corpus ==0.1.0
- - hedis ==0.10.2
+ - hedis ==0.10.3
- here ==1.2.13
- heredoc ==0.2.0.0
- heterocephalus ==1.0.5.2
@@ -954,7 +954,7 @@ default-package-overrides:
- hexpat ==0.20.13
- hexstring ==0.11.1
- hfsevents ==0.1.6
- - hidapi ==0.1.4
+ - hidapi ==0.1.5
- hidden-char ==0.1.0.2
- hierarchical-clustering ==0.4.6
- hierarchy ==1.0.2
@@ -1064,7 +1064,7 @@ default-package-overrides:
- hunit-dejafu ==1.2.0.6
- hvect ==0.4.0.0
- hvega ==0.1.0.3
- - hw-balancedparens ==0.2.0.1
+ - hw-balancedparens ==0.2.0.2
- hw-bits ==0.7.0.2
- hw-conduit ==0.2.0.3
- hw-diagnostics ==0.0.0.5
@@ -1098,7 +1098,7 @@ default-package-overrides:
- hybrid-vectors ==0.2.2
- hyperloglog ==0.4.2
- hyphenation ==0.7.1
- - hyraxAbif ==0.2.3.5
+ - hyraxAbif ==0.2.3.9
- iconv ==0.4.1.3
- identicon ==0.2.2
- ieee754 ==0.8.0
@@ -1676,7 +1676,7 @@ default-package-overrides:
- quicklz ==1.5.0.11
- rainbow ==0.30.0.2
- rainbox ==0.20.0.0
- - rakuten ==0.1.1.4
+ - rakuten ==0.1.1.5
- ramus ==0.1.2
- random ==1.1
- random-bytestring ==0.1.3.1
@@ -1729,7 +1729,7 @@ default-package-overrides:
- relational-query-HDBC ==0.7.1.1
- relational-record ==0.2.2.0
- relational-schemas ==0.1.6.2
- - relude ==0.1.0
+ - relude ==0.1.1
- renderable ==0.2.0.1
- repa ==3.4.1.3
- repline ==0.1.7.0
@@ -1775,9 +1775,9 @@ default-package-overrides:
- sandi ==0.4.2
- sandman ==0.2.0.1
- say ==0.1.0.0
- - sbp ==2.3.16
- - SCalendar ==1.1.0
+ - sbp ==2.3.17
- scalendar ==1.2.0
+ - SCalendar ==1.1.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
@@ -1942,7 +1942,7 @@ default-package-overrides:
- store ==0.5.0
- store-core ==0.4.4
- Strafunski-StrategyLib ==5.0.1.0
- - stratosphere ==0.24.3
+ - stratosphere ==0.24.4
- streaming ==0.2.1.0
- streaming-attoparsec ==1.0.0
- streaming-bytestring ==0.1.6
@@ -2033,7 +2033,7 @@ default-package-overrides:
- texmath ==0.11.0.1
- text ==1.2.3.0
- text-binary ==0.2.1.1
- - text-builder ==0.5.1.1
+ - text-builder ==0.5.3
- text-conversions ==0.3.0
- text-icu ==0.7.0.1
- text-latin1 ==0.3.1
@@ -2093,7 +2093,7 @@ default-package-overrides:
- tmapchan ==0.0.3
- tmapmvar ==0.0.4
- tmp-postgres ==0.1.1.1
- - tomland ==0.3
+ - tomland ==0.3.1
- tostring ==0.2.1.1
- transaction ==0.1.1.3
- transformers-base ==0.4.5.2
@@ -2207,7 +2207,7 @@ default-package-overrides:
- verbosity ==0.2.3.0
- versions ==3.4.0.1
- ViennaRNAParser ==1.3.3
- - viewprof ==0.0.0.21
+ - viewprof ==0.0.0.22
- vinyl ==0.8.1.1
- vivid ==0.3.0.2
- vivid-osc ==0.3.0.0
@@ -2344,7 +2344,7 @@ default-package-overrides:
- yesod-static ==1.6.0
- yesod-test ==1.6.5
- yesod-text-markdown ==0.1.10
- - yesod-websockets ==0.3.0
+ - yesod-websockets ==0.3.0.1
- yes-precure5-command ==5.5.3
- yi-language ==0.17.1
- yi-rope ==0.11
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 21660cfb7d2d..df117d1a5545 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5782,6 +5782,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "Frames-beam" = callPackage
+ ({ mkDerivation, base, beam-core, beam-migrate, beam-postgres
+ , bytestring, conduit, Frames, generics-sop, hspec, hspec-core
+ , monad-control, postgresql-simple, process, QuickCheck, scientific
+ , template-haskell, text, time, uuid-types, vinyl
+ }:
+ mkDerivation {
+ pname = "Frames-beam";
+ version = "0.1.0.1";
+ sha256 = "12n3pyr88ihgkfwynhvjx3m9fr1fbznpkgx9ihf7mqar9d8wnywj";
+ libraryHaskellDepends = [
+ base beam-core beam-migrate beam-postgres bytestring conduit Frames
+ generics-sop monad-control postgresql-simple process scientific
+ template-haskell text time uuid-types vinyl
+ ];
+ testHaskellDepends = [
+ base beam-core beam-migrate beam-postgres bytestring conduit Frames
+ generics-sop hspec hspec-core QuickCheck text vinyl
+ ];
+ description = "A library for accessing Postgres tables as in-memory data structures";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"Frank" = callPackage
({ mkDerivation, base, mtl, newtype, she, void }:
mkDerivation {
@@ -9898,6 +9921,8 @@ self: {
pname = "HsYAML";
version = "0.1.1.2";
sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx";
+ revision = "1";
+ editedCabalFile = "1hnp2sqjvn524040m0dzvzyrr8kp4i49gdyrzwym66j71xi6ynkl";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -10559,14 +10584,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "JuicyPixels_3_3" = callPackage
+ "JuicyPixels_3_3_1" = callPackage
({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
, primitive, transformers, vector, zlib
}:
mkDerivation {
pname = "JuicyPixels";
- version = "3.3";
- sha256 = "1v2xfqi65qcw31021fjpdbaixp2ijq4kmixy5zzkykwc6ap53ln4";
+ version = "3.3.1";
+ sha256 = "0k60hc156pj7dj9qqcwi1v3vibfsszccll96fbmn4hrkcqgn1aza";
libraryHaskellDepends = [
base binary bytestring containers deepseq mtl primitive
transformers vector zlib
@@ -12161,6 +12186,8 @@ self: {
pname = "MissingH";
version = "1.4.0.1";
sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8";
+ revision = "1";
+ editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989";
libraryHaskellDepends = [
array base containers directory filepath hslogger HUnit mtl network
old-locale old-time parsec process random regex-compat time unix
@@ -13653,6 +13680,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libGL;};
+ "OpenGLRaw_3_3_1_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, fixed, half, libGL
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "OpenGLRaw";
+ version = "3.3.1.0";
+ sha256 = "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb";
+ libraryHaskellDepends = [
+ base bytestring containers fixed half text transformers
+ ];
+ librarySystemDepends = [ libGL ];
+ 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 {
@@ -14471,6 +14515,8 @@ self: {
pname = "PortMidi";
version = "0.2.0.0";
sha256 = "1jb722gwgx1fdyv64nj3by22970l3r04ibc3fa3hnp3k4l2jvk0f";
+ revision = "1";
+ editedCabalFile = "0h3gql271mdz3kh0jgimxv8ada34b0h4n8wnyf5i759fqxpf6w86";
libraryHaskellDepends = [ base ];
librarySystemDepends = [ alsaLib ];
description = "A binding for PortMedia/PortMidi";
@@ -14717,12 +14763,12 @@ self: {
"PyF" = callPackage
({ mkDerivation, base, containers, formatting, haskell-src-meta
- , hspec, megaparsec, process, template-haskell, text
+ , hspec, megaparsec, process, python3, template-haskell, text
}:
mkDerivation {
pname = "PyF";
- version = "0.6.1.0";
- sha256 = "1m24wk5i0xn8qfh446nlis7h81p5wgy09hskslrmx3z4brqqpy7y";
+ version = "0.6.1.1";
+ sha256 = "0pska6y3hvzlhlxjdvjr4lixmjq5yczf7ydqf0488hjdlc4hirll";
libraryHaskellDepends = [
base containers formatting haskell-src-meta megaparsec
template-haskell text
@@ -14730,10 +14776,11 @@ self: {
testHaskellDepends = [
base formatting hspec process template-haskell text
];
+ testToolDepends = [ python3 ];
description = "Quasiquotations for a python like interpolated string formater";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
+ }) {inherit (pkgs) python3;};
"QIO" = callPackage
({ mkDerivation, base, containers, mtl, old-time, random }:
@@ -15002,18 +15049,16 @@ self: {
}) {};
"RFC1751" = callPackage
- ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck
- , test-framework, test-framework-hunit, test-framework-quickcheck2
+ ({ mkDerivation, base, bytestring, cereal, hspec, QuickCheck
, vector
}:
mkDerivation {
pname = "RFC1751";
- version = "0.3.1.0";
- sha256 = "1j1p94yp4aaw3shzizfih05fdixbpvpl4r3l78s4av7740q8r7yi";
- libraryHaskellDepends = [ base binary bytestring vector ];
+ version = "1.0.0";
+ sha256 = "1lj97jyw0pxq8rn0xg15x2xqm3vwqx4fy3qz8aimf193vgw2amah";
+ libraryHaskellDepends = [ base bytestring cereal vector ];
testHaskellDepends = [
- base binary bytestring HUnit QuickCheck test-framework
- test-framework-hunit test-framework-quickcheck2 vector
+ base bytestring cereal hspec QuickCheck vector
];
description = "RFC-1751 library for Haskell";
license = stdenv.lib.licenses.publicDomain;
@@ -15362,6 +15407,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "Rasterific_0_7_4" = callPackage
+ ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+ , free, JuicyPixels, mtl, primitive, transformers, vector
+ , vector-algorithms
+ }:
+ mkDerivation {
+ pname = "Rasterific";
+ version = "0.7.4";
+ sha256 = "13f5ay9wmva9k15a6pk4imxz6rj80gwc1f16906m7a6rm9vgwvlq";
+ libraryHaskellDepends = [
+ base bytestring containers dlist FontyFruity free JuicyPixels mtl
+ primitive transformers vector vector-algorithms
+ ];
+ description = "A pure haskell drawing engine";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ReadArgs" = callPackage
({ mkDerivation, base, hspec, system-filepath, text }:
mkDerivation {
@@ -17032,6 +17095,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "StateVar_1_1_1_1" = callPackage
+ ({ mkDerivation, base, stm, transformers }:
+ mkDerivation {
+ pname = "StateVar";
+ version = "1.1.1.1";
+ sha256 = "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b";
+ libraryHaskellDepends = [ base stm transformers ];
+ description = "State variables";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"StateVar-transformer" = callPackage
({ mkDerivation, base, mtl, transformers }:
mkDerivation {
@@ -17282,6 +17357,8 @@ self: {
pname = "Sysmon";
version = "0.1.2";
sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3";
+ revision = "1";
+ editedCabalFile = "0q8v52ldarrhgp73rnm81p2h3a43nap9q2036z6p28wn3ymrbgrx";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base ConfigFile filepath fingertree Glob MissingH mtl old-locale
@@ -19134,15 +19211,16 @@ self: {
}) {inherit (pkgs.xorg) xinput;};
"XML" = callPackage
- ({ mkDerivation, base, base-unicode-symbols, smallcheck, tasty
- , tasty-smallcheck, txt, util, vector
+ ({ mkDerivation, base, base-unicode-symbols, hs-functors
+ , multivector, smallcheck, tasty, tasty-smallcheck, txt, util
+ , vector
}:
mkDerivation {
pname = "XML";
- version = "0.0.0.0";
- sha256 = "1arlnyzj3zdzqrsr9lhicx2y1ag00cgf6jzn6nyxa7d7avp42025";
+ version = "0.0.1.0";
+ sha256 = "1cix816q5q45gyw48634ar4x50wmmqqn4cwz94czvlb7v03qc8rv";
libraryHaskellDepends = [
- base base-unicode-symbols txt util vector
+ base base-unicode-symbols hs-functors multivector txt util vector
];
testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
description = "Extensible Markup Language";
@@ -19370,8 +19448,8 @@ self: {
({ mkDerivation, base, deepseq, random }:
mkDerivation {
pname = "Yampa";
- version = "0.11";
- sha256 = "0frybgsj73r57rd6ckv9pgd9ff1g72qrlad90plb13cf2s6jdp3f";
+ version = "0.11.1";
+ sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base deepseq random ];
@@ -22845,6 +22923,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "alg_0_2_6_0" = callPackage
+ ({ mkDerivation, base, util }:
+ mkDerivation {
+ pname = "alg";
+ version = "0.2.6.0";
+ sha256 = "0y0qhhmyjzd8sf6v74066yx41nl1zsnsmk8scjvdym8j8k8mvrpk";
+ libraryHaskellDepends = [ base util ];
+ description = "Algebraic structures";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"alga" = callPackage
({ mkDerivation, aeson, base, containers, data-default, exceptions
, file-embed, filepath, formatting, haskeline, hspec, hxt
@@ -23135,8 +23225,8 @@ self: {
}:
mkDerivation {
pname = "alms";
- version = "0.6.7";
- sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
+ version = "0.6.9";
+ sha256 = "0p2lhwnprswvmg40w9inw963xywgfqprlap5s5ppxpfjj4bz9ksh";
isLibrary = false;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -24703,16 +24793,17 @@ self: {
"amazonka-iam-policy" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
- , bytestring, doctest, hspec, profunctors, scientific, text, time
+ , bytestring, doctest, hashable, hspec, profunctors, scientific
+ , text, time
}:
mkDerivation {
pname = "amazonka-iam-policy";
- version = "0.0.1";
- sha256 = "1mjc5ym604n9bi9fl7b0581i5z7vy12ri99lz3imz1k3dhr6xwga";
+ version = "0.0.4";
+ sha256 = "0nm24ck11d3ppcvqpqmi73l6s9ry20c907v4017gi6rlybzra75j";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
- aeson base base64-bytestring bytestring profunctors scientific text
- time
+ aeson base base64-bytestring bytestring hashable profunctors
+ scientific text time
];
testHaskellDepends = [
aeson aeson-pretty base bytestring doctest hspec
@@ -28176,6 +28267,8 @@ self: {
pname = "argon2";
version = "1.3.0.1";
sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry";
+ revision = "1";
+ editedCabalFile = "1bqzf2cfpd03sl3wq9dnrcxaysbs116ib33ja0v8zi4szddm33jv";
libraryHaskellDepends = [ base bytestring deepseq text-short ];
testHaskellDepends = [
base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -29860,23 +29953,23 @@ self: {
({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
, Cabal, cli-setup, composition-prelude, containers, cpphs
, dependency, dhall, directory, file-embed, filemanip, filepath
- , hashable, http-client, http-client-tls, lzma, microlens, mtl
+ , http-client, http-client-tls, lzma, microlens, mtl
, optparse-applicative, parallel-io, process, shake, shake-ats
, shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
}:
mkDerivation {
pname = "ats-pkg";
- version = "3.1.0.12";
- sha256 = "09kd57f3yjs112r9r8266ds8xsv6cjkyizzmknqyldllamh7qpjx";
+ version = "3.2.1.8";
+ sha256 = "183gdyivl6kab2k3z0jm6dk0wh83qwz3zvai7ayfkq3rjc6lb8ms";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint base binary bytestring bzlib Cabal
composition-prelude containers dependency dhall directory
- file-embed filemanip filepath hashable http-client http-client-tls
- lzma microlens mtl parallel-io process shake shake-ats shake-c
- shake-ext tar text unix zip-archive zlib
+ file-embed filemanip filepath http-client http-client-tls lzma
+ microlens mtl parallel-io process shake shake-ats shake-c shake-ext
+ tar text unix zip-archive zlib
];
libraryToolDepends = [ cpphs ];
executableHaskellDepends = [
@@ -30140,6 +30233,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "attoparsec-ip_0_0_3" = callPackage
+ ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty
+ , tasty-quickcheck, text, vector
+ }:
+ mkDerivation {
+ pname = "attoparsec-ip";
+ version = "0.0.3";
+ sha256 = "02d66mm1rc00dswkl9ink4pxwy8h7lyi2k9zcqda6ywa7cllhgl0";
+ libraryHaskellDepends = [ attoparsec base ip vector ];
+ testHaskellDepends = [
+ attoparsec base ip QuickCheck tasty tasty-quickcheck text vector
+ ];
+ description = "Parse IP data types with attoparsec";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"attoparsec-iso8601" = callPackage
({ mkDerivation, attoparsec, base, base-compat, text, time }:
mkDerivation {
@@ -30274,6 +30384,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "attoparsec-uri_0_0_6" = callPackage
+ ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
+ , QuickCheck, quickcheck-instances, strict, tasty, tasty-quickcheck
+ , text, vector
+ }:
+ mkDerivation {
+ pname = "attoparsec-uri";
+ version = "0.0.6";
+ sha256 = "046aq5c56p51nxyrazv3sv7m49c214gc673cwyic75vfykgbk20b";
+ libraryHaskellDepends = [
+ attoparsec attoparsec-ip base bytedump ip QuickCheck
+ quickcheck-instances strict text vector
+ ];
+ testHaskellDepends = [
+ attoparsec attoparsec-ip base bytedump ip QuickCheck
+ quickcheck-instances strict tasty tasty-quickcheck text vector
+ ];
+ description = "URI parser / printer using attoparsec";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"attoparsec-varword" = callPackage
({ mkDerivation, attoparsec, base, bytestring
, bytestring-builder-varword, hspec, QuickCheck
@@ -30883,8 +31015,8 @@ self: {
}:
mkDerivation {
pname = "avro";
- version = "0.3.3.1";
- sha256 = "1im7qydz1m0dzv45x9x8i4xr5snhzc6819gzrnm525jr8j8l50dk";
+ version = "0.3.4.2";
+ sha256 = "0g6y8f6j38n52vqwj185lyqc666cqrmgd6pn3427cqlhcj927b7v";
libraryHaskellDepends = [
aeson array base base16-bytestring binary bytestring containers
data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -30900,33 +31032,6 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "avro_0_3_4_1" = callPackage
- ({ mkDerivation, aeson, array, base, base16-bytestring, binary
- , bytestring, containers, data-binary-ieee754, directory, entropy
- , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
- , QuickCheck, scientific, semigroups, tagged, template-haskell
- , text, transformers, unordered-containers, vector
- }:
- mkDerivation {
- pname = "avro";
- version = "0.3.4.1";
- sha256 = "1v6ixrm870182krvdj62waa701pwwq93ca2yjrmz00jkmblj9kxm";
- libraryHaskellDepends = [
- aeson array base base16-bytestring binary bytestring containers
- data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
- semigroups tagged template-haskell text unordered-containers vector
- ];
- testHaskellDepends = [
- aeson array base base16-bytestring binary bytestring containers
- directory entropy extra fail hashable hspec lens lens-aeson mtl
- pure-zlib QuickCheck scientific semigroups tagged template-haskell
- text transformers unordered-containers vector
- ];
- description = "Avro serialization support for Haskell";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
"avwx" = callPackage
({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
, parsers, pretty-show, text
@@ -31632,6 +31737,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "axel" = callPackage
+ ({ mkDerivation, base, directory, filepath, lens, lens-aeson
+ , monad-control, mtl, parsec, process, regex-pcre, split, strict
+ , text, typed-process, vector, yaml
+ }:
+ mkDerivation {
+ pname = "axel";
+ version = "0.0.4";
+ sha256 = "0gg1q7nfwsdh0wr5mqyrjcrfga4i87j8q2f4n9nvpq6hmwnphpc3";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ libraryHaskellDepends = [
+ base directory filepath lens lens-aeson monad-control mtl parsec
+ process regex-pcre split strict text typed-process vector yaml
+ ];
+ executableHaskellDepends = [ base directory ];
+ description = "The Axel programming language";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"axiom" = callPackage
({ mkDerivation, base, bytestring, containers, directory
, ghcjs-perch, mtl, transformers, transient, transient-universe
@@ -31783,8 +31909,8 @@ self: {
pname = "b-tree";
version = "0.1.3";
sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
- revision = "1";
- editedCabalFile = "0y569gdl9b79c98lkd2zff71svi0b1i64dihc5dmsjlmzkwfzzhw";
+ revision = "2";
+ editedCabalFile = "04is4fc308f1achbdxvqq9rg4v8c02f1w88wysp318dbhhmwgggh";
libraryHaskellDepends = [
base binary bytestring containers directory errors exceptions
filepath lens mmap mtl pipes pipes-interleave transformers vector
@@ -33536,6 +33662,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "bench_1_0_12" = callPackage
+ ({ mkDerivation, base, criterion, optparse-applicative, process
+ , silently, text, turtle
+ }:
+ mkDerivation {
+ pname = "bench";
+ version = "1.0.12";
+ sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base criterion optparse-applicative process silently text turtle
+ ];
+ description = "Command-line benchmark tool";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"bench-graph" = callPackage
({ mkDerivation, base, Chart, Chart-diagrams, csv, directory
, filepath, split, text, transformers
@@ -33594,15 +33738,16 @@ self: {
"bencoding" = callPackage
({ mkDerivation, AttoBencode, attoparsec, base, bencode, bytestring
- , containers, criterion, deepseq, ghc-prim, hspec, mtl, pretty
- , QuickCheck, text
+ , containers, criterion, deepseq, ghc-prim, hspec, integer-gmp, mtl
+ , pretty, QuickCheck, text
}:
mkDerivation {
pname = "bencoding";
- version = "0.4.3.0";
- sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc";
+ version = "0.4.4.0";
+ sha256 = "088w5r0yz81b3iid3bc61lvm4d9f361kv2gq9jz7sbm43fkraxpp";
libraryHaskellDepends = [
- attoparsec base bytestring deepseq ghc-prim mtl pretty text
+ attoparsec base bytestring deepseq ghc-prim integer-gmp mtl pretty
+ text
];
testHaskellDepends = [
attoparsec base bytestring containers ghc-prim hspec QuickCheck
@@ -33849,8 +33994,8 @@ self: {
}:
mkDerivation {
pname = "bhoogle";
- version = "0.1.3.2";
- sha256 = "0dll14zrlyxsqraivdilna7v7awg4f90xc5hqik7lxmb3c7rmzr8";
+ version = "0.1.3.4";
+ sha256 = "06b2fc8667axzk58hpgb5wdbxd0lj1xrgkxvygsksq4q9wdwc8qn";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -33861,15 +34006,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "bhoogle_0_1_3_3" = callPackage
+ "bhoogle_0_1_3_5" = callPackage
({ mkDerivation, base, brick, bytestring, containers, directory
, filepath, hoogle, lens, process, protolude, text, time
, typed-process, vector, vty
}:
mkDerivation {
pname = "bhoogle";
- version = "0.1.3.3";
- sha256 = "0x4xdzm51ri4arcjhddv2s71wx1kiy1wp5iycahb9sq42r954k6n";
+ version = "0.1.3.5";
+ sha256 = "1gig9w1k1w2kw6y3wx6ckmc7kamwwzzq7mbaxil0rmb5ms0p1rf9";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -34915,7 +35060,7 @@ self: {
description = "Very low-level FFI bindings for Codec2";
license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {codec2 = null;};
+ }) {inherit (pkgs) codec2;};
"bindings-common" = callPackage
({ mkDerivation, base }:
@@ -38545,8 +38690,8 @@ self: {
}:
mkDerivation {
pname = "brick-skylighting";
- version = "0.2";
- sha256 = "1x4kfjj4sa5gbxnbvh76b4isrmc6jr11py9b50jsyvs720plq778";
+ version = "0.3";
+ sha256 = "1wjl5ff9c7czg7azj2pi17b3kzbgb5rmwb4nkxdy86xn6d68adi1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -39610,8 +39755,8 @@ self: {
}:
mkDerivation {
pname = "bv-sized";
- version = "0.4.0";
- sha256 = "18z4k076q0bk23di1i1hh8k0h319psh5hrh6jdv6446c7sg7v1c8";
+ version = "0.5.0";
+ sha256 = "08q4hg2kil8ahqpz0pmyxxnij3n3xhlfp5dr3ri3imgc1b2sn1m6";
libraryHaskellDepends = [
base containers lens mtl parameterized-utils prettyclass QuickCheck
random
@@ -41532,6 +41677,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "cache_0_1_1_1" = callPackage
+ ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "cache";
+ version = "0.1.1.1";
+ sha256 = "04azn2g1rndfpf6zl3sachzz471hhxykxh4clrz0vl5da8frja8h";
+ libraryHaskellDepends = [
+ base clock hashable stm transformers unordered-containers
+ ];
+ testHaskellDepends = [ base clock hspec stm transformers ];
+ description = "An in-memory key/value store with expiration support";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cached-io" = callPackage
({ mkDerivation, base, stm, time, transformers }:
mkDerivation {
@@ -43720,25 +43882,6 @@ self: {
}) {};
"cereal" = callPackage
- ({ mkDerivation, array, base, bytestring, containers, ghc-prim
- , QuickCheck, test-framework, test-framework-quickcheck2
- }:
- mkDerivation {
- pname = "cereal";
- version = "0.5.5.0";
- sha256 = "08k8y6nf3n8h8gzw4a44mssy7rhgpmfj28lhczjz4vgszc7k55qb";
- libraryHaskellDepends = [
- array base bytestring containers ghc-prim
- ];
- testHaskellDepends = [
- base bytestring QuickCheck test-framework
- test-framework-quickcheck2
- ];
- description = "A binary serialization library";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cereal_0_5_7_0" = callPackage
({ mkDerivation, array, base, bytestring, containers, ghc-prim
, QuickCheck, test-framework, test-framework-quickcheck2
}:
@@ -43755,7 +43898,6 @@ self: {
];
description = "A binary serialization library";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cereal-conduit" = callPackage
@@ -43782,8 +43924,8 @@ self: {
({ mkDerivation, base, cereal, data-dword }:
mkDerivation {
pname = "cereal-data-dword";
- version = "0.1";
- sha256 = "0fyi8xfp5xkb5cwacfvmrn10n905sr6qxbph9axz1rybjb129l3x";
+ version = "0.1.1";
+ sha256 = "14z0h7hz170l1zhz7add01q9n0v2diijskdrwfzqhvcka7a69566";
libraryHaskellDepends = [ base cereal data-dword ];
description = "Integration of \"cereal\" and \"data-dword\"";
license = stdenv.lib.licenses.mit;
@@ -44504,34 +44646,6 @@ self: {
}) {};
"chatwork" = callPackage
- ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
- , data-default-class, hspec, http-api-data, http-client
- , http-client-tls, http-types, req, servant-server, text, warp
- }:
- mkDerivation {
- pname = "chatwork";
- version = "0.1.3.4";
- sha256 = "16r8bfqw9dlzlzv4ydfn8ywjjly32b0ld5h9f1qrc7hdxb12qkv2";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- aeson aeson-casing base bytestring connection data-default-class
- http-api-data http-client http-client-tls http-types req text
- ];
- executableHaskellDepends = [
- aeson aeson-casing base bytestring connection data-default-class
- http-api-data http-client http-client-tls http-types req text
- ];
- testHaskellDepends = [
- aeson aeson-casing base bytestring connection data-default-class
- hspec http-api-data http-client http-client-tls http-types req
- servant-server text warp
- ];
- description = "The ChatWork API in Haskell";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "chatwork_0_1_3_5" = callPackage
({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
, data-default-class, hspec, http-api-data, http-client
, http-client-tls, http-types, req, servant-server, text, warp
@@ -44557,7 +44671,6 @@ self: {
];
description = "The ChatWork API in Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cheapskate" = callPackage
@@ -44982,8 +45095,8 @@ self: {
}:
mkDerivation {
pname = "chr-core";
- version = "0.1.0.1";
- sha256 = "07lc9h9k3zy1ylw5b5xv6kls7sj7ppr18gacvzfqz3ppys54kkja";
+ version = "0.1.0.4";
+ sha256 = "0kh8md0qw3x3b06lcl6v593dlh8a7m5j6w63j6fbwg2gmk290md9";
libraryHaskellDepends = [
base chr-data chr-pretty containers hashable logict-state mtl
pqueue unordered-containers
@@ -45000,10 +45113,8 @@ self: {
}:
mkDerivation {
pname = "chr-data";
- version = "0.1.0.0";
- sha256 = "0igcqrqbxy3l26b3girh6qpmls5z2jcgzywxid2qq348jan88bgh";
- revision = "1";
- editedCabalFile = "1wzhcwzaskbl28plgs0z26jh3mj99mf2rbkn75n75yr6gf8fqs44";
+ version = "0.1.0.1";
+ sha256 = "0w8nd6swl4k18rinvranqawf4zffdc4ixnn91a4h3ssf4kv47nsd";
libraryHaskellDepends = [
array base chr-pretty containers fclabels hashable microlens
microlens-mtl microlens-th mtl template-haskell
@@ -45093,14 +45204,16 @@ self: {
"chronos" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, clock
- , hashable, HUnit, primitive, QuickCheck, semigroups
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , text, torsor, vector
+ , criterion, deepseq, hashable, HUnit, old-locale, primitive
+ , QuickCheck, semigroups, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, text, thyme, time, torsor, vector
}:
mkDerivation {
pname = "chronos";
- version = "1.0.3";
- sha256 = "0xaw13qq3ifjk4x33q5vvbv2k1ydg673s0hsxrdi5kwl2rw0zi70";
+ version = "1.0.4";
+ sha256 = "1v9v237473d3fg45sqhx1ksmgvy7p144jdw0a4bvlma01fbzk09h";
+ revision = "1";
+ editedCabalFile = "0796ic47hmzard8bmgnj0kww32afp8lppx3l5c85nafk7dasykyn";
libraryHaskellDepends = [
aeson attoparsec base bytestring clock hashable primitive
semigroups text torsor vector
@@ -45109,6 +45222,10 @@ self: {
attoparsec base bytestring HUnit QuickCheck test-framework
test-framework-hunit test-framework-quickcheck2 text
];
+ benchmarkHaskellDepends = [
+ attoparsec base bytestring criterion deepseq old-locale QuickCheck
+ thyme time vector
+ ];
description = "A performant time library";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -45668,8 +45785,8 @@ self: {
({ mkDerivation, base, criterion, QuickCheck, random }:
mkDerivation {
pname = "cl3";
- version = "1.0.0.2";
- sha256 = "1ibwjry5xmf8dr8wbfdw3mzq4cz9dy5kvxy4sqkshcc08kjm2kp5";
+ version = "1.0.0.3";
+ sha256 = "16jllcyqdd6i0gq730c88ls47d2334ywr317pm7q6d6vgrjc4gjj";
libraryHaskellDepends = [ base random ];
testHaskellDepends = [ base QuickCheck ];
benchmarkHaskellDepends = [ base criterion ];
@@ -48259,6 +48376,19 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "colorful-monoids_0_2_1_2" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "colorful-monoids";
+ version = "0.2.1.2";
+ sha256 = "0y35f21n8xh1xq8i0anbfx034m5wnwhp2ka47vvi3w0iw13zyhhb";
+ libraryHaskellDepends = [ base ];
+ testHaskellDepends = [ base ];
+ description = "Styled console text output using ANSI escape sequences";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"colorize-haskell" = callPackage
({ mkDerivation, ansi-terminal, base, haskell-lexer }:
mkDerivation {
@@ -51656,12 +51786,12 @@ self: {
}) {};
"continued-fraction" = callPackage
- ({ mkDerivation, base, criterion, hspec, recursion-schemes }:
+ ({ mkDerivation, base, criterion, hspec, recursion }:
mkDerivation {
pname = "continued-fraction";
- version = "0.1.0.10";
- sha256 = "1c9lp30q94ddgrmvy93psas5lbyczkhwhr5nijg02sxjkmvrj47v";
- libraryHaskellDepends = [ base recursion-schemes ];
+ version = "0.1.0.11";
+ sha256 = "1kxakmm53003f41kskl7m2h9l6dlamv9bsxpgwi2w0fxacyqp076";
+ libraryHaskellDepends = [ base recursion ];
testHaskellDepends = [ base hspec ];
benchmarkHaskellDepends = [ base criterion ];
description = "Types and functions for working with continued fractions in Haskell";
@@ -51755,6 +51885,20 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "control" = callPackage
+ ({ mkDerivation, base, basic, stm, template-haskell, transformers
+ }:
+ mkDerivation {
+ pname = "control";
+ version = "0.1.1.0";
+ sha256 = "1393w30mgzhgppfrzjsh62gdw9agbjfxw9ahxphjabf0zdf34xzg";
+ libraryHaskellDepends = [
+ base basic stm template-haskell transformers
+ ];
+ description = "Class of monad transformers which control operations can be lifted thru";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"control-bool" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -54865,6 +55009,25 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "css-syntax_0_0_8" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
+ , scientific, text
+ }:
+ mkDerivation {
+ pname = "css-syntax";
+ version = "0.0.8";
+ sha256 = "1h9h606q9m9sxgwjxx3km9b30l4rmaygd2zfigf38wz45vqfqwa2";
+ libraryHaskellDepends = [
+ attoparsec base bytestring scientific text
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring directory hspec scientific text
+ ];
+ description = "This package implments a parser for the CSS syntax";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"css-text" = callPackage
({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
mkDerivation {
@@ -58132,10 +58295,10 @@ self: {
({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }:
mkDerivation {
pname = "dates";
- version = "0.2.2.1";
- sha256 = "02cc1h1rb37bx79fz5s573g3ib0fnscphlsgmd0m6hr1m8c2mgbd";
+ version = "0.2.2.2";
+ sha256 = "1vsjd3wwvg90yvj7g9921dz1b4j48h539jxapix319wkp0krk5cl";
revision = "1";
- editedCabalFile = "1qp9zipvm2wk1mzl6b6cl1ynjgs2lascvgdridn4alx5l3qnxw6m";
+ editedCabalFile = "1rm3s52hnrq1dgbslvilc7543k6z6fv109rn4ixwfi1wqfs1id8w";
libraryHaskellDepends = [
base base-unicode-symbols parsec syb time
];
@@ -59442,8 +59605,8 @@ self: {
}:
mkDerivation {
pname = "deferred-folds";
- version = "0.6.11";
- sha256 = "1xwdr5zlg09qnapqpsqvc77dx1avr73di5qd7ck2km5asfijdvj8";
+ version = "0.6.12";
+ sha256 = "1gvbm0dkmvjjz5wwg2a5p2ahyd2imz1g751sr8k536hnd377xzy8";
libraryHaskellDepends = [
base bytestring containers foldl primitive transformers
];
@@ -59823,15 +59986,14 @@ self: {
"dependency" = callPackage
({ mkDerivation, ansi-wl-pprint, base, binary, containers
- , criterion, deepseq, hspec, micro-recursion-schemes, microlens
+ , criterion, deepseq, hspec, microlens
}:
mkDerivation {
pname = "dependency";
- version = "1.2.0.1";
- sha256 = "0qk5qd4dihgix6jhb9g0d56ba3rhsfswn0407a7p6al7mnd8kxxv";
+ version = "1.2.0.3";
+ sha256 = "1zwqbx9fd02jjb40clq2r6isafgphmfkd0ai1w60kygb4cib7nkx";
libraryHaskellDepends = [
- ansi-wl-pprint base binary containers deepseq
- micro-recursion-schemes microlens
+ ansi-wl-pprint base binary containers deepseq microlens
];
testHaskellDepends = [ base containers hspec ];
benchmarkHaskellDepends = [ base containers criterion ];
@@ -60475,6 +60637,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "df1_0_2" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, containers
+ , QuickCheck, tasty, tasty-quickcheck, text, time
+ }:
+ mkDerivation {
+ pname = "df1";
+ version = "0.2";
+ sha256 = "11sd9d6izb3jrxxr27h058lajjij1p5wfsgg0pshjziqc9l426zs";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers text time
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring QuickCheck tasty tasty-quickcheck text
+ time
+ ];
+ description = "Type, render and parse the df1 hierarchical structured log format";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"dfinity-radix-tree" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, bloomfilter
, BoundedChan, bytestring, cmdargs, concurrent-extra, conduit
@@ -60765,8 +60947,8 @@ self: {
}:
mkDerivation {
pname = "dhall-to-cabal";
- version = "1.3.0.0";
- sha256 = "0mb0hvdhwlis38snxdyk01lyykxgav98ank3qq5rsf00ggdbv485";
+ version = "1.3.0.1";
+ sha256 = "0sb7wipngmxwd2mgzggcmg9pkzyqa65gp7j789y5lgp1q8q8gv26";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -60839,25 +61021,6 @@ self: {
}) {};
"di-core" = callPackage
- ({ mkDerivation, base, containers, exceptions, QuickCheck
- , safe-exceptions, stm, tasty, tasty-hunit, tasty-quickcheck, time
- }:
- mkDerivation {
- pname = "di-core";
- version = "1.0.2";
- sha256 = "0g6xr9cgqispal9s67l8iacdg0pg8ijaws5640fby6vv9jp42qn8";
- libraryHaskellDepends = [
- base containers exceptions safe-exceptions stm time
- ];
- testHaskellDepends = [
- base exceptions QuickCheck stm tasty tasty-hunit tasty-quickcheck
- time
- ];
- description = "Typeful hierarchical structured logging without monad towers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "di-core_1_0_3" = callPackage
({ mkDerivation, base, containers, QuickCheck, safe-exceptions, stm
, tasty, tasty-hunit, tasty-quickcheck, time
}:
@@ -60874,7 +61037,6 @@ self: {
];
description = "Typeful hierarchical structured logging without monad towers";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"di-df1" = callPackage
@@ -62560,6 +62722,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "discord-haskell" = callPackage
+ ({ mkDerivation, aeson, async, base, bytestring, containers
+ , data-default, http-client, iso8601-time, MonadRandom, req
+ , safe-exceptions, text, time, unordered-containers, vector
+ , websockets, wuss
+ }:
+ mkDerivation {
+ pname = "discord-haskell";
+ version = "0.5.1";
+ sha256 = "0y4ha8zsds53bq330740a0m4wjxmsrdlnhf2fmhp5i3c7rjknka8";
+ libraryHaskellDepends = [
+ aeson async base bytestring containers data-default http-client
+ iso8601-time MonadRandom req safe-exceptions text time
+ unordered-containers vector websockets wuss
+ ];
+ description = "Write bots for Discord in Haskell";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"discord-hs" = callPackage
({ mkDerivation, base, discord-gateway, discord-rest, discord-types
, hashable, mtl, url, websockets
@@ -66513,21 +66694,23 @@ self: {
}) {};
"edges" = callPackage
- ({ mkDerivation, base, cereal, contravariant, deepseq
- , deferred-folds, foldl, hashable, monad-par, pointed, potoki
- , potoki-cereal, primitive, primitive-extras, profunctors
- , QuickCheck, quickcheck-instances, rerebase, semigroupoids, tasty
- , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
+ ({ mkDerivation, base, cereal, cereal-data-dword, cereal-vector
+ , contravariant, data-dword, deepseq, deferred-folds, foldl
+ , hashable, monad-par, pointed, potoki, potoki-cereal, primitive
+ , primitive-extras, profunctors, QuickCheck, quickcheck-instances
+ , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck
+ , text, unordered-containers, vector, vector-th-unbox
}:
mkDerivation {
pname = "edges";
- version = "0.9.1.1";
- sha256 = "12alvmgxp488sg1km1j7kjlsbdk8xh6kxdpyxbvz4js6v1z54y0p";
+ version = "0.11.0.1";
+ sha256 = "12bs1wlfhhq5cqb0xan34jvdpx1asr3rb2d2yiafxqpngwvd7nh8";
libraryHaskellDepends = [
- base cereal contravariant deepseq deferred-folds foldl hashable
- monad-par pointed potoki potoki-cereal primitive primitive-extras
- profunctors QuickCheck semigroupoids text unordered-containers
- vector
+ base cereal cereal-data-dword cereal-vector contravariant
+ data-dword deepseq deferred-folds foldl hashable monad-par pointed
+ potoki potoki-cereal primitive primitive-extras profunctors
+ QuickCheck semigroupoids text unordered-containers vector
+ vector-th-unbox
];
testHaskellDepends = [
cereal foldl QuickCheck quickcheck-instances rerebase tasty
@@ -68028,18 +68211,18 @@ self: {
}) {};
"emd" = callPackage
- ({ mkDerivation, base, containers, finite-typelits
- , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
- , transformers, typelits-witnesses, vector, vector-sized
+ ({ mkDerivation, base, binary, containers, data-default-class
+ , finite-typelits, ghc-typelits-knownnat, ghc-typelits-natnormalise
+ , HUnit, transformers, typelits-witnesses, vector, vector-sized
}:
mkDerivation {
pname = "emd";
- version = "0.1.2.1";
- sha256 = "0lx2f4kxzpmpnhwsd9rd0jxx7n39b4f77vm5hnqzvyvdhvlcfr53";
+ version = "0.1.3.0";
+ sha256 = "0p8ww7bxdrv5xpy9gslzp1c25iqamsdy0rfm4y2n0p71l7w960rw";
libraryHaskellDepends = [
- base containers finite-typelits ghc-typelits-knownnat
- ghc-typelits-natnormalise transformers typelits-witnesses vector
- vector-sized
+ base binary containers data-default-class finite-typelits
+ ghc-typelits-knownnat ghc-typelits-natnormalise transformers
+ typelits-witnesses vector vector-sized
];
testHaskellDepends = [ base containers HUnit ];
description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
@@ -68232,8 +68415,10 @@ self: {
}:
mkDerivation {
pname = "engine-io";
- version = "1.2.20";
- sha256 = "1kx16zpfbish8mcpr6j5s7c63w277kyhcykvcfq2xgh1npg4p0z7";
+ version = "1.2.21";
+ sha256 = "0rqpxvw2d2m5hlgkc2a3794874dig84vph1wkqnlrv2vxixkqplw";
+ revision = "1";
+ editedCabalFile = "1n5l2fs0wn7wps2nr8irymrfac2qris75z3p73mmlxrdxmbjb2vr";
libraryHaskellDepends = [
aeson async attoparsec base base64-bytestring bytestring errors
free monad-loops mwc-random stm stm-delay text transformers
@@ -68270,8 +68455,8 @@ self: {
}:
mkDerivation {
pname = "engine-io-snap";
- version = "1.0.6";
- sha256 = "1lv9gzz61fcba2y0mqmcml1shk8qjxlw8c1fis4w7xs2xgrwbjbm";
+ version = "1.0.7";
+ sha256 = "0qvdsspv0q9fp93bifp03gqa1jbxcxrf4mhyrncwmy24my2nvq1z";
libraryHaskellDepends = [
base bytestring containers engine-io io-streams lifted-base
snap-core unordered-containers websockets websockets-snap
@@ -69174,6 +69359,33 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "ersatz_0_4_4" = callPackage
+ ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+ , cabal-doctest, containers, data-default, directory, doctest
+ , filepath, lens, mtl, parsec, process, semigroups, temporary
+ , transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "ersatz";
+ version = "0.4.4";
+ sha256 = "06d0fc5s5yxk1q54fsbnnhmvf25m5g86fqdzb42f0ckc0h3sbp22";
+ isLibrary = true;
+ isExecutable = true;
+ enableSeparateDataOutput = true;
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
+ libraryHaskellDepends = [
+ array attoparsec base bytestring containers data-default lens mtl
+ process semigroups temporary transformers unordered-containers
+ ];
+ executableHaskellDepends = [
+ array base containers lens mtl parsec semigroups
+ ];
+ testHaskellDepends = [ array base directory doctest filepath mtl ];
+ description = "A monad for expressing SAT or QSAT problems using observable sharing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ersatz-toysat" = callPackage
({ mkDerivation, array, base, containers, ersatz, toysolver
, transformers
@@ -71832,8 +72044,8 @@ self: {
}:
mkDerivation {
pname = "fast-arithmetic";
- version = "0.6.0.7";
- sha256 = "12ma6p4qy7wc22dd63dxqq3sq7spsx2hdzn82zf0w9y33y2jyaml";
+ version = "0.6.0.9";
+ sha256 = "1kpki7j8kz9xzzg8gl8l5g7wgq0v2s7r2lhr0mb4m67bkq61zmrs";
libraryHaskellDepends = [ base composition-prelude gmpint ];
testHaskellDepends = [
arithmoi base combinat-compat hspec QuickCheck
@@ -72120,8 +72332,8 @@ self: {
}:
mkDerivation {
pname = "fastparser";
- version = "0.3.1";
- sha256 = "0qs3i1cxcdgyi2595qcqalqflpfkqgg6krw7dmjq4kk4pmnm6yw4";
+ version = "0.3.1.1";
+ sha256 = "0wj50rpjr69sl4kkw6zybh2s9iq9ysv6sc83k50l5kq12p28yc5d";
libraryHaskellDepends = [
base bytestring bytestring-lexing containers kan-extensions
microlens thyme transformers vector-space
@@ -74196,8 +74408,8 @@ self: {
}:
mkDerivation {
pname = "fitspec";
- version = "0.4.4";
- sha256 = "15vmdipw3pz6x4x2c1ywf0h0jbiy14p557mx3hm2zhdpxn1bdwyr";
+ version = "0.4.5";
+ sha256 = "0s4rifky7rswajc5z7a0kmmqyws3q6ryqca2h7riyh7xzkbxqfvk";
libraryHaskellDepends = [
base cmdargs leancheck template-haskell
];
@@ -75629,6 +75841,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "foldable1" = callPackage
+ ({ mkDerivation, base, transformers, util }:
+ mkDerivation {
+ pname = "foldable1";
+ version = "0.1.0.0";
+ sha256 = "02p9wg0rcp7qvjp588y6r2szz7ja5x1idl04vn3hr7mbrbjq9ml5";
+ libraryHaskellDepends = [ base transformers util ];
+ description = "Foldable types with at least 1 element";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"foldl" = callPackage
({ mkDerivation, base, bytestring, comonad, containers
, contravariant, criterion, hashable, mwc-random, primitive
@@ -76793,8 +77016,8 @@ self: {
}:
mkDerivation {
pname = "free-algebras";
- version = "0.0.3.0";
- sha256 = "1qkgpmw2kv3x436f600cw73gdvfgjdl5i8nx80nh7q7dsg2ynl72";
+ version = "0.0.4.0";
+ sha256 = "1rfrdnwsb1kpdc0ha3a7yrykff6fi3ji6ljdxmijv2n4halmxnly";
libraryHaskellDepends = [
base constraints containers data-fix free groups kan-extensions mtl
natural-numbers transformers
@@ -77427,15 +77650,15 @@ self: {
}) {};
"fromhtml" = callPackage
- ({ mkDerivation, base, bytestring, process, text }:
+ ({ mkDerivation, base, bytestring, process-extras, text }:
mkDerivation {
pname = "fromhtml";
- version = "1.0.0";
- sha256 = "0idfjkwlg0g5vgv8x5m302ra4w23sgvq29gbbgyx99afrhxqh37l";
+ version = "1.0.1";
+ sha256 = "173rbbnn62mb7kxlv7g9r52gjqi07pj3kqd7h2qr8mhk4xlbbagy";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base bytestring process text ];
- executableHaskellDepends = [ base bytestring process text ];
+ libraryHaskellDepends = [ base bytestring process-extras text ];
+ executableHaskellDepends = [ base bytestring process-extras text ];
description = "Simple adapter for transformation of HTML to other formats";
license = stdenv.lib.licenses.mit;
}) {};
@@ -78281,8 +78504,8 @@ self: {
}:
mkDerivation {
pname = "funflow";
- version = "1.3.1";
- sha256 = "04980fbz3nzr70aakc7ng9d7047vrzh5864iwxziiqbw1h57la71";
+ version = "1.3.2";
+ sha256 = "01r1l1r8qg6w7wfcbs7qwxy22b7rd1cdixds425ynp9h0246lrmf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -78427,6 +78650,17 @@ self: {
license = stdenv.lib.licenses.lgpl3;
}) {};
+ "futures" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "futures";
+ version = "0.1";
+ sha256 = "0dx484i5q58yw3h6j9qp42x546vkky3sc29cqbr9969sfilmbqz8";
+ libraryHaskellDepends = [ base ];
+ description = "Simple and fast implementation of Future";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"fuzzcheck" = callPackage
({ mkDerivation, base, hspec, hspec-expectations, HUnit
, lifted-base, monad-control, QuickCheck, random, transformers
@@ -78800,6 +79034,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "gas" = callPackage
+ ({ mkDerivation, base, free, transformers }:
+ mkDerivation {
+ pname = "gas";
+ version = "0.0.0.1";
+ sha256 = "1khapcq5yfx46pmc3y5nax8p5v5ckbis8v4f53jng6j59cd27c3f";
+ libraryHaskellDepends = [ base free transformers ];
+ description = "Limit how many steps a program may take";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"gasp" = callPackage
({ mkDerivation, base, binary, containers }:
mkDerivation {
@@ -79577,26 +79822,6 @@ self: {
}) {};
"generic-lens" = callPackage
- ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
- , inspection-testing, lens, profunctors, QuickCheck, tagged
- }:
- mkDerivation {
- pname = "generic-lens";
- version = "1.0.0.1";
- sha256 = "0j83ynggqfaxp9g36lkjl9af57qixid9j1x1ljglny1zxqkgm888";
- libraryHaskellDepends = [ base profunctors tagged ];
- testHaskellDepends = [
- base doctest HUnit inspection-testing lens profunctors
- ];
- benchmarkHaskellDepends = [
- base criterion deepseq lens QuickCheck
- ];
- description = "Generically derive traversals, lenses and prisms";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "generic-lens_1_0_0_2" = callPackage
({ mkDerivation, base, criterion, deepseq, doctest, HUnit
, inspection-testing, lens, profunctors, QuickCheck, tagged
}:
@@ -79810,6 +80035,8 @@ self: {
pname = "generics-mrsop";
version = "1.0.0.1";
sha256 = "1spnsr127rhcpjwd7604pp7rpqp3q4rc8lb9msgl424hf62xbqq3";
+ revision = "1";
+ editedCabalFile = "1f3wg5sq8cm1bz210j4haxs511x786yq8wchfmdllw7cimhvw452";
libraryHaskellDepends = [ base containers mtl template-haskell ];
description = "Generic Programming with Mutually Recursive Sums of Products";
license = stdenv.lib.licenses.mit;
@@ -81087,15 +81314,15 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "ghc-exactprint_0_5_7_0" = callPackage
+ "ghc-exactprint_0_5_7_1" = callPackage
({ mkDerivation, base, bytestring, containers, Diff, directory
, filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
, silently, syb
}:
mkDerivation {
pname = "ghc-exactprint";
- version = "0.5.7.0";
- sha256 = "0r1cwjz96qrx0ww7snmwdh16xslzaqk6mlz3i9n4q779qf0y1n7m";
+ version = "0.5.7.1";
+ sha256 = "0w33vp4k2479xhq0b87ngznxwdklh43k19mzcb63dwh6cvh35kn4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -83855,8 +84082,8 @@ self: {
}:
mkDerivation {
pname = "githud";
- version = "2.0.2";
- sha256 = "0nhik30c7xzn3aqj8d8b8rk05viqmhl8q9ymswxxn9ws2nkm7rk8";
+ version = "2.1.0";
+ sha256 = "19j0vy427n3rzi1nfmh7kjn8jj1ji3xrbrs957hyns9sy4wwrfly";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base mtl parsec process text unix ];
@@ -84587,10 +84814,8 @@ self: {
}:
mkDerivation {
pname = "glirc";
- version = "2.27";
- sha256 = "0n7hh3020nsg034d2bdgdqf2glp6yaq9cp7cjlg3956zkrfi9jgw";
- revision = "1";
- editedCabalFile = "1d9v3bgzas23m13cr765n6dha6lsyw06wngjwb2rvaaj34sjl5hp";
+ version = "2.28";
+ sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -85129,7 +85354,8 @@ self: {
}) {};
"gnome-keyring" = callPackage
- ({ mkDerivation, base, bytestring, c2hs, gnome-keyring, text, time
+ ({ mkDerivation, base, bytestring, c2hs, gnome-keyring
+ , libgnome_keyring, text, time
}:
mkDerivation {
pname = "gnome-keyring";
@@ -85137,12 +85363,13 @@ self: {
sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8";
libraryHaskellDepends = [ base bytestring text time ];
librarySystemDepends = [ gnome-keyring ];
- libraryPkgconfigDepends = [ gnome-keyring ];
+ libraryPkgconfigDepends = [ libgnome_keyring ];
libraryToolDepends = [ c2hs ];
description = "Bindings for libgnome-keyring";
license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {inherit (pkgs.gnome2) gnome-keyring;};
+ }) {inherit (pkgs.gnome3) gnome-keyring;
+ inherit (pkgs) libgnome_keyring;};
"gnomevfs" = callPackage
({ mkDerivation, array, base, containers, glib, gnome-vfs
@@ -88468,6 +88695,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "greskell_0_2_1_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
+ , greskell-core, hint, hspec, semigroups, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "greskell";
+ version = "0.2.1.0";
+ sha256 = "03a3rgrzmhc3rh8hwz2pmq3w2q6yf8ypcfzbmqm8cwkix5xx1h8z";
+ libraryHaskellDepends = [
+ aeson base greskell-core semigroups text transformers
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring doctest doctest-discover greskell-core hint
+ hspec text unordered-containers
+ ];
+ description = "Haskell binding for Gremlin graph query language";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"greskell-core" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, doctest
, doctest-discover, hashable, hspec, QuickCheck, scientific
@@ -88511,6 +88760,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "greskell-websocket_0_1_1_0" = callPackage
+ ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+ , greskell-core, hashtables, hspec, safe-exceptions, stm, text
+ , unordered-containers, uuid, vector, websockets
+ }:
+ mkDerivation {
+ pname = "greskell-websocket";
+ version = "0.1.1.0";
+ sha256 = "1c3n222ihaqb2gls0c9f4zc8pgbwgan7j1n4h5p7xhp7csg34p13";
+ libraryHaskellDepends = [
+ aeson async base base64-bytestring bytestring greskell-core
+ hashtables safe-exceptions stm text unordered-containers uuid
+ vector websockets
+ ];
+ testHaskellDepends = [
+ aeson base bytestring greskell-core hspec unordered-containers uuid
+ vector
+ ];
+ description = "Haskell client for Gremlin Server using WebSocket serializer";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"grid" = callPackage
({ mkDerivation, base, cereal, containers, QuickCheck
, test-framework, test-framework-quickcheck2
@@ -91509,8 +91781,8 @@ self: {
}:
mkDerivation {
pname = "hadolint";
- version = "1.10.4";
- sha256 = "09sczm8l93lmkjz0c5l9al9jp8jpqcmk2zbxbbbq4g2jrsb3v30y";
+ version = "1.11.1";
+ sha256 = "07mgv88whga78x6sa7c1iw8l6k6p5yb0b38wpvy6cs3rzk4x2dx2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -92473,6 +92745,8 @@ self: {
pname = "halves";
version = "0.1.0.0";
sha256 = "06axsxkfja0p7vki4cnrf3rf3k255f5mk573pzn0zvzi4f8mmadn";
+ revision = "1";
+ editedCabalFile = "0hwp6fgnfmms2ckg0bzriklnshn7m39dxvj2vjrzm19spnf55fdn";
libraryHaskellDepends = [ base lens ];
testHaskellDepends = [ base hedgehog lens ];
description = "Splitting/combining data structures to/from halves, quarters, eighths";
@@ -94206,6 +94480,8 @@ self: {
pname = "hashable";
version = "1.2.7.0";
sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc";
+ revision = "1";
+ editedCabalFile = "197063dpl0wn67dp7a06yc2hxp81n24ykk7klbjx0fndm5n87dh3";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -95173,6 +95449,34 @@ self: {
}) {inherit (pkgs) glib;
inherit (pkgs.gnome3) gobjectIntrospection;};
+ "haskell-gi_0_21_4" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
+ , directory, doctest, filepath, glib, gobjectIntrospection
+ , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
+ , text, transformers, xdg-basedir, xml-conduit
+ }:
+ mkDerivation {
+ pname = "haskell-gi";
+ version = "0.21.4";
+ sha256 = "0rjb7pg8v0kjx115n0bksw705g6yg9vn8krxrakhvds5hvmb9caw";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ attoparsec base bytestring Cabal containers directory filepath
+ haskell-gi-base mtl pretty-show process regex-tdfa safe text
+ transformers xdg-basedir xml-conduit
+ ];
+ libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+ executableHaskellDepends = [
+ base containers directory filepath haskell-gi-base pretty-show text
+ ];
+ testHaskellDepends = [ base doctest process ];
+ 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;};
+
"haskell-gi-base" = callPackage
({ mkDerivation, base, bytestring, containers, glib, text }:
mkDerivation {
@@ -95349,6 +95653,8 @@ self: {
pname = "haskell-lsp";
version = "0.2.2.0";
sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd";
+ revision = "1";
+ editedCabalFile = "0bdgpj5cj4qwp31glmilp1gqdm8c3fkqvgw18aqv8pz2wg39x23y";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -95369,7 +95675,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp_0_6_0_0" = callPackage
+ "haskell-lsp_0_7_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, containers, data-default
, directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
, lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -95377,8 +95683,10 @@ self: {
}:
mkDerivation {
pname = "haskell-lsp";
- version = "0.6.0.0";
- sha256 = "1z5iy5m88zwbv5lrzg5ypmb4bcn4lg1xczq6nzkdlmkgc2l2w1c0";
+ version = "0.7.0.0";
+ sha256 = "1v67yj0ndd5wra2rnmdqcamivml82yn4lwhnm04nz6spsq2mqgkv";
+ revision = "1";
+ editedCabalFile = "1j33y61hwarfm5p54b682sd3rfhxf82lchr1jnnvv1h8xs56ryln";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -95392,8 +95700,8 @@ self: {
unordered-containers vector yi-rope
];
testHaskellDepends = [
- aeson base containers directory filepath hashable hspec lens
- network-uri sorted-list text yi-rope
+ aeson base bytestring containers data-default directory filepath
+ hashable hspec lens network-uri sorted-list stm text yi-rope
];
description = "Haskell library for the Microsoft Language Server Protocol";
license = stdenv.lib.licenses.mit;
@@ -95437,15 +95745,15 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "haskell-lsp-types_0_6_0_0" = callPackage
+ "haskell-lsp-types_0_7_0_0" = callPackage
({ mkDerivation, aeson, base, bytestring, data-default, filepath
, hashable, lens, network-uri, scientific, text
, unordered-containers
}:
mkDerivation {
pname = "haskell-lsp-types";
- version = "0.6.0.0";
- sha256 = "1cy8l7qzqa0iy4bqdfy2znih4vv5z8krmxdyb3bm66imykvn0w4q";
+ version = "0.7.0.0";
+ sha256 = "1iisadmi3v3wshpwi5cbn2p8p4qr9rh5xnlbhjymzxhj9k09cmcb";
libraryHaskellDepends = [
aeson base bytestring data-default filepath hashable lens
network-uri scientific text unordered-containers
@@ -95728,6 +96036,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskell-postal" = callPackage
+ ({ mkDerivation, base, bytestring, hspec, inline-c, libpostal, text
+ }:
+ mkDerivation {
+ pname = "haskell-postal";
+ version = "0.2.1.2";
+ sha256 = "158c7f7bj17xw9kjldrvq00ipghfa8cz5364qs4jnv6ibh6cx1fs";
+ libraryHaskellDepends = [ base bytestring inline-c text ];
+ libraryPkgconfigDepends = [ libpostal ];
+ testHaskellDepends = [ base bytestring hspec inline-c text ];
+ testPkgconfigDepends = [ libpostal ];
+ description = "Haskell binding for the libpostal library";
+ license = stdenv.lib.licenses.mit;
+ }) {libpostal = null;};
+
"haskell-proxy-list" = callPackage
({ mkDerivation, base, base64-string, bytestring, lens, random
, regex-base, regex-posix, text, wreq
@@ -95881,6 +96204,8 @@ self: {
pname = "haskell-src-exts";
version = "1.20.2";
sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
+ revision = "1";
+ editedCabalFile = "0gxpxs3p4qvky6m8g3fjj09hx7nkg28b9a4999ca7afz359si3r9";
libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
libraryToolDepends = [ happy ];
testHaskellDepends = [
@@ -97170,6 +97495,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "haskoin-bitcoind" = callPackage
+ ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+ , haskoin-core, monad-control, mtl, network-bitcoin, text
+ , transformers, transformers-base
+ }:
+ mkDerivation {
+ pname = "haskoin-bitcoind";
+ version = "0.3.0";
+ sha256 = "1b46mhjna32n41bj16ca58cijypls1n74aqhk785vla9v9ib9828";
+ libraryHaskellDepends = [
+ base base16-bytestring bytestring cereal haskoin-core monad-control
+ mtl network-bitcoin text transformers transformers-base
+ ];
+ description = "An adapter for haskoin to network-bitcoin";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"haskoin-core" = callPackage
({ mkDerivation, aeson, base, base16-bytestring, binary, byteable
, bytestring, cereal, conduit, containers, cryptohash, deepseq
@@ -99870,31 +100212,6 @@ self: {
}) {};
"hedis" = callPackage
- ({ mkDerivation, async, base, bytestring, bytestring-lexing
- , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
- , resource-pool, scanner, slave-thread, stm, test-framework
- , test-framework-hunit, text, time, tls, unordered-containers
- , vector
- }:
- mkDerivation {
- pname = "hedis";
- version = "0.10.2";
- sha256 = "05bnma4ssdg4zx39xrwx14xys47zdxxkk9iyi8d29p1vb90vv68w";
- libraryHaskellDepends = [
- async base bytestring bytestring-lexing deepseq errors HTTP mtl
- network network-uri resource-pool scanner stm text time tls
- unordered-containers vector
- ];
- testHaskellDepends = [
- async base bytestring doctest HUnit mtl slave-thread stm
- test-framework test-framework-hunit text time
- ];
- benchmarkHaskellDepends = [ base mtl time ];
- description = "Client library for the Redis datastore: supports full command set, pipelining";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hedis_0_10_3" = callPackage
({ mkDerivation, async, base, bytestring, bytestring-lexing
, deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
, resource-pool, scanner, slave-thread, stm, test-framework
@@ -99917,7 +100234,6 @@ self: {
benchmarkHaskellDepends = [ base mtl time ];
description = "Client library for the Redis datastore: supports full command set, pipelining";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hedis-config" = callPackage
@@ -101951,22 +102267,6 @@ self: {
}) {};
"hidapi" = callPackage
- ({ mkDerivation, base, bytestring, deepseq, deepseq-generics
- , systemd
- }:
- mkDerivation {
- pname = "hidapi";
- version = "0.1.4";
- sha256 = "0xbar7a0krfdj9aks9yqwv930ndikd0n6r6sm1ci97qg69cflh7w";
- libraryHaskellDepends = [
- base bytestring deepseq deepseq-generics
- ];
- librarySystemDepends = [ systemd ];
- description = "Haskell bindings to HIDAPI";
- license = stdenv.lib.licenses.mit;
- }) {inherit (pkgs) systemd;};
-
- "hidapi_0_1_5" = callPackage
({ mkDerivation, base, bytestring, deepseq, deepseq-generics
, systemd
}:
@@ -101980,7 +102280,6 @@ self: {
librarySystemDepends = [ systemd ];
description = "Haskell bindings to HIDAPI";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) systemd;};
"hidden-char" = callPackage
@@ -102535,6 +102834,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hinfo" = callPackage
+ ({ mkDerivation, aeson, base, optparse-applicative, text, yaml }:
+ mkDerivation {
+ pname = "hinfo";
+ version = "0.0.3.0";
+ sha256 = "04q4camvpfhgqmph4xpilwin9z5ig2v2mwhz2gz8wmgzyqxfbklv";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base optparse-applicative text yaml
+ ];
+ executableHaskellDepends = [
+ aeson base optparse-applicative text yaml
+ ];
+ testHaskellDepends = [ aeson base optparse-applicative text yaml ];
+ description = "Command Line App With Info on your Haskell App";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"hinotify_0_3_9" = callPackage
({ mkDerivation, async, base, containers, directory, unix }:
mkDerivation {
@@ -103730,8 +104048,8 @@ self: {
}:
mkDerivation {
pname = "hlint";
- version = "2.1.9";
- sha256 = "0q7acb636gzkp7qq1cyx04xjjw1ndpcxc49brmg61rbl0z1cxqsx";
+ version = "2.1.10";
+ sha256 = "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -104173,25 +104491,27 @@ self: {
"hmatrix-sundials" = callPackage
({ mkDerivation, base, containers, diagrams-lib
, diagrams-rasterific, hmatrix, hspec, inline-c, lens, plots
- , sundials_arkode, template-haskell, vector
+ , sundials_arkode, sundials_cvode, template-haskell, vector
}:
mkDerivation {
pname = "hmatrix-sundials";
- version = "0.19.0.0";
- sha256 = "03pil8zkkixlgv2m07zyiyribpkphhl75ixvazb36c6rznvkg6nd";
+ version = "0.19.1.0";
+ sha256 = "1vbpx8661nnj15vrg177qwaylfvlp0fxdnpzncwkm4ka81v65hb5";
+ revision = "1";
+ editedCabalFile = "0vl85crf6zpbjpvrkydi5qk7ziaxcwr3bpm15cbxw6k94a3y9lvx";
libraryHaskellDepends = [
base containers hmatrix inline-c template-haskell vector
];
- librarySystemDepends = [ sundials_arkode ];
+ librarySystemDepends = [ sundials_arkode sundials_cvode ];
testHaskellDepends = [
base containers diagrams-lib diagrams-rasterific hmatrix hspec
inline-c lens plots template-haskell vector
];
- testSystemDepends = [ sundials_arkode ];
+ testSystemDepends = [ sundials_arkode sundials_cvode ];
description = "hmatrix interface to sundials";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
- }) {sundials_arkode = null;};
+ }) {sundials_arkode = null; sundials_cvode = null;};
"hmatrix-svdlibc" = callPackage
({ mkDerivation, base, criterion, hmatrix, hspec, QuickCheck
@@ -104450,6 +104770,8 @@ self: {
pname = "hmt";
version = "0.16";
sha256 = "1s6fjyphq57wh15vryj6y493ikaqa3g14x6hj9lg2h6wf6g8042h";
+ revision = "1";
+ editedCabalFile = "0ng1z7s5alciw1r3r0ch8bakabqlind29pssrih09rbnqbqwbmcj";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson array base bytestring colour containers data-ordlist
@@ -104664,10 +104986,8 @@ self: {
}:
mkDerivation {
pname = "ho-rewriting";
- version = "0.2";
- sha256 = "1kasg0wbpi3x40f25z1akp1x90fb6l5hg0f7qzxkp577np1f6qn9";
- revision = "1";
- editedCabalFile = "0342zsigabmra9634vya1iyhpkcfhdym2wjix0h481c1gs2rci2n";
+ version = "0.2.1";
+ sha256 = "1hnbsgbrynng5zhi2p6794g70h99rdx1bcnqwvk4ibzfk8snd09x";
libraryHaskellDepends = [
base compdata containers mtl patch-combinators
];
@@ -105575,6 +105895,8 @@ self: {
pname = "hookup";
version = "0.2.2";
sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf";
+ revision = "1";
+ editedCabalFile = "1ag338856kxlywgcizqij566iaqicv4jb3kmd017k7qflq8vmwb3";
libraryHaskellDepends = [
attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
];
@@ -105896,18 +106218,17 @@ self: {
}) {};
"hora" = callPackage
- ({ mkDerivation, base, binary, hspec, QuickCheck, time
+ ({ mkDerivation, base, binary, bytestring, hspec, QuickCheck, time
, timezone-olson, timezone-series
}:
mkDerivation {
pname = "hora";
- version = "2.0.2";
- sha256 = "09xsvbr28macq5vkjd9b36ppi50yvpyibrv80w3gfwdzi4gypnd2";
- revision = "1";
- editedCabalFile = "18a1rw679vy46pqscpcb5hxphkim0z6pw7cyhsk2il30pg43hzms";
+ version = "2.2.0";
+ sha256 = "13i3z71xkyisgjms6g48hzgyva3dp83lk9m139ivysscgyr1a1pq";
libraryHaskellDepends = [ base binary time timezone-series ];
testHaskellDepends = [
- base binary hspec QuickCheck time timezone-olson timezone-series
+ base binary bytestring hspec QuickCheck time timezone-olson
+ timezone-series
];
description = "date time";
license = stdenv.lib.licenses.publicDomain;
@@ -105954,6 +106275,8 @@ self: {
pname = "hosc";
version = "0.16";
sha256 = "1xj5kkpkzzwfi26n28s0gkr9vzkmvp276n9jb75j2ccbr8q79vbj";
+ revision = "1";
+ editedCabalFile = "0n9ra6qhy5wighwa3zn5496473kdarhdgzsvmhnlp14s6sgw8akb";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
base binary blaze-builder bytestring data-binary-ieee754 network
@@ -106299,7 +106622,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "hpack_0_29_6" = callPackage
+ "hpack_0_29_7" = callPackage
({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
, containers, cryptonite, deepseq, directory, filepath, Glob, hspec
, http-client, http-client-tls, http-types, HUnit, infer-license
@@ -106309,8 +106632,8 @@ self: {
}:
mkDerivation {
pname = "hpack";
- version = "0.29.6";
- sha256 = "12alv7wx7zfysc8fdn8v971kw7k73w973h3jrwffkgfi1ld41mah";
+ version = "0.29.7";
+ sha256 = "07a9dar92qmgxfkf783rlwpkl49f242ygd50wrc22g4xllgrm2y9";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -107110,23 +107433,26 @@ self: {
"hriemann" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, containers
- , criterion, hostname, kazura-queue, network, protocol-buffers
- , protocol-buffers-descriptor, scientific, text, time, unagi-chan
+ , criterion, hostname, hspec, hspec-core, HUnit, kazura-queue, mtl
+ , network, protocol-buffers, protocol-buffers-descriptor
+ , QuickCheck, scientific, text, time, unagi-chan
}:
mkDerivation {
pname = "hriemann";
- version = "0.3.1.0";
- sha256 = "1n4awdyb25zqjaplv3alvqq48gp1wjzkhhhajsfqkxmsh2wd5wlv";
+ version = "0.3.2.0";
+ sha256 = "1b0vyxkyz8qqzvdrb0nyni6x490rxqh5zlydjrn9pbqc6npz7m8p";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base binary bytestring containers criterion hostname
- kazura-queue network protocol-buffers protocol-buffers-descriptor
- scientific text time unagi-chan
+ kazura-queue mtl network protocol-buffers
+ protocol-buffers-descriptor scientific text time unagi-chan
];
executableHaskellDepends = [ base ];
- testHaskellDepends = [ base ];
- description = "Initial project template from stack";
+ testHaskellDepends = [
+ base containers hspec hspec-core HUnit kazura-queue QuickCheck
+ ];
+ description = "A Riemann Client for Haskell";
license = stdenv.lib.licenses.mit;
}) {};
@@ -107413,6 +107739,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hs-functors_0_1_3_0" = callPackage
+ ({ mkDerivation, base, transformers }:
+ mkDerivation {
+ pname = "hs-functors";
+ version = "0.1.3.0";
+ sha256 = "1j7g5s82f8c1j4hans28m63bwi612j8kfrb7n9cdqqzlc1r804ik";
+ libraryHaskellDepends = [ base transformers ];
+ description = "Functors from products of Haskell and its dual to Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hs-gchart" = callPackage
({ mkDerivation, base, mtl }:
mkDerivation {
@@ -109188,6 +109526,8 @@ self: {
pname = "hslogger";
version = "1.2.10";
sha256 = "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp";
+ revision = "1";
+ editedCabalFile = "04vhwv9qidwan7fbkgvx8z5hnybjaf6wq2951fx4qw3nqsys9250";
libraryHaskellDepends = [
base containers directory mtl network old-locale process time unix
];
@@ -112727,28 +113067,39 @@ self: {
}) {};
"http2-client" = callPackage
- ({ mkDerivation, async, base, bytestring, containers
- , data-default-class, deepseq, http2, network, optparse-applicative
- , stm, time, tls
+ ({ mkDerivation, async, base, bytestring, containers, deepseq
+ , http2, network, stm, time, tls
}:
mkDerivation {
pname = "http2-client";
- version = "0.8.0.0";
- sha256 = "1c9nn6b9fs30prrkalx7n7i4a4a5ss53ky4x2nba4vcq4rgipch3";
- isLibrary = true;
- isExecutable = true;
+ version = "0.8.0.1";
+ sha256 = "055x0cscrd0idfda4ak48dagkmqkgj1zg29mz4yxrdj9vp2n0xd3";
libraryHaskellDepends = [
async base bytestring containers deepseq http2 network stm time tls
];
- executableHaskellDepends = [
- async base bytestring data-default-class http2 optparse-applicative
- time tls
- ];
testHaskellDepends = [ base ];
description = "A native HTTP2 client library";
license = stdenv.lib.licenses.bsd3;
}) {};
+ "http2-client-exe" = callPackage
+ ({ mkDerivation, async, base, bytestring, data-default-class, http2
+ , http2-client, optparse-applicative, time, tls
+ }:
+ mkDerivation {
+ pname = "http2-client-exe";
+ version = "0.1.0.0";
+ sha256 = "0i8rnq01dlnj7yzf64b7g7cshzsbxc668m9fhc97x3hbdr7b0iad";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ async base bytestring data-default-class http2 http2-client
+ optparse-applicative time tls
+ ];
+ description = "A command-line http2 client";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"http2-client-grpc" = callPackage
({ mkDerivation, base, binary, bytestring, data-default-class
, http2, http2-client, proto-lens, proto-lens-protoc, text, zlib
@@ -113478,28 +113829,6 @@ self: {
}) {};
"hw-balancedparens" = callPackage
- ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
- , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector
- }:
- mkDerivation {
- pname = "hw-balancedparens";
- version = "0.2.0.1";
- sha256 = "1kg8nl2dvd8xyc37v11bf0pw9pvcbzpv31y8vjzm1z5iyphn9lcr";
- libraryHaskellDepends = [
- base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple
- vector
- ];
- testHaskellDepends = [
- base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
- ];
- benchmarkHaskellDepends = [
- base criterion hw-bits hw-prim vector
- ];
- description = "Balanced parentheses";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "hw-balancedparens_0_2_0_2" = callPackage
({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
, hw-prim, hw-rankselect-base, QuickCheck, vector
}:
@@ -113518,7 +113847,6 @@ self: {
];
description = "Balanced parentheses";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hw-bits" = callPackage
@@ -113542,6 +113870,26 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hw-bits_0_7_0_3" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
+ , hw-prim, hw-string-parse, QuickCheck, safe, vector
+ }:
+ mkDerivation {
+ pname = "hw-bits";
+ version = "0.7.0.3";
+ sha256 = "1z6h8ljws92jdchzbkv7siig859b21ck04xnp2fka2j8p97d437w";
+ libraryHaskellDepends = [
+ base bytestring hw-int hw-prim hw-string-parse safe vector
+ ];
+ testHaskellDepends = [
+ base bytestring hspec hw-prim QuickCheck vector
+ ];
+ benchmarkHaskellDepends = [ base criterion hw-prim vector ];
+ description = "Bit manipulation";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hw-conduit" = callPackage
({ mkDerivation, array, base, bytestring, conduit
, conduit-combinators, criterion, hspec, mmap, time, vector, word8
@@ -113989,6 +114337,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hw-prim_0_6_2_12" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+ , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
+ , transformers, vector
+ }:
+ mkDerivation {
+ pname = "hw-prim";
+ version = "0.6.2.12";
+ sha256 = "10nbmpq8zm5j1jmn45w379rrmjvcssl213pmwh9p4zbnas71ba67";
+ libraryHaskellDepends = [
+ base bytestring mmap semigroups transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring directory exceptions hedgehog hspec
+ hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion mmap semigroups transformers vector
+ ];
+ description = "Primitive functions and data types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hw-prim-bits" = callPackage
({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
, hw-hspec-hedgehog, QuickCheck, vector
@@ -114107,8 +114479,8 @@ self: {
}:
mkDerivation {
pname = "hw-simd";
- version = "0.1.0.0";
- sha256 = "1j1cwd5nxv0rc72mkkmyw28xvns100ksn4nclg1701wxbzh2vyaq";
+ version = "0.1.1.1";
+ sha256 = "1mcingwc7z6ybsn32c3g66r4j9sfwpm4jkqvwh8cbbbd97lhalmq";
libraryHaskellDepends = [
base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
hw-rankselect-base vector
@@ -115315,8 +115687,8 @@ self: {
}:
mkDerivation {
pname = "hyraxAbif";
- version = "0.2.3.5";
- sha256 = "09csc3bm2il2hwglc1vvbz1pik4di5d7xwl9vfl5ahjkqdjlczzk";
+ version = "0.2.3.9";
+ sha256 = "0y9n5mz5hkbbdkw2h979y274x6y45pa9cw9wzbfnfczsjqgxgxs1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -115332,14 +115704,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hyraxAbif_0_2_3_8" = callPackage
+ "hyraxAbif_0_2_3_10" = callPackage
({ mkDerivation, base, binary, bytestring, directory, filepath
, hedgehog, hscolour, pretty-show, protolude, text
}:
mkDerivation {
pname = "hyraxAbif";
- version = "0.2.3.8";
- sha256 = "0n2hl623icgz8h2cjnll80c73117sa3fp7fa5zc0khd4x4jz2zan";
+ version = "0.2.3.10";
+ sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -115391,8 +115763,8 @@ self: {
}:
mkDerivation {
pname = "hzenity";
- version = "0.2";
- sha256 = "1ckc95a9hn8blv8yqdgpcs41wdk1j3mydy5pj41cl73jkir18a0f";
+ version = "0.3";
+ sha256 = "1kggc8xfdc5ychbciyzipyv6skfvyhrgjcb805vrpkz3l2b8h0g8";
libraryHaskellDepends = [
base containers data-default process process-extras text time
];
@@ -117383,16 +117755,16 @@ self: {
"indexation" = callPackage
({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
- , hashable, potoki, potoki-cereal, profunctors, stm-containers
+ , hashable, hashtables, mmorph, potoki, potoki-cereal, profunctors
, text, transformers, unordered-containers, vector
}:
mkDerivation {
pname = "indexation";
- version = "0.4.2";
- sha256 = "1ag30a4xlzii1pwl2dpgc7ydigfh3nw16xwjj2vp2qj54fh0rd1p";
+ version = "0.5.0.1";
+ sha256 = "036azy4bnz5xaf0m6dg18yfhi6sljiz9pmap2i8xs8gfbrrl3xsr";
libraryHaskellDepends = [
- base bytestring cereal deferred-folds focus hashable potoki
- potoki-cereal profunctors stm-containers text transformers
+ base bytestring cereal deferred-folds focus hashable hashtables
+ mmorph potoki potoki-cereal profunctors text transformers
unordered-containers vector
];
description = "Tools for entity indexation";
@@ -118797,6 +119169,29 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "intro_0_3_2_0" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, deepseq
+ , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text
+ , transformers, unordered-containers, writer-cps-mtl
+ }:
+ mkDerivation {
+ pname = "intro";
+ version = "0.3.2.0";
+ sha256 = "0nffkv59ws5ls8smafsvbgnpfhs6bbf6balwn23za1dlb5982ky3";
+ libraryHaskellDepends = [
+ base binary bytestring containers deepseq dlist extra hashable mtl
+ safe text transformers unordered-containers writer-cps-mtl
+ ];
+ testHaskellDepends = [
+ base binary bytestring containers deepseq dlist extra hashable lens
+ mtl QuickCheck safe text transformers unordered-containers
+ writer-cps-mtl
+ ];
+ description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"intro-prelude" = callPackage
({ mkDerivation, intro }:
mkDerivation {
@@ -119604,8 +119999,8 @@ self: {
}:
mkDerivation {
pname = "irc-core";
- version = "2.4.0";
- sha256 = "1ld3bkbn0y57jk86ls4gdxmfpm0yhm23wq3vidqb2l5hfbn80d0y";
+ version = "2.5.0";
+ sha256 = "124zfp6s8hj7z3m873145bnr0z8xlkbr1qgj2hvasd2qs2zrb8y8";
libraryHaskellDepends = [
attoparsec base base64-bytestring bytestring hashable primitive
text time vector
@@ -121437,8 +121832,8 @@ self: {
({ mkDerivation, base, haskeline, hspec, HUnit }:
mkDerivation {
pname = "jord";
- version = "0.2.0.0";
- sha256 = "0akf6jjijwgn4jsvlzvj7mh9fx9wx0p05gf7bara6hiqj58y6k65";
+ version = "0.3.1.0";
+ sha256 = "09wf9yzf9jzh4w2iqs0r33hi80ralbriipydbqpb0gx0i2sgwqay";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base ];
@@ -122190,24 +122585,30 @@ self: {
"json-rpc" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
- , conduit-extra, deepseq, hashable, lifted-async, monad-control
- , monad-logger, mtl, QuickCheck, stm, stm-conduit, test-framework
- , test-framework-quickcheck2, text, transformers
+ , conduit-extra, deepseq, hashable, hspec, monad-logger, mtl
+ , QuickCheck, stm-conduit, text, time, unliftio
, unordered-containers, vector
}:
mkDerivation {
pname = "json-rpc";
- version = "0.7.1.1";
- sha256 = "0izjkzs4szh7kcxsjhnpyvss96cizzwii1zjm8kyxz6v9cm7wn77";
+ version = "1.0.0";
+ sha256 = "0npqwq39w8r5q7s86gm79ldmnnn1klwn4lys207qdn6bph7g3cbk";
+ isLibrary = true;
+ isExecutable = true;
libraryHaskellDepends = [
aeson attoparsec base bytestring conduit conduit-extra deepseq
- hashable lifted-async monad-control monad-logger mtl QuickCheck stm
- stm-conduit text transformers unordered-containers vector
+ hashable monad-logger mtl QuickCheck stm-conduit text time unliftio
+ unordered-containers vector
+ ];
+ executableHaskellDepends = [
+ aeson base bytestring conduit conduit-extra monad-logger mtl
+ QuickCheck stm-conduit text time unliftio unordered-containers
+ vector
];
testHaskellDepends = [
- aeson base bytestring conduit lifted-async monad-logger mtl
- QuickCheck stm stm-conduit test-framework
- test-framework-quickcheck2 text transformers unordered-containers
+ aeson base bytestring conduit conduit-extra hspec monad-logger mtl
+ QuickCheck stm-conduit text time unliftio unordered-containers
+ vector
];
description = "Fully-featured JSON-RPC 2.0 library";
license = stdenv.lib.licenses.publicDomain;
@@ -122772,8 +123173,8 @@ self: {
}:
mkDerivation {
pname = "jukebox";
- version = "0.3.7";
- sha256 = "1m9za59bgvgzjd7fn11l322aq8j0xb6zsn94ycm0j5z3dwxv0l46";
+ version = "0.4.1";
+ sha256 = "1vpd5j71x85ni6wmvmifb5fw8h3y77l67a3dsngsdcs22jilbbgw";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -124783,8 +125184,8 @@ self: {
pname = "kqueue";
version = "0.2";
sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h";
- revision = "1";
- editedCabalFile = "0l4qgfjim0g1x9zs7w9mkvrj0dl13km8wximkn7ksczwp174k9ff";
+ revision = "2";
+ editedCabalFile = "1c7xskqgv45xsiwa2djfia0mq9f0p6gbb0dwlj5sd8swi3msbsfz";
libraryHaskellDepends = [ base directory filepath mtl time unix ];
libraryToolDepends = [ c2hs ];
description = "A binding to the kqueue event library";
@@ -125936,17 +126337,19 @@ self: {
"language-ats" = callPackage
({ mkDerivation, alex, ansi-wl-pprint, array, base
, composition-prelude, containers, cpphs, criterion, deepseq, happy
- , hspec, hspec-dirstream, microlens, recursion-schemes
- , system-filepath, transformers
+ , hspec, hspec-dirstream, microlens, recursion, system-filepath
+ , transformers
}:
mkDerivation {
pname = "language-ats";
- version = "1.5.0.0";
- sha256 = "1rh5dmgqw1r6k9cc81spd7rzl3nhaijiyf4s2dvfshbaayn2v10r";
+ version = "1.7.0.2";
+ sha256 = "1x5nm59nx2dwjxqrz8r0f6wg5szxcsvidqd9pjzh1znlxbzy3s6i";
+ revision = "1";
+ editedCabalFile = "0dzijl82zynk73ahd3rzkv7x86qpbn36hp558vwmcvd84qq0hbqf";
enableSeparateDataOutput = true;
libraryHaskellDepends = [
ansi-wl-pprint array base composition-prelude containers deepseq
- microlens recursion-schemes transformers
+ microlens recursion transformers
];
libraryToolDepends = [ alex cpphs happy ];
testHaskellDepends = [
@@ -128551,8 +128954,8 @@ self: {
pname = "lenz-template";
version = "0.2.0.0";
sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn";
- revision = "1";
- editedCabalFile = "05rgdgqk2yb92wlfs13844bdh7a2k2rddnxf9fcnz1c3qq4wkyi5";
+ revision = "2";
+ editedCabalFile = "0vd1xir15fizd2j575lgbr99gdm83n998w645cr0pzv3li6a56jq";
libraryHaskellDepends = [
base base-unicode-symbols containers lenz template-haskell
];
@@ -129173,6 +129576,24 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "libnix" = callPackage
+ ({ mkDerivation, aeson, base, directory, errors, filepath, process
+ , protolude, tasty, tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "libnix";
+ version = "0.2.0.1";
+ sha256 = "1a2j2pg9j65k34dxmkl1lqjj2q28j99dcadkwfhwwj6sy70v7gvg";
+ libraryHaskellDepends = [
+ aeson base errors filepath process protolude text
+ ];
+ testHaskellDepends = [
+ base directory errors protolude tasty tasty-hunit text
+ ];
+ description = "Bindings to the nix package manager";
+ license = stdenv.lib.licenses.gpl3;
+ }) {};
+
"libnotify" = callPackage
({ mkDerivation, base, bytestring, glib, gtk, libnotify }:
mkDerivation {
@@ -129683,6 +130104,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "lifted-base-tf" = callPackage
+ ({ mkDerivation, base, basic, control, criterion, HUnit
+ , lifted-base, monad-control, monad-peel, test-framework
+ , test-framework-hunit, transformers, transformers-compat
+ }:
+ mkDerivation {
+ pname = "lifted-base-tf";
+ version = "0.1.0.0";
+ sha256 = "1g3h86b6qrwq9sb5ppnpp4vygnfq4c77mhvzkk87yi56vvd6acix";
+ libraryHaskellDepends = [ base basic control ];
+ testHaskellDepends = [
+ base basic control HUnit lifted-base test-framework
+ test-framework-hunit transformers transformers-compat
+ ];
+ benchmarkHaskellDepends = [
+ base criterion lifted-base monad-control monad-peel transformers
+ ];
+ description = "lifted IO operations from the base library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lifted-protolude" = callPackage
({ mkDerivation, async, base, bytestring, containers, deepseq
, exceptions, ghc-prim, lifted-async, lifted-base, mtl, safe, stm
@@ -130957,6 +131399,8 @@ self: {
pname = "list-t";
version = "1.0.1";
sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3";
+ revision = "1";
+ editedCabalFile = "0jv0wxxr6rpw9mi3n6jbjqlk403wzycyafrc26vcwkdjaw63ckxb";
libraryHaskellDepends = [
base mmorph monad-control mtl transformers transformers-base
];
@@ -131154,6 +131598,32 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "liszt" = callPackage
+ ({ mkDerivation, base, binary, bytestring, containers, deepseq
+ , directory, exceptions, filepath, fsnotify, network, reflection
+ , scientific, sendfile, stm, stm-delay, text, transformers
+ , unordered-containers, winery
+ }:
+ mkDerivation {
+ pname = "liszt";
+ version = "0.1";
+ sha256 = "0ffqpplasb6d0kbj6n50811a5qawaghv9s9vfszm6z2dw27zkjwd";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base binary bytestring containers deepseq directory exceptions
+ filepath fsnotify network reflection scientific sendfile stm
+ stm-delay text transformers unordered-containers winery
+ ];
+ executableHaskellDepends = [
+ base binary bytestring containers deepseq directory exceptions
+ filepath fsnotify network reflection scientific sendfile stm
+ stm-delay text transformers unordered-containers winery
+ ];
+ description = "Append only key-list database";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"lit" = callPackage
({ mkDerivation, base, blaze-html, blaze-markup, cheapskate
, directory, filepath, highlighting-kate, parsec, text, time
@@ -132584,8 +133054,8 @@ self: {
({ mkDerivation, base, logict, mtl, transformers }:
mkDerivation {
pname = "logict-state";
- version = "0.1.0.4";
- sha256 = "0mkwggh97c3x96v7a4y7i4scdvr38d49an3617i9zgj328xkr6w9";
+ version = "0.1.0.5";
+ sha256 = "17rx8rj6m4jny52zh4daw6ac9pyp0yns470nm0bf2z9y69mfr63g";
libraryHaskellDepends = [ base logict mtl transformers ];
description = "Library for logic programming based on haskell package logict";
license = stdenv.lib.licenses.bsd3;
@@ -133253,8 +133723,8 @@ self: {
}:
mkDerivation {
pname = "lsp-test";
- version = "0.2.0.0";
- sha256 = "1zrzl132r8zfypqp38ni9sh7dgwmnysdxgr0b2jq3b69gz33nzs7";
+ version = "0.2.1.0";
+ sha256 = "1nd3nn5lyn9cwviijzfhqybj38zg10nf7ypb76ifaax91vj2hrkw";
libraryHaskellDepends = [
aeson aeson-pretty ansi-terminal base bytestring conduit
conduit-parse containers data-default Diff directory filepath
@@ -134288,21 +134758,21 @@ self: {
({ mkDerivation, ansi-wl-pprint, base, binary, Cabal, cli-setup
, composition-prelude, containers, criterion, directory, file-embed
, hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec
- , MonadRandom, mtl, optparse-applicative, random-shuffle
- , recursion-schemes, tar, template-haskell, text, th-lift-instances
- , titlecase, zip-archive, zlib
+ , MonadRandom, mtl, optparse-applicative, random-shuffle, recursion
+ , tar, template-haskell, text, th-lift-instances, titlecase
+ , zip-archive, zlib
}:
mkDerivation {
pname = "madlang";
- version = "4.0.2.8";
- sha256 = "11rz46jn396nr0gn75qvgmp98zv39l0g8gx36683fkhwfdlbr2iw";
+ version = "4.0.2.11";
+ sha256 = "1s924yvbk89xsl0zlm1shpc942q6nzi7fqqki8mlhj3ymqrgsv1k";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal cli-setup ];
libraryHaskellDepends = [
ansi-wl-pprint base binary composition-prelude containers directory
- file-embed megaparsec MonadRandom mtl random-shuffle
- recursion-schemes template-haskell text th-lift-instances titlecase
+ file-embed megaparsec MonadRandom mtl random-shuffle recursion
+ template-haskell text th-lift-instances titlecase
];
executableHaskellDepends = [
base directory http-client http-client-tls megaparsec
@@ -137041,8 +137511,8 @@ self: {
pname = "megaparsec";
version = "6.5.0";
sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
- revision = "2";
- editedCabalFile = "0ahvqr29ym3g46yv2jxniccyn1ng1yqicqdbamkzm89gjnxd9n25";
+ revision = "3";
+ editedCabalFile = "137ap53bgvnc0bdhkyv84290i3fzngryijsv33h7fb0q9k6dmb6h";
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq mtl
parser-combinators scientific text transformers
@@ -137403,6 +137873,8 @@ self: {
pname = "memory";
version = "0.14.16";
sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v";
+ revision = "1";
+ editedCabalFile = "10j8737fm287ii0nm4hqnhf87apls3xjczkzdw9qqkb4a2dybsbx";
libraryHaskellDepends = [
base basement bytestring deepseq foundation ghc-prim
];
@@ -137594,6 +138066,8 @@ self: {
pname = "mersenne-random-pure64";
version = "0.2.2.0";
sha256 = "1lbmdnlk21qqbzw1g7jph6d21dg3vf5saca3inwv1byxq7fh057g";
+ revision = "1";
+ editedCabalFile = "0pxq0xz42x60993rl4pr4pia80jv1xcqh6njvjzfvn75018j4gw5";
libraryHaskellDepends = [ base random time ];
description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
license = stdenv.lib.licenses.bsd3;
@@ -139497,6 +139971,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "modern-uri_0_2_2_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, contravariant
+ , criterion, deepseq, exceptions, hspec, hspec-discover
+ , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
+ , reflection, tagged, template-haskell, text, weigh
+ }:
+ mkDerivation {
+ pname = "modern-uri";
+ version = "0.2.2.0";
+ sha256 = "1ldl2i34fl7srv72bjxnrbihafq8m8mmk5xca6lhcqwdpx8yakxb";
+ libraryHaskellDepends = [
+ base bytestring containers contravariant deepseq exceptions
+ megaparsec mtl profunctors QuickCheck reflection tagged
+ template-haskell text
+ ];
+ testHaskellDepends = [
+ base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+ ];
+ testToolDepends = [ hspec-discover ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion deepseq megaparsec text weigh
+ ];
+ description = "Modern library for working with URIs";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"modify-fasta" = callPackage
({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
, pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -142872,6 +143373,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "multipart_0_1_3" = callPackage
+ ({ mkDerivation, base, bytestring, parsec, stringsearch }:
+ mkDerivation {
+ pname = "multipart";
+ version = "0.1.3";
+ sha256 = "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z";
+ libraryHaskellDepends = [ base bytestring parsec stringsearch ];
+ description = "HTTP multipart split out of the cgi package";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"multipart-names" = callPackage
({ mkDerivation, base, case-insensitive, HUnit, lens, parsec
, test-framework, test-framework-hunit
@@ -144588,8 +145101,8 @@ self: {
({ mkDerivation, base, containers, monoid-extras }:
mkDerivation {
pname = "namespace";
- version = "0.1.3.0";
- sha256 = "01iar2sj5819bzc9swn051qmiz190qa34rmh00gcnwpbhs1wxfdz";
+ version = "0.1.4.0";
+ sha256 = "12v2mk4wcqsdcwym6dbwkwcamr04l4vncdwfj0bsnxzvf4mjzx7p";
libraryHaskellDepends = [ base containers monoid-extras ];
testHaskellDepends = [ base ];
description = "A Generic Haskell library for managing namespaces";
@@ -144946,14 +145459,15 @@ self: {
}) {};
"natural" = callPackage
- ({ mkDerivation, base, checkers, hedgehog, lens, QuickCheck, tasty
- , tasty-hedgehog, tasty-hunit, tasty-quickcheck, transformers
+ ({ mkDerivation, base, checkers, hedgehog, lens, QuickCheck
+ , semigroupoids, tasty, tasty-hedgehog, tasty-hunit
+ , tasty-quickcheck, transformers
}:
mkDerivation {
pname = "natural";
- version = "0.1.0.2";
- sha256 = "1wjnhmcl057ahslki7yl9f73w60nzn23a6mj7mvvqhxy3q509wf5";
- libraryHaskellDepends = [ base lens ];
+ version = "0.3.0.2";
+ sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
+ libraryHaskellDepends = [ base lens semigroupoids ];
testHaskellDepends = [
base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
tasty-hunit tasty-quickcheck transformers
@@ -145511,6 +146025,8 @@ self: {
pname = "netclock";
version = "0.6";
sha256 = "0vskyczfhv9bszl2hnr6j9cvhkfampja5s41kh6i9wk8j9kpf9p8";
+ revision = "1";
+ editedCabalFile = "00wqr9nnjn8hm0r8xa5qrgqva5r0pcf32hlksrqhkzy12yl2kv08";
libraryHaskellDepends = [ base bytestring hosc network ];
description = "Netclock protocol";
license = stdenv.lib.licenses.gpl3;
@@ -146090,20 +146606,18 @@ self: {
"network-bitcoin" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, cookie, HTTP
- , http-client, http-types, network, QuickCheck, text, time
- , unordered-containers, vector
+ , http-client, http-types, network, network-uri, QuickCheck, text
+ , time, unordered-containers, vector
}:
mkDerivation {
pname = "network-bitcoin";
- version = "1.8.1";
- sha256 = "0gw04wh24j4vpyvx0wy0bdhh3dkwdxrg2laq7vsvwlpzwgcny99h";
- isLibrary = true;
- isExecutable = true;
+ version = "1.8.3";
+ sha256 = "1pllz4il53j9sf6xlxjl3ci3r1n348y6mg0vdy19xy19zy1rjz1q";
libraryHaskellDepends = [
aeson attoparsec base bytestring cookie HTTP http-client http-types
- network text time unordered-containers vector
+ network network-uri text time unordered-containers vector
];
- executableHaskellDepends = [
+ testHaskellDepends = [
aeson attoparsec base bytestring cookie HTTP http-client http-types
network QuickCheck text time unordered-containers vector
];
@@ -148376,21 +148890,19 @@ self: {
}) {};
"nqe" = callPackage
- ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
- , containers, exceptions, hspec, lifted-async, lifted-base
- , monad-control, stm, stm-conduit, text, transformers-base
+ ({ mkDerivation, base, bytestring, conduit, conduit-extra
+ , containers, exceptions, hspec, stm, stm-conduit, text, unliftio
}:
mkDerivation {
pname = "nqe";
- version = "0.1.0.0";
- sha256 = "1cg9f0bjf8sar3scln73ij0av4jwwv8ki44fdh1dbhcy1c9fn5d4";
+ version = "0.3.0.0";
+ sha256 = "1ggss61zym8ramf3yavmsgn013nlcv40kp6r2v1ax7ccdqyzjh98";
libraryHaskellDepends = [
- async base bytestring conduit conduit-extra containers lifted-async
- lifted-base monad-control stm transformers-base
+ base bytestring conduit conduit-extra containers stm unliftio
];
testHaskellDepends = [
- async base bytestring conduit conduit-extra exceptions hspec stm
- stm-conduit text
+ base bytestring conduit conduit-extra exceptions hspec stm
+ stm-conduit text unliftio
];
description = "Concurrency library in the style of Erlang/OTP";
license = stdenv.lib.licenses.publicDomain;
@@ -149377,12 +149889,12 @@ self: {
}) {};
"observable" = callPackage
- ({ mkDerivation, base, transformers }:
+ ({ mkDerivation, async, base, transformers }:
mkDerivation {
pname = "observable";
- version = "0.1.0";
- sha256 = "1y4rm73dqhdp5nvlqn68v1pkc9lg9wbhd1dx7nn3ckp8m5fv2kh0";
- libraryHaskellDepends = [ base transformers ];
+ version = "0.1.1";
+ sha256 = "1mcjmna0fra3xcxxxq4a7rzndrmh752ps0ykim1ikcjrgh2r0cpp";
+ libraryHaskellDepends = [ async base transformers ];
description = "Make your action to be observable and listen events from them";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -150222,6 +150734,8 @@ self: {
pname = "opaleye-trans";
version = "0.5.0";
sha256 = "18y9qcs771647g5xy7209rq32w7fqflcr313mdw1fv0m2ak65wb2";
+ revision = "2";
+ editedCabalFile = "1p51w0q74f8by2yw2hs1z9pfh6jxnlizf4jffjmj6j2kpm9hh3md";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -150502,6 +151016,24 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "openexr-write_0_1_0_2" = callPackage
+ ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
+ , deepseq, directory, hspec, split, vector, vector-split, zlib
+ }:
+ mkDerivation {
+ pname = "openexr-write";
+ version = "0.1.0.2";
+ sha256 = "1qh5kb3gj746y6s2jggccjgp8qyzdydz016z62854vg39sk5a1ib";
+ libraryHaskellDepends = [
+ base binary bytestring data-binary-ieee754 deepseq split vector
+ vector-split zlib
+ ];
+ testHaskellDepends = [ base bytestring directory hspec vector ];
+ description = "Library for writing images in OpenEXR HDR file format";
+ license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"openflow" = callPackage
({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
, deepseq, deepseq-generics, hashable, network
@@ -150763,6 +151295,8 @@ self: {
pname = "openssl-streams";
version = "1.2.1.3";
sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw";
+ revision = "1";
+ editedCabalFile = "0kvbb0sgli3h1yw229cllfrs2w1maapmvj1i472ywhpsgpz83362";
libraryHaskellDepends = [
base bytestring HsOpenSSL io-streams network
];
@@ -151142,6 +151676,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "optima" = callPackage
+ ({ mkDerivation, attoparsec, attoparsec-data, base
+ , optparse-applicative, rerebase, text, text-builder
+ }:
+ mkDerivation {
+ pname = "optima";
+ version = "0.3.0.1";
+ sha256 = "10xacn6myg486hk3i4a586xnwsjqjd1r29pyw1plgmb7yjp75z85";
+ libraryHaskellDepends = [
+ attoparsec attoparsec-data base optparse-applicative text
+ text-builder
+ ];
+ testHaskellDepends = [ attoparsec-data rerebase ];
+ description = "Simple command line interface arguments parser";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"optimal-blocks" = callPackage
({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
, cryptohash, deepseq, hex, QuickCheck, vector
@@ -153600,8 +154151,8 @@ self: {
}:
mkDerivation {
pname = "parameterized-utils";
- version = "1.0.0";
- sha256 = "0x1h38j61rwk6biz6nfqx252q1qy4wjrm7g4yv2bb9rddn131vaw";
+ version = "1.0.1";
+ sha256 = "0pcn1jiv5rhdm5nk6lg1xcr7cx7vsbl25n8slpf257khq23fjp6m";
libraryHaskellDepends = [
base containers deepseq ghc-prim hashable hashtables lens mtl
template-haskell text th-abstraction vector
@@ -153811,8 +154362,8 @@ self: {
pname = "parsec";
version = "3.1.13.0";
sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq";
- revision = "1";
- editedCabalFile = "1dpr1wfpykkl6kayp4wnyn0n1zv7pvqksax2i54dhdgjijj8qynd";
+ revision = "2";
+ editedCabalFile = "032sizm03m2vdqshkv4sdviyka05gqf8gs6r4hqf9did177i0qnm";
libraryHaskellDepends = [ base bytestring mtl text ];
testHaskellDepends = [
base HUnit mtl test-framework test-framework-hunit
@@ -158595,8 +159146,8 @@ self: {
pname = "pipes-s3";
version = "0.3.0.3";
sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa";
- revision = "2";
- editedCabalFile = "1sm1s8paqyh4d05179lfbjix5irc6j7ryrir5s29xpjxslanl01x";
+ revision = "3";
+ editedCabalFile = "14cz2sfyz0q0jrpjwj9a25flvcm7mhjhihg4pr356niyvnx1b01p";
libraryHaskellDepends = [
aws base bytestring http-client http-client-tls http-types pipes
pipes-bytestring pipes-safe resourcet text transformers
@@ -159025,8 +159576,8 @@ self: {
}:
mkDerivation {
pname = "plan-applicative";
- version = "2.0.0.1";
- sha256 = "0n6pm7arzgw7aq1bg00gjrnay3gjk6mhi8a70xzxa5sn64ndfl7k";
+ version = "2.0.1.0";
+ sha256 = "13pm9p7k74irz1rsgq5s6lksz86i82wddjapnqgm8xfg28fr8hmy";
libraryHaskellDepends = [
base bifunctors comonad containers profunctors streaming
transformers
@@ -160142,6 +160693,8 @@ self: {
pname = "polyparse";
version = "1.12";
sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m";
+ revision = "1";
+ editedCabalFile = "18daiyj3009wx0bhr87fbgy7xfh68ss9qzn6k3lgmh1z9dfsryrd";
libraryHaskellDepends = [ base bytestring text ];
description = "A variety of alternative parser combinator libraries";
license = "LGPL";
@@ -161531,8 +162084,8 @@ self: {
({ mkDerivation, potoki-core }:
mkDerivation {
pname = "potoki";
- version = "2.0.3";
- sha256 = "14rkg6mdbbg4m59rjb0pig9wv2lk0rm6a3l6sd042w5q8qy2rbdq";
+ version = "2.0.5";
+ sha256 = "1ik30rjpz5hr0n83nq0xdc381lrwir7z1iqcjmlwp3zan9hrnbk2";
libraryHaskellDepends = [ potoki-core ];
description = "Simple streaming in IO";
license = stdenv.lib.licenses.mit;
@@ -161564,18 +162117,18 @@ self: {
"potoki-core" = callPackage
({ mkDerivation, acquire, attoparsec, base, bytestring, directory
- , foldl, hashable, ilist, profunctors, ptr, QuickCheck
- , quickcheck-instances, random, rerebase, stm, tasty, tasty-hunit
- , tasty-quickcheck, text, transformers, unagi-chan
+ , foldl, hashable, ilist, primitive, profunctors, ptr, QuickCheck
+ , quickcheck-instances, random, rerebase, scanner, stm, tasty
+ , tasty-hunit, tasty-quickcheck, text, transformers
, unordered-containers, vector
}:
mkDerivation {
pname = "potoki-core";
- version = "2.2.5";
- sha256 = "0qd4y3xjqr93cyxycrnplqmf81yr0488l3rif4c2q7fhwh0kx3zb";
+ version = "2.2.7";
+ sha256 = "0pb20brgfc427gig317iyq6ln9z565aqanfm3cmkvgrzbvl9gf9q";
libraryHaskellDepends = [
acquire attoparsec base bytestring directory foldl hashable
- profunctors ptr stm text transformers unagi-chan
+ primitive profunctors ptr scanner stm text transformers
unordered-containers vector
];
testHaskellDepends = [
@@ -162236,6 +162789,17 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "preludeplus" = callPackage
+ ({ mkDerivation, base, containers }:
+ mkDerivation {
+ pname = "preludeplus";
+ version = "0.1.0.3";
+ sha256 = "0fbxydbkf8j7v0gb6an5p1phd637xpzipiyq4nwlzdlpkdbpkaav";
+ libraryHaskellDepends = [ base containers ];
+ description = "Generalizes List functions and replaces partials with NonEmpty equivalents";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"preprocess-haskell" = callPackage
({ mkDerivation, base, base-unicode-symbols, basic-prelude
, bytestring, Cabal, containers, cpphs, deepseq, directory
@@ -162914,15 +163478,16 @@ self: {
"primitive-extras" = callPackage
({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
- , foldl, primitive, profunctors, QuickCheck, quickcheck-instances
- , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector
+ , foldl, list-t, primitive, profunctors, QuickCheck
+ , quickcheck-instances, rerebase, tasty, tasty-hunit
+ , tasty-quickcheck, vector
}:
mkDerivation {
pname = "primitive-extras";
- version = "0.6.4.1";
- sha256 = "1b0q2qsd3ma6hg1av63fg0dqya6s61vv7giish9vh14cbz00zr66";
+ version = "0.6.7";
+ sha256 = "0kh2cccy1pmvvsrl9sjvcar4l1i3igk9vf8lxxxlwypj43nm32ny";
libraryHaskellDepends = [
- base bytestring cereal deferred-folds focus foldl primitive
+ base bytestring cereal deferred-folds focus foldl list-t primitive
profunctors vector
];
testHaskellDepends = [
@@ -163842,13 +164407,13 @@ self: {
({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
, blaze-html, bytestring, Cabal, cassava, conduit, containers
, criterion, cryptohash-sha256, data-interval, deepseq
- , deepseq-generics, directory, distributed-process
+ , deepseq-generics, deferred-folds, directory, distributed-process
, distributed-process-async, distributed-process-client-server
, distributed-process-extras, either, exceptions, extended-reals
- , filepath, ghc, ghc-boot, ghc-paths, ghci, Glob, gnuplot, hashable
- , hashable-time, haskeline, http-api-data, http-types, HUnit
- , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network
- , network-transport, network-transport-tcp, old-locale
+ , filepath, foldl, ghc, ghc-boot, ghc-paths, ghci, Glob, gnuplot
+ , hashable, hashable-time, haskeline, http-api-data, http-types
+ , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl
+ , network, network-transport, network-transport-tcp, old-locale
, optparse-applicative, parallel, path-pieces, QuickCheck, random
, random-shuffle, resourcet, rset, scotty, semigroups, stm
, stm-containers, template-haskell, temporary, text, time
@@ -163857,22 +164422,23 @@ self: {
}:
mkDerivation {
pname = "project-m36";
- version = "0.4";
- sha256 = "0lp0vrvvplyav0dp418kx12y4qrf7y7xp3vxwsv5jjb3sc7aqyq9";
+ version = "0.5";
+ sha256 = "0k9px4f4yn6fgzc7zaig33w4nqnjgrmizbmmq11yg76gk08f7mv1";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson attoparsec base base64-bytestring binary bytestring cassava
conduit containers cryptohash-sha256 data-interval deepseq
- deepseq-generics directory distributed-process
+ deepseq-generics deferred-folds directory distributed-process
distributed-process-async distributed-process-client-server
distributed-process-extras either exceptions extended-reals
- filepath ghc ghc-boot ghc-paths ghci Glob gnuplot hashable
+ filepath foldl ghc ghc-boot ghc-paths ghci Glob gnuplot hashable
hashable-time haskeline http-api-data list-t monad-parallel
MonadRandom mtl network-transport network-transport-tcp old-locale
optparse-applicative parallel path-pieces QuickCheck random-shuffle
- resourcet rset stm stm-containers temporary text time transformers
- unix unordered-containers uuid vector vector-binary-instances zlib
+ resourcet rset semigroups stm stm-containers temporary text time
+ transformers unix unordered-containers uuid vector
+ vector-binary-instances zlib
];
executableHaskellDepends = [
aeson attoparsec base base64-bytestring binary blaze-html
@@ -164087,6 +164653,33 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "prometheus-client_1_0_0" = callPackage
+ ({ mkDerivation, atomic-primops, base, bytestring, clock
+ , containers, criterion, deepseq, doctest, exceptions, hspec, mtl
+ , QuickCheck, random, random-shuffle, stm, text, transformers
+ , transformers-compat, utf8-string
+ }:
+ mkDerivation {
+ pname = "prometheus-client";
+ version = "1.0.0";
+ sha256 = "0i1kbc9hxqnqiqkvfygc6h5fmqmrqwlq1wbslq65md5d41bl37i7";
+ libraryHaskellDepends = [
+ atomic-primops base bytestring clock containers deepseq exceptions
+ mtl stm text transformers transformers-compat utf8-string
+ ];
+ testHaskellDepends = [
+ atomic-primops base bytestring clock containers deepseq doctest
+ exceptions hspec mtl QuickCheck random-shuffle stm text
+ transformers transformers-compat utf8-string
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion random text utf8-string
+ ];
+ description = "Haskell client library for http://prometheus.io.";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"prometheus-effect" = callPackage
({ mkDerivation, base, bytestring, clock, criterion, hashable
, http-types, mtl, random, retry, safe-exceptions, streaming
@@ -164116,12 +164709,16 @@ self: {
}) {};
"prometheus-metrics-ghc" = callPackage
- ({ mkDerivation, base, doctest, prometheus-client, utf8-string }:
+ ({ mkDerivation, base, doctest, prometheus-client, text
+ , utf8-string
+ }:
mkDerivation {
pname = "prometheus-metrics-ghc";
- version = "0.3.0";
- sha256 = "0cgcgzd7f39fhi0hxwjawif55a3i5mnnv7afxrrbk7gnhqb589nx";
- libraryHaskellDepends = [ base prometheus-client utf8-string ];
+ version = "1.0.0";
+ sha256 = "15zzj9dy9kfvkcypgnvh8xa6xsx0489ck8f30bm8958qp0za145z";
+ libraryHaskellDepends = [
+ base prometheus-client text utf8-string
+ ];
testHaskellDepends = [ base doctest prometheus-client ];
description = "Metrics exposing GHC runtime information for use with prometheus-client";
license = stdenv.lib.licenses.asl20;
@@ -167920,30 +168517,6 @@ self: {
}) {};
"rakuten" = callPackage
- ({ mkDerivation, aeson, base, bytestring, connection, constraints
- , data-default-class, extensible, hspec, http-api-data, http-client
- , http-client-tls, http-types, lens, req, servant-server, text
- , warp
- }:
- mkDerivation {
- pname = "rakuten";
- version = "0.1.1.4";
- sha256 = "010vfpnh4bhcdabrc6yl29q381fz8v5cx65s6vbh9hvilbsw2k09";
- libraryHaskellDepends = [
- aeson base bytestring connection constraints data-default-class
- extensible http-api-data http-client http-client-tls http-types
- lens req text
- ];
- testHaskellDepends = [
- aeson base bytestring connection constraints data-default-class
- extensible hspec http-api-data http-client http-client-tls
- http-types lens req servant-server text warp
- ];
- description = "The Rakuten API in Haskell";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "rakuten_0_1_1_5" = callPackage
({ mkDerivation, aeson, base, bytestring, connection, constraints
, data-default-class, extensible, hspec, http-api-data, http-client
, http-client-tls, http-types, lens, req, servant-server, text
@@ -167965,7 +168538,6 @@ self: {
];
description = "The Rakuten API in Haskell";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"ralist" = callPackage
@@ -168197,6 +168769,8 @@ self: {
pname = "random-fu-multivariate";
version = "0.1.2.0";
sha256 = "11hss3d1aa917g7w7k76zcakk82ras3046vb768yh5kayrb6a347";
+ revision = "2";
+ editedCabalFile = "13frafm1fdlgir64qsqy97158mv5chx98y23pdzdqiannf10w4by";
libraryHaskellDepends = [ base hmatrix mtl random-fu ];
testHaskellDepends = [ base ];
description = "Multivariate distributions for random-fu";
@@ -170070,6 +170644,17 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "recursion" = callPackage
+ ({ mkDerivation, base, composition-prelude }:
+ mkDerivation {
+ pname = "recursion";
+ version = "1.1.0.0";
+ sha256 = "02ibnagyll2zgr4v472rbmaj9vsp1amvhvd9pvd8d76nj99xwr9j";
+ libraryHaskellDepends = [ base composition-prelude ];
+ description = "A recursion schemes library for GHC";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"recursion-schemes" = callPackage
({ mkDerivation, base, base-orphans, comonad, free, HUnit
, template-haskell, th-abstraction, transformers
@@ -172037,8 +172622,8 @@ self: {
}:
mkDerivation {
pname = "relude";
- version = "0.1.0";
- sha256 = "16q9mh35c989pmy4xz602svfz57x2kbl8v82mjsapigmnxa41r8x";
+ version = "0.1.1";
+ sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable mtl stm text
transformers unordered-containers utf8-string
@@ -172054,7 +172639,7 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "relude_0_1_1" = callPackage
+ "relude_0_2_0" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, doctest
, gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
, tasty-hedgehog, text, transformers, unordered-containers
@@ -172062,8 +172647,8 @@ self: {
}:
mkDerivation {
pname = "relude";
- version = "0.1.1";
- sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0";
+ version = "0.2.0";
+ sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable mtl stm text
transformers unordered-containers utf8-string
@@ -173755,6 +174340,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "retry_0_7_6_3" = callPackage
+ ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
+ , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
+ , tasty-hunit, time, transformers
+ }:
+ mkDerivation {
+ pname = "retry";
+ version = "0.7.6.3";
+ sha256 = "19h3y5j2wim32cail0pix11vjhfbj3xiivlw2kyz1iqv4fxx8mby";
+ libraryHaskellDepends = [
+ base data-default-class exceptions ghc-prim random transformers
+ ];
+ testHaskellDepends = [
+ base data-default-class exceptions ghc-prim hedgehog HUnit mtl
+ random stm tasty tasty-hedgehog tasty-hunit time transformers
+ ];
+ description = "Retry combinators for monadic actions that may fail";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"retryer" = callPackage
({ mkDerivation, base, optparse-applicative, process }:
mkDerivation {
@@ -174468,6 +175074,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "risc-v" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+ , tasty, tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "risc-v";
+ version = "0.0.0.0";
+ sha256 = "0d1pb2h34ngr6pxmbizvka0ihaidhd7hkkmk74h51hh5mzp4zm04";
+ libraryHaskellDepends = [ base base-unicode-symbols util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ benchmarkHaskellDepends = [ base criterion ];
+ doHaddock = false;
+ description = "RISC-V";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"risc386" = callPackage
({ mkDerivation, alex, array, base, containers, happy, mtl, pretty
}:
@@ -175592,8 +176214,8 @@ self: {
}:
mkDerivation {
pname = "rpmbuild-order";
- version = "0.1";
- sha256 = "13hn4g2yh1llj7c661a9v25y3c5d3llsy3x4pk310ig08rzypvmi";
+ version = "0.2.1";
+ sha256 = "10m0lqakkdmhqcnl959d0nhair8p1zxq400yryzc59idx1w60vdn";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -176107,6 +176729,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "rv" = callPackage
+ ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+ , tasty, tasty-smallcheck, util
+ }:
+ mkDerivation {
+ pname = "rv";
+ version = "0.0.0.0";
+ sha256 = "17f9l2nixbnzmvhj9hb4lpc1aa80v4y5dlahahb370728a18jxjn";
+ libraryHaskellDepends = [ base base-unicode-symbols util ];
+ testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+ benchmarkHaskellDepends = [ base criterion ];
+ doHaddock = false;
+ description = "RISC-V";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"rvar" = callPackage
({ mkDerivation, base, MonadPrompt, mtl, random-source
, transformers
@@ -177261,33 +177899,27 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
- "sbp" = 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, time, yaml
+ "say_0_1_0_1" = callPackage
+ ({ mkDerivation, base, bytestring, gauge, hspec, text, transformers
+ , unliftio
}:
mkDerivation {
- pname = "sbp";
- version = "2.3.16";
- sha256 = "0m8i5n47bzlifp5pq6hkal7zbjga5j305sfccgjyrbiwpp1sxfg3";
- 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
+ pname = "say";
+ version = "0.1.0.1";
+ sha256 = "1r5kffjfwpas45g74sip8glrj1m9nygrnxjm7xgw898rq9pnafgn";
+ libraryHaskellDepends = [ base bytestring text transformers ];
+ testHaskellDepends = [
+ base bytestring hspec text transformers unliftio
];
- executableHaskellDepends = [
- aeson base basic-prelude binary-conduit bytestring conduit
- conduit-extra resourcet time yaml
+ benchmarkHaskellDepends = [
+ base bytestring gauge text transformers unliftio
];
- testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
- description = "SwiftNav's SBP Library";
- license = stdenv.lib.licenses.lgpl3;
+ description = "Send textual messages to a Handle in a thread-friendly way";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "sbp_2_3_17" = callPackage
+ "sbp" = callPackage
({ mkDerivation, aeson, array, base, base64-bytestring
, basic-prelude, binary, binary-conduit, bytestring, conduit
, conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
@@ -177311,7 +177943,6 @@ self: {
testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
description = "SwiftNav's SBP Library";
license = stdenv.lib.licenses.lgpl3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"sbp2udp" = callPackage
@@ -177575,6 +178206,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "scanner_0_3" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
+ , hspec, text
+ }:
+ mkDerivation {
+ pname = "scanner";
+ version = "0.3";
+ sha256 = "0yshznbp784d4gk2qz5jlw5ikc1s1h58h7vck2yksi4ynm3m3y57";
+ libraryHaskellDepends = [ base bytestring ];
+ testHaskellDepends = [ base bytestring hspec ];
+ benchmarkHaskellDepends = [
+ attoparsec base bytestring cereal criterion text
+ ];
+ description = "Fast non-backtracking incremental combinator parsing for bytestrings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"scanner-attoparsec" = callPackage
({ mkDerivation, attoparsec, base, bytestring, hspec, scanner }:
mkDerivation {
@@ -179326,8 +179975,8 @@ self: {
}:
mkDerivation {
pname = "self-extract";
- version = "0.3.3";
- sha256 = "0i2b4mxwa2m2p9xks18wna0p84732kbjvjiz3cy0pd9jfmc92vbm";
+ version = "0.3.4";
+ sha256 = "11v5d4sjbax5dncirmhgbvcj3a2ynnvlq34x4yamx0d9pm9b1idm";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -179530,8 +180179,8 @@ self: {
}:
mkDerivation {
pname = "semilattices";
- version = "0.0.0.1";
- sha256 = "0yqqww2mqspbhgkmzrkvljjkwfyi8iqndy8bm1c4sfmrza1h1byx";
+ version = "0.0.0.2";
+ sha256 = "1f4xy2kl8mqvlrzv8y0qs2i3c095iprbzpa4j424sifsmms3ya89";
libraryHaskellDepends = [
base containers hashable unordered-containers
];
@@ -179677,8 +180326,8 @@ self: {
}:
mkDerivation {
pname = "sendgrid-v3";
- version = "0.1.0.0";
- sha256 = "0sn1a47155d13w15jjbcbcl5sqnl286mf8q7k39qhir98qlq045s";
+ version = "0.1.1.0";
+ sha256 = "1f8kxg6v6804qq7kl22ycff26kq6nh5n7kpkvbdx36pf54a6632w";
libraryHaskellDepends = [ aeson base lens semigroups text wreq ];
testHaskellDepends = [ base semigroups tasty tasty-hunit text ];
description = "Sendgrid v3 API library";
@@ -181706,6 +182355,8 @@ self: {
pname = "servant-snap";
version = "0.8.2";
sha256 = "0iyiifr9przbayqjs7ydwbzwad5m79379ypmmfiyvcw9m14syhyk";
+ revision = "1";
+ editedCabalFile = "1lycc0iagcc2yd4hq778g2mkqh5fig6vcd3fv4s48wjgw4nic9qf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -182197,7 +182848,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "serverless-haskell_0_7_4" = callPackage
+ "serverless-haskell_0_7_5" = callPackage
({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
, amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
, hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@@ -182205,8 +182856,8 @@ self: {
}:
mkDerivation {
pname = "serverless-haskell";
- version = "0.7.4";
- sha256 = "1ymkg2gsj2r5913hax0hi2l7asrqxnbik2lhiqk9fpd4nhgqmp3y";
+ version = "0.7.5";
+ sha256 = "13l5day4dlwyykwx17v2znyh0ck1paaxjzzawnjklcjzk1rzj0i3";
libraryHaskellDepends = [
aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -183082,19 +183733,17 @@ self: {
}) {};
"shake-ats" = callPackage
- ({ mkDerivation, base, binary, dependency, directory, hashable
- , hs2ats, language-ats, microlens, shake, shake-c, shake-cabal
- , shake-ext, text
+ ({ mkDerivation, base, binary, dependency, directory, hs2ats
+ , language-ats, microlens, shake, shake-c, shake-cabal, shake-ext
+ , text
}:
mkDerivation {
pname = "shake-ats";
- version = "1.9.0.2";
- sha256 = "0ximikdjf03qr4xzb68z3knbg2g1xdl3kzmm7fnq03sz7jczf6j3";
- revision = "1";
- editedCabalFile = "03ihwl13qfkmplpxh8zpcndg119kwrc8f4504wrpg4sjm7gv5q5m";
+ version = "1.9.0.3";
+ sha256 = "1c1vphg9vv4lizcsg681wxq5dmvg5fkhp6x15738j7sfbd0k87ja";
libraryHaskellDepends = [
- base binary dependency directory hashable hs2ats language-ats
- microlens shake shake-c shake-cabal shake-ext text
+ base binary dependency directory hs2ats language-ats microlens
+ shake shake-c shake-cabal shake-ext text
];
description = "Utilities for building ATS projects with shake";
license = stdenv.lib.licenses.bsd3;
@@ -188667,8 +189316,8 @@ self: {
}:
mkDerivation {
pname = "socket";
- version = "0.8.0.1";
- sha256 = "18h9mf153j2mcymnlfqvspgb90iwffdqp4a6sqd357i9y8g6spvl";
+ version = "0.8.1.0";
+ sha256 = "1sbxcs1fmd7x95yk7sqv3q6gg2azn77l6sngiiv692966a0bxba0";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [
async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -188707,8 +189356,8 @@ self: {
}:
mkDerivation {
pname = "socket-io";
- version = "1.3.9";
- sha256 = "1bn0x8l288rgq1x04a6xlaky8zwzqzs5zpbv80fvnnzqb4810035";
+ version = "1.3.10";
+ sha256 = "0kq4xk1slgp2c7ik1gvpxwb0kxpwmxy943hxiq4g6bn5a1g3qis2";
libraryHaskellDepends = [
aeson attoparsec base bytestring engine-io mtl stm text
transformers unordered-containers vector
@@ -189710,6 +190359,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "speculate_0_3_3" = callPackage
+ ({ mkDerivation, base, cmdargs, containers, leancheck }:
+ mkDerivation {
+ pname = "speculate";
+ version = "0.3.3";
+ sha256 = "1x0vikgx09j842h1q4gzmndq16yr5514np17qaqfrc8578g9wfkf";
+ libraryHaskellDepends = [ base cmdargs containers leancheck ];
+ testHaskellDepends = [ base leancheck ];
+ benchmarkHaskellDepends = [ base leancheck ];
+ description = "discovery of properties about Haskell functions";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"speculation" = callPackage
({ mkDerivation, base, ghc-prim, stm, transformers }:
mkDerivation {
@@ -192743,19 +193406,21 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "stm-containers_1_0_0_1" = callPackage
+ "stm-containers_1_0_1_1" = callPackage
({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable
- , HTF, QuickCheck, rerebase, stm-hamt, transformers
+ , HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt
+ , transformers
}:
mkDerivation {
pname = "stm-containers";
- version = "1.0.0.1";
- sha256 = "0avwwabfsscpwn84xhr6vi38y6w49wsikyysjv4j55ax3bcvlks7";
+ version = "1.0.1.1";
+ sha256 = "16yds93abv9nmrbd5dcwbvmrq2ag0hdprs01khvnn9qg0nqs3lfn";
libraryHaskellDepends = [
- base deferred-folds focus hashable stm-hamt transformers
+ base deferred-folds focus hashable list-t stm-hamt transformers
];
testHaskellDepends = [
- deferred-folds focus foldl free HTF QuickCheck rerebase
+ deferred-folds focus foldl free HTF QuickCheck quickcheck-text
+ rerebase
];
description = "Containers for STM";
license = stdenv.lib.licenses.mit;
@@ -192808,14 +193473,15 @@ self: {
({ mkDerivation, async, base, criterion, deferred-folds, focus
, free, hashable, list-t, mwc-random, mwc-random-monad, primitive
, primitive-extras, QuickCheck, quickcheck-instances, rebase
- , rerebase, tasty, tasty-hunit, tasty-quickcheck
+ , rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers
}:
mkDerivation {
pname = "stm-hamt";
- version = "1.1.0.1";
- sha256 = "0152dl9mqxp410fc3h3mry4fsdf6yf39zf0mpn30zrgn5pvqbqwf";
+ version = "1.1.2.1";
+ sha256 = "1xbd1kcmiq1qah8hc3bkzf9wlhwrnf2qlh8rah8dyln0dcwapi6q";
libraryHaskellDepends = [
- base deferred-folds focus hashable primitive primitive-extras
+ base deferred-folds focus hashable list-t primitive
+ primitive-extras transformers
];
testHaskellDepends = [
deferred-folds focus QuickCheck quickcheck-instances rerebase tasty
@@ -193319,8 +193985,8 @@ self: {
}:
mkDerivation {
pname = "stratosphere";
- version = "0.24.3";
- sha256 = "1dvac89fzciklhkkagmhq93sk7mscnp3k4nw9izbfr5gyfdmvvdz";
+ version = "0.24.4";
+ sha256 = "0n4gry4vgqb64vy9ncyz3hcsjv31a869al5kbwgzi7pd7rp61zla";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -193493,8 +194159,8 @@ self: {
({ mkDerivation, base, bytestring, hidapi, mtl }:
mkDerivation {
pname = "streamdeck";
- version = "0.0.2";
- sha256 = "0kvzm7995c8wlxgksdhvv612iik944lm6fizvh8wzjbjavgwhwy6";
+ version = "0.0.3";
+ sha256 = "1cjvdf9ld55pv7n9cx2c4rsczqjxkrx1mkci8aziz59bs2ipqhak";
libraryHaskellDepends = [ base bytestring hidapi mtl ];
description = "Control library for the Elgato Stream Deck";
license = stdenv.lib.licenses.bsd3;
@@ -194074,8 +194740,8 @@ self: {
}:
mkDerivation {
pname = "strelka-core";
- version = "0.3";
- sha256 = "0g0cnd3j3xk84kihc7bbn2shy983yz5h2v15y2xhfx2anjl4qycl";
+ version = "0.3.0.1";
+ sha256 = "0hksf6p2pjvlvpgyndrcza16n0zyjaykqxzwy0igvylkwg1684qy";
libraryHaskellDepends = [
base base-prelude bifunctors bytestring hashable mtl semigroups
text transformers unordered-containers
@@ -195749,8 +196415,8 @@ self: {
}:
mkDerivation {
pname = "sv";
- version = "1.1";
- sha256 = "1xj4kyij566vzgw4qqvzrszp9apzlfljsm9m7706xf4in209pl00";
+ version = "1.1.1";
+ sha256 = "1d4f7l2k8vpskwf6iywfj7ivmfhdk2b10c9k8qrk6lms2mx0mwmh";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring contravariant hw-dsv
semigroupoids sv-core transformers utf8-string validation
@@ -195796,8 +196462,8 @@ self: {
}:
mkDerivation {
pname = "sv-core";
- version = "0.2";
- sha256 = "00h4m6xljjjmahmybrwfh7kyjklvy47qvnhrq063dhdinknip71d";
+ version = "0.2.1";
+ sha256 = "00xzsx7ssii7i8h7m2g99vq54q8xb1191vi0sn8cg6a2bdfl74hd";
libraryHaskellDepends = [
attoparsec base bifunctors bytestring containers contravariant
deepseq lens mtl parsec profunctors readable semigroupoids
@@ -196690,8 +197356,8 @@ self: {
}:
mkDerivation {
pname = "syntactic";
- version = "3.7";
- sha256 = "1x6hl048247d3h8bi3b94kqmgsmcc0d751n2mdyxim26cg1vnwzf";
+ version = "3.7.1";
+ sha256 = "06k2n84dn9rp59rcv29hqkrm5mri6hyhh0hdbh7qfqxa7m06sl6w";
libraryHaskellDepends = [
base constraints containers data-hash deepseq mtl syb
template-haskell tree-view
@@ -199942,8 +200608,8 @@ self: {
}:
mkDerivation {
pname = "temporary-resourcet";
- version = "0.1.0.0";
- sha256 = "1nxl8ivp5sd250w7pwm4f1kas5g1ikij3z39px717ys1xvk1r81h";
+ version = "0.1.0.1";
+ sha256 = "0wgfra7lkb5abnhk295l3vfcna79b8m309wp1cxgl3v96il6yh70";
libraryHaskellDepends = [
base directory exceptions filepath resourcet transformers unix
];
@@ -200522,6 +201188,8 @@ self: {
pname = "test-framework";
version = "0.8.2.0";
sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
+ revision = "1";
+ editedCabalFile = "1af61pnf2vrkvs3hcqla5ddsrd0hd2pylv6l545yn3dcvl665rcc";
libraryHaskellDepends = [
ansi-terminal ansi-wl-pprint base containers hostname old-locale
random regex-posix time xml
@@ -201207,8 +201875,30 @@ self: {
}:
mkDerivation {
pname = "text-builder";
- version = "0.5.1.1";
- sha256 = "02h27jb5m5yz5ai1q7x5w41vh8imnkhd2fp7l65mwxp96khsa7ql";
+ version = "0.5.3";
+ sha256 = "0488dy3x2gvwvnsmjs7g35pra9m1yqvqzw0klkhijsiaxnc4x95f";
+ libraryHaskellDepends = [
+ base base-prelude bytestring semigroups text
+ ];
+ testHaskellDepends = [
+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+ tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ criterion rerebase ];
+ description = "An efficient strict text builder";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "text-builder_0_5_3_1" = callPackage
+ ({ mkDerivation, base, base-prelude, bytestring, criterion
+ , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
+ , tasty-hunit, tasty-quickcheck, text
+ }:
+ mkDerivation {
+ pname = "text-builder";
+ version = "0.5.3.1";
+ sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q";
libraryHaskellDepends = [
base base-prelude bytestring semigroups text
];
@@ -201231,6 +201921,8 @@ self: {
pname = "text-containers";
version = "0.1.0.0";
sha256 = "0dsaqzh2hy6w9mzpsk22vmgmhx54l12il21n49f9g3cbr9kc9cv1";
+ revision = "2";
+ editedCabalFile = "0qssaccfhhk60855dy8ykrih3a597gqa9b88dxay6p5faxq9gczx";
libraryHaskellDepends = [
base bytestring containers deepseq ghc-prim hashable text-short
];
@@ -201721,6 +202413,8 @@ self: {
pname = "text-short";
version = "0.1.2";
sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk";
+ revision = "1";
+ editedCabalFile = "00w77idkh44m88vivkqsys0y1bbxrflh06yq66liq0wgjhhzdppj";
libraryHaskellDepends = [
base binary bytestring deepseq ghc-prim hashable text
];
@@ -201777,6 +202471,8 @@ self: {
pname = "text-show-instances";
version = "3.6.5";
sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql";
+ revision = "1";
+ editedCabalFile = "12k3hmn36w2mffhxjb5bx1g1gh3y0y4fync9hvk4gklh1w6dbs0a";
libraryHaskellDepends = [
base base-compat-batteries bifunctors binary containers directory
ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
@@ -201858,6 +202554,8 @@ self: {
pname = "text-utf8";
version = "1.2.3.0";
sha256 = "17xgi57wnjq06k0zllyj0k7jqfxridhczc1dzrg65vdrmzf8x31a";
+ revision = "1";
+ editedCabalFile = "05h8y5zw48w4sjmqxwn5vc1l7sh4kg3l4bbg0daac8bgjbdiz4jw";
libraryHaskellDepends = [
array base binary bytestring deepseq ghc-prim integer-gmp
];
@@ -202486,6 +203184,27 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "th-printf_0_6_0" = callPackage
+ ({ mkDerivation, base, charset, containers, hspec, HUnit
+ , microlens-platform, mtl, parsec, QuickCheck, semigroups
+ , template-haskell, th-lift, transformers
+ }:
+ mkDerivation {
+ pname = "th-printf";
+ version = "0.6.0";
+ sha256 = "1mqfbzx85c49q24yppkxgcd0h4s557b468qlnz2adbyba9wfsn62";
+ libraryHaskellDepends = [
+ base charset containers microlens-platform mtl parsec semigroups
+ template-haskell th-lift transformers
+ ];
+ testHaskellDepends = [
+ base hspec HUnit QuickCheck template-haskell
+ ];
+ description = "Quasiquoters for printf";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"th-reify-compat" = callPackage
({ mkDerivation, base, template-haskell }:
mkDerivation {
@@ -203149,8 +203868,8 @@ self: {
({ mkDerivation, async, base, stm }:
mkDerivation {
pname = "throttled";
- version = "1.0.0";
- sha256 = "09fwklq8c4vpxx3pqhdnjqpag3k632c4ya47khkdn6q54vrybj9m";
+ version = "1.1.0";
+ sha256 = "0grzdhgpba5wjylr3ci4xp1cx6d26jhh0r018n4l3fzi1zivwagg";
libraryHaskellDepends = [ async base stm ];
description = "Concurrent processing of a Foldable, throttled by CPU count";
license = stdenv.lib.licenses.bsd3;
@@ -203411,6 +204130,8 @@ self: {
pname = "tidal-midi";
version = "0.9.10";
sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4";
+ revision = "1";
+ editedCabalFile = "11wkj909j2jlq19ls7q5293av648vc2k6f2064hyrqwcd68mksnj";
libraryHaskellDepends = [
base containers PortMidi tidal time transformers
];
@@ -204998,8 +205719,8 @@ self: {
pname = "token-bucket";
version = "0.1.0.1";
sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
- revision = "3";
- editedCabalFile = "1gqlxy3rwrgag4qbjkh1f2kya4gcy1x5ic9xn997nzc6yi334v7m";
+ revision = "4";
+ editedCabalFile = "19kxi77aqyra00m02751sdfm6qy6mx4mlh7bhqv4wyaggwga707g";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base time ];
description = "Rate limiter using lazy bucket algorithm";
@@ -205145,31 +205866,6 @@ self: {
}) {};
"tomland" = callPackage
- ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec
- , megaparsec, mtl, parser-combinators, tasty, tasty-discover
- , tasty-hedgehog, tasty-hspec, text, time, unordered-containers
- }:
- mkDerivation {
- pname = "tomland";
- version = "0.3";
- sha256 = "0crwapvykd26b50bmh22vxpcv44f1jv88r0ifvr3hjmvv0v43lwh";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base hashable megaparsec mtl parser-combinators text time
- unordered-containers
- ];
- executableHaskellDepends = [ base text time unordered-containers ];
- testHaskellDepends = [
- base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog
- tasty-hspec text time unordered-containers
- ];
- testToolDepends = [ tasty-discover ];
- description = "TOML parser";
- license = stdenv.lib.licenses.mpl20;
- }) {};
-
- "tomland_0_3_1" = callPackage
({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec
, megaparsec, mtl, parser-combinators, tasty, tasty-discover
, tasty-hedgehog, tasty-hspec, text, time, transformers
@@ -205193,7 +205889,6 @@ self: {
testToolDepends = [ tasty-discover ];
description = "TOML parser";
license = stdenv.lib.licenses.mpl20;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tomlcheck" = callPackage
@@ -205406,23 +206101,28 @@ self: {
}) {};
"toxcore" = callPackage
- ({ mkDerivation, base, bytestring, bytestring-arbitrary
- , data-default-class, hspec, QuickCheck, saltine, toxcore
+ ({ mkDerivation, base, base16-bytestring, bytestring
+ , bytestring-arbitrary, data-default-class, directory, hspec
+ , QuickCheck, saltine, toxcore
}:
mkDerivation {
pname = "toxcore";
- version = "0.0.2";
- sha256 = "0wks3n93kyzpwyq0qk18qgrif8hjcm8rv2l6n41bhkvifrygz7l5";
- libraryHaskellDepends = [
- base bytestring bytestring-arbitrary data-default-class QuickCheck
- saltine
- ];
+ version = "0.2.0";
+ sha256 = "01pnl2x86zjs26cbp0m7ayx827s8l5ad2pgx7n48ziqrjyldp1f1";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base bytestring data-default-class ];
librarySystemDepends = [ toxcore ];
+ executableHaskellDepends = [
+ base base16-bytestring bytestring directory
+ ];
+ executableSystemDepends = [ toxcore ];
testHaskellDepends = [
- base data-default-class hspec QuickCheck saltine
+ base base16-bytestring bytestring bytestring-arbitrary
+ data-default-class hspec QuickCheck saltine
];
description = "Haskell bindings to the C reference implementation of Tox";
- license = stdenv.lib.licenses.agpl3;
+ license = stdenv.lib.licenses.gpl3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {toxcore = null;};
@@ -207512,6 +208212,8 @@ self: {
pname = "twee";
version = "2.1.5";
sha256 = "1v94hf1fd7n01drd6hx37zrplpzlskfmd3l8lmkb5kzy618x0cnb";
+ revision = "1";
+ editedCabalFile = "00dkqm778qn9zg562vbcydr0xqglcg9l3i1irvcwshj4q0larwv4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -208835,6 +209537,26 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "typed-process_0_2_3_0" = callPackage
+ ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
+ , process, stm, temporary, transformers
+ }:
+ mkDerivation {
+ pname = "typed-process";
+ version = "0.2.3.0";
+ sha256 = "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0";
+ libraryHaskellDepends = [
+ async base bytestring process stm transformers
+ ];
+ testHaskellDepends = [
+ async base base64-bytestring bytestring hspec process stm temporary
+ transformers
+ ];
+ description = "Run external processes, with strong typing of streams";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"typed-spreadsheet" = callPackage
({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
, diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -210685,6 +211407,33 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "universum_1_3_0" = callPackage
+ ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+ , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
+ , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
+ , text, transformers, unordered-containers, utf8-string, vector
+ }:
+ mkDerivation {
+ pname = "universum";
+ version = "1.3.0";
+ sha256 = "17ggcbkfympmj0y99ycdvck2iliqscz4hp1wz6qgl0gmb3ywx0gp";
+ libraryHaskellDepends = [
+ base bytestring containers deepseq ghc-prim hashable microlens
+ microlens-mtl mtl safe-exceptions stm text transformers
+ unordered-containers utf8-string vector
+ ];
+ testHaskellDepends = [
+ base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
+ utf8-string
+ ];
+ benchmarkHaskellDepends = [
+ base containers gauge unordered-containers
+ ];
+ description = "Custom prelude used in Serokell";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unix_2_7_2_2" = callPackage
({ mkDerivation, base, bytestring, time }:
mkDerivation {
@@ -212101,12 +212850,12 @@ self: {
}) {};
"util-exception" = callPackage
- ({ mkDerivation, base, lifted-base, monad-control, util }:
+ ({ mkDerivation, base, basic, control, lifted-base-tf, util }:
mkDerivation {
pname = "util-exception";
- version = "0.1.0.0";
- sha256 = "0y1d1y421sx8imibi235zc2f3cpjgg9pl6wkmigrxn4q4nwigkbr";
- libraryHaskellDepends = [ base lifted-base monad-control util ];
+ version = "0.2.0.0";
+ sha256 = "0dx617saxbz8ij78kspm4j9zibf77d2hpjbci1c3ag7dhxagvjbx";
+ libraryHaskellDepends = [ base basic control lifted-base-tf util ];
description = "Exceptional utilities";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -213096,6 +213845,22 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "vault-trans" = callPackage
+ ({ mkDerivation, aeson, base, containers, postgresql-simple, text
+ , transformers, unordered-containers, vault-tool
+ }:
+ mkDerivation {
+ pname = "vault-trans";
+ version = "0.1.0.1";
+ sha256 = "0vw66vgpwgnfihgjlngcjf2a288nbnbzb07zxisfxks0mj2vn4cc";
+ libraryHaskellDepends = [
+ aeson base containers postgresql-simple text transformers
+ unordered-containers vault-tool
+ ];
+ description = "A monad transformer for vault-tool";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"vaultaire-common" = callPackage
({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
, cereal, containers, hashable, hslogger, hspec, locators, mtl
@@ -213388,8 +214153,8 @@ self: {
pname = "vector-algorithms";
version = "0.7.0.1";
sha256 = "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd";
- revision = "1";
- editedCabalFile = "1996aj239vasr4hd5c0pi9i0bd08r6clzr76nqvf3hc5kjs7vml2";
+ revision = "2";
+ editedCabalFile = "186nxwg02m16v68gi186f0z99cafp4g87flhfccnzlrvshlfb83m";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base bytestring primitive vector ];
@@ -214068,24 +214833,6 @@ self: {
}) {};
"viewprof" = callPackage
- ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
- , scientific, text, vector, vector-algorithms, vty
- }:
- mkDerivation {
- pname = "viewprof";
- version = "0.0.0.21";
- sha256 = "1zms53c7kym2ln0w5hdnnacch5g6m2clj4zp053w1v7g0qggglnq";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- base brick containers directory ghc-prof lens scientific text
- vector vector-algorithms vty
- ];
- description = "Text-based interactive GHC .prof viewer";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "viewprof_0_0_0_22" = callPackage
({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
, scientific, text, vector, vector-algorithms, vty
}:
@@ -214101,7 +214848,6 @@ self: {
];
description = "Text-based interactive GHC .prof viewer";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"views" = callPackage
@@ -215221,6 +215967,37 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "wai-extra_3_0_24_1" = callPackage
+ ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+ , bytestring, case-insensitive, containers, cookie
+ , data-default-class, deepseq, directory, fast-logger, hspec
+ , http-types, HUnit, iproute, lifted-base, network, old-locale
+ , resourcet, streaming-commons, stringsearch, text, time
+ , transformers, unix, unix-compat, vault, void, wai, wai-logger
+ , word8, zlib
+ }:
+ mkDerivation {
+ pname = "wai-extra";
+ version = "3.0.24.1";
+ sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-terminal base base64-bytestring bytestring
+ case-insensitive containers cookie data-default-class deepseq
+ directory fast-logger http-types iproute lifted-base network
+ old-locale resourcet streaming-commons stringsearch text time
+ transformers unix unix-compat vault void wai wai-logger word8 zlib
+ ];
+ testHaskellDepends = [
+ base bytestring case-insensitive cookie fast-logger hspec
+ http-types HUnit resourcet text time transformers wai zlib
+ ];
+ description = "Provides some basic WAI handlers and middleware";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wai-frontend-monadcgi" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, cgi
, containers, http-types, transformers, wai
@@ -215969,8 +216746,8 @@ self: {
}:
mkDerivation {
pname = "wai-middleware-prometheus";
- version = "0.3.0";
- sha256 = "04ymaaby1pk60gg3bnz1a3mz0r7bl4p41kksbn40nvj5ahz41i6f";
+ version = "1.0.0";
+ sha256 = "0c04cq7q3ck394d7n92mwm0k9qh2dmyn9bsf1n20yzrwrnr9fgkl";
libraryHaskellDepends = [
base bytestring clock data-default http-types prometheus-client
text wai
@@ -218563,13 +219340,14 @@ self: {
"winery" = callPackage
({ mkDerivation, aeson, base, binary, bytestring, cassava
, containers, cpu, deepseq, directory, gauge, hashable, megaparsec
- , mtl, prettyprinter, prettyprinter-ansi-terminal, scientific
- , serialise, text, transformers, unordered-containers, vector
+ , mtl, prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+ , scientific, serialise, text, transformers, unordered-containers
+ , vector
}:
mkDerivation {
pname = "winery";
- version = "0.2";
- sha256 = "07bx9lc2l1kpf4a20gyygi2yb5kzfldf6fi69fwgi06qp1wc03vx";
+ version = "0.2.1";
+ sha256 = "09j7s44j5v6754g1v10yvmb7l9azn2p738x3c4p1iv6qlwghilbj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -218584,8 +219362,8 @@ self: {
];
testHaskellDepends = [
aeson base bytestring containers cpu hashable megaparsec mtl
- prettyprinter prettyprinter-ansi-terminal scientific text
- transformers unordered-containers vector
+ prettyprinter prettyprinter-ansi-terminal QuickCheck scientific
+ text transformers unordered-containers vector
];
benchmarkHaskellDepends = [
aeson base binary bytestring cassava containers cpu deepseq
@@ -218664,8 +219442,8 @@ self: {
}:
mkDerivation {
pname = "wiring";
- version = "0.5.0";
- sha256 = "1a01za9lg9ndyqgcdbx7zw3r4mi3v0qyyng4i7157xggbd6vyhn4";
+ version = "0.5.1";
+ sha256 = "1xzm68pydfbq5dmnap94hwmxk2sl44q15jvap3cqavlagcq7xqsl";
libraryHaskellDepends = [ base mtl template-haskell transformers ];
testHaskellDepends = [
base hspec mtl QuickCheck template-haskell transformers
@@ -218844,6 +219622,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wl-pprint-annotated_0_1_0_1" = callPackage
+ ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit
+ , text
+ }:
+ mkDerivation {
+ pname = "wl-pprint-annotated";
+ version = "0.1.0.1";
+ sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb";
+ libraryHaskellDepends = [ base containers deepseq text ];
+ testHaskellDepends = [
+ base containers deepseq tasty tasty-hunit text
+ ];
+ description = "Pretty printer with annotation support";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wl-pprint-ansiterm" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
, nats, semigroups, text, transformers, wl-pprint-extras
@@ -218878,6 +219673,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "wl-pprint-console_0_1_0_2" = callPackage
+ ({ mkDerivation, base, bytestring, colorful-monoids, text
+ , wl-pprint-annotated
+ }:
+ mkDerivation {
+ pname = "wl-pprint-console";
+ version = "0.1.0.2";
+ sha256 = "05dq90zh2ywmaz0z9vr7114f4c6gacp7b7hlbl3sx31km92v8xnb";
+ libraryHaskellDepends = [
+ base bytestring colorful-monoids text wl-pprint-annotated
+ ];
+ description = "Wadler/Leijen pretty printer supporting colorful console output";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wl-pprint-extras" = callPackage
({ mkDerivation, base, containers, HUnit, nats, semigroupoids
, semigroups, test-framework, test-framework-hunit, text
@@ -219754,6 +220565,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "writer-cps-mtl_0_1_1_5" = callPackage
+ ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
+ }:
+ mkDerivation {
+ pname = "writer-cps-mtl";
+ version = "0.1.1.5";
+ sha256 = "09snvqwwhp39vmiiz3jpnfyjfhvpcj8ykbnhmii0yclxxsjgamqm";
+ libraryHaskellDepends = [
+ base mtl transformers writer-cps-transformers
+ ];
+ description = "MonadWriter orphan instances for writer-cps-transformers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"writer-cps-transformers" = callPackage
({ mkDerivation, base, transformers }:
mkDerivation {
@@ -219765,6 +220591,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "writer-cps-transformers_0_1_1_4" = callPackage
+ ({ mkDerivation, base, transformers }:
+ mkDerivation {
+ pname = "writer-cps-transformers";
+ version = "0.1.1.4";
+ sha256 = "1zc5048spzf52gvski34ffvapw5s5yfdj7znv29yr71r4178pw6n";
+ libraryHaskellDepends = [ base transformers ];
+ description = "WriteT and RWST monad transformers";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wryte" = callPackage
({ mkDerivation, base, mtl, text }:
mkDerivation {
@@ -221670,6 +222508,8 @@ self: {
pname = "xmlhtml";
version = "0.2.5.2";
sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4";
+ revision = "1";
+ editedCabalFile = "15lvbvdcagnqr62wfs3zz9xlcv553jr4ixbl50fsaxhkvlnymk45";
libraryHaskellDepends = [
base blaze-builder blaze-html blaze-markup bytestring
bytestring-builder containers parsec text unordered-containers
@@ -221787,6 +222627,8 @@ self: {
pname = "xmonad";
version = "0.14";
sha256 = "0lq3k0ap7jxrrswpd954mqa6h8diccbif5srcgbmr39y6y8x0mm4";
+ revision = "1";
+ editedCabalFile = "0jkqbbm8allsaa412h8kdb6v64qcwqnpr2p6qxy21zy0jqdkhkp5";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
@@ -225348,22 +226190,6 @@ self: {
}) {};
"yesod-websockets" = callPackage
- ({ mkDerivation, base, conduit, mtl, transformers, unliftio, wai
- , wai-websockets, websockets, yesod-core
- }:
- mkDerivation {
- pname = "yesod-websockets";
- version = "0.3.0";
- sha256 = "0ip4fjjxhz79fj1gm0wl23jkkb64hqn9rwn0vaqy69wy4212jr2a";
- libraryHaskellDepends = [
- base conduit mtl transformers unliftio wai wai-websockets
- websockets yesod-core
- ];
- description = "WebSockets support for Yesod";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "yesod-websockets_0_3_0_1" = callPackage
({ mkDerivation, base, conduit, mtl, transformers, unliftio
, wai-websockets, websockets, yesod-core
}:
@@ -225377,7 +226203,6 @@ self: {
];
description = "WebSockets support for Yesod";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-websockets-extra" = callPackage
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 961cfb4dad07..95484c9258a6 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "groovy-${version}";
- version = "2.5.1";
+ version = "2.5.2";
src = fetchurl {
url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
- sha256 = "1zqq2jsaq547rm8qh8zpj36059jahsba733cwrmg6iq0c8ai4z3s";
+ sha256 = "0bi85gvgpwd9ndg0kiwlrp560934dzy1072zpf587vrmpvqrcps9";
};
buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 40a70623dcb7..765487fc6508 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -152,6 +152,7 @@ let
meta = {
homepage = https://www.perl.org/;
description = "The standard implementation of the Perl 5 programmming language";
+ license = licenses.artistic1;
maintainers = [ maintainers.eelco ];
platforms = platforms.all;
};
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index bf84471c7eb4..37a51ffded31 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -220,8 +220,8 @@ let
in {
php71 = generic {
- version = "7.1.20";
- sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
+ version = "7.1.21";
+ sha256 = "104mn4kppklb21hgz1a50kgmc0ak5y996sx990xpc8yy9dbrqh62";
};
php72 = generic {
diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix
index cb36c96a4c52..4e5793f11139 100644
--- a/pkgs/development/interpreters/ruby/rubygems-src.nix
+++ b/pkgs/development/interpreters/ruby/rubygems-src.nix
@@ -1,8 +1,8 @@
{ fetchurl
-, version ? "2.7.6"
-, sha256 ? "1sqy6z1kngq91nxmv1hw4xhw1ycwx9s76hfbpcdlgkm9haji9xv7"
+, version ? "2.7.7"
+, sha256 ? "1jsmmd31j8j066b83lin4bbqz19jhrirarzb41f3sjhfdjiwkcjc"
}:
fetchurl {
- url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz";
+ url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
sha256 = sha256;
}
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 952f7435c069..8e89aeb21a24 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "arrow-cpp-${version}";
- version = "0.9.0";
+ version = "0.10.0";
src = fetchurl {
url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
- sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
+ sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
};
sourceRoot = "apache-arrow-${version}/cpp";
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index a9652f4da3ee..f1db64cc9ea5 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -10,6 +10,7 @@
, dbus
, glib
, libxml2
+, fixDarwinDylibNames
, gnome3 # To pass updateScript
}:
@@ -24,7 +25,9 @@ stdenv.mkDerivation rec {
sha256 = "0vkan52ab9vrkknnv8y4f1cspk8x7xd10qx92xk9ys71p851z2b1";
};
- nativeBuildInputs = [ meson ninja pkgconfig ];
+ nativeBuildInputs = [ meson ninja pkgconfig ]
+ # Fixup rpaths because of meson, remove with meson-0.47
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ at-spi2-core atk dbus glib libxml2 ];
doCheck = false; # fails with "No test data file provided"
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 9bbde08023ba..d9251c2bdc5d 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -11,6 +11,7 @@
, libX11
, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
, libXi
+, fixDarwinDylibNames
, gnome3 # To pass updateScript
}:
@@ -27,7 +28,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ];
+ nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]
+ # Fixup rpaths because of meson, remove with meson-0.47
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
buildInputs = [ dbus glib libX11 libXtst libXi ];
doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 2874d22a1f9d..1e341d3124b4 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "babl-0.1.54";
+ name = "babl-0.1.56";
src = fetchurl {
url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
- sha256 = "01rad0sf9bkg7124qz5zdn08nl1q00yy5lg6ca3v053jblsg2asd";
+ sha256 = "0a2dvihah1j7qi5dp1qzzlwklcqnndmxsm7lc7i78g7c2yknrlla";
};
doCheck = true;
diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index a22437d3993e..176245491179 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeTextDir }:
+{ targetPlatform, stdenv, fetchurl, writeTextDir }:
let self =
stdenv.mkDerivation rec {
@@ -36,12 +36,12 @@ stdenv.mkDerivation rec {
set_target_properties(c-ares::cares PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${self}/include"
- INTERFACE_LINK_LIBRARIES "nsl;rt"
+ ${stdenv.lib.optionalString stdenv.isLinux ''INTERFACE_LINK_LIBRARIES "nsl;rt"''}
)
set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(c-ares::cares PROPERTIES
- IMPORTED_LOCATION_RELEASE "${self}/lib/libcares.so.2.2.0"
- IMPORTED_SONAME_RELEASE "libcares.so.2"
+ IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${targetPlatform.extensions.sharedLibrary}"
+ IMPORTED_SONAME_RELEASE "libcares${targetPlatform.extensions.sharedLibrary}"
)
add_library(c-ares::cares_shared INTERFACE IMPORTED)
set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares")
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 5f99f35a1599..bf7630608f7d 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas
+{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas
, gmpxx
, optimize ? false # impure
}:
@@ -6,23 +6,30 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "fflas-ffpack";
version = "2.3.2";
+
src = fetchFromGitHub {
owner = "linbox-team";
repo = "${pname}";
rev = "v${version}";
sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl";
};
+
checkInputs = [
gmpxx
];
+
+ enableParallelBuilding = true;
+
nativeBuildInputs = [
autoreconfHook
pkgconfig
] ++ stdenv.lib.optionals doCheck checkInputs;
- buildInputs = [ givaro openblas];
+
+ buildInputs = [ givaro blas ];
+
configureFlags = [
- "--with-blas-libs=-lopenblas"
- "--with-lapack-libs=-lopenblas"
+ "--with-blas-libs=-l${blas.linkName}"
+ "--with-lapack-libs=-l${blas.linkName}"
] ++ stdenv.lib.optionals (!optimize) [
# disable SIMD instructions (which are enabled *when available* by default)
"--disable-sse"
@@ -36,13 +43,15 @@ stdenv.mkDerivation rec {
"--disable-fma"
"--disable-fma4"
];
+
doCheck = true;
+
meta = {
inherit version;
description = ''Finite Field Linear Algebra Subroutines'';
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.raskin];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
homepage = https://linbox-team.github.io/fflas-ffpack/;
};
}
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 2b6a949c2326..d188cb9810a7 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "folly-${version}";
- version = "2018.07.09.00";
+ version = "2018.08.13.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
- sha256 = "08irwa2pb3f2gnk31rq31jjrqk2xxx0a0m72gf0bsv2w9fgn5sfm";
+ sha256 = "1lhq3l7rirhi4vwgiym0r3rff1i69c7bdpi1hm8r4axs2dfjvxdr";
};
nativeBuildInputs = [ autoreconfHook python pkgconfig ];
diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index f32bc120170c..4a72e1fa9b04 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -3,13 +3,13 @@
, libwebp, gnome3, libintl }:
let
- version = "0.4.4";
+ version = "0.4.6";
in stdenv.mkDerivation rec {
name = "gegl-${version}";
src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
- sha256 = "143qwn92xc5wm09p9iwrpw9y0ahha5lcyx1bb0lzwcb1fgd4bjzq";
+ sha256 = "1rcsa60z09jjayk0q6jam4w8rivh400a08bv2xykiv5qyr1yp5zk";
};
# needs fonts otherwise, don't know how to pass them
diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index 8c2e29231dca..a00e07376c7b 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -1,19 +1,33 @@
-{stdenv, fetchurl}:
+{ stdenv
+, lib
+, fetchurl
+, optimize ? false # impure hardware optimizations
+}:
stdenv.mkDerivation rec {
name = "gf2x-${version}";
- version = "1.2";
+ version = "1.2"; # remember to also update the url
src = fetchurl {
# find link to latest version (with file id) here: https://gforge.inria.fr/projects/gf2x/
- url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-1.2.tar.gz";
+ # Requested a predictable link:
+ # https://gforge.inria.fr/tracker/index.php?func=detail&aid=21704&group_id=1874&atid=6982
+ url = "https://gforge.inria.fr/frs/download.php/file/36934/gf2x-${version}.tar.gz";
sha256 = "0d6vh1mxskvv3bxl6byp7gxxw3zzpkldrxnyajhnl05m0gx7yhk1";
};
- meta = with stdenv.lib; {
+ # no actual checks present yet (as of 1.2), but can't hurt trying
+ # for an indirect test, run ntl's test suite
+ doCheck = true;
+
+ configureFlags = lib.optionals (!optimize) [
+ "--disable-hardware-specific-code"
+ ];
+
+ meta = with lib; {
description = ''Routines for fast arithmetic in GF(2)[x]'';
homepage = http://gf2x.gforge.inria.fr;
license = licenses.gpl2Plus;
- maintainers = with maintainers; [ raskin ];
+ maintainers = with maintainers; [ raskin timokau ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index fc1f186a219e..7f680b6b59bf 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];
+
cmakeFlags =
[ "-DgRPC_ZLIB_PROVIDER=package"
"-DgRPC_CARES_PROVIDER=package"
@@ -16,11 +17,19 @@ stdenv.mkDerivation rec {
"-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_GFLAGS_PROVIDER=package"
];
+
+ # CMake creates a build directory by default, this conflicts with the
+ # basel BUILD file on case-insensitive filesystems.
+ preConfigure = ''
+ rm -vf BUILD
+ '';
+
enableParallelBuilds = true;
meta = with stdenv.lib; {
description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)";
license = licenses.asl20;
+ maintainers = [ maintainers.lnl7 ];
homepage = https://grpc.io/;
};
}
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index a384e46fb147..4bf42e1b5b65 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -2,7 +2,7 @@
, gdk_pixbuf, xlibsWrapper, gobjectIntrospection
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? true, cups ? null
-, gdktarget ? "x11"
+, gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
, AppKit, Cocoa
, fetchpatch
}:
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 21f9adfdc8e3..27052d1922f6 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -1,10 +1,11 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info
, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobjectIntrospection
-, xorg, epoxy, json-glib, libxkbcommon, gmp
+, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3
+, x11Support ? stdenv.isLinux
, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
, xineramaSupport ? stdenv.isLinux
, cupsSupport ? stdenv.isLinux, cups ? null
-, darwin, gnome3
+, AppKit, Cocoa
}:
assert cupsSupport -> cups != null;
@@ -36,12 +37,13 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ libxkbcommon epoxy json-glib ];
+ buildInputs = [ libxkbcommon epoxy json-glib ]
+ ++ optional stdenv.isDarwin AppKit;
propagatedBuildInputs = with xorg; with stdenv.lib;
[ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas
libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
+ ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed
++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ]
- ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ])
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;
#TODO: colord?
@@ -55,9 +57,9 @@ stdenv.mkDerivation rec {
"--disable-debug"
"--disable-dependency-tracking"
"--disable-glibtest"
- "--with-gdktarget=quartz"
+ ] ++ optional (stdenv.isDarwin && !x11Support)
"--enable-quartz-backend"
- ] ++ optional stdenv.isLinux [
+ ++ optional x11Support [
"--enable-x11-backend"
] ++ optional waylandSupport [
"--enable-wayland-backend"
diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix
index 3d7c20691ab5..023572976351 100644
--- a/pkgs/development/libraries/indicator-application/gtk3.nix
+++ b/pkgs/development/libraries/indicator-application/gtk3.nix
@@ -1,39 +1,30 @@
-{ stdenv, fetchurl, lib, file
-, pkgconfig, autoconf
+{ stdenv, fetchbzr
+, pkgconfig, systemd, autoreconfHook
, glib, dbus-glib, json-glib
, gtk3, libindicator-gtk3, libdbusmenu-gtk3, libappindicator-gtk3 }:
-with lib;
-
stdenv.mkDerivation rec {
- name = "indicator-application-gtk3-${version}";
- version = "${versionMajor}.${versionMinor}";
- versionMajor = "12.10";
- versionMinor = "0";
+ pname = "indicator-application";
+ version = "12.10.1";
- src = fetchurl {
- url = "${meta.homepage}/${versionMajor}/${version}/+download/indicator-application-${version}.tar.gz";
- sha256 = "1z8ar0k47l4his7zvffbc2kn658nid51svqnfv0dms601w53gbpr";
+ name = "${pname}-gtk3-${version}";
+
+ src = fetchbzr {
+ url = "https://code.launchpad.net/~indicator-applet-developers/${pname}/trunk.17.04";
+ rev = "260";
+ sha256 = "1f0jdyqqb5g86zdpbcyn16x94yjigsfiv2kf73dvni5rp1vafbq1";
};
- nativeBuildInputs = [ pkgconfig autoconf ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
- glib dbus-glib json-glib
+ glib dbus-glib json-glib systemd
gtk3 libindicator-gtk3 libdbusmenu-gtk3 libappindicator-gtk3
];
postPatch = ''
- substituteInPlace configure.ac \
- --replace 'DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`' \
- "DBUSSERVICEDIR=$out/share/dbus-1/services"
- autoconf
- for f in {configure,ltmain.sh,m4/libtool.m4}; do
- substituteInPlace $f \
- --replace /usr/bin/file ${file}/bin/file
- done
- substituteInPlace src/Makefile.in \
- --replace 'applicationlibdir = $(INDICATORDIR)' "applicationlibdir = $out/lib"
+ substituteInPlace data/Makefile.am \
+ --replace "/etc/xdg/autostart" "$out/etc/xdg/autostart"
'';
configureFlags = [
@@ -47,7 +38,16 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}"
];
- meta = {
+ PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "$(out)/lib/systemd/user";
+ PKG_CONFIG_INDICATOR3_0_4_INDICATORDIR = "$(out)/lib/indicators3/7/";
+
+ # Upstart is not used in NixOS
+ postFixup = ''
+ rm -rf $out/share/indicator-application/upstart
+ rm -rf $out/share/upstart
+ '';
+
+ meta = with stdenv.lib; {
description = "Indicator to take menus from applications and place them in the panel";
homepage = https://launchpad.net/indicator-application;
license = licenses.gpl3;
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 1d389f914ddf..48f009f8d3e0 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.48/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.49/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 1ad2254ccf89..4f866974b61b 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,627 @@
{
attica = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/attica-5.48.0.tar.xz";
- sha256 = "1q2133gmhfi3wd9978556syzzqc1s6zgjc0p1353w6dmfwxfyzq8";
- name = "attica-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/attica-5.49.0.tar.xz";
+ sha256 = "1iqclahs9yzyjnkzbzr8hl9j6q8m2djdm6mix92xwrakgirnl3gn";
+ name = "attica-5.49.0.tar.xz";
};
};
baloo = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/baloo-5.48.0.tar.xz";
- sha256 = "0rgz2gx99c1k8vgfskx7w6q1sjf98wcvybv88djdlj2s6h2qn8lj";
- name = "baloo-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/baloo-5.49.0.tar.xz";
+ sha256 = "0xj12v0k58sr3snxyj4vx7dqhinrvk6qm0ikymscqgbmw9ijwxph";
+ name = "baloo-5.49.0.tar.xz";
};
};
bluez-qt = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/bluez-qt-5.48.0.tar.xz";
- sha256 = "149px5gnplk0y7cl3cz258qks3rq5p0kkk9rc48y59zvlxiyy949";
- name = "bluez-qt-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/bluez-qt-5.49.0.tar.xz";
+ sha256 = "0mgnq7w52ksr8b7ys2f1m3irnviy011bsaggh489fjy0xlzk5ard";
+ name = "bluez-qt-5.49.0.tar.xz";
};
};
breeze-icons = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/breeze-icons-5.48.0.tar.xz";
- sha256 = "1p0krrxfz6p0qhy79lnjyi0xsrprw1q4z65xah89kj0wmfriiyqh";
- name = "breeze-icons-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/breeze-icons-5.49.0.tar.xz";
+ sha256 = "178620hhqlv6dl8qal2bmiw55s8b3p4h16q8cgkmq5q5i59nzcph";
+ name = "breeze-icons-5.49.0.tar.xz";
};
};
extra-cmake-modules = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/extra-cmake-modules-5.48.0.tar.xz";
- sha256 = "1675xnc9hv8z8gp95ici2zqmbv7i6f65g0kln4fskxmlxnfplnzw";
- name = "extra-cmake-modules-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/extra-cmake-modules-5.49.0.tar.xz";
+ sha256 = "07pdgjyrxniacqcfvrzw8ij3kasx5pkbq38k6491qbhzfm8vi7y0";
+ name = "extra-cmake-modules-5.49.0.tar.xz";
};
};
frameworkintegration = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/frameworkintegration-5.48.0.tar.xz";
- sha256 = "1na913ndc55nlmfc61122b1p29h4prxnpc5pqvh6drsgfyacnm8y";
- name = "frameworkintegration-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/frameworkintegration-5.49.0.tar.xz";
+ sha256 = "1ni4jrny630zf3zwmqbm8z7dqgiar58992lylfv7kspdg5crcgfx";
+ name = "frameworkintegration-5.49.0.tar.xz";
};
};
kactivities = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kactivities-5.48.0.tar.xz";
- sha256 = "1zxdzwz8j43hh8d7v1qfihf95kwxvsbqki0zgdhlnj7s0xds0yz8";
- name = "kactivities-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kactivities-5.49.0.tar.xz";
+ sha256 = "117f3zrdbs0pa10wn7vy691n02m01h6x4pm8m1q3f4pjm0k4kqim";
+ name = "kactivities-5.49.0.tar.xz";
};
};
kactivities-stats = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kactivities-stats-5.48.0.tar.xz";
- sha256 = "11r61qnrjpc4ls18apb4a13j1lizjq48bxfw3f8p8hjxxxh8z0j6";
- name = "kactivities-stats-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kactivities-stats-5.49.0.tar.xz";
+ sha256 = "129z2m5330j0l1nw8g3qjib60xmx54c6d2g9vnp4w8z0agnihs5f";
+ name = "kactivities-stats-5.49.0.tar.xz";
};
};
kapidox = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kapidox-5.48.0.tar.xz";
- sha256 = "1b22np0lygnm2r2q1anh0f4b7dh2h0lccx767g4r2w0fw5r1bbb4";
- name = "kapidox-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kapidox-5.49.0.tar.xz";
+ sha256 = "09jph3hvasqx1ia0l7is9brc08nxvh9qmg8564nh5cmqaxdwj559";
+ name = "kapidox-5.49.0.tar.xz";
};
};
karchive = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/karchive-5.48.0.tar.xz";
- sha256 = "10qbx8k1yqqfp1pq5yj8ln3gpj2wnfnlln99gczf99f51fqd65p6";
- name = "karchive-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/karchive-5.49.0.tar.xz";
+ sha256 = "1p1gwqda2bsjdysp4ggwdsldbasyfl075xn3wchqyakdv2bdzmn0";
+ name = "karchive-5.49.0.tar.xz";
};
};
kauth = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kauth-5.48.0.tar.xz";
- sha256 = "00mpbs24dm9ycabpcm2wwlv1vdq4dq5qr2zw6bbqpgj3jplakbs7";
- name = "kauth-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kauth-5.49.0.tar.xz";
+ sha256 = "0qg3zwg3kfx2snmvsw4ixr0qds7bd7992dxggvi9dcny7dm9q0n8";
+ name = "kauth-5.49.0.tar.xz";
};
};
kbookmarks = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kbookmarks-5.48.0.tar.xz";
- sha256 = "11ics7gbdkx1f0pxryf2xwjq4fyqh6a3gzcizymm1m7gmygggqar";
- name = "kbookmarks-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kbookmarks-5.49.0.tar.xz";
+ sha256 = "0clmfdcc1fc98q3vbfjf8x140a6df88ixhz0mny3dpv1wcr5cz53";
+ name = "kbookmarks-5.49.0.tar.xz";
};
};
kcmutils = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kcmutils-5.48.0.tar.xz";
- sha256 = "0nvlzvv2gmc2hz11w6bixz4mccnj09g69byrnvsrwh0psf1kqlmw";
- name = "kcmutils-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kcmutils-5.49.0.tar.xz";
+ sha256 = "0xv899p9f0hj6hd089mhn910qn66bihzpaa11ikrhbimckw8g19q";
+ name = "kcmutils-5.49.0.tar.xz";
};
};
kcodecs = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kcodecs-5.48.0.tar.xz";
- sha256 = "1pz0s3krb4vv01hvpjdr5ngnw1ndxgsfln944fm9pfj0pmk7p92n";
- name = "kcodecs-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kcodecs-5.49.0.tar.xz";
+ sha256 = "07va63gsfjrc5ha9rdli923cwyzxpb3v8xgf1zfhw75cfkgda3nz";
+ name = "kcodecs-5.49.0.tar.xz";
};
};
kcompletion = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kcompletion-5.48.0.tar.xz";
- sha256 = "129mmh46y0r6dcnbxf5yswsr48qj5l25n930nlx7wzaav28y55lp";
- name = "kcompletion-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kcompletion-5.49.0.tar.xz";
+ sha256 = "16br6wnqzndk8v41im23h2ww4hypi2i1qfg6m9c49mpxflgmspbi";
+ name = "kcompletion-5.49.0.tar.xz";
};
};
kconfig = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kconfig-5.48.0.tar.xz";
- sha256 = "1g640cnd9j2jp35bb5zgjfxskbg3fj9p03r0yf3dkm1d1681x9a3";
- name = "kconfig-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kconfig-5.49.0.tar.xz";
+ sha256 = "0cb3crnlr8hr5npq3ykfxqd4yckmkykzrrizfs89ryhmznc2ngsf";
+ name = "kconfig-5.49.0.tar.xz";
};
};
kconfigwidgets = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kconfigwidgets-5.48.0.tar.xz";
- sha256 = "0xlnbw34zbmy7fwsi9iks4iv7shki4fqs7wd3yblmyxa2l18ldh9";
- name = "kconfigwidgets-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kconfigwidgets-5.49.0.tar.xz";
+ sha256 = "1nqcrqr67m3kvq2r83x45zcdghk12bas9fp0s43s68imrhy5xikz";
+ name = "kconfigwidgets-5.49.0.tar.xz";
};
};
kcoreaddons = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kcoreaddons-5.48.0.tar.xz";
- sha256 = "157k4l67iswny5krinfigfc6pabqfyfzya6hc5gcjrdplmnccy1f";
- name = "kcoreaddons-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kcoreaddons-5.49.0.tar.xz";
+ sha256 = "00s22jvbwav20cidnp8v9fgc6pqbp4wnqkb2spv18mjhg4pv3bqj";
+ name = "kcoreaddons-5.49.0.tar.xz";
};
};
kcrash = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kcrash-5.48.0.tar.xz";
- sha256 = "0qqwdx7piz4wfm4lh41kknfcyw5saw17qh07ghhi7j80whpkazk8";
- name = "kcrash-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kcrash-5.49.0.tar.xz";
+ sha256 = "0xmr9rrl0xahpnq1rw4bbar1nbr21x2bk4hhv79la6dsg9ha25b3";
+ name = "kcrash-5.49.0.tar.xz";
};
};
kdbusaddons = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kdbusaddons-5.48.0.tar.xz";
- sha256 = "0vpd4cij52v43fsifbk3nnmi5csik8h4avima6jw0b09s8xdz8rr";
- name = "kdbusaddons-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kdbusaddons-5.49.0.tar.xz";
+ sha256 = "1fnmrrffp3kfwyjfzqkzlizflpyqgzbjljb51ppmdypcq8wy9ibh";
+ name = "kdbusaddons-5.49.0.tar.xz";
};
};
kdeclarative = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kdeclarative-5.48.0.tar.xz";
- sha256 = "09nfp6vrj6dc3kfknicr8629ifz976wi4wxdh5bfx15z9296l8pd";
- name = "kdeclarative-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kdeclarative-5.49.0.tar.xz";
+ sha256 = "0kgawb8wfx4snk2ckwxj0hmpgcvq3k1zpsxqdawi4cmsy4bxzfs9";
+ name = "kdeclarative-5.49.0.tar.xz";
};
};
kded = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kded-5.48.0.tar.xz";
- sha256 = "13527iv6cf44wgxpqfhmkhryihjfi02fi78lf2bnvgwmhd2nl954";
- name = "kded-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kded-5.49.0.tar.xz";
+ sha256 = "1l6hs3spbs3618jwg3n7r3hrrkqxmmd43f0km8849x4641p72zyc";
+ name = "kded-5.49.0.tar.xz";
};
};
kdelibs4support = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/portingAids/kdelibs4support-5.48.0.tar.xz";
- sha256 = "058s5h6sfhi1i3pa59hwpyxzd01jgpb8r68nnbphmryimi5nazqf";
- name = "kdelibs4support-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/portingAids/kdelibs4support-5.49.0.tar.xz";
+ sha256 = "1cz70c77l66lbw4fbgmfbq1fldybqxsiay2pg9risgqp3ra8wahi";
+ name = "kdelibs4support-5.49.0.tar.xz";
};
};
kdesignerplugin = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kdesignerplugin-5.48.0.tar.xz";
- sha256 = "1kswvxgjpyi1p1kg4z5x5df8yqhrwhcpavzx4a83dg6hp5xk0l2l";
- name = "kdesignerplugin-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kdesignerplugin-5.49.0.tar.xz";
+ sha256 = "0hj4ng0i22rvw4kl0irhqhww3kvn4c0pncn38w1j5vim4gxv0xcd";
+ name = "kdesignerplugin-5.49.0.tar.xz";
};
};
kdesu = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kdesu-5.48.0.tar.xz";
- sha256 = "14ka3h06xbfv357z29zgbwnjcfwspi42f0fm3m7lszqhz9skj4v5";
- name = "kdesu-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kdesu-5.49.0.tar.xz";
+ sha256 = "1gwvby51qqbkrs2vjpnplxr6m6xa5ddfdjs1iygh8kpqsh8a765k";
+ name = "kdesu-5.49.0.tar.xz";
};
};
kdewebkit = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kdewebkit-5.48.0.tar.xz";
- sha256 = "0wf2prv85sayz1mqq0ymrqw3p0f3ikakhgzy01pixrp7qgwqkkrv";
- name = "kdewebkit-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kdewebkit-5.49.0.tar.xz";
+ sha256 = "05idyw94ayjh7qdia9pnjmx29r5lsch421kv8h5ivr7ixcbrgk6n";
+ name = "kdewebkit-5.49.0.tar.xz";
};
};
kdnssd = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kdnssd-5.48.0.tar.xz";
- sha256 = "01hra59b0sm82j7ry78f3clrypc80q59vx9h0ahacbab4pzq41p5";
- name = "kdnssd-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kdnssd-5.49.0.tar.xz";
+ sha256 = "1n61id2x1iianshg8g6fw389mqihz4h8sj9hnng7cdg4csh72ffr";
+ name = "kdnssd-5.49.0.tar.xz";
};
};
kdoctools = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kdoctools-5.48.0.tar.xz";
- sha256 = "0v8x198kfgz2p56nyy9cb6lks5yazdbdg55c4ps5bw36dbmpd3v8";
- name = "kdoctools-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kdoctools-5.49.0.tar.xz";
+ sha256 = "1dmpk453s71ls0q8hgpqqd5dcr7zlimf5wykizcy2wn7p77gzsgl";
+ name = "kdoctools-5.49.0.tar.xz";
};
};
kemoticons = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kemoticons-5.48.0.tar.xz";
- sha256 = "166sjwrn9dm4km8sypdwcfsylcamhl1gfl28h8hrv498zhnyrfb9";
- name = "kemoticons-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kemoticons-5.49.0.tar.xz";
+ sha256 = "0mz9hkhnprjbrfq54mqcvj8w87h025785m1bas80brsqzvni5krn";
+ name = "kemoticons-5.49.0.tar.xz";
};
};
kfilemetadata = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kfilemetadata-5.48.0.tar.xz";
- sha256 = "0krn53a2s950fb980gdap5hwf994kxfd4h8zk7a4s9cick957z5f";
- name = "kfilemetadata-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kfilemetadata-5.49.0.tar.xz";
+ sha256 = "045k1mgn8kg0qfsr5sl1499nzhzmbcvrqc205pmq6sh4r14nvk80";
+ name = "kfilemetadata-5.49.0.tar.xz";
};
};
kglobalaccel = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kglobalaccel-5.48.0.tar.xz";
- sha256 = "15dlpm69d38bsgl6hc7f1mjjq8qyxac010whx4rcsk4vsrwdfnm7";
- name = "kglobalaccel-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kglobalaccel-5.49.0.tar.xz";
+ sha256 = "1fk7wazfwr7smqiym3phm5yvw6cmiczag52y1vad8fgb3izd6zhl";
+ name = "kglobalaccel-5.49.0.tar.xz";
};
};
kguiaddons = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kguiaddons-5.48.0.tar.xz";
- sha256 = "0viqq9qg448fh12isc1kkmzcnnsjqw5fx4wlshyza19gfr4ym0dz";
- name = "kguiaddons-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kguiaddons-5.49.0.tar.xz";
+ sha256 = "1zkjd3l5pyvvilcc9lbdgqaxnpvh586yf0cndl90h3x89hy1d4xk";
+ name = "kguiaddons-5.49.0.tar.xz";
};
};
kholidays = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kholidays-5.48.0.tar.xz";
- sha256 = "04vjp2jm2c6qgj50jbqkkgqh8b759pd4dpsczfkyq30p03vybxr4";
- name = "kholidays-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kholidays-5.49.0.tar.xz";
+ sha256 = "0yc4i4qsk3w1v0andw737ps1ad70696q140k0ycfhk6qmv1wvsdp";
+ name = "kholidays-5.49.0.tar.xz";
};
};
khtml = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/portingAids/khtml-5.48.0.tar.xz";
- sha256 = "1zrilnvvvvjq82hm6gbh5pvzfygy8w7a0140d3l74jjgy01394m1";
- name = "khtml-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/portingAids/khtml-5.49.0.tar.xz";
+ sha256 = "0k9m2pgq64grmgc6ywpzfnn65h8wfkkiwjbmz2mwbf2yi9c1ky64";
+ name = "khtml-5.49.0.tar.xz";
};
};
ki18n = {
- version = "5.48.1";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/ki18n-5.48.1.tar.xz";
- sha256 = "0m9x6bagviqrnm0hx7ykggqiykxv3qi11bmi0xz2f02y78q89f3h";
- name = "ki18n-5.48.1.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/ki18n-5.49.0.tar.xz";
+ sha256 = "1i4rdrxann45zl6fkmfd1b96q52g0mpc5x19fx9h80crapkm8jjz";
+ name = "ki18n-5.49.0.tar.xz";
};
};
kiconthemes = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kiconthemes-5.48.0.tar.xz";
- sha256 = "1xqbg10qlk1zdha4kfyya1471r35gnz63iyj0ks3gzyfjvbivpy4";
- name = "kiconthemes-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kiconthemes-5.49.0.tar.xz";
+ sha256 = "1f7pk6smi2f0mm7jkrw5ymmkhd9gi8vnmppyblp1v3pvmy571c2m";
+ name = "kiconthemes-5.49.0.tar.xz";
};
};
kidletime = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kidletime-5.48.0.tar.xz";
- sha256 = "184b1qdh4bwsdg9lyl4d8rcs833fqcmfvbb5qmdd3mqvvg8xv9mm";
- name = "kidletime-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kidletime-5.49.0.tar.xz";
+ sha256 = "1fd02anlmaa0hnnp5q1s9973m3asy56qppwq1va1g6ga3csv3wrv";
+ name = "kidletime-5.49.0.tar.xz";
};
};
kimageformats = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kimageformats-5.48.0.tar.xz";
- sha256 = "1myxp583gw5d50ddkkv6ipbdzf6k3sdk9gambklay1dzmy4b91sc";
- name = "kimageformats-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kimageformats-5.49.0.tar.xz";
+ sha256 = "1q7019gbk59fwampna1ayjvw016c0q79hmldpaqh3xa9sh082wy4";
+ name = "kimageformats-5.49.0.tar.xz";
};
};
kinit = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kinit-5.48.0.tar.xz";
- sha256 = "08sf3j1bpxzqjim777d6znn8f7rzs5vpm4wz21s1ng3f32z2km9a";
- name = "kinit-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kinit-5.49.0.tar.xz";
+ sha256 = "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95";
+ name = "kinit-5.49.0.tar.xz";
};
};
kio = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kio-5.48.0.tar.xz";
- sha256 = "0am03nwbfidb5dxs8j8qaan4mcs7xv75sk135rslwfp5q56v1fa0";
- name = "kio-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kio-5.49.0.tar.xz";
+ sha256 = "0rrsg3g1b204cdp58vxd5dig1ggwyvk1382p1c86vn6w8qbrq27k";
+ name = "kio-5.49.0.tar.xz";
};
};
kirigami2 = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kirigami2-5.48.0.tar.xz";
- sha256 = "0f01rnzzv2w7mmb0war8kph46c3wbdbz7s9i6rwh6g7kg6zvzn52";
- name = "kirigami2-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kirigami2-5.49.0.tar.xz";
+ sha256 = "1wan9h7kvjzvyzfjfjd512lxiac5prhs493xjqwxgags6kxwglaz";
+ name = "kirigami2-5.49.0.tar.xz";
};
};
kitemmodels = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kitemmodels-5.48.0.tar.xz";
- sha256 = "13b0fqy4yg4zahqq8376gnna36mfg94yb5d1fz0cgw7fk9d920gf";
- name = "kitemmodels-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kitemmodels-5.49.0.tar.xz";
+ sha256 = "1frha301540js45mrxiw034m9b2rwsa56xphkqn6cm4jmn48qdjg";
+ name = "kitemmodels-5.49.0.tar.xz";
};
};
kitemviews = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kitemviews-5.48.0.tar.xz";
- sha256 = "0cdyw0gy67yhhxv44j1bhhd4qnj7rwi0fjzf275532bf3js1j12w";
- name = "kitemviews-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kitemviews-5.49.0.tar.xz";
+ sha256 = "1aj605q2p72w4rb9i0f2xb93bn5xfjq9sl5i4h6rqflcvvy7qpdp";
+ name = "kitemviews-5.49.0.tar.xz";
};
};
kjobwidgets = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kjobwidgets-5.48.0.tar.xz";
- sha256 = "0a5awpbka6mk4r4m5if7s9i5ybysykpcmlj69liabzcv0k1x5y6w";
- name = "kjobwidgets-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kjobwidgets-5.49.0.tar.xz";
+ sha256 = "04i5cvbxii7n0jr3ai1dh44miqbdkxb6an5w8s7qvkv0xmkml35g";
+ name = "kjobwidgets-5.49.0.tar.xz";
};
};
kjs = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/portingAids/kjs-5.48.0.tar.xz";
- sha256 = "0ysbf6m63cw2iywwr7p5ngsh7s7ml9sc1sqkhnbh7racn0pzc1l4";
- name = "kjs-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/portingAids/kjs-5.49.0.tar.xz";
+ sha256 = "057ikyi4wffjvxdyk08hmj7h8vmbwbcxv98apmjzgsd611zvx5p0";
+ name = "kjs-5.49.0.tar.xz";
};
};
kjsembed = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/portingAids/kjsembed-5.48.0.tar.xz";
- sha256 = "0j74g3xb23k55pixk76z2ib6yyc7f2iwvwqvvw1f907rn43g6qqx";
- name = "kjsembed-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/portingAids/kjsembed-5.49.0.tar.xz";
+ sha256 = "0qddjkfm6f0f5dynqvi3l23mgyfdbk4xzg967sj3a2qlq423ah0m";
+ name = "kjsembed-5.49.0.tar.xz";
};
};
kmediaplayer = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/portingAids/kmediaplayer-5.48.0.tar.xz";
- sha256 = "1kw35c5dmwsrkinfgmylzgvw3zcg0yimlfcl52bhdg0x7sgdbjkq";
- name = "kmediaplayer-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/portingAids/kmediaplayer-5.49.0.tar.xz";
+ sha256 = "0hbx48ivj4i96yagd9n9vd22ycsljrvijm6nfms4x7z7jr49flrx";
+ name = "kmediaplayer-5.49.0.tar.xz";
};
};
knewstuff = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/knewstuff-5.48.0.tar.xz";
- sha256 = "0g2sxk6wqqgynmqgz6jxknlrsmpj4y94cn7vpw84isd9brsr5hfv";
- name = "knewstuff-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/knewstuff-5.49.0.tar.xz";
+ sha256 = "1vhcl2z9rcqg8390l1cwn3yyi1n17pn6mn8fsplp25qhzimb8bmk";
+ name = "knewstuff-5.49.0.tar.xz";
};
};
knotifications = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/knotifications-5.48.0.tar.xz";
- sha256 = "11p03jgkw8zvfsal6q3yxz5shkpxiknnryw2a120sjmsab87imzb";
- name = "knotifications-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/knotifications-5.49.0.tar.xz";
+ sha256 = "10481j2irlqhqd16xi412xbglnyjl0ndanlv9s0d3fxirs95zdd9";
+ name = "knotifications-5.49.0.tar.xz";
};
};
knotifyconfig = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/knotifyconfig-5.48.0.tar.xz";
- sha256 = "1rlzmp1lzrniav2d5sjzh43mdm47i5dpa2rlsqppqq5887wjphcm";
- name = "knotifyconfig-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/knotifyconfig-5.49.0.tar.xz";
+ sha256 = "09v4aq5x98sqg2awhw0n0y0rnjkr77kbf51xij0fiykd4llp9lfa";
+ name = "knotifyconfig-5.49.0.tar.xz";
};
};
kpackage = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kpackage-5.48.0.tar.xz";
- sha256 = "18q6gp1gmzjyid803j7mcm9dbqg4bcd059qlp6sb6rkllygv4pcr";
- name = "kpackage-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kpackage-5.49.0.tar.xz";
+ sha256 = "1xbfjwxb4gff8gg0hs5m9s0jcnzqk27rs2jr71g5ckhvs5psnkcd";
+ name = "kpackage-5.49.0.tar.xz";
};
};
kparts = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kparts-5.48.0.tar.xz";
- sha256 = "1p4xdrxfvq5xj17zf8gfxc0c9lryp8n9ahinardlb3rnb1wcw4hv";
- name = "kparts-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kparts-5.49.0.tar.xz";
+ sha256 = "0zdz0byj0gsbgb007y8x37w8yf1gkw6dsp2s9bbdc4w6h9ipdj2k";
+ name = "kparts-5.49.0.tar.xz";
};
};
kpeople = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kpeople-5.48.0.tar.xz";
- sha256 = "1gddld3phsqknm3x0k0wnhgqid5dqsqbw06v91vbl8746np04zf7";
- name = "kpeople-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kpeople-5.49.0.tar.xz";
+ sha256 = "0i5pd1d2jphsvpc3dpdw28dsdal1qrnnrx3k6qx4wax3f8ph5khv";
+ name = "kpeople-5.49.0.tar.xz";
};
};
kplotting = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kplotting-5.48.0.tar.xz";
- sha256 = "17f78wppaj433x6fm108z5zw849qvnjsxisa92rxmkm9c64wzijg";
- name = "kplotting-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kplotting-5.49.0.tar.xz";
+ sha256 = "13fzqqkyxs4ja6n5yb9lc5jx4qpsmrbsiihnwrgj3lhpzhlr91n0";
+ name = "kplotting-5.49.0.tar.xz";
};
};
kpty = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kpty-5.48.0.tar.xz";
- sha256 = "0ywkiw7gpqx7zrj6wrvfsn2sjkyxzsmqn8p91z0kz1s3id2s04fk";
- name = "kpty-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kpty-5.49.0.tar.xz";
+ sha256 = "1pnj07079l6gkz6171fcvljh0dcdy9s77p1q0l9nnkknjbr102pg";
+ name = "kpty-5.49.0.tar.xz";
};
};
kross = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/portingAids/kross-5.48.0.tar.xz";
- sha256 = "0zxhn8wai71ll1113k47xmcspbp16iz1rybm6m2qs6f4j5ghif8q";
- name = "kross-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/portingAids/kross-5.49.0.tar.xz";
+ sha256 = "194zcf499fkwk3wcs3kc3l0fi9h8gn5yqh6gxrgiyn6iyy9a4qdz";
+ name = "kross-5.49.0.tar.xz";
};
};
krunner = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/krunner-5.48.0.tar.xz";
- sha256 = "0mdwyvx656ba8pwvg4qw8jr268iffqrp9ipr28m71hkx0sh7k6hn";
- name = "krunner-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/krunner-5.49.0.tar.xz";
+ sha256 = "02l5gch9hpag1q5ixnb541g7m9lx25pbggldpa8zykp63apyca19";
+ name = "krunner-5.49.0.tar.xz";
};
};
kservice = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kservice-5.48.0.tar.xz";
- sha256 = "1r5d3cdvmbyqn8hm2hjalgg1ncnpdh1w7fd5rr0k97j5qj29ypis";
- name = "kservice-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kservice-5.49.0.tar.xz";
+ sha256 = "1wwb6c6m8f3b16p47adkc05rrlszvvym7ckks5xp08s58pk1dm8z";
+ name = "kservice-5.49.0.tar.xz";
};
};
ktexteditor = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/ktexteditor-5.48.0.tar.xz";
- sha256 = "1fnq6d3ky277rbg3ngq55gdswrgfxsn19c43s23xcbfaymmhapj7";
- name = "ktexteditor-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/ktexteditor-5.49.0.tar.xz";
+ sha256 = "14iss8svx49vav0h2kg8vhv8g5hg4ky30s7049csfwz7xhp7jmcj";
+ name = "ktexteditor-5.49.0.tar.xz";
};
};
ktextwidgets = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/ktextwidgets-5.48.0.tar.xz";
- sha256 = "0hf4rpnkc9qfpnpfm6bsrrjrvvkr6785pnakqyfbjcgbyavp58hg";
- name = "ktextwidgets-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/ktextwidgets-5.49.0.tar.xz";
+ sha256 = "14gclshmpwmfwkp2hzlnf823pjjmknd9q0gdclsh3yy268c2rsw1";
+ name = "ktextwidgets-5.49.0.tar.xz";
};
};
kunitconversion = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kunitconversion-5.48.0.tar.xz";
- sha256 = "0hipqjj82zkq8ysvg304m5jblxxrvjh8vfc3wgl93zvj0mwx06db";
- name = "kunitconversion-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kunitconversion-5.49.0.tar.xz";
+ sha256 = "11jnqz218rga3f4ppf1d927c7qhh2qpghwjpsrnrxdkz5nrvnf79";
+ name = "kunitconversion-5.49.0.tar.xz";
};
};
kwallet = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kwallet-5.48.0.tar.xz";
- sha256 = "047jp26igla05isq6hg5bq9l3xd3dfa3v8dq3rz4im7dwa10hshr";
- name = "kwallet-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kwallet-5.49.0.tar.xz";
+ sha256 = "13bmks9jb3yhp6clv25qkqkrvbhfyk9z16laxsv79jdd82lxgn1z";
+ name = "kwallet-5.49.0.tar.xz";
};
};
kwayland = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kwayland-5.48.0.tar.xz";
- sha256 = "1qcb2kg1a23fvl6i0xky6mzmn3f6pqkvpv0dy245bd01x7q4csg4";
- name = "kwayland-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kwayland-5.49.0.tar.xz";
+ sha256 = "0d95l2i3j1xxkc15n57w4rhf3di02zna4zzn4gap9qdhfxlfbqi6";
+ name = "kwayland-5.49.0.tar.xz";
};
};
kwidgetsaddons = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kwidgetsaddons-5.48.0.tar.xz";
- sha256 = "079f28ifadxhvk4miwlnhw3dvg7bmb6gjiqcg2w65bmp21rsywb7";
- name = "kwidgetsaddons-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kwidgetsaddons-5.49.0.tar.xz";
+ sha256 = "1frgqz9njbc81pfy6gl6p0hyh1977lg31ynrx5wy7lg7fwaxwl92";
+ name = "kwidgetsaddons-5.49.0.tar.xz";
};
};
kwindowsystem = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kwindowsystem-5.48.0.tar.xz";
- sha256 = "1b6cvx3yqkqmvji2y7ys421hmj98xhww1rlgphfdvrdaqzl4579n";
- name = "kwindowsystem-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kwindowsystem-5.49.0.tar.xz";
+ sha256 = "175rzwrjndhawyy4x11lbihdr1r9gwxmxjpbz4x06hlz4g50wffp";
+ name = "kwindowsystem-5.49.0.tar.xz";
};
};
kxmlgui = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kxmlgui-5.48.0.tar.xz";
- sha256 = "0n38bxxip1c4fgj00jvph98qhb11ifx40z4m0pjafm52bg0kaa2h";
- name = "kxmlgui-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kxmlgui-5.49.0.tar.xz";
+ sha256 = "0wsgs5ya3wnc5cryi1r9i30sq8dnnhh15p02skdjlhwjfvdhxmfa";
+ name = "kxmlgui-5.49.0.tar.xz";
};
};
kxmlrpcclient = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/kxmlrpcclient-5.48.0.tar.xz";
- sha256 = "0s0xrx2p0jngk83zb8zjn4vkwnj46wzbxzj904g71ca428nmfx40";
- name = "kxmlrpcclient-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/kxmlrpcclient-5.49.0.tar.xz";
+ sha256 = "0l4jnvn7s77jkvd2z44mz24mfzcw499plms79j21pjryc88drh06";
+ name = "kxmlrpcclient-5.49.0.tar.xz";
};
};
modemmanager-qt = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/modemmanager-qt-5.48.0.tar.xz";
- sha256 = "17pnzpv3g3g25vnh9jjjk3fk6i3lhk6icl56ifcsmpj09nlw41im";
- name = "modemmanager-qt-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/modemmanager-qt-5.49.0.tar.xz";
+ sha256 = "1wf3v552vbr4kh2d770zn3yn0q3bqjqbfrvnf813mnld7961m7p2";
+ name = "modemmanager-qt-5.49.0.tar.xz";
};
};
networkmanager-qt = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/networkmanager-qt-5.48.0.tar.xz";
- sha256 = "15qikndykampl63bnp6rik1vkmwpivqf1krbsb0r29fmwyzhy38v";
- name = "networkmanager-qt-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/networkmanager-qt-5.49.0.tar.xz";
+ sha256 = "16pnd52m9srcb2ml3vc3kd9k1yak5rq09yci39qp7z5jbdy7jk2z";
+ name = "networkmanager-qt-5.49.0.tar.xz";
};
};
oxygen-icons5 = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/oxygen-icons5-5.48.0.tar.xz";
- sha256 = "08y1gy2xgzby9wxbh90cfzly1aym9nym5r8m7z848a4v7chp0wpw";
- name = "oxygen-icons5-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/oxygen-icons5-5.49.0.tar.xz";
+ sha256 = "0llx06sr36cd6vgkgm3jw6k4cv1cfx3r6x6lmb477wpahis0n75g";
+ name = "oxygen-icons5-5.49.0.tar.xz";
};
};
plasma-framework = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/plasma-framework-5.48.0.tar.xz";
- sha256 = "1hl1q1v8kmq20bzm2bfrpjx1f1rljg2akib0sc65nw6vclrcgh82";
- name = "plasma-framework-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/plasma-framework-5.49.0.tar.xz";
+ sha256 = "1yrccbkdpnfbgn7fzpmzzxm5c7fhkv1vqygq1f96r30fia0cj5jv";
+ name = "plasma-framework-5.49.0.tar.xz";
};
};
prison = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/prison-5.48.0.tar.xz";
- sha256 = "04asjh9k6qhz6mzqvcw5famjh8fdfrjj5gwhar9lpzvl53k9236q";
- name = "prison-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/prison-5.49.0.tar.xz";
+ sha256 = "0dppz9x6k84sl0aiyjlh3xigqgda64r8mij3bzxcdkv2wbc4ld9d";
+ name = "prison-5.49.0.tar.xz";
};
};
purpose = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/purpose-5.48.0.tar.xz";
- sha256 = "015dcsz2pybfl13dq0fhja7j05bvchjd6bcwmniq8cwc2dg2qxyp";
- name = "purpose-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/purpose-5.49.0.tar.xz";
+ sha256 = "014izz6vvk3vqw7s2qy33dqfflyylk8vqr9srkf391f6yfld9ygz";
+ name = "purpose-5.49.0.tar.xz";
};
};
qqc2-desktop-style = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/qqc2-desktop-style-5.48.0.tar.xz";
- sha256 = "1wc4vxjipdw3zq1lqwz3s7f0gzrcvs8svy9ip5r40qcz2w55s4an";
- name = "qqc2-desktop-style-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/qqc2-desktop-style-5.49.0.tar.xz";
+ sha256 = "1vbms7b8x1y7yh8im8dv1q3wwl3j2x4r47yqg86f28grw2r2n2zj";
+ name = "qqc2-desktop-style-5.49.0.tar.xz";
};
};
solid = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/solid-5.48.0.tar.xz";
- sha256 = "0fy070kbqs9hvi1ngmqzfz8a9vnry0mrin51z1yfdc44806bk2ns";
- name = "solid-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/solid-5.49.0.tar.xz";
+ sha256 = "1p7rdmf2f8520xc7zp7wxlcizyyjfxwq5mf95qsfpwc4dl0c43gp";
+ name = "solid-5.49.0.tar.xz";
};
};
sonnet = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/sonnet-5.48.0.tar.xz";
- sha256 = "1mzl2a61jrqflnlkkrp079z428sf2bc811qwfx0rdh0jp7bc7sq4";
- name = "sonnet-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/sonnet-5.49.0.tar.xz";
+ sha256 = "0m5pmka1hwjsg3c3qvx087z3fjrfw0ayk7ylgjls5iwd39kkl1b3";
+ name = "sonnet-5.49.0.tar.xz";
};
};
syntax-highlighting = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/syntax-highlighting-5.48.0.tar.xz";
- sha256 = "03cfljg90iszpxmx6f0dv1w1r451yqzi9bk27x56s5xzsghj8bv5";
- name = "syntax-highlighting-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/syntax-highlighting-5.49.0.tar.xz";
+ sha256 = "17rkgzkfiz5dv0xr67na7ikqszgwjnf2gc11b2h47qdsr7pgx95v";
+ name = "syntax-highlighting-5.49.0.tar.xz";
};
};
threadweaver = {
- version = "5.48.0";
+ version = "5.49.0";
src = fetchurl {
- url = "${mirror}/stable/frameworks/5.48/threadweaver-5.48.0.tar.xz";
- sha256 = "0pks8sddqdhlcrqgb106b6jy0gh3gfcss2rdavqfck6d9780v125";
- name = "threadweaver-5.48.0.tar.xz";
+ url = "${mirror}/stable/frameworks/5.49/threadweaver-5.49.0.tar.xz";
+ sha256 = "099bs429p71dzrqy25z61rvn48w3b73p7yag4q69jnxcpj0qcyz7";
+ name = "threadweaver-5.49.0.tar.xz";
};
};
}
diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix
index d043820aa083..649541e22627 100644
--- a/pkgs/development/libraries/libdwarf/default.nix
+++ b/pkgs/development/libraries/libdwarf/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, libelf }:
let
- version = "20180527";
+ version = "20180809";
src = fetchurl {
url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
# Upstream displays this hash broken into three parts:
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index e9010852eb33..6001946cb970 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -11,11 +11,11 @@ assert javaSupport -> jdk != null;
stdenv.mkDerivation rec {
name = "libguestfs-${version}";
- version = "1.38.3";
+ version = "1.38.4";
src = fetchurl {
url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz";
- sha256 = "130nc9v9f8k5kwz9hzqd43fjxg01hl7jh0jw1fhs4ah5hmg71v34";
+ sha256 = "1xsazw6yrbgmc647j8l896fzv534157sqmdzac09rxkxwiy0wm16";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index d1dae0cfee6e..8cca5333d084 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
description= "A Qt5 library to write cross-platfrom clients for Matrix";
homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html;
license = licenses.lgpl21;
- platforms = platforms.linux;
+ platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ peterhoeg ];
};
}
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 84fb600d88e3..ea24c9da88b9 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "librealsense-${version}";
- version = "2.14.1";
+ version = "2.15.0";
src = fetchFromGitHub {
owner = "IntelRealSense";
repo = "librealsense";
rev = "v${version}";
- sha256 = "1gxfnc1c87a3xfp0dpcp32jjjmxz7f9aw6jcda87lr2xvhpvq0n5";
+ sha256 = "12918gcn0w5h6bqgx6s44w44bs1x2pcndn2833xzya69rddkdv6x";
};
buildInputs = [
diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 083ea88301a6..521f963e277c 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
stdenv.mkDerivation rec {
- name = "librelp-1.2.16";
+ name = "librelp-1.2.17";
src = fetchurl {
url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
- sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc";
+ sha256 = "1w6blhfr3rlmvjj0fbr8rsycrkm5b92n44zaaijg1jnvxjfqpy0v";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 91d2851df2bb..e30f2b0af5d5 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -27,6 +27,7 @@ let
meta = with lib; {
description = "Free TLS/SSL implementation";
homepage = "https://www.libressl.org";
+ license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ];
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
};
diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index 9db56aa3a9ec..ad8120d3591a 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
- rev = "0.6.34";
+ rev = "0.6.35";
name = "libsolv-${rev}";
src = fetchFromGitHub {
inherit rev;
owner = "openSUSE";
repo = "libsolv";
- sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7";
+ sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq";
};
cmakeFlags = [
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 994d22846773..b3636eef2621 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
+{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
, libvpx, check, libconfig, pkgconfig }:
let
@@ -20,7 +20,7 @@ let
];
buildInputs = [
- libsodium libmsgpack ncurses libconfig
+ libsodium msgpack ncurses libconfig
] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
libopus libvpx
];
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 63f11daad288..4b104a04c15d 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -60,7 +60,9 @@ in stdenv.mkDerivation rec {
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
patchShebangs . # fixes /usr/bin/python references
- '';
+ substituteInPlace src/util/virjsoncompat.c --replace \
+ '"libjansson.so.4"' '"${jansson}/lib/libjansson${stdenv.targetPlatform.extensions.sharedLibrary}"'
+ '';
configureFlags = [
"--localstatedir=/var"
diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
index 2f89c0abdfc6..b0449d8205d1 100644
--- a/pkgs/development/libraries/libwps/default.nix
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libwps-${version}";
- version = "0.4.9";
+ version = "0.4.10";
src = fetchurl {
url = "mirror://sourceforge/libwps/${name}.tar.bz2";
- sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6";
+ sha256 = "1adx2wawl0i16p8df80m6k6a137h709ip4zc0zlzr6wal8gpn0i4";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
index c4ff0e892a82..a9a649e2de76 100644
--- a/pkgs/development/libraries/linbox/default.nix
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -4,7 +4,7 @@
, autoreconfHook
, givaro
, pkgconfig
-, openblas
+, blas
, fflas-ffpack
, gmpxx
, optimize ? false # impure
@@ -29,13 +29,13 @@ stdenv.mkDerivation rec {
buildInputs = [
givaro
- openblas
+ blas
gmpxx
fflas-ffpack
];
configureFlags = [
- "--with-blas-libs=-lopenblas"
+ "--with-blas-libs=-l${blas.linkName}"
"--disable-optimization"
] ++ stdenv.lib.optionals (!optimize) [
# disable SIMD instructions (which are enabled *when available* by default)
@@ -65,12 +65,14 @@ stdenv.mkDerivation rec {
doCheck = true;
+ enableParallelBuilding = true;
+
meta = {
inherit version;
description = "C++ library for exact, high-performance linear algebra";
license = stdenv.lib.licenses.lgpl21Plus;
maintainers = [stdenv.lib.maintainers.timokau];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
homepage = http://linalg.org/;
};
}
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
new file mode 100644
index 000000000000..34dfe26ad70b
--- /dev/null
+++ b/pkgs/development/libraries/lmdbxx/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchFromGitHub
+, lmdb }:
+
+stdenv.mkDerivation rec {
+ name = "lmdbxx-${version}";
+ version = "0.9.14.0";
+
+ src = fetchFromGitHub {
+ owner = "bendiken";
+ repo = "lmdbxx";
+ rev = "${version}";
+ sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6";
+ };
+
+ buildInputs = [ lmdb ];
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = {
+ homepage = "https://github.com/bendiken/lmdbxx#readme";
+ description = "C++11 wrapper for the LMDB embedded B+ tree database library";
+ license = stdenv.lib.licenses.unlicense;
+ maintainers = with stdenv.lib.maintainers; [ fgaz ];
+ };
+}
+
diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix
similarity index 69%
rename from pkgs/development/libraries/libmsgpack/default.nix
rename to pkgs/development/libraries/msgpack/default.nix
index 8feacd4e3653..bf51f8954025 100644
--- a/pkgs/development/libraries/libmsgpack/default.nix
+++ b/pkgs/development/libraries/msgpack/default.nix
@@ -1,12 +1,12 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "2.1.5";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "cpp-${version}";
- sha256 = "0n4kvma3dldfsvv7b0zw23qln6av5im2aqqd6m890i75zwwkw0zv";
+ sha256 = "0nr6y9v4xbvzv717j9w9lhmags1y2s5mq103v044qlyd2jkbg2p4";
};
})
diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
similarity index 95%
rename from pkgs/development/libraries/libmsgpack/generic.nix
rename to pkgs/development/libraries/msgpack/generic.nix
index 947960d23592..67418b6666d4 100644
--- a/pkgs/development/libraries/libmsgpack/generic.nix
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "libmsgpack-${version}";
+ name = "msgpack-${version}";
inherit src patches;
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 4e9dab79e4e9..3089e6da23ae 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -113,9 +113,10 @@ in stdenv.mkDerivation rec {
rm -f "$out"/lib/*.a
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://developer.mozilla.org/en-US/docs/NSS;
description = "A set of libraries for development of security-enabled client and server applications";
- platforms = stdenv.lib.platforms.all;
+ license = licenses.mpl20;
+ platforms = platforms.all;
};
}
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index 96d3be41235a..63a51a90ccd2 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -14,16 +14,13 @@ assert withGf2x -> gf2x != null;
stdenv.mkDerivation rec {
name = "ntl-${version}";
- version = "11.2.1";
+ version = "11.3.0";
+
src = fetchurl {
url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz";
- sha256 = "04avzmqflx2a33n7v9jj32g83p7m6z712fg1mw308jk5ca2qp489";
+ sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s";
};
- patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
- substituteInPlace DoConfig --replace g++ c++
- '';
-
buildInputs = [
gmp
];
@@ -51,6 +48,7 @@ stdenv.mkDerivation rec {
else
"generic" # "chooses options that should be OK for most platforms"
}"
+ "CXX=c++"
] ++ lib.optionals withGf2x [
"NTL_GF2X_LIB=on"
"GF2X_PREFIX=${gf2x}"
@@ -66,6 +64,8 @@ stdenv.mkDerivation rec {
length integers, and for vectors, matrices, and polynomials over
the integers and over finite fields.
'';
+ # Upstream contact: maintainer is victorshoup on GitHub. Alternatively the
+ # email listed on the homepage.
homepage = http://www.shoup.net/ntl/;
maintainers = with maintainers; [ timokau ];
license = licenses.gpl2Plus;
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 2bb82efb24ce..bd7d252e1a08 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -6,7 +6,7 @@
, pkgconfig
, nettle
, gnutls
-, libmsgpack
+, msgpack
, readline
, libargon2
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
pkgconfig
nettle
gnutls
- libmsgpack
+ msgpack
readline
libargon2
];
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 9ed555053e25..16e00e9f2b95 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://www.openldap.org/;
description = "An open source implementation of the Lightweight Directory Access Protocol";
+ license = licenses.openldap;
maintainers = with maintainers; [ lovek323 ];
platforms = platforms.unix;
};
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 9f0c2b2a5b88..380c0c4af638 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -109,11 +109,12 @@ let
fi
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://www.openssl.org/;
description = "A cryptographic library that implements the SSL and TLS protocols";
- platforms = stdenv.lib.platforms.all;
- maintainers = [ stdenv.lib.maintainers.peti ];
+ license = licenses.openssl;
+ platforms = platforms.all;
+ maintainers = [ maintainers.peti ];
priority = 10; # resolves collision with ‘man-pages’
};
};
diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index a4196e0dc9f0..0c05e2ec5f61 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, requireFile, autoPatchelfHook, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
+{ stdenv, requireFile, autoPatchelfHook, fixDarwinDylibNames, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
assert odbcSupport -> unixODBC != null;
let
+ inherit (stdenv.lib) optional optionals optionalString;
+
baseVersion = "12.2";
version = "${baseVersion}.0.1.0";
requireSource = component: arch: version: rel: hash: (requireFile rec {
- name = "instantclient-${component}-${arch}-${version}" + (stdenv.lib.optionalString (rel != "") "-${rel}") + ".zip";
+ name = "instantclient-${component}-${arch}-${version}" + (optionalString (rel != "") "-${rel}") + ".zip";
url = "http://www.oracle.com/technetwork/database/database-technologies/instant-client/downloads/index.html";
sha256 = hash;
});
@@ -24,37 +26,46 @@ let
(requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194")
(requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb")
(requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ]
- ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d");
+ ++ optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d");
"x86_64-darwin" = [
(requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9")
(requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b")
(requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ]
- ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e");
+ ++ optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e");
}."${stdenv.system}" or throwSystem;
+ extLib = stdenv.hostPlatform.extensions.sharedLibrary;
in stdenv.mkDerivation rec {
inherit version srcs;
name = "oracle-instantclient-${version}";
buildInputs = [ stdenv.cc.cc.lib ]
- ++ stdenv.lib.optionals (stdenv.isLinux) [ libaio ]
- ++ stdenv.lib.optional odbcSupport unixODBC;
- nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ];
+ ++ optionals (stdenv.isLinux) [ libaio ]
+ ++ optional odbcSupport unixODBC;
+
+ nativeBuildInputs = [ makeWrapper unzip ]
+ ++ optional stdenv.isLinux autoPatchelfHook
+ ++ optional stdenv.isDarwin fixDarwinDylibNames;
unpackCmd = "unzip $curSrc";
installPhase = ''
mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"}
-
install -Dm755 {sqlplus,adrci,genezi} $out/bin
- ln -s $out/bin/sqlplus $out/bin/sqlplus64
- install -Dm644 *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib
+ ${optionalString stdenv.isDarwin ''
+ for exe in "$out/bin/"* ; do
+ install_name_tool -add_rpath "$out/lib" "$exe"
+ done
+ ''}
+ ln -sfn $out/bin/sqlplus $out/bin/sqlplus64
+ install -Dm644 *${extLib}* $out/lib
install -Dm644 *.jar $out/share/java
install -Dm644 sdk/include/* $out/include
install -Dm644 sdk/demo/* $out/share/${name}/demo
# PECL::oci8 will not build without this
- ln -s $out/lib/libclntsh.so.12.1 $out/lib/libclntsh.so
+ # this symlink only exists in dist zipfiles for some platforms
+ ln -sfn $out/lib/libclntsh${extLib}.12.1 $out/lib/libclntsh${extLib}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 82927664b4c1..6675bbf91836 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/polkit;
description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
+ license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ ];
};
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 9955af046597..286be260052b 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -59,4 +59,10 @@ stdenv.mkDerivation rec {
homepage = http://www.netlib.org/blas/;
platforms = stdenv.lib.platforms.unix;
};
+
+ # We use linkName to pass a different name to --with-blas-libs for
+ # fflas-ffpack and linbox, because we use blas on darwin but openblas
+ # elsewhere.
+ # See see https://github.com/NixOS/nixpkgs/pull/45013.
+ passthru.linkName = "blas";
}
diff --git a/pkgs/development/libraries/science/math/ecos/default.nix b/pkgs/development/libraries/science/math/ecos/default.nix
new file mode 100644
index 000000000000..645a865eb955
--- /dev/null
+++ b/pkgs/development/libraries/science/math/ecos/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "ecos-${version}";
+ version = "2.0.6";
+
+ src = fetchFromGitHub {
+ owner = "embotech";
+ repo = "ecos";
+ rev = "v${version}";
+ sha256 = "11v958j66wq30gxpjpkgl7n3rvla845lygz8fl39pgf1vk9sdyc7";
+ };
+
+ buildPhase = ''
+ make all shared
+ '';
+
+ doCheck = true;
+ checkPhase = ''
+ make test
+ ./runecos
+ '';
+
+ installPhase = ''
+ mkdir -p $out/lib
+ cp lib*.a lib*.so $out/lib
+ cp -r include $out/
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A lightweight conic solver for second-order cone programming";
+ homepage = https://www.embotech.com/ECOS;
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.bhipple ];
+ };
+}
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e00a5ca9f8d9..18483f9e327c 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -143,4 +143,10 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ ttuegel ];
};
+
+ # We use linkName to pass a different name to --with-blas-libs for
+ # fflas-ffpack and linbox, because we use blas on darwin but openblas
+ # elsewhere.
+ # See see https://github.com/NixOS/nixpkgs/pull/45013.
+ passthru.linkName = "openblas";
}
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix
index 6cb6e626f279..935217c6992e 100644
--- a/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -22,13 +22,30 @@ buildPythonPackage rec {
--replace "'git-annex'" "'${git-annex}/bin/git-annex'"
'';
- # TODO: Remove for next version
patches = [
+ # fixes the "not-a-git-repo" testcase where recent git versions expect a slightly different error.
./not-a-git-repo-testcase.patch
+
+ # fixes the testcase which parses the output of `git-annex info` where several
+ # new lines are displayed that broke the test.
+ (fetchpatch {
+ url = "https://github.com/Ma27/git-annex-adapter/commit/39cb6da69c1aec3d57ea9f68c2dea5113ae1b764.patch";
+ sha256 = "0wyy2icqan3jpiw7dm50arfq3mgq4b5s3g91k82srap763r9hg5m";
+ })
+
+ # fixes the testcase which runs "git status" and complies with the
+ # slightly altered output.
(fetchpatch {
url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch";
sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir";
})
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [
+ # `rev` is part of utillinux on NixOS which is not available on `nixpks` for darwin:
+ # https://logs.nix.ci/?key=nixos/nixpkgs.45061&attempt_id=271763ba-2ae7-4098-b469-b82b1d8edb9b
+ (fetchpatch {
+ url = "https://github.com/alpernebbi/git-annex-adapter/commit/0b60b4577528b309f6ac9d47b55a00dbda9850ea.patch";
+ sha256 = "0z608hpmyzv1mm01dxr7d6bi1hc77h4yafghkynmv99ijgnm1qk7";
+ })
];
checkInputs = [
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index a526cf8578ab..9bbab76d4a2f 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -273,6 +273,7 @@ let
igraph = [ pkgs.gmp pkgs.libxml2.dev ];
JavaGD = [ pkgs.jdk ];
jpeg = [ pkgs.libjpeg.dev ];
+ jqr = [ pkgs.jq.dev ];
KFKSDS = [ pkgs.gsl_1 ];
kza = [ pkgs.fftw.dev ];
libamtrack = [ pkgs.gsl_1 ];
@@ -413,6 +414,7 @@ let
geoCount = [ pkgs.pkgconfig ];
gdtools = [ pkgs.pkgconfig ];
JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
+ jqr = [ pkgs.jq.lib ];
kza = [ pkgs.pkgconfig ];
magick = [ pkgs.pkgconfig ];
mwaved = [ pkgs.pkgconfig ];
@@ -776,6 +778,12 @@ let
'';
});
+ jqr = old.jqr.overrideDerivation (attrs: {
+ preConfigure = ''
+ patchShebangs configure
+ '';
+ });
+
pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: {
postPatch = lib.optionalString stdenv.isDarwin ''
for file in R/*.{r,r.in}; do
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 1e1ee8bc7971..eb9be9ed18c9 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -21,7 +21,7 @@
, libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
, cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
-, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
+, msgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
, cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx
}@args:
@@ -219,7 +219,7 @@ in
};
msgpack = attrs: {
- buildInputs = [ libmsgpack ];
+ buildInputs = [ msgpack ];
};
mysql = attrs: {
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 19609e15c765..7cf709066542 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -22,7 +22,7 @@ buildPythonApplication rec {
postInstall = ''
mv "$out/bin/b2" "$out/bin/backblaze-b2"
- sed 's/^have b2 \&\&$/have backblaze-b2 \&\&/' -i contrib/bash_completion/b2
+ sed 's/^have b2 \&\&$/_have backblaze-b2 \&\&/' -i contrib/bash_completion/b2
sed 's/^\(complete -F _b2\) b2/\1 backblaze-b2/' -i contrib/bash_completion/b2
mkdir -p "$out/etc/bash_completion.d"
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 2c81e27d3a20..acb58863e6b7 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -132,6 +132,11 @@ stdenv.mkDerivation rec {
src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java \
--replace /bin:/usr/bin ${defaultShellPath}
+ # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash
+ echo "PATH=$PATH:${defaultShellPath}" >> runfiles.bash.tmp
+ cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp
+ mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash
+
patchShebangs .
'';
diff --git a/pkgs/development/tools/database/sqldeveloper/18.2.nix b/pkgs/development/tools/database/sqldeveloper/18.2.nix
new file mode 100644
index 000000000000..adb22f45c8e1
--- /dev/null
+++ b/pkgs/development/tools/database/sqldeveloper/18.2.nix
@@ -0,0 +1,84 @@
+{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }:
+
+let
+ version = "18.2.0.183.1748";
+
+ desktopItem = makeDesktopItem {
+ name = "sqldeveloper";
+ exec = "sqldeveloper";
+ icon = "sqldeveloper";
+ desktopName = "Oracle SQL Developer 18";
+ genericName = "Oracle SQL Developer 18";
+ comment = "Oracle's Oracle DB GUI client";
+ categories = "Application;Development;";
+ };
+in
+ stdenv.mkDerivation rec {
+
+ inherit version;
+ name = "sqldeveloper-${version}";
+
+ src = requireFile rec {
+ name = "sqldeveloper-${version}-no-jre.zip";
+ url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/";
+ message = ''
+ This Nix expression requires that ${name} already be part of the store. To
+ obtain it you need to
+
+ - navigate to ${url}
+ - make sure that it says "Version ${version}" above the list of downloads
+ - if it does not, click on the "Previous Version" link below the downloads
+ and repeat until the version is correct. This is necessarry because as the
+ time of this writing there exists no permanent link for the current version
+ yet.
+ Also consider updating this package yourself (you probably just need to
+ change the `version` variable and update the sha256 to the one of the
+ new file) or opening an issue at the nixpkgs repo.
+ - accept the license agreement
+ - download the file listed under "Other Platforms"
+ - sign in or create an oracle account if neccessary
+
+ and then add the file to the Nix store using either:
+
+ nix-store --add-fixed sha256 ${name}
+
+ or
+
+ nix-prefetch-url --type sha256 file:///path/to/${name}
+ '';
+ sha256 = "0clz2w4ghqczy9sz6j4qqygk20whdwkca192pd3v0dw09875as0k";
+ };
+
+ buildInputs = [ makeWrapper unzip ];
+
+ unpackCmd = "unzip $curSrc";
+
+ installPhase = ''
+ mkdir -p $out/libexec $out/share/{applications,pixmaps}
+ mv * $out/libexec/
+
+ mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png
+ cp ${desktopItem}/share/applications/* $out/share/applications
+
+ makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \
+ --set JAVA_HOME ${jdk.home} \
+ --run "cd $out/libexec/sqldeveloper/bin"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Oracle's Oracle DB GUI client";
+ longDescription = ''
+ Oracle SQL Developer is a free integrated development environment that
+ simplifies the development and management of Oracle Database in both
+ traditional and Cloud deployments. SQL Developer offers complete
+ end-to-end development of your PL/SQL applications, a worksheet for
+ running queries and scripts, a DBA console for managing the database,
+ a reports interface, a complete data modeling solution, and a migration
+ platform for moving your 3rd party databases to Oracle.
+ '';
+ homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ ardumont flokli ma27 ];
+ };
+}
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index b950ab0f10ff..45e8ba4f7c02 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -79,6 +79,6 @@ in
homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/;
license = licenses.unfree;
platforms = [ "x86_64-linux" "x86_64-darwin" ];
- maintainers = [ maintainers.ardumont ];
+ maintainers = with maintainers; [ ardumont flokli ];
};
}
diff --git a/pkgs/development/tools/ghp-import/default.nix b/pkgs/development/tools/ghp-import/default.nix
index 9bad3fc6870a..44c16b3a4bfd 100644
--- a/pkgs/development/tools/ghp-import/default.nix
+++ b/pkgs/development/tools/ghp-import/default.nix
@@ -3,12 +3,12 @@
with python3.pkgs;
buildPythonApplication rec {
- version = "0.4.1";
+ version = "0.5.5";
pname = "ghp-import";
src = fetchPypi {
inherit pname version;
- sha256 = "6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053";
+ sha256 = "1mvmpi7lqflw2lr0g0y5f9s0d1pv9cav4gbmaqnziqg442klx4iy";
};
disabled = isPyPy;
diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 30dd7f217915..1403194925d3 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -9,8 +9,8 @@ mkDerivation {
src = fetchFromGitHub {
owner = "haskell-CI";
repo = "haskell-ci";
- rev = "f7ab8c794d7a957370d89f9b4e285a6d20bf8af8";
- sha256 = "0w8qjdy8hzdrwmqnkf4y967r9xh0k21w3hxqlsjp66cay1vby2s8";
+ rev = "f67bc41621d40d6559684be5406d65409df4c480";
+ sha256 = "1r79dbgjq97h30xa3xhf75l0bivag8an9ag00mgzgpglvgc96czm";
};
isLibrary = true;
isExecutable = true;
diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix
new file mode 100644
index 000000000000..1691f09e6e41
--- /dev/null
+++ b/pkgs/development/tools/lattice-diamond/default.nix
@@ -0,0 +1,115 @@
+{ stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib,
+ freetype, fontconfig, xorg }:
+
+stdenv.mkDerivation rec {
+ name = "diamond-3.10";
+
+ nativeBuildInputs = [ rpmextract patchelf makeWrapper file ];
+
+ src = requireFile {
+ name = "diamond_3_10-base_x64-111-2-x86_64-linux.rpm";
+ url = "http://www.latticesemi.com/view_document?document_id=52180";
+ sha256 = "ec0b370cf8bd55831eeed7c5eadcabacbd6e63ac657c20209d672119a07a5c0f";
+ };
+
+ buildCommand = ''
+ origprefix=usr/local/diamond/3.10_x64
+ prefix=diamond
+
+ echo "Unpacking $src..."
+ rpmextract $src
+
+ # Move $pwd/usr/local/diamond/VERS to $out/diamond, cd.
+ mkdir -p $out/$prefix
+ rmdir $out/$prefix
+ mv $origprefix $out/$prefix
+
+ cd $out
+
+ # Extract all tarballs.
+ for tb in \
+ cae_library/cae_library.tar.gz \
+ embedded_source/embedded_source.tar.gz \
+ ispfpga/ispfpga.tar.gz \
+ synpbase/synpbase.tar.gz \
+ tcltk/tcltk.tar.gz \
+ bin/bin.tar.gz \
+ examples/examples.tar.gz \
+ data/data.tar.gz ; do
+
+ echo "Extracting tarball $prefix/$tb"
+ cd $out/$prefix/$(dirname $tb)
+ tar xf $(basename $tb)
+ rm $(basename $tb)
+ done
+
+ # Patch shebangs in start scripts .
+ cd $out/$prefix/bin/lin64
+ for tool in \
+ programmer \
+ pgrcmd \
+ diamond_env \
+ powercal \
+ model300 \
+ update \
+ diamond \
+ debugger \
+ ddtcmd \
+ cableserver \
+ revealrva \
+ ipexpress \
+ fileutility \
+ diamond ; do
+
+ echo "Patching script $prefix/bin/lin64/$tool..."
+ patchShebangs $tool
+ done
+
+ # Patch executable ELFs.
+ for path in bin/lin64 ispfpga/bin/lin64; do
+ cd $out/$prefix/$path
+ for f in *; do
+ if ! file $f | grep -q "ELF 64-bit LSB executable" ; then
+ continue
+ fi
+ echo "Patching ELF $prefix/$path/$f..."
+ # We force RPATH otherwise libraries from LD_LIBRARY_PATH (which the
+ # tools mangle by themselves) will not be able to find their
+ # dependencies from nix.
+ patchelf \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "$libPath" --force-rpath \
+ $f
+ done
+ done
+
+ # Remove 32-bit libz.
+ rm $out/$prefix/bin/lin64/libz.{so,so.1}
+
+ # Make wrappers (should these target more than the 'diamond' tool?).
+ # The purpose of these is just to call the target program using its
+ # absolute path - otherwise, it will crash.
+ mkdir -p bin
+ for tool in diamond ; do
+ makeWrapper $out/$prefix/bin/lin64/$tool $out/bin/$tool
+ done
+ '';
+
+ libPath = stdenv.lib.makeLibraryPath [
+ glib zlib freetype fontconfig
+ xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt
+ ];
+
+ meta = {
+ description = "Vendor development tools for Lattice FPGA devices";
+ longDescription = ''
+ Lattice Diamond software is the leading-edge software design environment
+ for cost- sensitive, low-power Lattice FPGA architectures. It is the
+ next-generation replacement for ispLEVER.
+ '';
+ homepage = "http://www.latticesemi.com/latticediamond";
+ license = stdenv.lib.licenses.unfree;
+ maintainers = with stdenv.lib.maintainers; [ q3k ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile b/pkgs/development/tools/puppet/puppet-lint/Gemfile
new file mode 100644
index 000000000000..105049819129
--- /dev/null
+++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "puppet-lint"
diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock
new file mode 100644
index 000000000000..8c5d369fb371
--- /dev/null
+++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock
@@ -0,0 +1,13 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ puppet-lint (2.3.6)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ puppet-lint
+
+BUNDLED WITH
+ 1.16.3
diff --git a/pkgs/development/tools/puppet/puppet-lint/default.nix b/pkgs/development/tools/puppet/puppet-lint/default.nix
new file mode 100644
index 000000000000..2940605b1b08
--- /dev/null
+++ b/pkgs/development/tools/puppet/puppet-lint/default.nix
@@ -0,0 +1,7 @@
+{ bundlerApp }:
+
+bundlerApp {
+ pname = "puppet-lint";
+ gemdir = ./.;
+ exes = [ "puppet-lint" ];
+}
diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/development/tools/puppet/puppet-lint/gemset.nix
new file mode 100644
index 000000000000..86d18b0c554c
--- /dev/null
+++ b/pkgs/development/tools/puppet/puppet-lint/gemset.nix
@@ -0,0 +1,10 @@
+{
+ puppet-lint = {
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1wyk2l440d96ps3x127r52n51kqpqi2nzb3xlg92qn6aksqhnkis";
+ type = "gem";
+ };
+ version = "2.3.6";
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index e5e6f639b95d..1e665c847b4e 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
in
stdenv.mkDerivation rec {
name = "grails-${version}";
- version = "3.3.6";
+ version = "3.3.8";
src = fetchurl {
url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
- sha256 = "0q3rbz47lp2zh2794aycf85vnic77dg3sclrqbizfpdijma87iy7";
+ sha256 = "1hfqlaiv29im6pyqi7irl28ws7nn2jc4g4718gysfmm1gvlprpn0";
};
buildInputs = [ unzip ];
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index cb75b6802702..aa4ff210812b 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -33,7 +33,7 @@ let
self = rec {
df-hashes = builtins.fromJSON (builtins.readFile ./game.json);
- dwarf-fortress = df-games.dwarf-fortress_0_44_11;
+ dwarf-fortress = df-games.dwarf-fortress_0_44_12;
dwarf-fortress-full = callPackage ./lazy-pack.nix { };
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index f781b0a71de3..a7b059bb6892 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -6,11 +6,11 @@
}:
let
- dfVersion = "0.44.11";
- version = "${dfVersion}-alpha1";
+ dfVersion = "0.44.12";
+ version = "${dfVersion}-r1";
# revision of library/xml submodule
- xmlRev = "853bd161270f50b21fe4b751de339458f78f56d6";
+ xmlRev = "23500e4e9bd1885365d0a2ef1746c321c1dd5094";
arch =
if stdenv.system == "x86_64-linux" then "64"
@@ -41,7 +41,7 @@ let
src = fetchFromGitHub {
owner = "DFHack";
repo = "dfhack";
- sha256 = "1vzrpdw0pn18calayf9dwqpyg37cb7wkzkvskxjx9nak5ilxzywm";
+ sha256 = "0j03lq6j6w378z6cvm7jspxc7hhrqm8jaszlq0mzfvap0k13fgyy";
rev = version;
fetchSubmodules = true;
};
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 4236d6bab989..652e4c184753 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "dwarf-therapist-${version}";
- version = "40.1.0";
+ version = "41.0.2";
src = fetchFromGitHub {
owner = "Dwarf-Therapist";
repo = "Dwarf-Therapist";
rev = "v${version}";
- sha256 = "1aklwic5npgkp8rkrvz2q9idkipsm1h26mgd8q03135nzl1ld9q3";
+ sha256 = "0cvnk1dkszh7q7viv3i1v3ifzv1w0xyz69mifa1cbvbi47z2dh0d";
};
buildInputs = [ qtbase qtdeclarative ];
diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix
index 0a501bc3c052..caa9adeefd06 100644
--- a/pkgs/games/dwarf-fortress/soundsense.nix
+++ b/pkgs/games/dwarf-fortress/soundsense.nix
@@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
version = "2016-1_196";
- dfVersion = "0.44.11";
+ dfVersion = "0.44.12";
inherit soundPack;
name = "soundsense-${version}";
src = fetchzip {
diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix
index b56170e5229a..d90812f5d05e 100644
--- a/pkgs/games/dwarf-fortress/twbt/default.nix
+++ b/pkgs/games/dwarf-fortress/twbt/default.nix
@@ -3,12 +3,12 @@
stdenvNoCC.mkDerivation rec {
name = "twbt-${version}";
- version = "6.49";
- dfVersion = "0.44.11";
+ version = "6.54";
+ dfVersion = "0.44.12";
src = fetchurl {
url = "https://github.com/mifki/df-twbt/releases/download/v${version}/twbt-${version}-linux.zip";
- sha256 = "1qjkc7k33qhxj2g18njzasccjqsis5y8zrw5vl90h4rs3i8ld9xz";
+ sha256 = "10gfd6vv0vk4v1r5hjbz7vf1zqys06dsad695gysc7fbcik2dakh";
};
sourceRoot = ".";
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index b9887fe4cfc0..0c5a81a52f0f 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -3,7 +3,7 @@
, ncurses, glib, gtk2, libsndfile, zlib
}:
-let dfVersion = "0.44.11"; in
+let dfVersion = "0.44.12"; in
stdenv.mkDerivation {
name = "dwarf_fortress_unfuck-${dfVersion}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
owner = "svenstaro";
repo = "dwarf_fortress_unfuck";
rev = dfVersion;
- sha256 = "0kkk8md2xq8l0c4m9hkg66qqjad3xi4jbb5z2ginhqixxpfbz8rf";
+ sha256 = "1kszkb1d1vll8p04ja41nangsaxb5lv4p3xh2jhmsmipfixw7nvz";
};
cmakeFlags = [
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 8003468f50fa..5d7883c18949 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -9,7 +9,7 @@ let
inherit (stdenv.lib) optional optionals;
name = "freeciv";
- version = "2.5.11";
+ version = "2.6.0";
in
stdenv.mkDerivation {
name = "${name}-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
- sha256 = "1bcs4mj4kzkpyrr0yryydmn0dzcqazvwrf02nfs7r5zya9lm572c";
+ sha256 = "16f9wsnn7073s6chzbm3819swd0iw019p9nrzr3diiynk28kj83w";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix
index 01815cade5ea..ff09a70e932e 100644
--- a/pkgs/games/gnubg/default.nix
+++ b/pkgs/games/gnubg/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }:
-let version = "1.06.001"; in
+let version = "1.06.002"; in
stdenv.mkDerivation {
name = "gnubg-"+version;
src = fetchurl {
url = "http://gnubg.org/media/sources/gnubg-release-${version}-sources.tar.gz";
- sha256 = "0snz3j1bvr25ji7lg82bl2gm2s2x9lrpc7viw0hclgz0ql74cw7b";
+ sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 7c32d7faa3c5..99c369fdce80 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -4,11 +4,11 @@
python.pkgs.buildPythonApplication rec {
pname = "mnemosyne";
- version = "2.6";
+ version = "2.6.1";
src = fetchurl {
url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz";
- sha256 = "0b7b5sk5bfbsg5cyybkv5xw9zw257v3khsn0lwlbxnlhakd0rsg4";
+ sha256 = "0xcwikq51abrlqfn5bv7kcw1ccd3ip0w6cjd5vnnzwnaqwdj8cb3";
};
propagatedBuildInputs = with python.pkgs; [
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 5533fd699bbf..140e199908ce 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,13 +20,13 @@ let
};
in stdenv.mkDerivation rec {
name = "dolphin-emu-${version}";
- version = "2018-07-22";
+ version = "2018-08-17";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
- rev = "7c2d2548a88abf9a5fa0bff52e00c57d093a9e19";
- sha256 = "0x9h8s6fa04vcdwaqgrd5jpbgadgpkj3m4g2w1mp97libvr7hpy4";
+ rev = "12a5fd80bde3c1f5557ea647ebb127d37e74040d";
+ sha256 = "0sk3jn5sm9fabs5bvwy75zw2szrb19qqwns2ypzqpgd4d5zjrs4x";
};
enableParallelBuilding = true;
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index f7c920abc48e..0410af974f61 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "adapta-gtk-theme-${version}";
- version = "3.94.0.1";
+ version = "3.94.0.92";
src = fetchFromGitHub {
owner = "adapta-project";
repo = "adapta-gtk-theme";
rev = version;
- sha256 = "17hck0hzkdj1bibn9wi7cxca8r539idb916v2l71gz7ynhav006d";
+ sha256 = "18gdsk07954wxsgr8i9kkpc8p6wvdr039lszz8hcplf2134bmb96";
};
preferLocalBuild = true;
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index b3dfed3d265e..5944dfc991de 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -192,11 +192,11 @@ self = rec {
};
vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-nix-2018-07-01";
+ name = "vim-nix-2018-08-19";
src = fetchgit {
url = "https://github.com/LnL7/vim-nix";
- rev = "7d71026ba7c2d0a4bdb915e884c4ac8dbdc45bf0";
- sha256 = "084vs1p0qpkc4cx049v3mkyylj1n1yvd45i1sc9qafgp4x5va457";
+ rev = "ab3c4d52d08e9e8d2a0919e38f98ba25a2b8ad18";
+ sha256 = "1waan5vgba8qx3107hdrnmbnq5kr1n49q43p7m2g7wmj81v050yb";
};
dependencies = [];
@@ -1029,6 +1029,17 @@ self = rec {
};
+ vim-lastplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-lastplace-2017-06-13";
+ src = fetchgit {
+ url = "https://github.com/farmergreg/vim-lastplace";
+ rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55";
+ sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja";
+ };
+ dependencies = [];
+
+ };
+
vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-go-2018-07-22";
src = fetchgit {
@@ -2085,6 +2096,17 @@ self = rec {
};
+ vim-qml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+ name = "vim-qml-2018-07-22";
+ src = fetchgit {
+ url = "https://github.com/peterhoeg/vim-qml";
+ rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a";
+ sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc";
+ };
+ dependencies = [];
+
+ };
+
vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-markdown-2018-06-05";
src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4d0e85e153ce..32a9a6216016 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -50,6 +50,7 @@
"github:ensime/ensime-vim"
"github:ervandew/supertab"
"github:esneider/YUNOcommit.vim"
+"github:farmergreg/vim-lastplace"
"github:fatih/vim-go"
"github:FelikZ/ctrlp-py-matcher"
"github:fisadev/vim-isort"
@@ -168,6 +169,7 @@
"github:osyo-manga/vim-textobj-multiblock"
"github:osyo-manga/vim-watchdogs"
"github:pangloss/vim-javascript"
+"github:peterhoeg/vim-qml"
"github:plasticboy/vim-markdown"
"github:python-mode/python-mode"
"github:Quramy/tsuquyomi"
diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 2796fed17dc6..a02127ab7989 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -4,14 +4,14 @@
}:
python.pkgs.buildPythonApplication rec {
- version = "0.6.0";
+ version = "0.6.1";
name = "bcc-${version}";
src = fetchFromGitHub {
owner = "iovisor";
repo = "bcc";
rev = "v${version}";
- sha256 = "1fk2kvbdvm87rkha2cigz2qhhlrni4g0dcnmiiyya79y85ahfvga";
+ sha256 = "1rfqjbq8ah8zrsnpbx0h5irq3h2snncfvi4pvaxl7574kciprjxj";
};
format = "other";
diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 3430797666eb..557bc2f186f3 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,33 +1,45 @@
-{ stdenv, fetchurl
-, sysfsutils, openssl
-, libcap, opensp, docbook_sgml_dtd_31
-, libidn, nettle
-, SGMLSpm, libgcrypt }:
+{ stdenv, fetchFromGitHub, fetchpatch
+, libxslt, docbook_xsl, docbook_xml_dtd_44
+, sysfsutils, openssl, libcap, libgcrypt, nettle, libidn2
+}:
let
- time = "20161105";
+ time = "20180629";
in
stdenv.mkDerivation rec {
name = "iputils-${time}";
- src = fetchurl {
- url = "https://github.com/iputils/iputils/archive/s${time}.tar.gz";
- sha256 = "12mdmh4qbf5610csaw3rkzhpzf6djndi4jsl4gyr8wni0cphj4zq";
+ src = fetchFromGitHub {
+ owner = "iputils";
+ repo = "iputils";
+ rev = "s${time}";
+ sha256 = "19rpl48pjgmyqlm4h7sml5gy7yg4cxciadxcs24q1zj40c05jls0";
};
+ patches = [
+ (fetchpatch {
+ name = "dont-hardcode-the-location-of-xsltproc.patch";
+ url = "https://github.com/iputils/iputils/commit/d0ff83e87ea9064d9215a18e93076b85f0f9e828.patch";
+ sha256 = "05wrwf0bfmax69bsgzh3b40n7rvyzw097j8z5ix0xsg0kciygjvx";
+ })
+ ];
+
prePatch = ''
- sed -e s/sgmlspl/sgmlspl.pl/ \
- -e s/nsgmls/onsgmls/ \
- -i doc/Makefile
+ substituteInPlace doc/custom-man.xsl \
+ --replace "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
+ for xmlFile in doc/*.xml; do
+ substituteInPlace $xmlFile \
+ --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd"
+ done
'';
# Disable idn usage w/musl: https://github.com/iputils/iputils/pull/111
makeFlags = [ "USE_GNUTLS=no" ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "USE_IDN=no";
- depsBuildBuild = [ opensp SGMLSpm docbook_sgml_dtd_31 ];
+ nativeBuildInputs = [ libxslt.bin ];
buildInputs = [
sysfsutils openssl libcap libgcrypt nettle
- ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn;
+ ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isMusl) libidn2;
# ninfod probably could build on cross, but the Makefile doesn't pass --host etc to the sub configure...
buildFlags = "man all" + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) " ninfod";
@@ -35,21 +47,23 @@ stdenv.mkDerivation rec {
installPhase =
''
mkdir -p $out/bin
- cp -p ping tracepath clockdiff arping rdisc rarpd $out/bin/
+ cp -p arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6 $out/bin/
if [ -x ninfod/ninfod ]; then
cp -p ninfod/ninfod $out/bin
fi
mkdir -p $out/share/man/man8
+ cd doc
cp -p \
- doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/rarpd.8 doc/tracepath.8 doc/ninfod.8 \
+ arping.8 clockdiff.8 ninfod.8 pg3.8 ping.8 rarpd.8 rdisc.8 tftpd.8 tracepath.8 traceroute6.8 \
$out/share/man/man8
'';
meta = with stdenv.lib; {
homepage = https://github.com/iputils/iputils;
description = "A set of small useful utilities for Linux networking";
+ license = with licenses; [ gpl2Plus bsd3 ]; # TODO: AS-IS, SUN MICROSYSTEMS license
platforms = platforms.linux;
- maintainers = with maintainers; [ lheckemann ];
+ maintainers = with maintainers; [ primeos lheckemann ];
};
}
diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 0bfd3d0ac34c..f32af5169534 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.63";
+ version = "4.14.65";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1ly6pjvlfrlrclfnl98ghwal25z58lppnj6gj7x1m1mswzq54bnd";
+ sha256 = "1v55nmg1x9ygisgf0pjd3lygvjin3i6ld24anl6nggmrdd00r60j";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
index 7d29f9f805fc..ffce27178b6c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.17.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.17.15";
+ version = "4.17.17";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0yg0hh1ld3d5cd4ll7f48p769wda2a1ap8fmnnsfsazidka5vf75";
+ sha256 = "1g525zi7x3j7niqasrm8jwalf391p6pwa17zmr0iibal6xf3di1x";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
index 691ab096e8ae..b69d994f3b57 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.18.1";
+ version = "4.18.3";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0hps1h8rs1cc8385m69754vwbjmwasr7bfv9f9nsv8fmx73aspvj";
+ sha256 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 0516c947e8c7..4b2f3bf6c380 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.148";
+ version = "4.4.150";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "10yrqizwkawbs332rl3fmr3cpwcl2j0mik4md7isg5xlkc00zc8r";
+ sha256 = "1xdfq11pa4ayi89vynbddq5k47f01szc04lbl5aaxpnch982jj8g";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index add40aaa8159..a8e059e99509 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.120";
+ version = "4.9.122";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "14gx6gqahz74vaw8jd0wkxn0w05i7cyfgi24ld2q3p2yhq3gannp";
+ sha256 = "0v7qdkdlgpv83v4lzm59jgaxy1l7dzkqjr3fcahqrnrcdf3r0vx4";
};
} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix
index 96b84c00a5f0..aba907039aca 100644
--- a/pkgs/os-specific/linux/lsscsi/default.nix
+++ b/pkgs/os-specific/linux/lsscsi/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
substituteInPlace Makefile.in --replace /usr "$out"
'';
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index a24024112c95..096eefe8a68f 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -78,11 +78,12 @@ stdenv.mkDerivation {
cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://sourceware.org/lvm2/;
description = "Tools to support Logical Volume Management (LVM) on Linux";
- platforms = stdenv.lib.platforms.linux;
- maintainers = with stdenv.lib.maintainers; [raskin];
+ platforms = platforms.linux;
+ license = with licenses; [ gpl2 bsd2 lgpl21 ];
+ maintainers = with maintainers; [raskin];
inherit version;
downloadPage = "ftp://sources.redhat.com/pub/lvm2/";
};
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index e5ee5e202944..642653259c34 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "mcelog-${version}";
- version = "159";
+ version = "160";
src = fetchFromGitHub {
owner = "andikleen";
repo = "mcelog";
rev = "v${version}";
- sha256 = "1w8y4igxi48r2d9s6g9fm1bgmsga94gfz6x0xaln6rhvbgi318xg";
+ sha256 = "1m985wvdykl3003967lp1i7707qhwdj3h13cl8g1afjaip9ccd48";
};
postPatch = ''
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index b6fdae75bac2..6de666630bb3 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -44,9 +44,10 @@ stdenv.mkDerivation rec {
-e 's@/usr/sbin/sendmail@${sendmail-script}@' -i Makefile
'';
- meta = {
+ meta = with stdenv.lib; {
description = "Programs for managing RAID arrays under Linux";
homepage = http://neil.brown.name/blog/mdadm;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix
index d36544453323..a29a03734242 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/pkgs/os-specific/linux/mingetty/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation {
makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8)
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://sourceforge.net/projects/mingetty;
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix
index 70cbae88d695..ef0bdc4f1266 100644
--- a/pkgs/os-specific/linux/nss_ldap/default.nix
+++ b/pkgs/os-specific/linux/nss_ldap/default.nix
@@ -1,8 +1,8 @@
{stdenv, fetchurl, openldap, perl}:
-
+
stdenv.mkDerivation {
name = "nss_ldap-265";
-
+
src = fetchurl {
url = http://www.padl.com/download/nss_ldap-265.tar.gz;
sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp";
@@ -29,7 +29,9 @@ stdenv.mkDerivation {
buildInputs = [ openldap perl ];
- meta = {
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "LDAP module for the Solaris Nameservice Switch (NSS)";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index 1eec10860f72..c7b71d4e5018 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, ncurses}:
stdenv.mkDerivation rec {
- name = "psmisc-23.1";
+ name = "psmisc-23.2";
src = fetchurl {
url = "mirror://sourceforge/psmisc/${name}.tar.xz";
- sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f";
+ sha256 = "0s1kjhrik0wzqbm7hv4gkhywhjrwhp9ajw0ad05fwharikk6ah49";
};
buildInputs = [ncurses];
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 25ba60b58eea..885ea3421f65 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -81,10 +81,11 @@ stdenv.mkDerivation rec {
mv $out/bin/su $su/bin
'';
- meta = {
- homepage = http://pkg-shadow.alioth.debian.org/;
+ meta = with stdenv.lib; {
+ homepage = https://github.com/shadow-maint;
description = "Suite containing authentication-related tools such as passwd and su";
- platforms = stdenv.lib.platforms.linux;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
};
passthru = {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 015aabbacfe6..912ba5b5e0ef 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -198,10 +198,11 @@ in stdenv.mkDerivation rec {
# runtime; otherwise we can't and we need to reboot.
passthru.interfaceVersion = 2;
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/systemd;
description = "A system and service manager for Linux";
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.eelco ];
+ license = licenses.lgpl21Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.eelco ];
};
}
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 6ccd849e1c8f..5665b0536543 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -66,7 +66,8 @@ wrapped-full = with luajitPackages; let
luaPkgs = [
luasec luasocket # trust anchor bootstrap, prefill module
lfs # prefill module
- # TODO: cqueues and others for http2 module
+ # Almost all is for the 'http' module:
+ http cqueues fifo lpeg lpeg_patterns luaossl compat53 basexx
];
in runCommand unwrapped.name
{
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 400f15565ef2..03fdf7908cc4 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -3,15 +3,15 @@
buildGoPackage rec {
name = "hydron-unstable-${version}";
- version = "2018-08-15";
+ version = "2018-08-18";
goPackagePath = "github.com/bakape/hydron";
goDeps = ./deps.nix;
src = fetchFromGitHub {
owner = "bakape";
repo = "hydron";
- rev = "4c219dc016f18e11a50e52485cbeb28135921386";
- sha256 = "0xj705wdyajzli66p0cxvl47gx6z7nx9cbzm7lbbqn51qxw71p64";
+ rev = "78257f1c1f34cdad1931531601163071f7f29aa9";
+ sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0";
};
enableParallelBuilding = true;
diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix
index 9b0890d36f40..c5d584f1bcd3 100644
--- a/pkgs/servers/hydron/deps.nix
+++ b/pkgs/servers/hydron/deps.nix
@@ -104,8 +104,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54";
- sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3";
+ rev = "aaf60122140d3fcf75376d319f0554393160eb50";
+ sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv";
};
}
]
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index a9d8714476cb..9790df9ce765 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl, cyrus_sasl, libevent}:
stdenv.mkDerivation rec {
- version = "1.5.9";
+ version = "1.5.10";
name = "memcached-${version}";
src = fetchurl {
url = "https://memcached.org/files/${name}.tar.gz";
- sha256 = "01hx4hs8lgmjzpqj1iv5fpdwv1ymrii6bp4nh1s0mjvipxymgwsa";
+ sha256 = "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29";
};
buildInputs = [cyrus_sasl libevent];
diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix
new file mode 100644
index 000000000000..76f3ded78086
--- /dev/null
+++ b/pkgs/servers/rainloop/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, unzip, dataPath ? "/etc/rainloop" }: let
+ common = { edition, sha256 }:
+ stdenv.mkDerivation (rec {
+ name = "rainloop-${edition}-${version}";
+ version = "1.12.1";
+
+ buildInputs = [ unzip ];
+
+ unpackPhase = ''
+ mkdir rainloop
+ unzip -q -d rainloop $src
+ '';
+
+ src = fetchurl {
+ url = "https://github.com/RainLoop/rainloop-webmail/releases/download/v${version}/rainloop-${edition}${stdenv.lib.optionalString (edition != "") "-"}${version}.zip";
+ sha256 = sha256;
+ };
+
+ installPhase = ''
+ mkdir $out
+ cp -r rainloop/* $out
+ rm -rf $out/data
+ ln -s ${dataPath} $out/data
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Simple, modern & fast web-based email client";
+ homepage = "https://www.rainloop.net";
+ downloadPage = https://github.com/RainLoop/rainloop-webmail/releases;
+ license = licenses.agpl3;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ das_j ];
+ };
+ });
+ in {
+ rainloop-community = common {
+ edition = "community";
+ sha256 = "06w1vxqpcj2j8dzzjqh6azala8l46hzy85wcvqbjdlj5w789jzsx";
+ };
+ rainloop-standard = common {
+ edition = "";
+ sha256 = "1fbnpk7l2fbmzn31vx36caqg9xm40g4hh4mv3s8d70slxwhlscw0";
+ };
+ }
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index a609476c41aa..439acd927e31 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, mecab, kytea, libedit, pkgconfig
-, suggestSupport ? false, zeromq, libevent, libmsgpack
+, suggestSupport ? false, zeromq, libevent, msgpack
, lz4Support ? false, lz4
, zlibSupport ? false, zlib
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
[ pkgconfig mecab kytea libedit ]
++ optional lz4Support lz4
++ optional zlibSupport zlib
- ++ optionals suggestSupport [ zeromq libevent libmsgpack ];
+ ++ optionals suggestSupport [ zeromq libevent msgpack ];
configureFlags = with stdenv.lib;
optional zlibSupport "--with-zlib"
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 121e42f7a978..da6143c21f0d 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -22,14 +22,14 @@ galeraLibs = buildEnv {
};
common = rec { # attributes common to both builds
- version = "10.2.16";
+ version = "10.2.17";
src = fetchurl {
urls = [
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
];
- sha256 = "1i2dwpp96ywjk147qqpcad8vqcy4rxmfbv2cb8ww3sffpa9yx0n1";
+ sha256 = "09xy6mgnz22mz8zgqlnddn8nzgs9xlz8lai4a7aa8x78in7hgcz7";
name = "mariadb-${version}.tar.gz";
};
diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix
index 7906546ec1ca..ef8b77ad1176 100644
--- a/pkgs/servers/sql/pgbouncer/default.nix
+++ b/pkgs/servers/sql/pgbouncer/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "pgbouncer-${version}";
- version = "1.8.1";
+ version = "1.9.0";
src = fetchurl {
url = "https://pgbouncer.github.io/downloads/files/${version}/${name}.tar.gz";
- sha256 = "1j4d7rkivg3vg27pvirigq9cy4v7pi48x7w57baq131c5lmdx2zs";
+ sha256 = "012zh9l68r1ramrd66yam6y3al0i85dvvg4wwwkn6qwq6dhskv1r";
};
buildInputs = [ libevent openssl ];
diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index a27f0ef0824c..f4c7bfb1b85f 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }:
+{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }:
stdenv.mkDerivation rec {
name = "pgroonga-${version}";
- version = "2.0.6";
+ version = "2.0.9";
src = fetchurl {
url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz";
- sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68";
+ sha256 = "0dfkhl2im4cn2lczbsvb8zyylrzlm0vqk9ixjsalcaqxgxph2dpz";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ postgresql libmsgpack groonga ];
+ buildInputs = [ postgresql msgpack groonga ];
makeFlags = [ "HAVE_MSGPACK=1" ];
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 1d0d499db03c..11671aba633d 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -30,7 +30,7 @@ let
dontPatchShebangs = false;
propagatedBuildInputs = with py.pkgs; [
- pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
+ pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython jmespath
] ++ stdenv.lib.optional windowsSupport pywinrm;
meta = with stdenv.lib; {
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index c3d6faeac527..c2f73cea9558 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
cp ${./beta__init__.py} $out/google-cloud-sdk/lib/surface/beta/__init__.py
# create wrappers with correct env
- for program in gcloud bq gsutil git-credential-gcloud.sh; do
+ for program in gcloud bq gsutil git-credential-gcloud.sh docker-credential-gcloud; do
programPath="$out/google-cloud-sdk/bin/$program"
binaryPath="$out/bin/$program"
wrapProgram "$programPath" \
diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index e0b4d1fee124..86f8619f101e 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,12 +3,12 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.5.15";
+ version = "2.5.16";
name = "dar-${version}";
src = fetchurl {
url = "mirror://sourceforge/dar/${name}.tar.gz";
- sha256 = "1h700i2k524w5rf5gr9yxl50ca5jwzqlkifay4ffcbhbkqln1n2q";
+ sha256 = "0fy39y6kfda0lvbymc0dblvzmli5y9bq81q0r8fwjzd105qwjmz9";
};
buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 84940e23f0c1..1aa4fff82241 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -9,11 +9,11 @@ let
s = # Generated upstream information
rec {
baseName="asymptote";
- version="2.46";
+ version="2.47";
name="${baseName}-${version}";
- hash="06nvvgpyrjwd3pd7q2j6qj5fjv3yvdqb0k9859i1lghjm0bg5kkq";
- url="https://freefr.dl.sourceforge.net/project/asymptote/2.46/asymptote-2.46.src.tgz";
- sha256="06nvvgpyrjwd3pd7q2j6qj5fjv3yvdqb0k9859i1lghjm0bg5kkq";
+ hash="0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971";
+ url="https://freefr.dl.sourceforge.net/project/asymptote/2.47/asymptote-2.47.src.tgz";
+ sha256="0zc24n2vwzxdfmcppqfk3fkqlb4jmvswzi3bz232kxl7dyiyb971";
};
buildInputs = [
ghostscriptX imagemagick fftw
diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index bffcc597ea0a..e71ba3bf58ed 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "clipster-${version}";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "mrichar1";
repo = "clipster";
rev = "${version}";
- sha256 = "0v1412zdkps21i5bw1p7jdv5ydnbw9dcr02318qr5mvk8lwdmsgw";
+ sha256 = "08zs7yjpjc6haddkwx7sq5vyq2ldy455qlcrx1a3vi7krmdwl1q9";
};
pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);
diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix
index 7c689211f6ed..9b52d3fd3608 100644
--- a/pkgs/tools/misc/dateutils/default.nix
+++ b/pkgs/tools/misc/dateutils/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- version = "0.4.3";
+ version = "0.4.4";
name = "dateutils-${version}";
src = fetchurl {
url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz";
- sha256 = "06lgqp2cyvmh09j04lm3g6ml7yxn1x92rjzgnwzq4my95c37kmdh";
+ sha256 = "0ky8177is4swgxfqczc78d7yjc13w626k515qw517086n7xjxk59";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index b3a654be04e4..a11e8a44de92 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,16 +4,16 @@
# There is also cdebootstrap now. Is that easier to maintain?
stdenv.mkDerivation rec {
name = "debootstrap-${version}";
- version = "1.0.106";
+ version = "1.0.107";
src = fetchurl {
# git clone git://git.debian.org/d-i/debootstrap.git
# I'd like to use the source. However it's lacking the lanny script ? (still true?)
url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
- sha256 = "0vn2camhwf6h2ja78km9ihi8df4pfzvm9hnppv6vq32lfwjd3z2g";
+ sha256 = "1gq5r4fa0hrq4c69l2s0ygnfyvr90k2wqaq15s869hayhnssx4g1";
};
- buildInputs = [ dpkg gettext gawk perl ];
+ buildInputs = [ dpkg gettext gawk perl wget ];
dontBuild = true;
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
--subst-var-by id "$(type -p id)" \
--subst-var-by perl "$(type -p perl)" \
--subst-var-by uname "$(type -p uname)" \
- --subst-var-by wget "${wget}/bin/wget"
+ --subst-var-by wget "$(type -p wget)"
done
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 69b60ae0997e..045c004fb6ac 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -6,7 +6,7 @@
let
pname = "peruse";
- version = "1.2.20180219";
+ version = "1.2.20180816";
in mkDerivation rec {
name = "${pname}-${version}";
@@ -15,8 +15,8 @@ in mkDerivation rec {
src = fetchFromGitHub {
owner = "KDE";
repo = pname;
- rev = "4125d3149c45d196600258686610de701130113d";
- sha256 = "1x8in7z17gzgiibshw7xfs6m6bhr3n5fys3nlpab77nm0dl3f4r5";
+ rev = "f50027c6c9c680c4e2ce1dba4ec43364e661e7a3";
+ sha256 = "1217fa6w9ryh499agcc67mnp8k9dah4r0sw74qzsbk4p154jbgch";
};
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index de6c16123960..f5e1d69a0391 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig
-, zlib, openssl, libevent, ncurses, ruby, libmsgpack, libssh }:
+, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }:
stdenv.mkDerivation rec {
name = "tmate-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
dontUseCmakeConfigure = true;
- buildInputs = [ libtool zlib openssl libevent ncurses ruby libmsgpack libssh ];
+ buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ];
nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
enableParallelBuilding = true;
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 467b17e468a2..19a90e2c13c9 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://www.ntp.org/;
description = "An implementation of the Network Time Protocol";
+ license = {
+ # very close to isc and bsd2
+ url = https://www.eecis.udel.edu/~mills/ntp/html/copyright.html;
+ };
maintainers = [ maintainers.eelco ];
platforms = platforms.linux;
};
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 96016ee7b4f3..cea8a3f133f4 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -55,10 +55,11 @@ stdenv.mkDerivation rec {
done
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = https://ppp.samba.org/;
description = "Point-to-point implementation for Linux and Solaris";
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ stdenv.lib.maintainers.falsifian ];
+ license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ];
+ platforms = platforms.linux;
+ maintainers = [ maintainers.falsifian ];
};
}
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
index d8a633f03321..03270ce87881 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ perl which ];
- meta = {
+ meta = with stdenv.lib; {
description = "PPTP client for Linux";
homepage = http://pptpclient.sourceforge.net/;
- platforms = stdenv.lib.platforms.linux;
- maintainers = [ ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index acda30dbfef8..ad03e9266c68 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -6,12 +6,12 @@ in
stdenv.mkDerivation rec {
pname = "spoofer";
- version = "1.3.2";
+ version = "1.3.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz";
- sha256 = "05297dyyq8bdpbr3zz974l7vm766lq1bsxvzp5pa4jfpvnj7cl1g";
+ sha256 = "0zpqn3jj14grwggzl235smm93d2lm5r5cr6z6wydw1045m5rlvrp";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix
index d27fe50ab581..70fd3f3369a1 100644
--- a/pkgs/tools/package-management/nix-review/default.nix
+++ b/pkgs/tools/package-management/nix-review/default.nix
@@ -3,27 +3,23 @@
, fetchFromGitHub
, nix
, git
-, makeWrapper
+, lib
}:
python3.pkgs.buildPythonApplication rec {
pname = "nix-review";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-review";
rev = version;
- sha256 = "0lfwikcxnjjb10ssawkfgq7k8i86lsdcn0c0plwi9hgpxl2b52mp";
+ sha256 = "0ncifmp90870v6r651p92wbvpayfblm5k9nxikryjaj1fnvd2np3";
};
- buildInputs = [ makeWrapper ];
-
- preFixup = ''
- wrapProgram $out/bin/nix-review --prefix PATH : ${stdenv.lib.makeBinPath [
- git nix
- ]}
- '';
+ makeWrapperArgs = [
+ "--prefix" "PATH" ":" "${lib.makeBinPath [ nix git ]}"
+ ];
meta = with stdenv.lib; {
description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
index cce3370aeda1..2391ea1b859b 100644
--- a/pkgs/tools/security/cfssl/default.nix
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
name = "cfssl-${version}";
@@ -13,6 +13,17 @@ buildGoPackage rec {
sha256 = "0j2gz2vl2pf7ir7sc7jrwmjnr67hk4qhxw09cjx132jbk337jc9x";
};
+ # The following patch ensures that the auth-key decoder doesn't break,
+ # if the auth-key file contains leading or trailing whitespaces.
+ # https://github.com/cloudflare/cfssl/pull/923 is merged
+ # remove patch when it becomes part of a release.
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/cloudflare/cfssl/commit/7e13f60773c96644db9dd8d342d42fe3a4d26f36.patch";
+ sha256 = "1z2v2i8yj7qpj8zj5f2q739nhrr9s59jwzfzk52wfgssl4vv5mn5";
+ })
+ ];
+
meta = with stdenv.lib; {
homepage = https://cfssl.org/;
description = "Cloudflare's PKI and TLS toolkit";
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 4b25e944510d..bb7a6a0e7724 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.6";
+ version = "2.6.7";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CISOfy";
repo = "${pname}";
rev = "${version}";
- sha256 = "02d8nwy78gy07c32c7dk3sl93h1z0gav0h4j7xp85m6xj852lb5a";
+ sha256 = "0ayil5bzxqaksmr79x0gxy60k8djzg0bs60jfg8qi6128q6srhar";
};
nativeBuildInputs = [ makeWrapper perl ];
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix
index a2a4f82f652c..71bdd3af55de 100644
--- a/pkgs/tools/security/mktemp/default.nix
+++ b/pkgs/tools/security/mktemp/default.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation {
sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f";
};
- meta = {
- platforms = stdenv.lib.platforms.unix;
+ meta = with stdenv.lib; {
+ description = "Simple tool to make temporary file handling in shells scripts safe and simple";
+ homepage = https://www.mktemp.org;
+ license = licenses.isc;
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index b9fcb502124f..135436e8f112 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "di-${version}";
- version = "4.46";
+ version = "4.47";
src = fetchurl {
url = "http://gentoo.com/di/${name}.tar.gz";
- sha256 = "0cskiqywiqkw44zdg4q78bjns6jjp1dz5lzdxrhpnpldc6075irw";
+ sha256 = "0zlapxlzjizwzwa8xwrwibhcbkh0wx7n74gvjpp6wlwq7cgiq0xm";
};
makeFlags = [ "INSTALL_DIR=$(out)" ];
diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index ad16746a2666..7e781223b572 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
stdenv.mkDerivation rec {
- version = "4.6.1";
+ version = "4.6.2";
name = "sleuthkit-${version}";
src = fetchFromGitHub {
owner = "sleuthkit";
repo = "sleuthkit";
rev = name;
- sha256 = "1hf783mwa5ws9qvjpj6zgvivi0cfhs8r8m1869ajz5m80lv8fggw";
+ sha256 = "1ykl6ijf15mjfvmkk9b4gj18kspdairn7ms4wsi2v9kb25776skx";
};
postPatch = ''
diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix
index d106d140a67e..1490f0900b9d 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/pkgs/tools/text/diffstat/default.nix
@@ -1,14 +1,14 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
- name = "diffstat-1.61";
+ name = "diffstat-1.62";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/diffstat/${name}.tgz"
"https://invisible-mirror.net/archives/diffstat/${name}.tgz"
];
- sha256 = "1vjmda2zfjxg0qkaj8hfqa8g6bfwnn1ja8696rxrjgqq4w69wd95";
+ sha256 = "07sr482y6iw7n7ddkba0w51kbjc99snvnijkn5ba2xzd8hv1h2bz";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index 81b88ff8d835..75e380a6b661 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -1,12 +1,12 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
- version = "2.2.3a";
+ version = "2.2.4";
name = "discount-${version}";
src = fetchurl {
url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2";
- sha256 = "0m09x9dd75d3pqvmrwr0kqw3dm2x3ss9clj5fxf7lq79lbyxbxbm";
+ sha256 = "199hwajpspqil0a4y3yxsmhdp2dm73gqkzfk4mrwzsmlq8y1xzbl";
};
patches = ./fix-configure-path.patch;
diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix
index 85888dbbf0df..949a9c89e9af 100644
--- a/pkgs/tools/text/icdiff/default.nix
+++ b/pkgs/tools/text/icdiff/default.nix
@@ -2,13 +2,13 @@
pythonPackages.buildPythonApplication rec {
name = "icdiff-${version}";
- version = "1.9.1";
+ version = "1.9.3";
src = fetchFromGitHub {
owner = "jeffkaufman";
repo = "icdiff";
rev = "release-${version}";
- sha256 = "0ffn5kq7dwvrimxgpj9ksym36c18md8nsdps82qzhm1xq7p9w9yb";
+ sha256 = "10hv09sg7m8gzjf1v785kvim9ps81akzyx7ws6ypylyxc0l2fdcl";
};
meta = with stdenv.lib; {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ece6c03e168a..634a3e4c17e4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -173,6 +173,7 @@ mapAliases ({
module_init_tools = kmod; # added 2016-04-22
mpich2 = mpich; # added 2018-08-06
msf = metasploit; # added 2018-04-25
+ libmsgpack = msgpack; # added 2018-08-17
mssys = ms-sys; # added 2015-12-13
multipath_tools = multipath-tools; # added 2016-01-21
mupen64plus1_5 = mupen64plus; # added 2016-02-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60aa4d9e89c7..91e91bdd3a7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1488,6 +1488,10 @@ with pkgs;
syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { };
+ inherit (callPackages ../servers/rainloop { })
+ rainloop-community
+ rainloop-standard;
+
ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { };
riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
@@ -7020,6 +7024,11 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
+ mono514 = callPackage ../development/compilers/mono/5.14.nix {
+ inherit (darwin) libobjc;
+ inherit (darwin.apple_sdk.frameworks) Foundation;
+ };
+
monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
mosml = callPackage ../development/compilers/mosml { };
@@ -7160,6 +7169,13 @@ with pkgs;
sqldeveloper = callPackage ../development/tools/database/sqldeveloper { };
+ # sqldeveloper_18 needs JavaFX, which currently only is available inside the
+ # (non-free and net yet packaged for Darwin) OracleJDK
+ # we might be able to get rid of it, as soon as we have an OpenJDK with OpenJFX included
+ sqldeveloper_18 = callPackage ../development/tools/database/sqldeveloper/18.2.nix {
+ jdk = oraclejdk;
+ };
+
squeak = callPackage ../development/compilers/squeak { };
squirrel-sql = callPackage ../development/tools/database/squirrel-sql {
@@ -8095,6 +8111,8 @@ with pkgs;
ddd = callPackage ../development/tools/misc/ddd { };
+ lattice-diamond = callPackage ../development/tools/lattice-diamond { };
+
distcc = callPackage ../development/tools/misc/distcc { };
# distccWrapper: wrapper that works as gcc or g++
@@ -8492,6 +8510,8 @@ with pkgs;
pup = callPackage ../development/tools/pup { };
+ puppet-lint = callPackage ../development/tools/puppet/puppet-lint { };
+
pyrseas = callPackage ../development/tools/database/pyrseas { };
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };
@@ -9182,9 +9202,19 @@ with pkgs;
ffcast = callPackage ../tools/X11/ffcast { };
- fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {};
+ fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {
+ # We need to use blas instead of openblas on darwin,
+ # see https://github.com/NixOS/nixpkgs/pull/45013.
+ blas = if stdenv.isDarwin then blas else openblas;
+ };
+
fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {};
- linbox = callPackage ../development/libraries/linbox {};
+ linbox = callPackage ../development/libraries/linbox {
+ # We need to use blas instead of openblas on darwin, see
+ # https://github.com/NixOS/nixpkgs/pull/45013 and
+ # https://github.com/NixOS/nixpkgs/pull/45015.
+ blas = if stdenv.isDarwin then blas else openblas;
+ };
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa;
@@ -9662,7 +9692,6 @@ with pkgs;
gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
cupsSupport = config.gtk2.cups or stdenv.isLinux;
- gdktarget = if stdenv.isDarwin then "quartz" else "x11";
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
@@ -9670,7 +9699,9 @@ with pkgs;
gdktarget = "x11";
};
- gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
+ gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
+ inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
+ };
gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { };
gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
@@ -9954,6 +9985,8 @@ with pkgs;
lmdb = callPackage ../development/libraries/lmdb { };
+ lmdbxx = callPackage ../development/libraries/lmdbxx { };
+
levmar = callPackage ../development/libraries/levmar { };
leptonica = callPackage ../development/libraries/leptonica { };
@@ -10427,8 +10460,6 @@ with pkgs;
libmtp = callPackage ../development/libraries/libmtp { };
- libmsgpack = callPackage ../development/libraries/libmsgpack { };
-
libmypaint = callPackage ../development/libraries/libmypaint { };
libmysofa = callPackage ../development/libraries/audio/libmysofa { };
@@ -11108,6 +11139,8 @@ with pkgs;
mqtt-bench = callPackage ../applications/misc/mqtt-bench {};
+ msgpack = callPackage ../development/libraries/msgpack { };
+
msilbc = callPackage ../development/libraries/msilbc { };
mp4v2 = callPackage ../development/libraries/mp4v2 { };
@@ -13724,9 +13757,7 @@ with pkgs;
iproute = callPackage ../os-specific/linux/iproute { };
- iputils = callPackage ../os-specific/linux/iputils {
- inherit (buildPackages.buildPackages.perlPackages) SGMLSpm;
- };
+ iputils = callPackage ../os-specific/linux/iputils { };
iptables = callPackage ../os-specific/linux/iptables { };
@@ -15133,6 +15164,8 @@ with pkgs;
vdrsymbols = callPackage ../data/fonts/vdrsymbols { };
+ vegur = callPackage ../data/fonts/vegur { };
+
vistafonts = callPackage ../data/fonts/vista-fonts { };
vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };
@@ -16132,6 +16165,8 @@ with pkgs;
fetchmail = callPackage ../applications/misc/fetchmail { };
+ fig2dev = callPackage ../applications/graphics/fig2dev { };
+
flacon = callPackage ../applications/audio/flacon { };
flexget = callPackage ../applications/networking/flexget { };
@@ -16975,7 +17010,7 @@ with pkgs;
recurseIntoAttrs (makeOverridable mkApplications attrs);
inherit (kdeApplications)
- akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
+ akonadi akregator ark dolphin dragon 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 ksystemlog kwalletmanager marble minuet okular spectacle;
@@ -17314,7 +17349,7 @@ with pkgs;
minitube = libsForQt5.callPackage ../applications/video/minitube { };
- mimic = callPackage ../applications/audio/mimic {
+ mimic = callPackage ../applications/audio/mimic {
pulseaudioSupport = config.pulseaudio or false;
};
@@ -18044,6 +18079,8 @@ with pkgs;
qt = qt4;
};
+ qsstv = qt5.callPackage ../applications/misc/qsstv { };
+
qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { };
@@ -20513,6 +20550,8 @@ with pkgs;
star = callPackage ../applications/science/biology/star { };
+ strelka = callPackage ../applications/science/biology/strelka { };
+
varscan = callPackage ../applications/science/biology/varscan { };
hmmer = callPackage ../applications/science/biology/hmmer { };
@@ -20551,6 +20590,8 @@ with pkgs;
cliquer = callPackage ../development/libraries/science/math/cliquer { };
+ ecos = callPackage ../development/libraries/science/math/ecos { };
+
flintqs = callPackage ../development/libraries/science/math/flintqs { };
gurobi = callPackage ../applications/science/math/gurobi { };
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c7d4c18810f0..7933ca46b98a 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -7,7 +7,7 @@
{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig
, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat
-, glib, gobjectIntrospection, libevent, zlib, autoreconfHook
+, glib, gobjectIntrospection, libevent, zlib, autoreconfHook, gnum4
, mysql, postgresql, cyrus_sasl
, fetchFromGitHub, libmpack, which, fetchpatch, writeText
}:
@@ -43,6 +43,32 @@ let
inherit lua;
};
+ basexx = buildLuaPackage rec {
+ version = "0.4.0";
+ name = "basexx-${version}";
+
+ src = fetchFromGitHub {
+ owner = "aiq";
+ repo = "basexx";
+ rev = "v${version}";
+ sha256 = "12y0ng9bp5b98iax35pnp0kc0mb42spv1cbywvfq6amik6l0ya7g";
+ };
+
+ buildPhase = ":";
+ installPhase = ''
+ install -Dt "$out/lib/lua/${lua.luaversion}/" \
+ lib/basexx.lua
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Lua library for base2, base16, base32, base64, base85";
+ homepage = "https://github.com/aiq/basexx";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vcunat ];
+ platforms = platforms.all;
+ };
+ };
+
bit32 = buildLuaPackage rec {
version = "5.3.0";
name = "bit32-${version}";
@@ -72,6 +98,93 @@ let
};
};
+ compat53 = buildLuaPackage rec {
+ version = "0.7";
+ name = "compat53-${version}";
+
+ src = fetchFromGitHub {
+ owner = "keplerproject";
+ repo = "lua-compat-5.3";
+ rev = "v${version}";
+ sha256 = "02a14nvn7aggg1yikj9h3dcf8aqjbxlws1bfvqbpfxv9d5phnrpz";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ postConfigure = ''
+ CFLAGS+=" -shared $(pkg-config --libs ${if isLuaJIT then "luajit" else "lua"})"
+ '';
+
+ buildPhase = ''
+ cc lstrlib.c $CFLAGS -o string.so
+ cc ltablib.c $CFLAGS -o table.so
+ cc lutf8lib.c $CFLAGS -o utf8.so
+ '';
+
+ # There's no need to separate *.lua and *.so, I guess? TODO: conventions?
+ installPhase = ''
+ install -Dt "$out/lib/lua/${lua.luaversion}/compat53" \
+ compat53/*.lua *.so
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Compatibility module providing Lua-5.3-style APIs for Lua 5.2 and 5.1";
+ homepage = "https://github.com/keplerproject/lua-compat-5.3";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vcunat ];
+ platforms = platforms.all;
+ };
+ };
+
+ cqueues = buildLuaPackage rec {
+ name = "cqueues-${version}";
+ version = "20171014";
+
+ src = fetchurl {
+ url = "https://www.25thandclement.com/~william/projects/releases/${name}.tgz";
+ sha256 = "1dabhpn6r0hlln8vx9hxm34pfcm46qzgpb2apmziwg5z51fi4ksb";
+ };
+
+ preConfigure = ''export prefix=$out'';
+
+ nativeBuildInputs = [ gnum4 ];
+ buildInputs = [ openssl ];
+
+ meta = with stdenv.lib; {
+ description = "A type of event loop for Lua";
+ homepage = "https://www.25thandclement.com/~william/projects/cqueues.html";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vcunat ];
+ platforms = platforms.unix;
+ };
+ };
+
+ fifo = buildLuaPackage rec {
+ version = "0.2";
+ name = "fifo-${version}";
+
+ src = fetchFromGitHub {
+ owner = "daurnimator";
+ repo = "fifo.lua";
+ rev = version;
+ sha256 = "1800k7h5hxsvm05bjdr65djjml678lwb0661cll78z1ys2037nzn";
+ };
+
+ buildPhase = ":";
+ installPhase = ''
+ mkdir -p "$out/lib/lua/${lua.luaversion}"
+ mv fifo.lua "$out/lib/lua/${lua.luaversion}/"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A lua library/'class' that implements a FIFO";
+ homepage = "https://github.com/daurnimator/fifo.lua";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vcunat ];
+ platforms = platforms.all;
+ };
+ };
+
luabitop = buildLuaPackage rec {
version = "1.0.2";
name = "bitop-${version}";
@@ -109,6 +222,38 @@ let
};
};
+ http = buildLuaPackage rec {
+ version = "0.2";
+ name = "http-${version}";
+
+ src = fetchFromGitHub {
+ owner = "daurnimator";
+ repo = "lua-http";
+ rev = "v${version}";
+ sha256 = "0a8vsj49alaf1fkhv51n5mgpjq8izfff3shcjs8xk7p2bc46vd7i";
+ };
+
+ /* TODO: separate docs derivation? (pandoc is heavy)
+ nativeBuildInputs = [ pandoc ];
+ makeFlags = [ "-C doc" "lua-http.html" "lua-http.3" ];
+ */
+
+ buildPhase = ":";
+ installPhase = ''
+ install -Dt "$out/lib/lua/${lua.luaversion}/http" \
+ http/*.lua
+ install -Dt "$out/lib/lua/${lua.luaversion}/http/compat" \
+ http/compat/*.lua
+ '';
+
+ meta = with stdenv.lib; {
+ description = "HTTP library for lua";
+ homepage = "https://daurnimator.github.io/lua-http/${version}/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vcunat ];
+ };
+ };
+
luacheck = buildLuaPackage rec {
pname = "luacheck";
version = "0.20.0";
@@ -298,6 +443,28 @@ let
};
};
+ luaossl = buildLuaPackage rec {
+ name = "luaossl-${version}";
+ version = "20170903";
+
+ src = fetchurl {
+ url = "https://www.25thandclement.com/~william/projects/releases/${name}.tgz";
+ sha256 = "10392bvd0lzyibipblgiss09zlqh3a5zgqg1b9lgbybpqb9cv2k3";
+ };
+
+ preConfigure = ''export prefix=$out'';
+
+ buildInputs = [ openssl ];
+
+ meta = with stdenv.lib; {
+ description = "Comprehensive binding to OpenSSL for Lua 5.1+";
+ homepage = "https://www.25thandclement.com/~william/projects/luaossl.html";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vcunat ];
+ platforms = platforms.unix;
+ };
+ };
+
luaposix = buildLuaPackage rec {
name = "posix-${version}";
version = "34.0.4";
@@ -688,6 +855,32 @@ let
};
};
+ lpeg_patterns = buildLuaPackage rec {
+ version = "0.5";
+ name = "lpeg_patterns-${version}";
+
+ src = fetchFromGitHub {
+ owner = "daurnimator";
+ repo = "lpeg_patterns";
+ rev = "v${version}";
+ sha256 = "1s3c179a64r45ffkawv9dnxw4mzwkzj00nr9z2gs5haajgpjivw6";
+ };
+
+ buildPhase = ":";
+ installPhase = ''
+ mkdir -p "$out/lib/lua/${lua.luaversion}"
+ mv lpeg_patterns "$out/lib/lua/${lua.luaversion}/"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A collection of LPEG patterns";
+ homepage = "https://github.com/daurnimator/lpeg_patterns";
+ license = licenses.mit;
+ maintainers = with maintainers; [ vcunat ];
+ inherit (lpeg.meta) platforms;
+ };
+ };
+
cjson = buildLuaPackage rec {
name = "cjson-${version}";
version = "2.1.0";
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e389315162c0..0a2a9f386a13 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16148,7 +16148,7 @@ let
install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex"
install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse"
install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames"
- install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.4/darwin-2level/auto/Text/BibTeX/BibTeX.bundle"
+ install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/${perl.version}/darwin-2level/auto/Text/BibTeX/BibTeX.bundle"
'';
meta = {
description = "Interface to read and parse BibTeX files";