From 380dd22f7c896ae9ea03bfcb0a79e4ff1e89f9ee Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 8 Mar 2018 16:50:52 -0500 Subject: [PATCH 001/105] terraform-provider-nixos: init at 0.0.1 --- .../terraform-provider-nixos/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix new file mode 100644 index 00000000000..135e5402929 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-provider-nixos/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + name = "terraform-provider-nixos-${version}"; + version = "0.0.1"; + goPackagePath = "github.com/tweag/terraform-provider-nixos"; + src = fetchFromGitHub { + owner = "tweag"; + repo = "terraform-provider-nixos"; + sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; + rev = "v${version}"; + }; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postBuild = "mv go/bin/terraform-provider-nixos{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform plugin for outputting NixOS configuration files from Terraform resources."; + homepage = "https://github.com/tweag/terraform-provider-nixos"; + license = licenses.mpl20; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e97a4d38acb..1ac40100f15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20537,6 +20537,8 @@ with pkgs; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; + terraform-provider-nixos = callPackage ../applications/networking/cluster/terraform-provider-nixos {}; + terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; terragrunt = callPackage ../applications/networking/cluster/terragrunt {}; From 998a19e8549a05f1c50f0fbc5180e5d44446cd64 Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Thu, 22 Mar 2018 14:54:22 -0400 Subject: [PATCH 002/105] syslog-ng: enable SMTP destination --- pkgs/development/libraries/libesmtp/default.nix | 12 ++++++++++++ pkgs/tools/system/syslog-ng/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libesmtp/default.nix diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix new file mode 100644 index 00000000000..0ddd7900494 --- /dev/null +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -0,0 +1,12 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libESMTP-${version}"; + version = "1.0.6"; + + src = fetchurl { + url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2"; + sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; + }; +} + diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index a2230503551..b356cd1d484 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, openssl, libcap, curl, which , eventlog, pkgconfig, glib, python, systemd, perl , riemann_c_client, protobufc, pcre, libnet -, json_c, libuuid, libivykis, mongoc, rabbitmq-c }: +, json_c, libuuid, libivykis, mongoc, rabbitmq-c +, libesmtp +}: let pname = "syslog-ng"; @@ -36,12 +38,14 @@ stdenv.mkDerivation rec { libivykis mongoc rabbitmq-c + libesmtp ]; configureFlags = [ "--enable-manpages" "--enable-dynamic-linking" "--enable-systemd" + "--enable-smtp" "--with-ivykis=system" "--with-librabbitmq-client=system" "--with-mongoc=system" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a386cf8a1c3..130686ac781 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8683,6 +8683,8 @@ with pkgs; esdl = callPackage ../development/libraries/esdl { }; + libesmtp = callPackage ../development/libraries/libesmtp { }; + exiv2 = callPackage ../development/libraries/exiv2 { }; expat = callPackage ../development/libraries/expat { }; From db5350092a1ecfd72e991ce06cc223af481069d2 Mon Sep 17 00:00:00 2001 From: dbornside Date: Fri, 23 Mar 2018 13:45:28 -0400 Subject: [PATCH 003/105] libesmtp: add metadata --- pkgs/development/libraries/libesmtp/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 0ddd7900494..a5db1525137 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -8,5 +8,11 @@ stdenv.mkDerivation rec { url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2"; sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; }; + + meta = { + homepage = http://brianstafford.info/libesmtp/index.html; + description = "A Library for Posting Electronic Mail"; + licenses = stdenv.licenses.lgpl3Plus; + }; } From 4dc0315259df05fd1121f37d3040a3b2a80c26fd Mon Sep 17 00:00:00 2001 From: dbornside Date: Fri, 23 Mar 2018 14:21:36 -0400 Subject: [PATCH 004/105] libesmtp: wrong license/wrong license attribute --- pkgs/development/libraries/libesmtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index a5db1525137..49e202f2844 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh"; }; - meta = { + meta = with stdenv.lib; { homepage = http://brianstafford.info/libesmtp/index.html; description = "A Library for Posting Electronic Mail"; - licenses = stdenv.licenses.lgpl3Plus; + license = licenses.gpl3; }; } From aab5e4becb4b62c0dde544a46dc02bebd3a039cd Mon Sep 17 00:00:00 2001 From: dbornside Date: Fri, 23 Mar 2018 14:37:58 -0400 Subject: [PATCH 005/105] libesmtp: actually correct license --- pkgs/development/libraries/libesmtp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 49e202f2844..980cee2e687 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://brianstafford.info/libesmtp/index.html; description = "A Library for Posting Electronic Mail"; - license = licenses.gpl3; + license = licenses.lgpl21; }; } From 7a27cae113f7a9b422d7ba9fbd54c7371c2009fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sun, 18 Mar 2018 18:09:01 +0100 Subject: [PATCH 006/105] terminus: init at 1.0.0-alpha.42 --- pkgs/applications/misc/terminus/default.nix | 43 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/misc/terminus/default.nix diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix new file mode 100644 index 00000000000..67ca05fdb10 --- /dev/null +++ b/pkgs/applications/misc/terminus/default.nix @@ -0,0 +1,43 @@ +{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo +, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr +, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver +, libxcb, makeWrapper, nodejs +, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: + +let + libPath = stdenv.lib.makeLibraryPath [ + stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb + libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio + ]; +in +stdenv.mkDerivation rec { + version = "1.0.0-alpha.42"; + name = "terminus-${version}"; + src = fetchurl { + url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb"; + sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb"; + }; + buildInputs = [ dpkg makeWrapper ]; + unpackPhase = '' + mkdir pkg + dpkg-deb -x $src pkg + sourceRoot=pkg + ''; + installPhase = '' + mkdir -p "$out/bin" + mv opt "$out/" + ln -s "$out/opt/Terminus/terminus" "$out/bin/terminus" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Terminus/terminus" + mv usr/* "$out/" + wrapProgram $out/bin/terminus --prefix PATH : ${lib.makeBinPath [ nodejs ]} + ''; + dontPatchELF = true; + meta = with lib; { + description = "A terminal for a more modern age"; + homepage = https://eugeny.github.io/terminus/; + maintainers = with maintainers; [ jlesquembre ]; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b08c1bebf1f..0e9fe09e909 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17778,6 +17778,8 @@ with pkgs; vte = gnome2.vte.override { pythonSupport = true; }; }; + terminus = callPackage ../applications/misc/terminus { inherit (gnome2) GConf; }; + lxterminal = callPackage ../applications/misc/lxterminal { vte = gnome3.vte; }; From 9f447ca367f6717607421ccd47e1855d6c3d9b1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 31 Mar 2018 05:33:53 -0700 Subject: [PATCH 007/105] rdkafka: 0.11.3 -> 0.11.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rdkafka/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.11.4 with grep in /nix/store/p7dbh8kabl3bqr28icnkzp55s6636mpl-rdkafka-0.11.4 - directory tree listing: https://gist.github.com/ab8b067a5f31e07af4ed6b1dbdc1a8a4 --- pkgs/development/libraries/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index bb43a49235b..b0e43e08653 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "17ghq0kzk2fdpxhr40xgg3s0p0n0gkvd0d85c6jsww3mj8v5xd14"; + sha256 = "11ps8sy4v8yvj4sha7d1q3rmhfw7l1rd52rnl01xam9862yasahs"; }; nativeBuildInputs = [ pkgconfig ]; From c6a9e3a911e59f7b687b5378e0c58ef1dd0625c2 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 1 Apr 2018 03:57:38 -0400 Subject: [PATCH 008/105] Added ElvishJerricco to GHCJS maintainers --- maintainers/maintainer-list.nix | 5 +++++ pkgs/development/compilers/ghcjs/base.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff567e6ca0d..54aba9cac3b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1176,6 +1176,11 @@ github = "ellis"; name = "Ellis Whitehead"; }; + elvishjerricco = { + email = "elvishjerricco@gmail.com"; + github = "ElvishJerricco"; + name = "Will Fancher"; + }; enzime = { email = "enzime@users.noreply.github.com"; github = "enzime"; diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 3aac2d70e13..07662d32d25 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -189,7 +189,7 @@ in mkDerivation (rec { description = "A Haskell to JavaScript compiler that uses the GHC API"; license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio ]; + maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio elvishjerricco ]; hydraPlatforms = if broken then [] else ghc.meta.platforms; inherit broken; }) From 1ab373614624078e58542ebbe1abcc533af292ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20L=C3=B6tzsch?= Date: Sun, 1 Apr 2018 18:27:55 +0200 Subject: [PATCH 009/105] mate/mate-screensaver: fixed unixAuth Without this fix, it's not possible to unlock the mate-screensaver. --- nixos/modules/services/x11/desktop-managers/mate.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 0117dc9d132..db83aaf3c19 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -108,6 +108,8 @@ in services.gnome3.gnome-keyring.enable = true; services.upower.enable = config.powerManagement.enable; + security.pam.services."mate-screensaver".unixAuth = true; + environment.pathsToLink = [ "/share" ]; }; From 9f70551937ff5478547092449fd588c1c09f4982 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 3 Apr 2018 21:40:09 -0400 Subject: [PATCH 010/105] beluga: init at 20180403 --- .../science/logic/beluga/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/science/logic/beluga/default.nix diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix new file mode 100644 index 00000000000..da0e9bf1c1d --- /dev/null +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, ocamlPackages, omake }: + +stdenv.mkDerivation { + name = "beluga-20180403"; + + src = fetchFromGitHub { + owner = "Beluga-lang"; + repo = "Beluga"; + rev = "046aa59f008be70a7c4700b723bed0214ea8b687"; + sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld"; + }; + + nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ]; + buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ]; + + installPhase = '' + mkdir -p $out + cp -r bin $out/ + + mkdir -p $out/share/beluga + cp -r tools/ examples/ $out/share/beluga + + mkdir -p $out/share/emacs/site-lisp/beluga/ + cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga + ''; + + meta = { + description = "A functional language for reasoning about formal systems"; + homepage = http://complogic.cs.mcgill.ca/beluga/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.bcdarwin ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 073596951ef..52dafc4a69a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19859,6 +19859,8 @@ with pkgs; aspino = callPackage ../applications/science/logic/aspino {}; + beluga = callPackage ../applications/science/logic/beluga { }; + boogie = dotnetPackages.Boogie; inherit (callPackage ./coq-packages.nix {}) From 39db8ac1d87b90a51e53f95b831e7fc140148e30 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Wed, 4 Apr 2018 16:14:40 -0700 Subject: [PATCH 011/105] godot: add application metadata and man page to share. --- pkgs/development/tools/godot/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index e89b2f62b15..89cc7eb1bfe 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -42,6 +42,19 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp bin/godot.x11.tools.* $out/bin/godot + + mkdir -p "$out/share/applications" + cp misc/dist/linux/godot.desktop "$out/share/applications/" + substituteInPlace "$out/share/applications/godot.desktop" \ + --replace "Exec=godot" \ + "Exec=$out/bin/godot" + + mkdir -p "$out/share/icons/hicolor/scalable/apps/" + cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg" + cp icon.png "$out/share/icons/godot.png" + + mkdir -p "$out/share/man/man6" + cp misc/dist/linux/godot.6 "$out/share/man/man6/" ''; meta = { From 70675de9cb68ef57f3539bb072938f24ba190f8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Apr 2018 07:36:50 -0700 Subject: [PATCH 012/105] yad: 0.37.0 -> 0.40.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yad/versions. These checks were done: - built on NixOS - ran ‘/nix/store/qiw8cbdki0gylr19ryi6204ybp66zni4-yad-0.40.0/bin/yad-icon-browser -h’ got 0 exit code - ran ‘/nix/store/qiw8cbdki0gylr19ryi6204ybp66zni4-yad-0.40.0/bin/yad-icon-browser --help’ got 0 exit code - ran ‘/nix/store/qiw8cbdki0gylr19ryi6204ybp66zni4-yad-0.40.0/bin/.yad-icon-browser-wrapped -h’ got 0 exit code - ran ‘/nix/store/qiw8cbdki0gylr19ryi6204ybp66zni4-yad-0.40.0/bin/.yad-icon-browser-wrapped --help’ got 0 exit code - found 0.40.0 with grep in /nix/store/qiw8cbdki0gylr19ryi6204ybp66zni4-yad-0.40.0 - directory tree listing: https://gist.github.com/0a4215eabbdbe78cf2ad8560c88f7b9c --- pkgs/tools/misc/yad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 31b8d673a98..2c5a2b808a5 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -2,11 +2,11 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "yad-0.37.0"; + name = "yad-0.40.0"; src = fetchurl { url = "http://sourceforge.net/projects/yad-dialog/files/${name}.tar.xz"; - sha256 = "0fhqsgml1axaa9avd0hbam5wm77c2c7q1bz4hs7fvyvdnljazvwi"; + sha256 = "1x0fsv8nfkm8lchdawnf3zw79jaqbnvhv87sk5r8g86knv8vgl62"; }; configureFlags = [ From e120915248d2936d9f99ee4498dc29e392891d2a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 5 Apr 2018 10:16:20 -0400 Subject: [PATCH 013/105] mesos: fix on darwin by disabling java interface --- .../networking/cluster/mesos/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 68c66d78de1..961c0afc5c5 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -4,6 +4,7 @@ , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook +, withJava ? !stdenv.isDarwin }: let @@ -46,11 +47,13 @@ in stdenv.mkDerivation rec { autoreconfHook ]; buildInputs = [ - makeWrapper curl sasl jdk + makeWrapper curl sasl python wrapPython boto setuptools leveldb - subversion apr glog openssl libevent maven + subversion apr glog openssl libevent ] ++ lib.optionals stdenv.isLinux [ libnl + ] ++ lib.optionals withJava [ + jdk maven ]; propagatedBuildInputs = [ @@ -181,6 +184,7 @@ in stdenv.mkDerivation rec { "--with-libevent=${libevent.dev}" "--with-protobuf=${pythonProtobuf.protobuf}" "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar" + (if withJava then "--enable-java" else "--disable-java") ] ++ lib.optionals stdenv.isLinux [ "--with-network-isolator" "--with-nl=${libnl.dev}" @@ -190,16 +194,6 @@ in stdenv.mkDerivation rec { rm -rf $out/var rm $out/bin/*.sh - mkdir -p $out/share/java - cp src/java/target/mesos-*.jar $out/share/java - - MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} - - mkdir -p $out/nix-support - touch $out/nix-support/setup-hook - echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook - # Inspired by: pkgs/development/python-modules/generic/default.nix pushd src/python mkdir -p $out/lib/${python.libPrefix}/site-packages @@ -218,6 +212,16 @@ in stdenv.mkDerivation rec { --old-and-unmanageable \ --prefix="$out" popd + '' + stdenv.lib.optionalString withJava '' + mkdir -p $out/share/java + cp src/java/target/mesos-*.jar $out/share/java + + MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary} + + mkdir -p $out/nix-support + touch $out/nix-support/setup-hook + echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook + echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook ''; postFixup = '' @@ -248,6 +252,6 @@ in stdenv.mkDerivation rec { license = licenses.asl20; description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 05bffb5a0dff8567d75e59e04bed94af78c9d495 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Apr 2018 09:08:28 -0700 Subject: [PATCH 014/105] weka: 3.8.2 -> 3.9.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/weka/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 3.9.2 with grep in /nix/store/rv6aq5p1qacvpvaw9vszawzidsh8xdl9-weka-3.9.2 - directory tree listing: https://gist.github.com/c1ee16794a22549147d4d292cad986e5 --- pkgs/applications/science/math/weka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 6a692e07c43..a59746dcaeb 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "weka-${version}"; - version = "3.8.2"; + version = "3.9.2"; src = fetchurl { url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip"; - sha256 = "0p353lhhcv3swwn1bl64vkyjk480vv9ghhlyqjxiar4p3xifjayb"; + sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; buildInputs = [ unzip ]; From c195e52df5ee010bba5ff6478cdccb6dbe3c5820 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 14 Mar 2018 20:49:54 +0100 Subject: [PATCH 015/105] axel: mark linux only --- pkgs/tools/networking/axel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index c9d689b8b2c..2155d3c1b3d 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Console downloading program with some features for parallel connections for faster downloading"; homepage = http://axel.alioth.debian.org/; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; }; } From a378141684f1e1932b9c4c20359511e252673072 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 14 Mar 2018 22:03:41 +0100 Subject: [PATCH 016/105] caffe2: mark linux only --- pkgs/development/libraries/science/math/caffe2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index af7078599db..916bf122b3c 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { algorithms. You can bring your creations to scale using the power of GPUs in the cloud or to the masses on mobile with Caffe2's cross-platform libraries. ''; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; }; From 12e87a1ffbc11e0d266b166840dd0876ca22875e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 14 Mar 2018 22:52:41 +0100 Subject: [PATCH 017/105] catfish: mark linux only --- pkgs/applications/search/catfish/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index 79af80ea75f..adf0f51fc4c 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -61,7 +61,7 @@ pythonPackages.buildPythonApplication rec { options. ''; license = licenses.gpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } From 9b322eb45dbe22ff02daca7b70152bdda73dcf9e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 17:34:32 +0100 Subject: [PATCH 018/105] dlib: mark linux only --- pkgs/development/libraries/dlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 53ec9949f17..eaae1f7ecda 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.dlib.net; license = licenses.boost; maintainers = with maintainers; [ christopherpoole ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From d15203992792193d41756b613d085731d253da36 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 18:34:56 +0100 Subject: [PATCH 019/105] emojione: mark linux only --- pkgs/data/fonts/emojione/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 560aed970bb..9d4c1e22e14 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source emoji set"; homepage = http://emojione.com/; license = licenses.cc-by-40; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; } From 13139fccc683ae1117ad858ebd4df47c01d307db Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 19:31:17 +0100 Subject: [PATCH 020/105] focuswriter: mark linux only --- pkgs/applications/editors/focuswriter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index bb897b2e7e2..0e4a6a5bf20 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Simple, distraction-free writing environment"; license = licenses.gpl3Plus; maintainers = with maintainers; [ madjar ]; - platforms = platforms.all; + platforms = platforms.linux; homepage = https://gottcode.org/focuswriter/; }; } From 1fe1b9c8c10c34ba04946fb4c3b696e8b1e5746f Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 23:17:44 +0100 Subject: [PATCH 021/105] gkrellm: mark linux only --- pkgs/applications/misc/gkrellm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index b9cbf8064a0..b4fac899f66 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = http://gkrellm.srcbox.net; license = licenses.gpl3Plus; maintainers = [ ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 3642e1c581d85013755206597cc688d95fef7ded Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 23:24:17 +0100 Subject: [PATCH 022/105] globalplatform: mark linux only --- pkgs/development/libraries/globalplatform/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index 5b55a09db62..3ef279616f7 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; description = "Library for interacting with smart card devices"; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; }; } From 8a4ed1b3c2dc98de81431a85d27ec36d3909203e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 18 Mar 2018 22:22:27 +0100 Subject: [PATCH 023/105] gstreamermm: mark linux only --- pkgs/development/libraries/gstreamer/gstreamermm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index bee80cb24ec..14e27ab6068 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "C++ interface for GStreamer"; homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html; license = licenses.lgpl21Plus; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; From 43a686f4c7f990b5158c4903745e6f14462c0e43 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 18 Mar 2018 22:24:45 +0100 Subject: [PATCH 024/105] guile-fibers: mark linux only --- pkgs/development/guile-modules/guile-fibers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index 5f82a93c513..cfb56790221 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -23,6 +23,6 @@ in stdenv.mkDerivation { homepage = https://github.com/wingo/fibers; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From 3030252b1e26fc02884b5e1edb6a43dd68c597f2 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 19 Mar 2018 22:13:24 +0100 Subject: [PATCH 025/105] herqq: mark linux only --- pkgs/development/libraries/herqq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 8f1aadc3a26..75dd8693d2c 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m"; }; - meta = { + meta = with stdenv.lib; { homepage = http://herqq.org; description = "A software library for building UPnP devices and control points"; - inherit (qt5.qtbase.meta) platforms; + platforms = platforms.linux; maintainers = [ ]; }; } From 2174683e0cde97edc73c75a836d1ffe62a7b6e03 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 19 Mar 2018 22:18:22 +0100 Subject: [PATCH 026/105] htpdate: mark linux only --- pkgs/tools/networking/htpdate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index f0bb4ab46fa..c8e14ad7f69 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; homepage = http://www.vervest.org/htp/; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } From 3890c471de718842da25f3519ae67329adb424db Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 19 Mar 2018 22:22:25 +0100 Subject: [PATCH 027/105] icewm: mark linux only --- pkgs/applications/window-managers/icewm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index ffd1d995e87..3329b3b69e0 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = http://www.icewm.org/; license = licenses.lgpl2; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 7fea3e2acc59baf70de81a6fdcb8a269db0a653c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 19 Mar 2018 23:03:58 +0100 Subject: [PATCH 028/105] ipmitool: mark linux only --- pkgs/tools/system/ipmitool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index fe411edfcda..c906ad3c8cf 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = ''Command-line interface to IPMI-enabled devices''; license = licenses.bsd3; homepage = https://sourceforge.net/projects/ipmitool/; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; }; } From 18bc2aeadb1f2ce2e41c2c2c93df2a7e0842c764 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 19 Mar 2018 23:46:33 +0100 Subject: [PATCH 029/105] jgmenu: mark linux only --- pkgs/applications/misc/jgmenu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index e87288d7128..ffb898b265c 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/johanmalm/jgmenu; description = "Small X11 menu intended to be used with openbox and tint2"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } From a45ada6614eeca62bfb98cedeea31a410857e242 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 21 Mar 2018 22:00:01 +0100 Subject: [PATCH 030/105] mate-calc: mark linux only (cherry picked from commit bdf28cc2b1360dbc202bd2106fa20bbe85fe1b91) --- pkgs/desktops/mate/mate-calc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 5f968633d93..7e501fcf379 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Calculator for the MATE desktop"; homepage = http://mate-desktop.org; license = [ licenses.gpl2Plus ]; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } From 318d8fea4406fb9f90e09af1960c6c842dc40d5e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 21 Mar 2018 22:01:03 +0100 Subject: [PATCH 031/105] mate-icon-theme: mark linux only --- pkgs/desktops/mate/mate-icon-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 93ad93b07b9..7291b475fe1 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; buildInputs = [ librsvg hicolor-icon-theme ]; - + postInstall = '' for theme in "$out"/share/icons/*; do "${gtk3.out}/bin/gtk-update-icon-cache" "$theme" done ''; - + meta = { description = "Icon themes from MATE"; homepage = http://mate-desktop.org; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; }; } From 73a3e39c92b1089c7c98f9092733d5b252bdbe76 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 22 Mar 2018 23:13:23 +0100 Subject: [PATCH 032/105] mtx: mark linux only --- pkgs/tools/backup/mtx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index bc1f584f1c0..46f213a6ef4 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/mtx/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } From b0894c42eab2968c3b8a9f43a6ecaf288685f264 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 22 Mar 2018 23:26:41 +0100 Subject: [PATCH 033/105] offrss: mark linux only --- pkgs/applications/networking/offrss/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index af6a4dfddc1..d499916c7b6 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = "Offline RSS/Atom reader"; license="AGPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + platforms = stdenv.lib.platforms.linux; }; } From 2483f218cd3c279b7e78623b4c9e69092dc758b9 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 24 Mar 2018 00:10:46 +0100 Subject: [PATCH 034/105] opensmtpd-extras: mark linux only --- pkgs/servers/mail/opensmtpd/extras.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 5e87a1fb099..6b63c317d78 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = https://www.opensmtpd.org/; description = "Extra plugins for the OpenSMTPD mail server"; license = licenses.isc; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; }; } From 7053b097de9334b07f6b74476b6b206542695731 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 24 Mar 2018 00:16:15 +0100 Subject: [PATCH 035/105] openvdb: mark linux only --- pkgs/development/libraries/openvdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index f9540d2c4d2..8ed383c887b 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec LOG4CPLUS_LIB= BLOSC_INCLUDE_DIR=${c-blosc}/include/ BLOSC_LIB_DIR=${c-blosc}/lib/ - ''; + ''; installFlags = ''DESTDIR=$(out)''; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec description = "An open framework for voxel"; homepage = "http://www.openvdb.org"; maintainers = [ maintainers.guibou ]; - platforms = platforms.all; + platforms = platforms.linux; license = licenses.mpl20; }; } From f6cf8e3426b048484d183f257e572033cc43d442 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 24 Mar 2018 02:20:54 +0100 Subject: [PATCH 036/105] posterazor: mark linux only --- pkgs/applications/misc/posterazor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 1347840ee67..6cb00fb1525 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = http://posterazor.sourceforge.net/; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ stdenv.lib.maintainers.madjar ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } From 32227af3a687f4192a2728579ad8c2e46b46d3e5 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 24 Mar 2018 02:23:30 +0100 Subject: [PATCH 037/105] pure-ftpd: mark linux only --- pkgs/servers/ftp/pure-ftpd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 3728ee6c2a8..f41bb726a28 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = https://www.pureftpd.org; license = licenses.isc; # with some parts covered by BSD3(?) maintainers = [ maintainers.lethalman ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } From cc0fc1724bb6ca0e0ed5605da6e47124ac6f4f66 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 25 Mar 2018 15:09:21 +0200 Subject: [PATCH 038/105] s6-rc: mark linux only --- pkgs/tools/system/s6-rc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 13ce2414abf..ed1da8d450d 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://skarnet.org/software/s6-rc/; description = "A service manager for s6-based systems"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ pmahoney ]; }; From df776afc3dc2e648c1b1dbd7bb1f9482b59b0e54 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 25 Mar 2018 15:11:30 +0200 Subject: [PATCH 039/105] schroedinger: mark linux only --- pkgs/development/libraries/schroedinger/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index d8e67baa13d..2309719c2bd 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = http://diracvideo.org/; maintainers = [ maintainers.spwhitt ]; license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 1a9423ad6dc9296bed3329b576ea02278a050a45 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 25 Mar 2018 15:28:48 +0200 Subject: [PATCH 040/105] sg3_utils: mark linux only --- pkgs/tools/system/sg3_utils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index c1c4527d0a0..ca1af7a74e4 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sg.danny.cz/sg/; description = "Utilities that send SCSI commands to devices"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; } From fb3b3d6394c1220586717793096236b1b783fd68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 5 Apr 2018 19:21:16 +0100 Subject: [PATCH 041/105] weka: use makeWrapper --- pkgs/applications/science/math/weka/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index a59746dcaeb..3bfb22dad93 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, unzip }: +{ stdenv, fetchurl, jre, unzip, makeWrapper }: stdenv.mkDerivation rec { name = "weka-${version}"; @@ -9,20 +9,16 @@ stdenv.mkDerivation rec { sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip makeWrapper ]; # The -Xmx1000M comes suggested from their download page: # http://www.cs.waikato.ac.nz/ml/weka/downloading.html installPhase = '' - mkdir -pv $out/share/weka $out/bin + mkdir -pv $out/share/weka cp -Rv * $out/share/weka - cat > $out/bin/weka << EOF - #!${stdenv.shell} - ${jre}/bin/java -Xmx1000M -jar $out/share/weka/weka.jar - EOF - - chmod +x $out/bin/weka + makeWrapper ${jre}/bin/java $out/bin/weka \ + --add-flags "-Xmx1000M -jar $out/share/weka/weka.jar" ''; meta = { From c639649ef05a888021bb3d6b7f06d18686b11632 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 5 Apr 2018 13:58:07 -0400 Subject: [PATCH 042/105] leveldb: fix install_name on darwin --- pkgs/development/libraries/leveldb/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 3ff2ca0b0ee..2b50c09af5c 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { make all leveldbutil libmemenv.a ''; - installPhase = " + installPhase = (stdenv.lib.optionalString stdenv.isDarwin '' + for file in *.dylib*; do + install_name_tool -id $out/lib/$file $file + done + '') + # XXX consider removing above after transition to cmake in the next release + " mkdir -p $out/{bin,lib,include} cp -r include $out From 9eec034d7596bc40a3c346db545d24747fa4e29e Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sun, 18 Mar 2018 09:25:19 -0700 Subject: [PATCH 043/105] nixos/transmission: refactor preStart into script --- nixos/modules/services/torrent/transmission.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 1cf85af2a06..d23eebb388e 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -21,6 +21,16 @@ let # for users in group "transmission" to have access to torrents fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings; + + preStart = pkgs.writeScript "transmission-pre-start" '' + #!${pkgs.runtimeShell} + set -ex + for DIR in ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir}; do + mkdir -p "$DIR" + chmod 770 "$DIR" + done + cp -f ${settingsFile} ${settingsDir}/settings.json + ''; in { options = { @@ -89,9 +99,7 @@ in # 1) Only the "transmission" user and group have access to torrents. # 2) Optionally update/force specific fields into the configuration file. - serviceConfig.ExecStartPre = '' - ${pkgs.runtimeShell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json" - ''; + serviceConfig.ExecStartPre = preStart; serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}"; serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; serviceConfig.User = "transmission"; From c0de2454bd630532ba6ede52180a03006c1df571 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sun, 18 Mar 2018 10:09:42 -0700 Subject: [PATCH 044/105] nixos/transmission: Refactor out explicit listing of managed directories --- nixos/modules/services/torrent/transmission.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index d23eebb388e..0998d5a7107 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -22,10 +22,13 @@ let # for users in group "transmission" to have access to torrents fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings; + # Directories transmission expects to exist and be ug+rwx. + directoriesToManage = [ homeDir settingsDir fullSettings.download-dir fullSettings.incomplete-dir ]; + preStart = pkgs.writeScript "transmission-pre-start" '' #!${pkgs.runtimeShell} set -ex - for DIR in ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir}; do + for DIR in ${escapeShellArgs directoriesToManage}; do mkdir -p "$DIR" chmod 770 "$DIR" done From d0d05024d10b79ce893509194a1c3bfbc03721a8 Mon Sep 17 00:00:00 2001 From: Corey O'Connor Date: Sun, 18 Mar 2018 10:21:24 -0700 Subject: [PATCH 045/105] nixos/transmission: add basic nixos test --- nixos/release.nix | 1 + nixos/tests/transmission.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 nixos/tests/transmission.nix diff --git a/nixos/release.nix b/nixos/release.nix index 22deea6fee0..c84853a142c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -383,6 +383,7 @@ in rec { tests.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; + tests.transmission = callTest tests/transmission.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; tests.vault = callTest tests/vault.nix {}; tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {}; diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix new file mode 100644 index 00000000000..34c49bd7f15 --- /dev/null +++ b/nixos/tests/transmission.nix @@ -0,0 +1,21 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "transmission"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ coconnor ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + networking.firewall.allowedTCPPorts = [ 9091 ]; + + services.transmission.enable = true; + }; + + testScript = + '' + startAll; + $machine->waitForUnit("transmission"); + $machine->shutdown; + ''; +}) From 48d4cef9d317eaae8c47962111d75a3a162441db Mon Sep 17 00:00:00 2001 From: obadz Date: Thu, 5 Apr 2018 23:15:20 +0100 Subject: [PATCH 046/105] localtime: remove dependency on go --- pkgs/tools/system/localtime/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index d9cfc77203e..c49054f3a67 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, systemd, polkit, fetchFromGitHub, m4 }: +{ stdenv, go, systemd, polkit, fetchFromGitHub, m4, removeReferencesTo }: stdenv.mkDerivation { name = "localtime-2017-11-07"; @@ -10,10 +10,15 @@ stdenv.mkDerivation { sha256 = "04fyna8p7q7skzx9fzmncd6gx7x5pwa9jh8a84hpljlvj0kldfs8"; }; - buildInputs = [ go systemd polkit m4 ]; + buildInputs = [ go systemd polkit m4 removeReferencesTo ]; + disallowedRequisites = [ go ]; makeFlags = [ "PREFIX=$(out)" ]; + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + ''; + meta = { description = "A daemon for keeping the system timezone up-to-date based on the current location"; homepage = https://github.com/Stebalien/localtime; From 3868973c414d604f4b441784f5e017367126985d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 5 Apr 2018 17:48:57 -0400 Subject: [PATCH 047/105] libevent: fix install_name on darwin --- pkgs/development/libraries/libevent/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index e14f4cbf5d6..871437f1908 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, findutils +{ stdenv, fetchurl, findutils, fixDarwinDylibNames , sslSupport? true, openssl }: @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional sslSupport openssl ++ stdenv.lib.optional stdenv.isCygwin findutils + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames ; postInstall = stdenv.lib.optionalString sslSupport '' From 8ea70531de391a66fc0c7d445340ca7c6e21c892 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 5 Apr 2018 21:48:21 -0400 Subject: [PATCH 048/105] amazonka: fix build after hackage update fixes #38306 --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4d85a26227e..fdabea7aa75 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1009,3 +1009,20 @@ self: super: { pure-zlib = doJailbreak super.pure-zlib; } + +// + +(let + amazonkaOverrides = self: super: { + conduit = self.conduit_1_2_13_1; + conduit-extra = self.conduit-extra_1_2_3_2; + resourcet = self.resourcet_1_1_11; + xml-conduit = self.xml-conduit_1_7_1_2; + http-conduit = self.http-conduit_2_2_4; + }; + amazonka-core = super.amazonka-core.overrideScope amazonkaOverrides; + amazonka = super.amazonka.overrideScope amazonkaOverrides; + amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides; +in { + inherit amazonka amazonka-core amazonka-test; +}) \ No newline at end of file From d7d2ac0af28fff330f5931ca5ee744edd0a476f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 5 Apr 2018 20:54:06 -0700 Subject: [PATCH 049/105] sysbench: 1.0.13 -> 1.0.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sysbench/versions. These checks were done: - built on NixOS - ran ‘/nix/store/d3633p13b97v5r5xswf85v9fxql1jv72-sysbench-1.0.14/bin/sysbench --help’ got 0 exit code - ran ‘/nix/store/d3633p13b97v5r5xswf85v9fxql1jv72-sysbench-1.0.14/bin/sysbench --version’ and found version 1.0.14 - found 1.0.14 with grep in /nix/store/d3633p13b97v5r5xswf85v9fxql1jv72-sysbench-1.0.14 - directory tree listing: https://gist.github.com/56c18be2af370efb1c887dd27074fd4e --- pkgs/development/tools/misc/sysbench/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index d72fc86d7ee..dbd036d03fd 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,7 +2,7 @@ , libaio }: stdenv.mkDerivation rec { - name = "sysbench-1.0.13"; + name = "sysbench-1.0.14"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ vim mysql.connector-c libaio ]; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "akopytov"; repo = "sysbench"; - rev = "1.0.13"; - sha256 = "1inxyjpcyv2ag3k5riwlaq91362y16yks75vs2crmhjxlxdspy8c"; + rev = "1.0.14"; + sha256 = "0mp1wqdm87zqyn55z23qf1izqz7ijgcbsysdwqndd98w6m5d86rp"; }; meta = { From 863c2908f2a80eaa87357f4e6214aa71f797a11c Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 7 Nov 2017 20:58:08 +0900 Subject: [PATCH 050/105] ns-3: init at 28.0 ns-3 is a discrete event C++ network simulator developed at www.nsnam.org . Python bindings & manual building are disabled by default but you can override it. --- .../science/networking/ns3/default.nix | 98 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 100 insertions(+) create mode 100644 pkgs/development/libraries/science/networking/ns3/default.nix diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix new file mode 100644 index 00000000000..9fc72f18e5d --- /dev/null +++ b/pkgs/development/libraries/science/networking/ns3/default.nix @@ -0,0 +1,98 @@ +{ stdenv +, fetchFromGitHub, fetchurl +, python + +# for binding generation +, castxml ? null + +# can take a long time, generates > 30000 images/graphs +, enableDoxygen ? false + +# e.g. "optimized" or "debug". If not set, use default one +, build_profile ? null + +# --enable-examples +, withExamples ? false + +# very long +, withManual ? false, doxygen ? null, graphviz ? null, imagemagick ? null +# for manual, tetex is used to get the eps2pdf binary +# texlive to get latexmk. building manual still fails though +, dia, tetex ? null, ghostscript ? null, texlive ? null + +# generates python bindings +, generateBindings ? false, ncurses ? null + +# All modules can be enabled by choosing 'all_modules'. +# we include here the DCE mandatory ones +, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"] +, gcc6 +, lib +}: + +let + pythonEnv = python.withPackages(ps: + stdenv.lib.optional withManual ps.sphinx + ++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ]) + ); +in +stdenv.mkDerivation rec { + + name = "ns-3.${version}"; + version = "28"; + + # the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2; + # fetches everything (netanim, etc), this package focuses on ns3-core + src = fetchFromGitHub { + owner = "nsnam"; + repo = "ns-3-dev-git"; + rev = name; + sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng"; + }; + + # ncurses is a hidden dependency of waf when checking python + buildInputs = lib.optionals generateBindings [ castxml ncurses ] + ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ] + ++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ]; + + propagatedBuildInputs = [ gcc6 pythonEnv ]; + + postPatch = '' + patchShebangs ./waf + patchShebangs doc/ns3_html_theme/get_version.sh + ''; + + configureScript = "${python.interpreter} ./waf configure"; + + configureFlags = with stdenv.lib; [ + "--enable-modules=${stdenv.lib.concatStringsSep "," modules}" + "--with-python=${pythonEnv.interpreter}" + ] + ++ optional (build_profile != null) "--build-profile=${build_profile}" + ++ optional generateBindings [ ] + ++ optional withExamples " --enable-examples " + ++ optional doCheck " --enable-tests " + ; + + postBuild = with stdenv.lib; let flags = concatStringsSep ";" ( + optional enableDoxygen "./waf doxygen" + ++ optional withManual "./waf sphinx" + ); + in "${flags}" + ; + + doCheck = true; + + # we need to specify the proper interpreter else ns3 can check against a + # different version even though we + checkPhase = '' + ${pythonEnv.interpreter} ./test.py + ''; + + meta = { + homepage = http://www.nsnam.org; + license = stdenv.lib.licenses.gpl3; + description = "A discrete time event network simulator"; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb07c9b5ea3..9f6e0755f54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20204,6 +20204,8 @@ with pkgs; megam = callPackage ../applications/science/misc/megam { }; + ns-3 = callPackage ../development/libraries/science/networking/ns3 { }; + root = callPackage ../applications/science/misc/root { inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; From d488a9dc7ac18d36b8323d6c0e43a74737e53ebe Mon Sep 17 00:00:00 2001 From: Tim Engler Date: Fri, 6 Apr 2018 07:49:55 +0000 Subject: [PATCH 051/105] nixos/lxqt: enable upower if config.powerManagement is enabled (#38318) --- nixos/modules/services/x11/desktop-managers/lxqt.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index fb907618d35..2596ec4ad85 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -61,6 +61,8 @@ in environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; + services.upower.enable = config.powerManagement.enable; }; + } From 098c851dcbed754361ae6bcb94aae519b27b8be8 Mon Sep 17 00:00:00 2001 From: Herdiansyah Date: Fri, 6 Apr 2018 14:55:08 +0700 Subject: [PATCH 052/105] neofetch: 3.3.0 -> 3.4.0 (#38491) --- pkgs/tools/misc/neofetch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index de4a22ee9e4..097eb2408f8 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "neofetch-${version}"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; rev = version; - sha256 = "1f1hvd635wv81qg802jdi0yggi4631w9nlznipaxkvk4y1zpdq5j"; + sha256 = "10h4f7n6bllbq459nm9wppvk65n81zzv556njfqplzw3mpdrbiyx"; }; dontBuild = true; From ff5baea979b81cd3324580a6e182a8019337fe7e Mon Sep 17 00:00:00 2001 From: Isaac Shapira Date: Fri, 6 Apr 2018 01:57:20 -0600 Subject: [PATCH 053/105] pywal: init at 2.0.5 (#38443) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/tools/graphics/pywal/default.nix | 28 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/tools/graphics/pywal/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a39aa8b9882..91535b2f1c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -72,6 +72,11 @@ github = "FireyFly"; name = "Jonas Höglund"; }; + Fresheyeball = { + email = "fresheyeball@gmail.com"; + github = "fresheyeball"; + name = "Isaac Shapira"; + }; Gonzih = { email = "gonzih@gmail.com"; github = "Gonzih"; diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix new file mode 100644 index 00000000000..95f7c547b55 --- /dev/null +++ b/pkgs/tools/graphics/pywal/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub, imagemagick, feh }: + +python3Packages.buildPythonApplication rec { + pname = "pywal"; + version = "2.0.5"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "117f61db013409ee2657aab9230cc5c2cb2b428c17f7fbcf664909122962165e"; + }; + + # necessary for imagemagick to be found during tests + buildInputs = [ imagemagick ]; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ imagemagick feh ]}" ]; + + preCheck = '' + mkdir tmp + HOME=$PWD/tmp + ''; + + meta = with lib; { + description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; + homepage = https://github.com/dylanaraps/pywal; + license = licenses.mit; + maintainers = with maintainers; [ Fresheyeball ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f6e0755f54..9115bfafa96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4449,6 +4449,8 @@ with pkgs; pytrainer = callPackage ../applications/misc/pytrainer { }; + pywal = callPackage ../tools/graphics/pywal {}; + remarshal = callPackage ../development/tools/remarshal { }; rtaudio = callPackage ../development/libraries/audio/rtaudio { }; From ce1c1e3093b9652fb3a3cdc1472afbc8a84dee68 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 6 Apr 2018 10:57:19 +0200 Subject: [PATCH 054/105] Remove maintainership With this patch I remove myself as a maintainer for all packages I currently maintain. This is due the fact that I will be basically off the grid from May 2018 until early 2019, as I will be on a trip through north america. I will revert this patch as soon as I'm back, as I plan to continue contributing to nixpkgs then. But as I cannot maintain anything during that time, I'd like to get this patch merged. Signed-off-by: Matthias Beyer --- pkgs/applications/misc/buku/default.nix | 2 +- pkgs/applications/misc/cataract/build.nix | 2 +- pkgs/applications/misc/cli-visualizer/default.nix | 2 +- pkgs/applications/misc/ctodo/default.nix | 2 +- pkgs/applications/misc/haxor-news/default.nix | 2 +- pkgs/applications/misc/hr/default.nix | 2 +- pkgs/applications/misc/hstr/default.nix | 2 +- pkgs/applications/misc/khal/default.nix | 2 +- pkgs/applications/misc/khard/default.nix | 2 +- pkgs/applications/misc/mdp/default.nix | 2 +- pkgs/applications/misc/mwic/default.nix | 2 +- pkgs/applications/misc/rtv/default.nix | 2 +- pkgs/applications/misc/sc-im/default.nix | 2 +- pkgs/applications/misc/sigal/default.nix | 2 +- pkgs/applications/misc/stag/default.nix | 2 +- pkgs/applications/misc/tasknc/default.nix | 2 +- pkgs/applications/misc/tasksh/default.nix | 2 +- pkgs/applications/misc/timewarrior/default.nix | 2 +- pkgs/applications/misc/toot/default.nix | 2 +- pkgs/applications/misc/vit/default.nix | 2 +- pkgs/applications/misc/weather/default.nix | 2 +- pkgs/applications/misc/yaft/default.nix | 2 +- pkgs/applications/office/beancount/bean-add.nix | 2 +- pkgs/applications/office/beancount/default.nix | 2 +- pkgs/applications/office/fava/default.nix | 2 +- pkgs/applications/office/wordgrinder/default.nix | 2 +- .../version-management/bugseverywhere/default.nix | 2 +- .../version-management/git-and-tools/git-dit/default.nix | 2 +- .../xfce/panel-plugins/xfce4-mailwatch-plugin.nix | 2 +- pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix | 2 +- pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix | 2 +- pkgs/development/libraries/zlog/default.nix | 2 +- pkgs/development/misc/loc/default.nix | 2 +- pkgs/development/python-modules/pygraphviz/default.nix | 2 +- .../python-modules/requests-toolbelt/default.nix | 4 ++-- pkgs/development/tools/database/sqlitebrowser/default.nix | 2 +- pkgs/misc/screensavers/pipes/default.nix | 2 +- pkgs/servers/misc/taskserver/default.nix | 2 +- pkgs/servers/web-apps/klaus/default.nix | 2 +- pkgs/tools/misc/mpdscribble/default.nix | 2 +- pkgs/tools/misc/multitail/default.nix | 2 +- pkgs/tools/misc/smenu/default.nix | 2 +- pkgs/tools/misc/vdirsyncer/default.nix | 2 +- pkgs/tools/misc/vimer/default.nix | 2 +- pkgs/tools/networking/http-prompt/default.nix | 2 +- pkgs/top-level/python-packages.nix | 8 ++++---- 46 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index c645d9bf0b4..fb1f6403ce4 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -52,7 +52,7 @@ with python3.pkgs; buildPythonApplication rec { homepage = https://github.com/jarun/Buku; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ infinisil ]; }; } diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index e48b32a783d..f2aac4326cb 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = http://cgg.bzatek.net/; description = "a simple static web photo gallery, designed to be clean and easily usable"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 8b24df1bee9..fa9d3e2fdf4 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dpayne/cli-visualizer; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 0123e0c38d7..f8927319a01 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://ctodo.apakoh.dk/; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index b37a6ad732f..624c15e118a 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { homepage = https://github.com/donnemartin/haxor-news; description = "Browse Hacker News like a haxor"; license = licenses.asl20; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 2fd56e3c555..6b0926db047 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/LuRsT/hr; description = "A horizontal bar for your terminal"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 6b62b418d78..db50b0d2169 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/dvorka/hstr; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; # Cannot test others }; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 91e583e2af4..5351cd41b25 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -40,6 +40,6 @@ buildPythonApplication rec { homepage = http://lostpackets.de/khal/; description = "CLI calendar application"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; }; } diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 5f3ac3d93c4..c626aaca66b 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -31,6 +31,6 @@ python3Packages.buildPythonApplication rec { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 9e584217c59..fd0a8ea1fe4 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/visit1985/mdp; description = "A command-line based markdown presentation tool"; - maintainers = with maintainers; [ matthiasbeyer vrthra ]; + maintainers = with maintainers; [ vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index e6ac35d19a0..02c18109abc 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://jwilk.net/software/mwic; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 5ca8bfcf5df..ed54e523c8f 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -48,6 +48,6 @@ buildPythonApplication rec { homepage = https://github.com/michael-lazar/rtv; description = "Browse Reddit from your Terminal"; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ]; + maintainers = with maintainers; [ jgeerds wedens ]; }; } diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index e664a5a7527..acd79859901 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/andmarti1424/sc-im; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; # Cannot test others }; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 622f6e14752..411fd756579 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { description = "Yet another simple static gallery generator"; homepage = http://sigal.saimon.org/en/latest/index.html; license = licenses.mit; - maintainers = with maintainers; [ domenkozar matthiasbeyer ]; + maintainers = with maintainers; [ domenkozar ]; }; } diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index ebb50e685da..6d6382faccd 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { homepage = https://github.com/seenaburns/stag; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 0deda8ce35a..3f395696161 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/lharding/tasknc; description = "A ncurses wrapper around taskwarrior"; - maintainers = with maintainers; [ matthiasbeyer infinisil ]; + maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; # Cannot test others }; } diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 11bc7620368..f64d2547198 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "REPL for taskwarrior"; homepage = http://tasktools.org; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 42f3d1646c5..9aca45264af 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A command-line time tracker"; homepage = https://tasktools.org/projects/timewarrior.html; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer mrVanDalo ]; + maintainers = with maintainers; [ mrVanDalo ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 1f8ab8b438d..e282e752b31 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index d8dea641c3a..37d7aeb88e6 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "Visual Interactive Taskwarrior"; - maintainers = with pkgs.lib.maintainers; [ matthiasbeyer ]; + maintainers = with pkgs.lib.maintainers; [ ]; platforms = pkgs.lib.platforms.linux; license = pkgs.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 90fa0166154..544c1252ff4 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = http://fungi.yuggoth.org/weather; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; # my only platform }; } diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index d273d27944a..0794b2b6dbe 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/uobikiemukot/yaft; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 9eec315217c..cfd7a4eda20 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # The (only) source file states: # License: "Do what you feel is right, but don't be a jerk" public license. - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index d88e37a4c5f..d500be8a1f2 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication rec { generate a variety of reports from them, and provides a web interface. ''; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index fdbf9183d75..9040e5cb885 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { homepage = https://beancount.github.io/fava; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index be5ac7a2f2b..8efe9b368a0 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Text-based word processor"; homepage = https://cowlark.com/wordgrinder; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/version-management/bugseverywhere/default.nix b/pkgs/applications/version-management/bugseverywhere/default.nix index 6301acdf134..7c41a60a725 100644 --- a/pkgs/applications/version-management/bugseverywhere/default.nix +++ b/pkgs/applications/version-management/bugseverywhere/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { homepage = http://www.bugseverywhere.org/; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index d8104995152..41096441b8e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -41,6 +41,6 @@ buildRustPackage rec { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; license = licenses.gpl2; - maintainers = with maintainers; [ Profpatsch matthiasbeyer ]; + maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index 80153332934..541b30ec1b3 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Mailwatch plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 8a602b8b4a1..5331c29a454 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 1ba4340fcb5..c420c9fb643 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Battery plugin for Xfce panel"; platforms = platforms.linux; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index d3dc41371de..21d8a7babb3 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://hardysimpson.github.com/zlog; license = licenses.lgpl21; platforms = platforms.linux; # cannot test on something else - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index eef10f3323f..efa76ea00a0 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { homepage = https://github.com/cgag/loc; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index bed258c1673..e6ab3512797 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Python interface to Graphviz graph drawing package"; homepage = https://github.com/pygraphviz/pygraphviz; license = licenses.bsd3; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index e7834e62b82..809c8d3c96d 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; homepage = http://toolbelt.rtfd.org; - maintainers = with lib.maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with lib.maintainers; [ jgeerds ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 74adac9f8a3..054eabdb5e4 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { description = "DB Browser for SQLite"; homepage = http://sqlitebrowser.org/; license = licenses.gpl3; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index 8539db5e002..6e4ae16e9c8 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/pipeseroni/pipes.sh; description = "Animated pipes terminal screensaver"; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 0511c822ebe..466c3873c60 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = http://taskwarrior.org; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; + maintainers = with stdenv.lib.maintainers; [ makefu ]; }; } diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/servers/web-apps/klaus/default.nix index bb953ecc03a..81d1e57e7a0 100644 --- a/pkgs/servers/web-apps/klaus/default.nix +++ b/pkgs/servers/web-apps/klaus/default.nix @@ -35,6 +35,6 @@ python.pkgs.buildPythonApplication rec { description = "The first Git web viewer that Just Works"; homepage = https://github.com/jonashaag/klaus; license = licenses.isc; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 56684848eba..47eec54e127 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; homepage = http://mpd.wikia.com/wiki/Client:mpdscribble; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index bd446395bc7..82155eb51c7 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.vanheusden.com/multitail/; description = "tail on Steroids"; - maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index 061a6c58d23..3db0ee9af26 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { your selection will be sent to standard output. ''; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index ad5b259eb77..9d1e4096776 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://github.com/pimutils/vdirsyncer; description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer jgeerds ]; + maintainers = with maintainers; [ jgeerds ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index a655aa9502e..7ccc6e9dc27 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in an existing instance of GVim or MacVim. ''; license = licenses.mit; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index b1f83c8b216..37f4f96a317 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; homepage = https://github.com/eliangcs/http-prompt; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # can only test on linux }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81c2a62796f..11edd50672f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -634,7 +634,7 @@ in { meta = { description = "Atomic file writes on POSIX"; homepage = https://pypi.python.org/pypi/atomicwrites/0.1.0; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; }; @@ -4759,7 +4759,7 @@ in { description = "Python humanize utilities"; homepage = https://github.com/jmoiron/humanize; license = licenses.mit; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # can only test on linux }; @@ -4847,7 +4847,7 @@ in { description = "WSGI HTTP Digest Authentication middleware"; homepage = https://github.com/jonashaag/httpauth; license = licenses.bsd2; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; }; @@ -16738,7 +16738,7 @@ in { homepage = https://github.com/uri-templates/uritemplate-py; description = "Python implementation of URI Template"; license = licenses.asl20; - maintainers = with maintainers; [ matthiasbeyer ]; + maintainers = with maintainers; [ ]; }; }; From b894dd8b821d74b25911f63762c24024107d9372 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 6 Apr 2018 10:56:56 +0200 Subject: [PATCH 055/105] Update create-gce.sh script. Set default option for GCE images to disable host key replacement by service. (cherry picked from commit 748d96ffa3c51c3127bcdf23a88d54afad6406e9) --- nixos/maintainers/scripts/gce/create-gce.sh | 4 ++-- nixos/modules/virtualisation/google-compute-image.nix | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index ef1801fe54b..0fd26d34d07 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -3,7 +3,7 @@ set -euo pipefail -BUCKET_NAME="${BUCKET_NAME:-nixos-images}" +BUCKET_NAME="${BUCKET_NAME:-nixos-cloud-images}" TIMESTAMP="$(date +%Y%m%d%H%M)" export TIMESTAMP @@ -19,5 +19,5 @@ img_name=$(basename "$img_path") img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g') if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name" + gsutil acl ch -u AllUsers:R "gs://${BUCKET_NAME}/$img_name" fi -gcloud compute images create "$img_id" --source-uri "gs://${BUCKET_NAME}/$img_name" diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index eaf8b14cd8e..559c30b9416 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -57,6 +57,12 @@ in # Always include cryptsetup so that NixOps can use it. environment.systemPackages = [ pkgs.cryptsetup ]; + # Make sure GCE image does not replace host key that NixOps sets + environment.etc."default/instance_configs.cfg".text = lib.mkDefault '' + [InstanceSetup] + set_host_keys = false + ''; + # Rely on GCP's firewall instead networking.firewall.enable = mkDefault false; From 2ed8e7a0f92b738d539b2c9c2ac17fb7a2fb2e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 6 Apr 2018 08:21:43 +0100 Subject: [PATCH 056/105] pwndbg: init at 2018-04-06 --- .../development/tools/misc/pwndbg/default.nix | 48 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/tools/misc/pwndbg/default.nix diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix new file mode 100644 index 00000000000..9c6b00cd5be --- /dev/null +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gdb }: + +stdenv.mkDerivation rec { + name = "pwndbg-2018-04-06"; + + src = fetchFromGitHub { + owner = "pwndbg"; + repo = "pwndbg"; + rev = "e225ba9f647ab8f7f4871075529c0ec239f43300"; + sha256 = "1s6m93qi3baclgqqii4fnmzjmg0c6ipkscg7xiljaj5z4bs371j4"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with pythonPackages; [ + future + isort + psutil + pycparser + pyelftools + python-ptrace + ROPGadget + six + unicorn + pygments + enum34 + ]; + + installPhase = '' + mkdir -p $out/share/pwndbg + cp -r *.py pwndbg $out/share/pwndbg + makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ + --add-flags "-q -x $out/share/pwndbg/gdbinit.py" + ''; + + preFixup = '' + sed -i "/import sys/a import sys; sys.path.insert(0, '$PYTHONPATH'.split(':'))" \ + $out/share/pwndbg/gdbinit.py + ''; + + meta = with stdenv.lib; { + description = "Exploit Development and Reverse Engineering with GDB Made Easy"; + homepage = http://pwndbg.com; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f6e0755f54..dcc2db72ccd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4437,6 +4437,8 @@ with pkgs; pwnat = callPackage ../tools/networking/pwnat { }; + pwndbg = callPackage ../development/tools/misc/pwndbg { }; + pycangjie = pythonPackages.pycangjie; pydb = callPackage ../development/tools/pydb { }; From e7a352f96f1621be3432385871f00348cf9e1657 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Fri, 6 Apr 2018 12:18:37 +0200 Subject: [PATCH 057/105] atom : 1.25.0 -> 1.25.1 --- pkgs/applications/editors/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 8c7ff7b5eae..9fbf4431f60 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "04iiw0qzl9025l4lasz42w5nfnvsmc7vwcf4a9c2hvl9xsyckajh"; + sha256 = "0h0kr4w26c6i89rb9y4aw4l8f63al42i2cy3ddk16m1irzij9fk4"; name = "${name}.deb"; }; From c0c4557393156e6432a8e554d14a78f704b0c82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Fri, 6 Apr 2018 12:25:15 +0200 Subject: [PATCH 058/105] pwndbg: fix wrapper mistake --- pkgs/development/tools/misc/pwndbg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index 9c6b00cd5be..df4b91a79b0 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - sed -i "/import sys/a import sys; sys.path.insert(0, '$PYTHONPATH'.split(':'))" \ + sed -i "/import sys/a import sys; sys.path[0:0] = '$PYTHONPATH'.split(':')" \ $out/share/pwndbg/gdbinit.py ''; From 6c87fbb62028933e6fe8de0f09b5fcf0f689d5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 6 Apr 2018 12:06:58 +0100 Subject: [PATCH 059/105] zfsUnstable: mark linux 4.16 as broken --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index bf02044a8c4..78d313fa9a1 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -144,7 +144,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.16"; # this package should point to the latest release. version = "0.7.7"; From e7f2b7692b137e809262f80798cb0fe7d5f0ce3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 6 Apr 2018 12:09:33 +0100 Subject: [PATCH 060/105] zfsUnstable: mark correct zfs version as incompatible --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 78d313fa9a1..83309813239 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -144,7 +144,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = "4.16"; + incompatibleKernelVersion = null; # this package should point to the latest release. version = "0.7.7"; @@ -163,7 +163,7 @@ in { zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-04-04"; From f8fe297ff1dd7caebee4b923ce2178da090564ac Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 6 Apr 2018 14:18:16 +0200 Subject: [PATCH 061/105] julia: remove wrapper from julia binaries, in stead symlink shared libraries from LD_LIBRARY_PATH into lib/julia, as using a wrapper with LD_LIBRARY_PATH causes segmentation faults when program returns an error: $ julia -e 'throw(Error())' only applied for 0.6, which is the current julia version. Will see if we can remove the older versions in master. (cherry picked from commit 41f3a4e0030a1b0233de6ca7f5208c44eb370313) --- pkgs/development/compilers/julia/0.6.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index 36bbb7d817f..6fad8e5259c 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -172,10 +172,14 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for prog in "$out/bin/julia" "$out/bin/julia-debug"; do - wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \ - --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" + # Symlink shared libraries from LD_LIBRARY_PATH into lib/julia, + # as using a wrapper with LD_LIBRARY_PATH causes segmentation + # faults when program returns an error: + # $ julia -e 'throw(Error())' + find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do + if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then + ln -sv $lib $out/lib/julia/$(basename $lib) + fi done ''; From 0af5b254ab6b3a54037ebab6fa09a85f52568d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 6 Apr 2018 16:17:25 +0100 Subject: [PATCH 062/105] zfsUnstable: fix evaluation of error message --- pkgs/os-specific/linux/zfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 83309813239..ae51d3d4f98 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -27,7 +27,7 @@ let versionAtLeast kernel.version incompatibleKernelVersion then throw '' Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. - ${stdenv.lib.optional (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} + ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} '' else stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; From 15a2dca15c25279843374003c8ae553e3b4af385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= Date: Fri, 6 Apr 2018 18:31:10 +0200 Subject: [PATCH 063/105] Sublime dev (#38383) * Package sublime-dev build. * sublime3-dev: Init at 3160 * Sublime3: Refactor to share derivation between sublime-text 3 dev and stable * Sublime3: Refactor as a fuction to avoid duplicating parameters * Sublime3: Remove unnecessary rec https://github.com/NixOS/nixpkgs/pull/38383#discussion_r178898901 * sublime3-dev: 3160 -> 3161 --- .../editors/sublime/{ => 2}/default.nix | 0 .../default.nix => sublime/3/common.nix} | 44 +++++++++++-------- .../editors/sublime/3/packages.nix | 18 ++++++++ pkgs/top-level/all-packages.nix | 6 ++- 4 files changed, 47 insertions(+), 21 deletions(-) rename pkgs/applications/editors/sublime/{ => 2}/default.nix (100%) rename pkgs/applications/editors/{sublime3/default.nix => sublime/3/common.nix} (82%) create mode 100644 pkgs/applications/editors/sublime/3/packages.nix diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/2/default.nix similarity index 100% rename from pkgs/applications/editors/sublime/default.nix rename to pkgs/applications/editors/sublime/2/default.nix diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime/3/common.nix similarity index 82% rename from pkgs/applications/editors/sublime3/default.nix rename to pkgs/applications/editors/sublime/3/common.nix index 9c8a75320a6..7185a82a960 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -1,33 +1,39 @@ +{buildVersion, x32sha256, x64sha256}: + { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, pkexecPath ? "/run/wrappers/bin/pkexec", libredirect, - gksuSupport ? false, gksu, unzip, zip, bash }: + gksuSupport ? false, gksu, unzip, zip, bash}: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3143"; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; in let + archSha256 = + if stdenv.system == "i686-linux" then + x32sha256 + else + x64sha256; + + arch = + if stdenv.system == "i686-linux" then + "x32" + else + "x64"; + # package with just the binaries sublime = stdenv.mkDerivation { - name = "sublimetext3-${build}-bin"; - + name = "sublimetext3-${buildVersion}-bin"; src = - if stdenv.system == "i686-linux" then - fetchurl { - name = "sublimetext-${build}.tar.bz2"; - url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; - } - else - fetchurl { - name = "sublimetext-${build}.tar.bz2"; - url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; - }; + fetchurl { + name = "sublimetext-${buildVersion}.tar.bz2"; + url = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; + sha256 = archSha256; + }; dontStrip = true; dontPatchELF = true; @@ -80,8 +86,8 @@ in let wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; -in stdenv.mkDerivation { - name = "sublimetext3-${build}"; +in stdenv.mkDerivation (rec { + name = "sublimetext3-${buildVersion}"; phases = [ "installPhase" ]; @@ -110,4 +116,4 @@ in stdenv.mkDerivation { license = licenses.unfree; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix new file mode 100644 index 00000000000..84394e85c88 --- /dev/null +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -0,0 +1,18 @@ +{ callPackage }: + +let + common = opts: callPackage (import ./common.nix opts); +in + rec { + sublime3-dev = common { + buildVersion = "3161"; + x32sha256 = "0qrm2qmfsj71lr83c8zas2n3xk8hk9k4w8ygnasjhggmyjm3wy0q"; + x64sha256 = "0cgadylm68s2jly10r038q1fvmbzmpc2nvqy86vlyq9avgqbm5pc"; + } {}; + + sublime3 = common { + buildVersion = "3143"; + x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i"; + x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw"; + } {}; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eba05ff31a3..73800bf0f62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17824,9 +17824,11 @@ with pkgs; inherit sbcl lispPackages; }; - sublime = callPackage ../applications/editors/sublime { }; + sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { }); - sublime3 = lowPrio (callPackage ../applications/editors/sublime3 { }); + sublime3 = sublime3Packages.sublime3; + + sublime3-dev = sublime3Packages.sublime3-dev; inherit (callPackages ../applications/version-management/subversion/default.nix { bdbSupport = true; From 80faa73fc064a946ad5ca9e702eb68922759b684 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 6 Apr 2018 19:20:03 +0200 Subject: [PATCH 064/105] neomutt: Fix the path to the auxiliary tools This path changed from $out/lib/neomutt to $out/libexec/neomutt. --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d9c2a136adf..7bd0ea70dc6 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { postInstall = '' cp ${muttWrapper} $out/bin/mutt - wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt" + wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" ''; doCheck = true; From ae8e564ba8b8a6a06f743a9ac6422f2286c36771 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Apr 2018 09:40:57 -0700 Subject: [PATCH 065/105] notmuch: 0.26 -> 0.26.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/notmuch/versions. These checks were done: - built on NixOS - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch --help’ got 0 exit code - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch help’ got 0 exit code - ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch --version’ and found version 0.26.1 - found 0.26.1 with grep in /nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1 - directory tree listing: https://gist.github.com/adeae189f9ac416571a7c0e3beca712f --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index a3de728ce41..20e8071b121 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.26"; + version = "0.26.1"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k"; + sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk"; }; nativeBuildInputs = [ pkgconfig ]; From add8d33447c5b25becb7617a559753eca16480ec Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 6 Apr 2018 20:51:51 +0200 Subject: [PATCH 066/105] checkstyle: 8.8 -> 8.9 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 6043e2d289d..c06cd9c3eb5 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "8.8"; + version = "8.9"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "0yawd6mbz6cqj0qlrh01vy33p30f4s3pfrvsxwg5l11p416zzrz4"; + sha256 = "058lffmlzw7nqz5z89m2k640q7ffz6dz008bddvjsgpxbrdb89cd"; }; installPhase = '' From 9db699e4a3cc307de51d9b90a1746e6b115efbbc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 6 Apr 2018 21:10:42 +0200 Subject: [PATCH 067/105] wlroots,rootston: Mark them as broken until the first stable release Upstream requested that we remove these packages until the first stable release. More details are in #38344. This isn't ideal but it seems like the best solution for now. Close #38344. --- pkgs/development/libraries/wlroots/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 3fdaeb82438..24cff1996c3 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -42,5 +42,8 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; + # Marked as broken until the first official/stable release (upstream + # request). See #38344 for the public discussion. + broken = true; }; } From d788e36d26a5e4e55b8906ddbb0ee6fc01a77b1a Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 6 Apr 2018 21:20:56 +0200 Subject: [PATCH 068/105] pugixml: 1.8.1 -> 1.9 --- pkgs/development/libraries/pugixml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index dd33f63c913..1730f9b733c 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pugixml-${version}"; - version = "1.8.1"; + version = "1.9"; src = fetchurl { url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; - sha256 = "0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80"; + sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni"; }; nativeBuildInputs = [ cmake ]; From e1da086e75b9c4d6676e61b60f730e82d6f3416b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 6 Apr 2018 21:32:39 +0200 Subject: [PATCH 069/105] calibre: 3.20.0 -> 3.21.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3c023a27974..50395c9c1d0 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.20.0"; + version = "3.21.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1rnmh24d9hqnncg6p6zwkb3y3m4k9n7pzma69haxnm7iaps84gmy"; + sha256 = "0nd9lv7armmkjwxjhs5mhsksvig5n435kww1dy9fq5hxg7nkq5ip"; }; patches = [ From 073089914e7890960ffa4cc5b57b18950d90ba37 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 6 Apr 2018 22:36:03 +0300 Subject: [PATCH 070/105] nixos/nginx: fix gitweb submodule --- nixos/modules/services/misc/gitweb.nix | 1 + .../services/web-servers/nginx/gitweb.nix | 29 ++++++++----------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix index 8e4d85a1e15..b0e34a690ca 100644 --- a/nixos/modules/services/misc/gitweb.nix +++ b/nixos/modules/services/misc/gitweb.nix @@ -28,6 +28,7 @@ in example = '' $feature{'highlight'}{'default'} = [1]; $feature{'ctags'}{'default'} = [1]; + $feature{'avatar'}{'default'} = ['gravatar']; ''; }; diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix index 344c1f7b8aa..3dc3ebc7e4c 100644 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -22,36 +22,31 @@ in config = mkIf config.services.nginx.gitweb.enable { - systemd.sockets.gitweb = { - description = "GitWeb Listen Socket"; - listenStreams = [ "/run/gitweb.sock" ]; - socketConfig = { - Accept = "false"; - SocketUser = "nginx"; - SocketGroup = "nginx"; - SocketMode = "0600"; - }; - wantedBy = [ "sockets.target" ]; - }; systemd.services.gitweb = { description = "GitWeb service"; - script = "${git}/share/gitweb/gitweb.cgi --fcgi"; + script = "${pkgs.git}/share/gitweb/gitweb.cgi --fastcgi --nproc=1"; + environment = { + FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; + }; serviceConfig = { - Type = "simple"; - StandardInput = "socket"; User = "nginx"; Group = "nginx"; + RuntimeDirectory = [ "gitweb" ]; }; + wantedBy = [ "multi-user.target" ]; }; services.nginx = { virtualHosts.default = { - locations."/gitweb" = { - root = "${pkgs.git}/share/gitweb"; + locations."/gitweb/" = { + root = "${pkgs.git}/share"; + tryFiles = "$uri @gitweb"; + }; + locations."@gitweb" = { extraConfig = '' include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile}; - fastcgi_pass unix:/run/gitweb.sock; + fastcgi_pass unix:/run/gitweb/gitweb.sock; ''; }; }; From 5e7e762b67bcaad1803f281041685f78ef8c95c4 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Fri, 6 Apr 2018 23:53:49 +0200 Subject: [PATCH 071/105] maintainers: add bandresen --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f881f07e5b2..6169959367a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -517,6 +517,11 @@ email = "sivaraman.balaji@gmail.com"; name = "Balaji Sivaraman"; }; + bandresen = { + email = "bandresen@gmail.com"; + github = "bandresen"; + name = "Benjamin Andresen"; + }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; From 51e4358cc3d8e636fc3dfad83a31df6005799087 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 7 Apr 2018 01:55:19 +0200 Subject: [PATCH 072/105] lf: 1 -> 2 --- pkgs/tools/misc/lf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 0a7073f4d48..8ef5bd1c07c 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-${version}"; - version = "1"; + version = "2"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0mq83m7mvavd0dzhk8g6ffldy57i22n0846yzqnlz733chiy3anz"; + sha256 = "0g9fy6x3wc5hda886ci79wj7rnjwvaidbwhsrckqgiqymbzvrdb8"; }; goPackagePath = "github.com/gokcehan/lf"; @@ -24,7 +24,7 @@ buildGoPackage rec { runHook preBuild runHook renameImports cd go/src/${goPackagePath} - go install -ldflags="-s -w -X main.gVersion=${version}" + go install -ldflags="-s -w -X main.gVersion=r${version}" runHook postBuild ''; From 5a75e845ad02124b513f234fefc3a4f55d82be3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 7 Apr 2018 04:05:11 +0200 Subject: [PATCH 073/105] nheko: init at 0.3.0 --- .../instant-messengers/nheko/default.nix | 83 ++++++++++++++++ .../nheko/external-deps.patch | 94 +++++++++++++++++++ .../instant-messengers/nheko/fetchurls.patch | 21 +++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 200 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/nheko/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/nheko/external-deps.patch create mode 100644 pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix new file mode 100644 index 00000000000..90a546154d1 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -0,0 +1,83 @@ +{ stdenv, fetchFromGitHub, fetchurl, cmake, doxygen, lmdb, qt5 }: + +let + json_hpp = fetchurl { + url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp; + sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733"; + }; + + variant_hpp = fetchurl { + url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp; + sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq"; + }; + + matrix-structs = stdenv.mkDerivation rec { + name = "matrix-structs-git"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "matrix-structs"; + rev = "91bb2b85a75d664007ef81aeb500d35268425922"; + sha256 = "1v544pv18sd91gdrhbk0nm54fggprsvwwrkjmxa59jrvhwdk7rsx"; + }; + + postUnpack = '' + cp ${json_hpp} "$sourceRoot/include/json.hpp" + cp ${variant_hpp} "$sourceRoot/include/variant.hpp" + ''; + + patches = [ ./fetchurls.patch ]; + + nativeBuildInputs = [ cmake doxygen ]; + }; + + tweeny = fetchFromGitHub { + owner = "mobius3"; + repo = "tweeny"; + rev = "b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf"; + sha256 = "1wyyq0j7dhjd6qgvnh3knr70li47hmf5394yznkv9b1indqjx4mi"; + }; + + lmdbxx = fetchFromGitHub { + owner = "bendiken"; + repo = "lmdbxx"; + rev = "0b43ca87d8cfabba392dfe884eb1edb83874de02"; + sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; + }; +in +stdenv.mkDerivation rec { + name = "nheko-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "mujx"; + repo = "nheko"; + rev = "v${version}"; + sha256 = "178z64vkl7nmr1amgsgvdcwipj8czp7vbvidxllxiwal21yvqpky"; + }; + + # This patch is likely not strictly speaking needed, but will help detect when + # a dependency is updated, so that the fetches up there can be updated too + patches = [ ./external-deps.patch ]; + + cmakeFlags = [ + "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a" + "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs" + "-DTWEENY_INCLUDE_DIR=${tweeny}/include" + "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Desktop client for the Matrix protocol"; + maintainers = with maintainers; [ ekleog ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch new file mode 100644 index 00000000000..661ae756a4d --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch @@ -0,0 +1,94 @@ +diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake +index 3b9817d..e69de29 100644 +--- a/cmake/LMDBXX.cmake ++++ b/cmake/LMDBXX.cmake +@@ -1,23 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build lmdbxx. +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx) +- +-set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT}) +- +-ExternalProject_Add( +- lmdbxx +- +- GIT_REPOSITORY https://github.com/bendiken/lmdbxx +- GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02 +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${LMDBXX_ROOT} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) +diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake +index cef00f6..e69de29 100644 +--- a/cmake/MatrixStructs.cmake ++++ b/cmake/MatrixStructs.cmake +@@ -1,33 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build matrix-structs. +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs) +-set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include) +-set(MATRIX_STRUCTS_LIBRARY matrix_structs) +- +-link_directories(${MATRIX_STRUCTS_ROOT}) +- +-set(WINDOWS_FLAGS "") +- +-if(MSVC) +- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64") +-endif() +- +-ExternalProject_Add( +- MatrixStructs +- +- GIT_REPOSITORY https://github.com/mujx/matrix-structs +- GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922 +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${MATRIX_STRUCTS_ROOT} +- CONFIGURE_COMMAND ${CMAKE_COMMAND} +- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT} +- ${WINDOWS_FLAGS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release +- INSTALL_COMMAND "" +-) +diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake +index 537ac92..e69de29 100644 +--- a/cmake/Tweeny.cmake ++++ b/cmake/Tweeny.cmake +@@ -1,23 +0,0 @@ +-include(ExternalProject) +- +-# +-# Build tweeny +-# +- +-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party) +-set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny) +- +-set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include) +- +-ExternalProject_Add( +- Tweeny +- +- GIT_REPOSITORY https://github.com/mobius3/tweeny +- GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf +- +- BUILD_IN_SOURCE 1 +- SOURCE_DIR ${TWEENY_ROOT} +- CONFIGURE_COMMAND "" +- BUILD_COMMAND "" +- INSTALL_COMMAND "" +-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch new file mode 100644 index 00000000000..e2f72f600ed --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/nheko/fetchurls.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 077ac37..c639d71 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,16 +18,6 @@ include(Doxygen) + # + include(CompilerFlags) + +-file(DOWNLOAD +- "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp" +- ${PROJECT_SOURCE_DIR}/include/json.hpp +- EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733) +- +-file(DOWNLOAD +- "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp" +- ${PROJECT_SOURCE_DIR}/include/variant.hpp +- EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a") +- + include_directories(include) + + set(SRC diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1cfa3463ef..386be327153 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16969,6 +16969,8 @@ with pkgs; nedit = callPackage ../applications/editors/nedit { }; + nheko = callPackage ../applications/networking/instant-messengers/nheko { }; + nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; From 5eb88ec7f0710a83013de2baac5d884e85516350 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 7 Apr 2018 10:20:14 +0800 Subject: [PATCH 074/105] elisa: 0.0.20180320 -> 0.1 --- pkgs/applications/audio/elisa/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 6affb16e073..4ef1f1dd202 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,14 +7,13 @@ mkDerivation rec { name = "elisa-${version}"; - # 0.1 is expected in early/mid 2018-04 - version = "0.0.20180320"; + version = "0.1"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; - rev = "9dd35d7244a8a3553275152f5b50fbe6d272ce64"; - sha256 = "0mjqvcpk2y4jlwkka8gzl50wgqjjx9bzpbrj79cr0ib3jyviss4k"; + rev = version; + sha256 = "13i0fkpwrskric3gfalh7mcpp4l2knwnq7jpq391lgh6krq04r4w"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; From 49d0fa77293ecf2cab218113b22bb74b2af7e9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Sat, 7 Apr 2018 08:38:54 +0200 Subject: [PATCH 075/105] josm: 13500 -> 13576 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index a73e4820e6c..6c14c93c83d 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13500"; + version = "13576"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1dyys4y859dazjqpn3f7vd0cpyglk82y3igrdca293y0n0hrmi7v"; + sha256 = "0pw7srvds8zs53ibvj779vj505h2gfrn7xqx13hkbacdg441jkd4"; }; buildInputs = [ jre8 makeWrapper ]; From babd72618f0b9720b77412980ad4b8a3f3074132 Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Tue, 13 Mar 2018 12:38:25 -0400 Subject: [PATCH 076/105] perlPackages.FilePid: init at 1.01 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 025799f888f..25fea1bcdfb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5756,6 +5756,20 @@ let self = _self // overrides; _self = with self; { }; }; + FilePid = buildPerlPackage rec { + name = "File-Pid-1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CW/CWEST/${name}.tar.gz"; + sha256 = "bafeee8fdc96eb06306a0c58bbdb7209b6de45f850e75fdc6b16db576e05e422"; + }; + propagatedBuildInputs = [ ClassAccessor ]; + meta = { + license = stdenv.lib.licenses.free; # Same as Perl + description = "Pid File Manipulation"; + maintainers = [ maintainers.limeytexan ]; + }; + }; + Filepushd = buildPerlPackage { name = "File-pushd-1.005"; src = fetchurl { From 2ecd96a135c97b83f4e2d3b8d2d08ed9832d9520 Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Fri, 6 Apr 2018 12:52:41 -0400 Subject: [PATCH 077/105] perlPackages.FileTouch: init at 0.11 Also corrected alphabetization for the FileTemp and FileType packages. --- pkgs/top-level/perl-packages.nix | 44 +++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 25fea1bcdfb..8316d874105 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5861,21 +5861,6 @@ let self = _self // overrides; _self = with self; { }; }; - FileTemp = null; - - FileType = buildPerlPackage { - name = "File-Type-0.22"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; - sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; - }; - meta = { - description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file."; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - }; - }; - FileSlurp = buildPerlPackage { name = "File-Slurp-9999.19"; # WARNING: check on next update if deprecation warning is gone @@ -5916,6 +5901,35 @@ let self = _self // overrides; _self = with self; { }; }; + FileTemp = null; + + FileTouch = buildPerlPackage rec { + name = "File-Touch-0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/${name}.tar.gz"; + sha256 = "e379a5ff89420cf39906e5ceff309b8ce958f99f9c3e57ad52b5002a3982d93c"; + }; + meta = { + homepage = https://github.com/neilb/File-Touch; + description = "Update file access and modification times, optionally creating files if needed"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + + FileType = buildPerlPackage { + name = "File-Type-0.22"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; + sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; + }; + meta = { + description = "File::Type uses magic numbers (typically at the start of a file) to determine the MIME type of that file."; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + }; + }; + FileUtil = buildPerlPackage rec { name = "File-Util-4.161950"; src = fetchurl { From b25153a2983bc8b7fbfdc3b505f98a3c9b9d5072 Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Tue, 13 Mar 2018 12:24:33 -0400 Subject: [PATCH 078/105] perlPackages.FileTail: init at 1.3 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8316d874105..c65adafc78f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5901,6 +5901,19 @@ let self = _self // overrides; _self = with self; { }; }; + FileTail = buildPerlPackage rec { + name = "File-Tail-1.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MG/MGRABNAR/${name}.tar.gz"; + sha256 = "1ixg6kn4h330xfw3xgvqcbzfc3v2wlzjim9803jflhvfhf0rzl16"; + }; + meta = { + description = "Perl extension for reading from continously updated files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.limeytexan ]; + }; + }; + FileTemp = null; FileTouch = buildPerlPackage rec { From 1d0bff83d9f87535f2f1861cae53c18226794795 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Fri, 6 Apr 2018 21:32:16 +0200 Subject: [PATCH 079/105] pythonPackages.ewmh: init at 0.1.6 --- .../python-modules/ewmh/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/ewmh/default.nix diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix new file mode 100644 index 00000000000..a24d049fc22 --- /dev/null +++ b/pkgs/development/python-modules/ewmh/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, xlib }: + +buildPythonPackage rec { + pname = "ewmh"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g9l14my3v8zlgq1yd8wh5gpara0qcapsfmvg7lq2lapglzhjsy5"; + }; + + propagatedBuildInputs = [ xlib ]; + + # No tests included + doCheck = false; + + meta = { + homepage = https://github.com/parkouss/pyewmh; + description = "An implementation of EWMH (Extended Window Manager Hints), based on Xlib"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ bandresen ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11edd50672f..c5211a1a314 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -233,6 +233,8 @@ in { email_validator = callPackage ../development/python-modules/email-validator { }; + ewmh = callPackage ../development/python-modules/ewmh { }; + dbus-python = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; From 6c3186848d0a672233569a5579fafd69423b4b39 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 31 Mar 2018 10:29:13 +0000 Subject: [PATCH 080/105] ocamlPackages.js_of_ocaml-ppx_deriving_json: init at 3.1.0 --- .../tools/ocaml/js_of_ocaml/ppx_deriving_json.nix | 15 +++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix new file mode 100644 index 00000000000..8f32887c5bf --- /dev/null +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -0,0 +1,15 @@ +{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler +, js_of_ocaml, ppx_deriving +}: + +stdenv.mkDerivation rec { + name = "js_of_ocaml-ppx_deriving_json-${version}"; + + inherit (js_of_ocaml-compiler) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder ]; + + propagatedBuildInputs = [ js_of_ocaml ppx_deriving ]; + + buildPhase = "jbuilder build -p js_of_ocaml-ppx_deriving_json"; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7ac8508d889..e7dba3e8855 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -330,6 +330,8 @@ let js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {}; + js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {}; + jsonm = callPackage ../development/ocaml-modules/jsonm { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; From 04b592e0fa18b530287bff8c69db2b5d1112bed4 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 7 Apr 2018 16:06:06 +0200 Subject: [PATCH 081/105] easytag: add opus support --- pkgs/applications/audio/easytag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 1ca2570fd4b..e3263c944f4 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib -, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas +, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas , gnome3, wrapGAppsHook }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libid3tag id3lib taglib libvorbis libogg flac + gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gsettings-desktop-schemas gnome3.defaultIconTheme ]; From 3e37d2e2a65d076c0855517f782d0b5ca8f88c02 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 7 Apr 2018 16:54:13 +0200 Subject: [PATCH 082/105] accountsservice: 0.6.45 -> 0.6.46 --- pkgs/development/libraries/accountsservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index d1b3b9b9827..f12dfb4635b 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.45"; + version = "0.6.46"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "09pg25ir7kjigvp2cxd9fkfw8c8ql8vrswfvymg9zmbmma9w43zv"; + sha256 = "09ddndbha2wh22a0k5150d2wy0v8k8zj3vmbdijyirqwhf5vjr8q"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; From 95ece9efe5104522ed024e3858d46f17bc6aaf16 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 7 Apr 2018 17:39:54 +0200 Subject: [PATCH 083/105] spin: switch back to dropbox mirror see #38542 for details --- .../tools/analysis/spin/default.nix | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 1be5655b1e5..a59b452b432 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, requireFile, makeWrapper, yacc, gcc +{ stdenv, lib, fetchurl, makeWrapper, yacc, gcc , withISpin ? true, tk, swarm, graphviz }: let @@ -10,14 +10,12 @@ in stdenv.mkDerivation rec { version = "6.4.8"; url-version = stdenv.lib.replaceChars ["."] [""] version; - src = requireFile { - name = "spin${url-version}.tar.gz"; - sha256 = "1rpazi5fj772121cn7r85fxypmaiv0x6x2l82b5y1xqzyf0fi4ph"; - message = '' - reCAPTCHA is preventing us to download the file for you. - Please download it at http://spinroot.com/spin/Src/index.html - and add it to the nix-store using nix-prefetch-url. - ''; + src = fetchurl { + # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. + # Dropbox mirror from developers: + # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa + url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADya1lOBJZDbgWGrUSq-dfHa/spin${url-version}.tar.gz?raw=1"; + sha256 = "1rvamdsf0igzpndlr4ck7004jw9x1bg4xyf78zh5k9sp848vnd80"; }; nativeBuildInputs = [ makeWrapper ]; @@ -25,12 +23,6 @@ in stdenv.mkDerivation rec { sourceRoot = "Spin/Src${version}"; - unpackPhase = '' - # The archive is compressed twice - gunzip -c $src > spin.tar.gz - tar -xzf spin.tar.gz - ''; - installPhase = '' install -Dm755 spin $out/bin/spin wrapProgram $out/bin/spin \ From e1dee4efcbffc72260025078bf8297a3b732509c Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 6 Apr 2018 18:51:10 +0200 Subject: [PATCH 084/105] lib: make extensible This allows the lib fixed point to be extended with myLib = lib.extend (self: super: { foo = "foo"; }) With this it's possible to have the new modified lib attrset available to all modules when using evalModules myLib.evalModules { modules = [ ({ lib, ... }: { options.bar = lib.mkOption { default = lib.foo; }; }) ]; } => { config = { bar = "foo"; ... }; options = ...; } --- lib/default.nix | 8 +++++--- lib/modules.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index cbe0a0ba21b..59b3d2159da 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -5,9 +5,11 @@ */ let - callLibs = file: import file { inherit lib; }; + inherit (import ./fixed-points.nix {}) makeExtensible; - lib = rec { + lib = makeExtensible (self: let + callLibs = file: import file { lib = self; }; + in with self; { # often used, or depending on very little trivial = callLibs ./trivial.nix; @@ -128,5 +130,5 @@ let mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs nixType imap overridableDelayableArgs; - }; + }); in lib diff --git a/lib/modules.nix b/lib/modules.nix index acd07f732bd..4ef982c7ec9 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -59,7 +59,7 @@ rec { }; }; - closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs); + closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options lib; } // specialArgs); options = mergeModules prefix (reverseList (filterModules (specialArgs.modulesPath or "") closed)); From 27c9bd664775685b6186d32b62095df3435bc240 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 10:51:17 -0700 Subject: [PATCH 085/105] getmail: 5.5 -> 5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/getmail/versions. These checks were done: - built on NixOS - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail-wrapped -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail-wrapped --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail-wrapped --version’ and found version 5.6 - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail --version’ and found version 5.6 - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail-gmail-xoauth-tokens-wrapped -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail-gmail-xoauth-tokens-wrapped --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail-gmail-xoauth-tokens -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail-gmail-xoauth-tokens --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail_fetch-wrapped -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail_fetch-wrapped --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail_fetch-wrapped --version’ and found version 5.6 - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail_fetch -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail_fetch --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail_fetch --version’ and found version 5.6 - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail_maildir-wrapped -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail_maildir-wrapped --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail_maildir -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail_maildir --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail_mbox-wrapped -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/.getmail_mbox-wrapped --help’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail_mbox -h’ got 0 exit code - ran ‘/nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6/bin/getmail_mbox --help’ got 0 exit code - found 5.6 with grep in /nix/store/m5b7cgi58ahzp7n1j6x7gjxjm77fsj9i-getmail-5.6 - directory tree listing: https://gist.github.com/05a73027c43a157053c33c4886d466f8 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 4a358255b10..224c7a4ab48 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "5.5"; + version = "5.6"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0l43lbnrnyyrq8mlnw37saq6v0mh3nkirdq1dwnsrihykzjjwf70"; + sha256 = "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6"; }; doCheck = false; From 7f25b26511aef36fdad4fb3999af8ce7c2dfea72 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 23 Mar 2018 10:08:06 +0100 Subject: [PATCH 086/105] linuxPackages_custom: fix missing argument and add test The required argument 'hostPlatform' was missing from linuxPackages_custom's call to linuxManualConfig. In order to prevent this in the future, this commit adds linuxPackages_custom_tinyconfig_kernel so linuxPackages_custom gets tested. This also adds linuxConfig, to derivate default linux configurations via make defconfig, make tinyconfig, etc. Closes #38034. Signed-off-by: Austin Seipp --- .../linux/kernel/manual-config.nix | 2 ++ pkgs/top-level/all-packages.nix | 33 +++++++++++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 60fb0064513..9833bb57baf 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -35,6 +35,8 @@ in { extraMeta ? {}, # Whether to utilize the controversial import-from-derivation feature to parse the config allowImportFromDerivation ? false, + # ignored + features ? null, hostPlatform }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1480b906403..3debf1a9489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13605,12 +13605,25 @@ with pkgs; # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. linuxPackages_testing = linuxPackagesFor pkgs.linux_testing; - linuxPackages_custom = { version, src, configfile }: + linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }: recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile stdenv; - allowImportFromDerivation = true; + inherit version src configfile stdenv allowImportFromDerivation; + inherit (stdenv) hostPlatform; })); + # This serves as a test for linuxPackages_custom + linuxPackages_custom_tinyconfig_kernel = let + base = pkgs.linuxPackages.kernel; + tinyLinuxPackages = pkgs.linuxPackages_custom { + inherit (base) version src; + allowImportFromDerivation = false; + configfile = pkgs.linuxConfig { + makeTarget = "tinyconfig"; + src = base.src; + }; + }; + in tinyLinuxPackages.kernel; + # Build a kernel with bcachefs module linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); @@ -13648,6 +13661,20 @@ with pkgs; # A function to build a manually-configured kernel linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + + # Derive one of the default .config files + linuxConfig = { src, makeTarget ? "defconfig", name ? "kernel.config" }: + stdenv.mkDerivation { + inherit name src; + buildPhase = '' + set -x + make ${makeTarget} + ''; + installPhase = '' + cp .config $out + ''; + }; + buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; keyutils = callPackage ../os-specific/linux/keyutils { }; From 4499513e54dcd8c76280fca69083a139cacd0303 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 7 Apr 2018 22:44:21 +0100 Subject: [PATCH 087/105] rust: Allow setting cargoSha256 to null. Setting the hash to null is a convenient way to bypass the hash check while developing. It looks like the ability to do this was inadvertently removed while adding vendor directory support. This still checks that the user is explicitly setting the value but allows null as a valid option. --- pkgs/build-support/rust/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 83ef146de5f..f407ba25bf8 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -4,7 +4,7 @@ let inherit stdenv cacert git rust cargo-vendor; }; in -{ name, cargoSha256 ? null +{ name, cargoSha256 ? "unset" , src ? null , srcs ? null , sourceRoot ? null @@ -17,7 +17,7 @@ in , cargoVendorDir ? null , ... } @ args: -assert cargoVendorDir == null -> cargoSha256 != null; +assert cargoVendorDir == null -> cargoSha256 != "unset"; let lib = stdenv.lib; From d824354badd02626b7234569209ad34da465e4d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 18:50:37 -0700 Subject: [PATCH 088/105] cheat: 2.2.2 -> 2.2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cheat/versions. These checks were done: - built on NixOS - ran ‘/nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3/bin/.cheat-wrapped -h’ got 0 exit code - ran ‘/nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3/bin/.cheat-wrapped --help’ got 0 exit code - ran ‘/nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3/bin/.cheat-wrapped -v’ and found version 2.2.3 - ran ‘/nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3/bin/.cheat-wrapped --version’ and found version 2.2.3 - ran ‘/nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3/bin/cheat -h’ got 0 exit code - ran ‘/nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3/bin/cheat --help’ got 0 exit code - ran ‘/nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3/bin/cheat -v’ and found version 2.2.3 - ran ‘/nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3/bin/cheat --version’ and found version 2.2.3 - found 2.2.3 with grep in /nix/store/m8yp4ml3jvxhbci1fjg34b27pvpzq9pr-cheat-2.2.3 - directory tree listing: https://gist.github.com/661cfb129e250e70cce3e717f95e1ca9 --- pkgs/applications/misc/cheat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 4ef1adb8e6c..ad3f6534659 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -4,7 +4,7 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "cheat"; - version = "2.2.2"; + version = "2.2.3"; propagatedBuildInputs = [ docopt pygments ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "chrisallenlane"; repo = "cheat"; rev = version; - sha256 = "1da4m4n6nivjakpll6jj0aszrv24g2zax74034lzpv3pbh84fvas"; + sha256 = "1p9a54fax3b1ilqcwdlccy08ww3igwsyzcyikqivaxj5p6mqq6wl"; }; # no tests available doCheck = false; From 7b75bc79efa99e985e7786aed991f8cfecac6747 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 20:11:48 -0700 Subject: [PATCH 089/105] bcftools: 1.7 -> 1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bcftools/versions. These checks were done: - built on NixOS - ran ‘/nix/store/5nqh165r343n7954gm49wbsdwf9iic3l-bcftools-1.8/bin/plot-vcfstats -h’ got 0 exit code - ran ‘/nix/store/5nqh165r343n7954gm49wbsdwf9iic3l-bcftools-1.8/bin/plot-vcfstats --help’ got 0 exit code - ran ‘/nix/store/5nqh165r343n7954gm49wbsdwf9iic3l-bcftools-1.8/bin/bcftools -h’ got 0 exit code - ran ‘/nix/store/5nqh165r343n7954gm49wbsdwf9iic3l-bcftools-1.8/bin/bcftools --help’ got 0 exit code - ran ‘/nix/store/5nqh165r343n7954gm49wbsdwf9iic3l-bcftools-1.8/bin/bcftools help’ got 0 exit code - found 1.8 with grep in /nix/store/5nqh165r343n7954gm49wbsdwf9iic3l-bcftools-1.8 - directory tree listing: https://gist.github.com/c9ddd760c0c740dabaabeb604fbb8a5a --- pkgs/applications/science/biology/bcftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 5e899568a7d..1459f5b29a7 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "bcftools"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1l82sgw86l1626b7kxv3h0696lbj7317bb48rvqb1zqd3gcn6kyx"; + sha256 = "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa"; }; nativeBuildInputs = [ perl ]; From 4b7f2dd6223eee408181a1136068b2eda129d905 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 7 Apr 2018 22:16:18 -0500 Subject: [PATCH 090/105] qemu-riscv: update to qemu-2.11.92pre60378_f733c7b5f This obsoletes two of the included patches, one of them RISC-V specific, since they've been picked up by upstream. This build has been confirmed as being able to build and run an (extremely recent) RISC-V Fedora 28 Rawhide image, available from: https://fedorapeople.org/groups/risc-v/disk-images/ Signed-off-by: Austin Seipp --- .../virtualization/qemu/riscv-initrd.patch | 98 ------------------- .../virtualization/qemu/riscv.nix | 21 ++-- 2 files changed, 12 insertions(+), 107 deletions(-) delete mode 100644 pkgs/applications/virtualization/qemu/riscv-initrd.patch diff --git a/pkgs/applications/virtualization/qemu/riscv-initrd.patch b/pkgs/applications/virtualization/qemu/riscv-initrd.patch deleted file mode 100644 index a7e5b28cfd5..00000000000 --- a/pkgs/applications/virtualization/qemu/riscv-initrd.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 44b0f612499764dad425d467aadacb01fbd4a920 Mon Sep 17 00:00:00 2001 -From: Shea Levy -Date: Tue, 20 Feb 2018 07:59:43 -0500 -Subject: [PATCH] riscv: Respect the -initrd flag. - -Logic for initrd start address borrowed from arm/boot.c ---- - hw/riscv/virt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 46 insertions(+), 3 deletions(-) - -diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c -index 46d95b2b79..5c7d191a3f 100644 ---- a/hw/riscv/virt.c -+++ b/hw/riscv/virt.c -@@ -77,7 +77,35 @@ static uint64_t load_kernel(const char *kernel_filename) - return kernel_entry; - } - --static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, -+static hwaddr load_initrd(const char *filename, uint64_t mem_size, -+ uint64_t kernel_entry, hwaddr *start) -+{ -+ int size; -+ -+ /* We want to put the initrd far enough into RAM that when the -+ * kernel is uncompressed it will not clobber the initrd. However -+ * on boards without much RAM we must ensure that we still leave -+ * enough room for a decent sized initrd, and on boards with large -+ * amounts of RAM we must avoid the initrd being so far up in RAM -+ * that it is outside lowmem and inaccessible to the kernel. -+ * So for boards with less than 256MB of RAM we put the initrd -+ * halfway into RAM, and for boards with 256MB of RAM or more we put -+ * the initrd at 128MB. -+ */ -+ *start = kernel_entry + MIN(mem_size / 2, 128 * 1024 * 1024); -+ -+ size = load_ramdisk(filename, *start, mem_size - *start); -+ if (size == -1) { -+ size = load_image_targphys(filename, *start, mem_size - *start); -+ if (size == -1) { -+ error_report("qemu: could not load ramdisk '%s'", filename); -+ exit(1); -+ } -+ } -+ return *start + size; -+} -+ -+static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, - uint64_t mem_size, const char *cmdline) - { - void *fdt; -@@ -233,6 +261,8 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap, - qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename); - qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline); - g_free(nodename); -+ -+ return fdt; - } - - static void riscv_virt_board_init(MachineState *machine) -@@ -246,6 +276,7 @@ static void riscv_virt_board_init(MachineState *machine) - char *plic_hart_config; - size_t plic_hart_config_len; - int i; -+ void *fdt; - - /* Initialize SOC */ - object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY); -@@ -265,7 +296,8 @@ static void riscv_virt_board_init(MachineState *machine) - main_mem); - - /* create device tree */ -- create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline); -+ fdt = create_fdt(s, memmap, machine->ram_size, -+ machine->kernel_cmdline); - - /* boot rom */ - memory_region_init_ram(boot_rom, NULL, "riscv_virt_board.bootrom", -@@ -273,7 +305,18 @@ static void riscv_virt_board_init(MachineState *machine) - memory_region_add_subregion(system_memory, 0x0, boot_rom); - - if (machine->kernel_filename) { -- load_kernel(machine->kernel_filename); -+ uint64_t kernel_entry = load_kernel(machine->kernel_filename); -+ -+ if (machine->initrd_filename) { -+ hwaddr start; -+ hwaddr end = load_initrd(machine->initrd_filename, -+ machine->ram_size, kernel_entry, -+ &start); -+ qemu_fdt_setprop_cell(fdt, "/chosen", -+ "linux,initrd-start", start); -+ qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end", -+ end); -+ } - } - - /* reset vector */ diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix index 5e234dcb893..29cb8f5bfbc 100644 --- a/pkgs/applications/virtualization/qemu/riscv.nix +++ b/pkgs/applications/virtualization/qemu/riscv.nix @@ -1,22 +1,25 @@ { qemu, fetchFromGitHub, lib }: let src = fetchFromGitHub { - owner = "riscv"; - repo = "riscv-qemu"; - rev = "af435b709d4a5de3ec2e59ff4dcd05b0b295a730"; - sha256 = "1kqcsn8yfdg3zyd991i4v5dxznd1l4a4hjry9304lvsm3sz2wllw"; + owner = "riscv"; + repo = "riscv-qemu"; + rev = "f733c7b5f86147216e14aff90c03ccdd76056bef"; + sha256 = "1ppr9qqwi7qqh8m6dgk1hrzg8zri240il27l67vfayd8ijagb9zq"; fetchSubmodules = true; }; - version = "2.11.50"; - revCount = "58771"; - shortRev = "af435b709d"; + version = "2.11.92"; + revCount = "60378"; + shortRev = builtins.substring 0 9 src.rev; targets = [ "riscv32-linux-user" "riscv32-softmmu" "riscv64-linux-user" "riscv64-softmmu" ]; in lib.overrideDerivation qemu (orig: { name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}"; inherit src; - # https://github.com/riscv/riscv-qemu/pull/109 - patches = orig.patches ++ [ ./riscv-initrd.patch ]; + # The pulseaudio and statfs patches are in 2.12.0+, which this is based on + patches = [ + ./force-uid0-on-9p.patch + ./no-etc-install.patch + ]; configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ]; postInstall = null; }) From 86c5420a2e8ff0ece4fd90db4e42fd52d069f533 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 7 Apr 2018 23:02:59 -0500 Subject: [PATCH 091/105] nixpkgs: remove z3 4.5.0 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/z3/4.5.0.nix | 31 -------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 32 deletions(-) delete mode 100644 pkgs/applications/science/logic/z3/4.5.0.nix diff --git a/pkgs/applications/science/logic/z3/4.5.0.nix b/pkgs/applications/science/logic/z3/4.5.0.nix deleted file mode 100644 index 827cb2cbe3d..00000000000 --- a/pkgs/applications/science/logic/z3/4.5.0.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }: - -let - python = python2; -in stdenv.mkDerivation rec { - name = "z3-${version}"; - version = "4.5.0"; - - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "z3-4.5.0"; - sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp"; - }; - - buildInputs = [ python fixDarwinDylibNames ]; - enableParallelBuilding = true; - - configurePhase = '' - ${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages} - cd build - ''; - - meta = { - description = "A high-performance theorem prover and SMT solver"; - homepage = "https://github.com/Z3Prover/z3"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3debf1a9489..b9d6c0a76c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20060,7 +20060,6 @@ with pkgs; gmp-static = gmp.override { withStatic = true; }; }; - z3_4_5_0 = callPackage ../applications/science/logic/z3/4.5.0.nix {}; z3 = callPackage ../applications/science/logic/z3 { python = python2; }; tlaplus = callPackage ../applications/science/logic/tlaplus {}; From dfcbd477be28a1776c975c36e779dd22520d7941 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 21:28:05 -0700 Subject: [PATCH 092/105] adapta-gtk-theme: 3.93.0.174 -> 3.93.0.225 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - directory tree listing: https://gist.github.com/3865bcde7ac7faabba940e89c5114260 --- pkgs/misc/themes/adapta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index c38d9b03a6e..c62250b1124 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.93.0.174"; + version = "3.93.0.225"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "0fkvcpx2vhyr3z74r5mcpjh293w3cfm07axj8dj84nl2hi6im8b6"; + sha256 = "1mjdvfvx45pdypl34yghgi47bj86rwvryx9mwhwwb09psn9smp49"; }; preferLocalBuild = true; From d39cb9da43dca633ae2666348b1ceff24fff72eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 21:44:41 -0700 Subject: [PATCH 093/105] cb2bib: 1.9.2 -> 1.9.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cb2bib/versions. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 1.9.7 with grep in /nix/store/hvx77c2sm156llkibz4hdizn7syszvgl-cb2bib-1.9.7 - directory tree listing: https://gist.github.com/ddafa78f4e3eb99a2d1689e87e89d3ba --- pkgs/applications/office/cb2bib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 1004733a18b..813608a386a 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "cb2bib"; - version = "1.9.2"; + version = "1.9.7"; src = fetchurl { url = "http://www.molspaces.com/dl/progs/${name}.tar.gz"; - sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin"; + sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; nativeBuildInputs = [ qmake ]; From dbffe147eaaf8b73932b9e585595890593ee05dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 22:18:27 -0700 Subject: [PATCH 094/105] asymptote: 2.41 -> 2.42 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/asymptote/versions. These checks were done: - built on NixOS - ran ‘/nix/store/2qw7zf6brwdbj56dbrn9342s3l51j2d1-asymptote-2.42/bin/asy -h’ got 0 exit code - ran ‘/nix/store/2qw7zf6brwdbj56dbrn9342s3l51j2d1-asymptote-2.42/bin/asy --help’ got 0 exit code - found 2.42 with grep in /nix/store/2qw7zf6brwdbj56dbrn9342s3l51j2d1-asymptote-2.42 - directory tree listing: https://gist.github.com/ea517431d1ae476366452121c7871132 --- pkgs/tools/graphics/asymptote/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 04863d6ce62..ce66402d09f 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.41"; + version="2.42"; name="${baseName}-${version}"; - hash="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"; - url="https://freefr.dl.sourceforge.net/project/asymptote/2.41/asymptote-2.41.src.tgz"; - sha256="1w7fbq6gy65g0mxg6wdxi7v178c5yxvh9yrnv3bzm4sjzf4pwvhx"; + hash="0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"; + url="https://freefr.dl.sourceforge.net/project/asymptote/2.42/asymptote-2.42.src.tgz"; + sha256="0dprc4shzdpvp87kc97ggh5ay2zmskjjaciay7mnblx63rhk1d95"; }; buildInputs = [ ghostscriptX imagemagick fftw From 147153042392eb15cab468a3a208b74e61203968 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Apr 2018 22:22:45 -0700 Subject: [PATCH 095/105] autorandr: 1.4 -> 1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/autorandr/versions. These checks were done: - built on NixOS - ran ‘/nix/store/vjiasvrsgwrpyqcy437jjk56r62m7w4c-autorandr-1.5/bin/autorandr -h’ got 0 exit code - ran ‘/nix/store/vjiasvrsgwrpyqcy437jjk56r62m7w4c-autorandr-1.5/bin/autorandr --help’ got 0 exit code - ran ‘/nix/store/vjiasvrsgwrpyqcy437jjk56r62m7w4c-autorandr-1.5/bin/autorandr --version’ and found version 1.5 - found 1.5 with grep in /nix/store/vjiasvrsgwrpyqcy437jjk56r62m7w4c-autorandr-1.5 - directory tree listing: https://gist.github.com/ca1a736eb6be03089d56d2e50bef2cfd --- pkgs/tools/misc/autorandr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index db2e1fc622f..9a51553ae43 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.4"; + version = "1.5"; in stdenv.mkDerivation { name = "autorandr-${version}"; @@ -48,7 +48,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = "${version}"; - sha256 = "08i71r221ilc8k1c59w89g3iq5m7zwhnjjzapavhqxlr8y9dcpf5"; + sha256 = "01pij2r73f190qk7q3cgf5cmk0w59g9l9v4vah5vf4ddn7nnk7yq"; }; meta = { From 39b67479eaafb3ccbc2dae4bdca23ac7aa21096e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Sun, 8 Apr 2018 07:24:34 +0200 Subject: [PATCH 096/105] pspg: init at 1.0.0 --- pkgs/tools/misc/pspg/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/pspg/default.nix diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix new file mode 100644 index 00000000000..b9543dc143c --- /dev/null +++ b/pkgs/tools/misc/pspg/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig }: + +stdenv.mkDerivation rec { + name = "pspg-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "okbob"; + repo = "pspg"; + rev = "${version}"; + sha256 = "1swrg4bg7i4xpdrsg8dsfldbxaffni04x8i1s0g6h691qcin675v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnugrep ncurses ]; + + preBuild = '' + makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/okbob/pspg; + description = "Postgres Pager"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.jlesquembre ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3debf1a9489..8448daadae6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4421,6 +4421,8 @@ with pkgs; pssh = callPackage ../tools/networking/pssh { }; + pspg = callPackage ../tools/misc/pspg { }; + pstoedit = callPackage ../tools/graphics/pstoedit { }; psutils = callPackage ../tools/typesetting/psutils { }; From 669737089a1a68df45e23a64c2f3128b3519128e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 8 Apr 2018 01:37:32 -0400 Subject: [PATCH 097/105] xaw3d: use an https download url --- pkgs/development/libraries/Xaw3d/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 07d256f4f57..93ebe955659 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -3,9 +3,7 @@ stdenv.mkDerivation { name = "Xaw3d-1.6.2"; src = fetchurl { - urls = [ - ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.2.tar.bz2 - ]; + url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2; sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"; }; nativeBuildInputs = [ pkgconfig ]; From e42ae4e586cc7e1e76387d5c6b14382a83ee1c64 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 30 Mar 2018 23:39:50 -0700 Subject: [PATCH 098/105] obs-studio: 21.0.3 -> 21.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/obs-studio/versions. These checks were done: - built on NixOS - ran `/nix/store/3dqzcmdm5caax4gqr61k05hmxrs1ca5w-obs-studio-21.1.1/bin/obs -h` got 0 exit code - ran `/nix/store/3dqzcmdm5caax4gqr61k05hmxrs1ca5w-obs-studio-21.1.1/bin/obs --help` got 0 exit code - ran `/nix/store/3dqzcmdm5caax4gqr61k05hmxrs1ca5w-obs-studio-21.1.1/bin/.obs-wrapped -h` got 0 exit code - ran `/nix/store/3dqzcmdm5caax4gqr61k05hmxrs1ca5w-obs-studio-21.1.1/bin/.obs-wrapped --help` got 0 exit code - found 21.1.1 with grep in /nix/store/3dqzcmdm5caax4gqr61k05hmxrs1ca5w-obs-studio-21.1.1 - directory tree listing: https://gist.github.com/08175928e798aeee1fb0326677000c7c --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index a3ed28c3fd0..f3e2072d6da 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -29,13 +29,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "21.0.3"; + version = "21.1.1"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "1mrihhzlsc66w5lr1lcm8c8jg6z0iwmmckr3pk3gk92z4s55969q"; + sha256 = "11gr4szjypihp0562r23pvkmaln6vjz1z4y4ls34bmc8n9ixrdcv"; }; patches = [ ./find-xcb.patch ]; From fc6ab8dfa7b7cb99e3b44994ebe76f9b637ec2c6 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Sun, 8 Apr 2018 08:46:42 +0200 Subject: [PATCH 099/105] google-compute-image: provide correct MTU --- nixos/modules/virtualisation/google-compute-image.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 559c30b9416..0b6bec786da 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -75,6 +75,9 @@ in networking.usePredictableInterfaceNames = false; + # GC has 1460 MTU + networking.interfaces.eth0.mtu = 1460; + # allow the google-accounts-daemon to manage users users.mutableUsers = true; # and allow users to sudo without password From c83682bb68a8b9f42f6ff56ee54baf08e014d111 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 4 Apr 2018 19:27:01 -0400 Subject: [PATCH 100/105] gtk-traymanager: fix build --- pkgs/development/haskell-modules/configuration-nix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 199b9c17654..6fb55d326b1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -143,6 +143,7 @@ self: super: builtins.intersectAttrs super { gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; + gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3; # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; From 2498bcb1c4c6f039a266e7c2f42d6d0ef84ade7d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Apr 2018 02:30:36 +0200 Subject: [PATCH 101/105] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.9.2-5-g17e0b6c from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/fac6246666ddef2f36284ddfc705eb4f9a46f6f5. --- .../haskell-modules/hackage-packages.nix | 2240 ++++++++++++++--- 1 file changed, 1870 insertions(+), 370 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ae6a334de81..ad52aac1626 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -839,6 +839,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "AlgoRhythm" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default, derive + , directory, Euterpea, HCodecs, HUnit, kmeans, lilypond, midi, mtl + , prettify, QuickCheck, random, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers + }: + mkDerivation { + pname = "AlgoRhythm"; + version = "0.1.0.0"; + sha256 = "03rmcafbnbb43fww1y6rfi8dpbl85yi71rjxmz7mqxh4zn5c9jwz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default derive Euterpea HCodecs kmeans + lilypond midi mtl prettify QuickCheck random template-haskell text + transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring derive directory Euterpea HCodecs HUnit lilypond + QuickCheck random test-framework test-framework-hunit + test-framework-quickcheck2 transformers + ]; + homepage = "http://github.com/omelkonian/AlgoRhythm/"; + description = "Algorithmic music composition"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "AlgorithmW" = callPackage ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { @@ -10957,8 +10986,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.1.2"; sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs"; - revision = "2"; - editedCabalFile = "04g0yga3v0922aysqv2m2h7vxbaaxfdb7lafsakpzlp0w659f930"; + revision = "3"; + editedCabalFile = "0z1ks049q9jsc5ysh12idkqf3rz0bnvv74rhlaw24r5q2xj8lv8i"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -13652,6 +13681,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ONC-RPC" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cereal, containers + , filepath, haskell-src-exts, network, parsec, random, time, unix + , vector + }: + mkDerivation { + pname = "ONC-RPC"; + version = "0.1"; + sha256 = "19smd0rp0jx9i59jgjk149g4czpwjx173szhp1z9dvm5j0pdwyy5"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base bytestring Cabal cereal containers filepath haskell-src-exts + parsec vector + ]; + libraryHaskellDepends = [ + base bytestring Cabal cereal containers filepath haskell-src-exts + network parsec random time unix vector + ]; + executableHaskellDepends = [ base filepath ]; + description = "ONC RPC (aka Sun RPC) and XDR library"; + license = stdenv.lib.licenses.asl20; + }) {}; + "OSM" = callPackage ({ mkDerivation, base, comonad-transformers, containers, data-lens , hxt, newtype @@ -13758,13 +13811,14 @@ self: { }) {}; "OddWord" = callPackage - ({ mkDerivation, base, QuickCheck }: + ({ mkDerivation, base, criterion, QuickCheck }: mkDerivation { pname = "OddWord"; - version = "1.0.1.0"; - sha256 = "0aa3pp2ivbddn3632cnkxd3bj8373ns1nf4v2jvz7zcijiz4chx1"; + version = "1.0.1.1"; + sha256 = "0sb0hmvvp6cdxf8siqfp7wvcxq8rbiz7h9mxmbkcksscjp8m02mm"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; + benchmarkHaskellDepends = [ base criterion ]; homepage = "http://www.gekkou.co.uk/"; description = "Provides a wrapper for deriving word types with fewer bits"; license = stdenv.lib.licenses.bsd3; @@ -19852,17 +19906,18 @@ self: { }) {}; "YamlReference" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, dlist - , hashmap, HUnit, mtl, regex-compat + ({ mkDerivation, base, bytestring, Cabal, containers, directory + , dlist, hashmap, HUnit, mtl, regex-compat }: mkDerivation { pname = "YamlReference"; version = "0.10.0"; sha256 = "01cjddbg98vs1bd66n0v58i415kqn7cfi6cslk384p7j2ivwv2ad"; - revision = "1"; - editedCabalFile = "1pcrd8ww4fm9big1bcafkmsl9kifixkyny9b3z172w8yhamk2wwq"; + revision = "2"; + editedCabalFile = "023997365188qvgrfg8wshmmlrjr7z435329pxcsvmfcywnc739a"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers dlist regex-compat ]; @@ -19893,6 +19948,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Yampa_0_11" = callPackage + ({ mkDerivation, base, deepseq, random }: + mkDerivation { + pname = "Yampa"; + version = "0.11"; + sha256 = "0frybgsj73r57rd6ckv9pgd9ff1g72qrlad90plb13cf2s6jdp3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base deepseq random ]; + testHaskellDepends = [ base ]; + homepage = "http://www.haskell.org/haskellwiki/Yampa"; + description = "Library for programming hybrid systems"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Yampa-core" = callPackage ({ mkDerivation, base, deepseq, random, vector-space }: mkDerivation { @@ -20408,6 +20479,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-bignum_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion + , ghc-prim, hedgehog, llvm-hs-pure, mwc-random, tasty + , tasty-hedgehog, template-haskell, vector, vector-th-unbox + , wide-word + }: + mkDerivation { + pname = "accelerate-bignum"; + version = "0.2.0.0"; + sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog + tasty tasty-hedgehog + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx + base criterion mwc-random vector vector-th-unbox wide-word + ]; + homepage = "https://github.com/tmcdonell/accelerate-bignum"; + description = "Fixed-length large integer arithmetic for Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-blas" = callPackage ({ mkDerivation, accelerate, accelerate-llvm , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs @@ -20438,6 +20538,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-blas_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, blas-hs + , bytestring, containers, criterion, cublas, cuda, deepseq + , file-embed, hedgehog, hmatrix, llvm-hs-pure, mtl, mwc-random + , mwc-random-accelerate, tasty, tasty-hedgehog + }: + mkDerivation { + pname = "accelerate-blas"; + version = "0.2.0.0"; + sha256 = "0y77wsdw0i7b5bzlfrrn9q4d8q95r8z71g8qy77n24db1pwmjqy9"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda + file-embed llvm-hs-pure mtl + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog + tasty tasty-hedgehog + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base + criterion deepseq hmatrix mwc-random mwc-random-accelerate + ]; + description = "Numeric Linear Algebra in Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-cublas" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda , accelerate-io, accelerate-utility, base, cublas, cuda, hmatrix @@ -20515,22 +20644,20 @@ self: { "accelerate-examples" = callPackage ({ mkDerivation, accelerate, accelerate-fft, accelerate-io - , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint - , array, base, binary, bmp, bytestring, bytestring-lexing, cereal + , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base + , binary, bmp, bytestring, bytestring-lexing, cereal , colour-accelerate, containers, criterion, directory, fclabels , filepath, gloss, gloss-accelerate, gloss-raster-accelerate , gloss-rendering, HUnit, lens-accelerate, linear , linear-accelerate, matrix-market-attoparsec, mwc-random - , normaldistribution, pipes, QuickCheck, random, repa, repa-io - , scientific, test-framework, test-framework-hunit - , test-framework-quickcheck2, vector, vector-algorithms + , normaldistribution, QuickCheck, random, repa, repa-io, scientific + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "1.1.0.0"; - sha256 = "0zpjmk6v314jfda7fy22xghfqlqfh8vyf938qwyp6xjf1mpq1r1x"; - revision = "3"; - editedCabalFile = "1ir5i8skpyzpvwa17yw02j9rn9c5qjjincwrnjdwaixcdc7lsy4b"; + version = "1.2.0.0"; + sha256 = "1gb4m1ri461f78x913ipxh14ybwl9wzbv81w8943whiwrmb3p5pc"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; @@ -20541,14 +20668,13 @@ self: { test-framework-quickcheck2 ]; executableHaskellDepends = [ - accelerate accelerate-fft accelerate-io array base binary bmp - bytestring bytestring-lexing cereal colour-accelerate containers - criterion directory fclabels filepath gloss gloss-accelerate - gloss-raster-accelerate gloss-rendering HUnit lens-accelerate + accelerate accelerate-fft accelerate-io base binary bmp bytestring + bytestring-lexing cereal colour-accelerate containers criterion + directory fclabels filepath gloss gloss-accelerate + gloss-raster-accelerate gloss-rendering lens-accelerate linear-accelerate matrix-market-attoparsec mwc-random - normaldistribution pipes QuickCheck random repa repa-io scientific - test-framework test-framework-hunit test-framework-quickcheck2 - vector vector-algorithms + normaldistribution random repa repa-io scientific vector + vector-algorithms ]; homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; @@ -20576,6 +20702,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-fft_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, bytestring + , carray, containers, cuda, cufft, fft, file-embed, hashable + , hedgehog, lens-accelerate, mtl, tasty, tasty-hedgehog + , unordered-containers + }: + mkDerivation { + pname = "accelerate-fft"; + version = "1.2.0.0"; + sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base bytestring carray containers cuda cufft + fft file-embed hashable lens-accelerate mtl unordered-containers + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog + tasty tasty-hedgehog + ]; + homepage = "https://github.com/AccelerateHS/accelerate-fft"; + description = "FFT using the Accelerate library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-fftw" = callPackage ({ mkDerivation, accelerate, accelerate-io, base, carray, fft , storable-complex @@ -20656,6 +20808,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate-io_1_2_0_0" = callPackage + ({ mkDerivation, accelerate, array, base, bmp, bytestring, hedgehog + , primitive, repa, tasty, tasty-hedgehog, vector + }: + mkDerivation { + pname = "accelerate-io"; + version = "1.2.0.0"; + sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; + libraryHaskellDepends = [ + accelerate array base bmp bytestring primitive repa vector + ]; + testHaskellDepends = [ + accelerate array base hedgehog tasty tasty-hedgehog vector + ]; + homepage = "https://github.com/AccelerateHS/accelerate-io"; + description = "Read and write Accelerate arrays in various formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-llvm" = callPackage ({ mkDerivation, abstract-deque, accelerate, base, bytestring , chaselev-deque, containers, data-default-class, deepseq @@ -21985,7 +22157,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_3_0_0" = callPackage + "aeson_1_3_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable @@ -21997,8 +22169,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.3.0.0"; - sha256 = "1glrwccp5hi9zn8d34761zinvpmbd4dsbgzqg2qxk6glp928phna"; + version = "1.3.1.0"; + sha256 = "0ljndkgibz3qbddz2451v1r9w8i440kpslg3al3m7gc82mxz2xrr"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text @@ -23116,14 +23288,15 @@ self: { "aivika" = callPackage ({ mkDerivation, array, base, binary, containers, deepseq, mtl - , mwc-random, random, vector + , mwc-random, random, semigroups, vector }: mkDerivation { pname = "aivika"; - version = "5.5"; - sha256 = "0phzdgdxcdzdvgllp7c3b8bffdr8xhpid0yify7yrpnxc4y4rw5s"; + version = "5.6"; + sha256 = "0gri5kwzw2a9fjcr7924kdaxgs9zl4j8brgknwyxrky0p93a8zry"; libraryHaskellDepends = [ - array base binary containers deepseq mtl mwc-random random vector + array base binary containers deepseq mtl mwc-random random + semigroups vector ]; homepage = "http://www.aivikasoft.com"; description = "A multi-method simulation library"; @@ -23287,14 +23460,15 @@ self: { "aivika-transformers" = callPackage ({ mkDerivation, aivika, array, base, containers, mtl, mwc-random - , random, vector + , random, semigroups, vector }: mkDerivation { pname = "aivika-transformers"; - version = "5.5"; - sha256 = "09q221ayhfx5h51cc0h8lsx4b1cnzk3bssr5bf28xixaf3j4faj5"; + version = "5.6"; + sha256 = "0vy3d4vldifiwc12j6746axhb1k3ir703wzgycvk4xn60qhjp4g9"; libraryHaskellDepends = [ - aivika array base containers mtl mwc-random random vector + aivika array base containers mtl mwc-random random semigroups + vector ]; homepage = "http://www.aivikasoft.com"; description = "Transformers for the Aivika simulation library"; @@ -28443,8 +28617,8 @@ self: { }: mkDerivation { pname = "argon2"; - version = "1.3.0.0"; - sha256 = "0sszifmi74b2n19d4f5f30pfnivqm6n1jdwf2j402schkd1wz7cp"; + version = "1.3.0.1"; + sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry"; libraryHaskellDepends = [ base bytestring deepseq text-short ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck @@ -30472,6 +30646,8 @@ self: { pname = "attoparsec-iso8601"; version = "1.0.0.0"; sha256 = "12l55b76bhya9q89mfmqmy6sl5v39b6gzrw5rf3f70vkb23nsv5a"; + revision = "1"; + editedCabalFile = "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4"; libraryHaskellDepends = [ attoparsec base base-compat text time ]; homepage = "https://github.com/bos/aeson"; description = "Parsing of ISO 8601 dates, originally from aeson"; @@ -32145,6 +32321,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "b9_0_5_43" = callPackage + ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes + , bytestring, conduit, conduit-extra, ConfigFile, directory + , filepath, free, hashable, hspec, hspec-expectations, lens, mtl + , optparse-applicative, parallel, parsec, pretty, pretty-show + , process, QuickCheck, random, shake, syb, template, text, time + , transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "b9"; + version = "0.5.43"; + sha256 = "168rgqqnxi8f39dg510nxlh813ch4dkdxxd4rymf09dkn87w1snk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bifunctors binary boxes bytestring conduit + conduit-extra ConfigFile directory filepath free hashable lens mtl + parallel parsec pretty pretty-show process QuickCheck random shake + syb template text time transformers unordered-containers vector + yaml + ]; + executableHaskellDepends = [ + base bytestring directory lens optparse-applicative + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations QuickCheck text + unordered-containers vector yaml + ]; + homepage = "https://github.com/sheyll/b9-vm-image-builder"; + description = "A tool and library for building virtual machine images"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "babl" = callPackage ({ mkDerivation, babl, base }: mkDerivation { @@ -32680,6 +32890,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-compat_0_10_0" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "base-compat"; + version = "0.10.0"; + sha256 = "0s46gkixvnafc9rj7sqn4m6bl0457myhn8lp65d5s579zrj8y43i"; + libraryHaskellDepends = [ base unix ]; + description = "A compatibility layer for base"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "base-compat-batteries" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , QuickCheck + }: + mkDerivation { + pname = "base-compat-batteries"; + version = "0.10.0"; + sha256 = "0zyhl2yfycwcgvf8kh8g3y8zkp21b0wd4nnhvgjdcw11gn6nb26x"; + libraryHaskellDepends = [ base base-compat ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "base-compat with extra batteries"; + license = stdenv.lib.licenses.mit; + }) {}; + "base-encoding" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, text @@ -33202,8 +33439,8 @@ self: { }: mkDerivation { pname = "battleplace"; - version = "0.1.0.0"; - sha256 = "1p3dxz8a752wc6fmj6kip4gcwj77c96ic5wzlhgv670xsh4ac1qg"; + version = "0.1.0.1"; + sha256 = "1zjjmz36lxxrxgx449212q878mzavjpwx5jad0lk9ninpas16h5v"; libraryHaskellDepends = [ aeson base bytestring cereal data-default hashable memory servant text vector @@ -33462,16 +33699,16 @@ self: { "beam-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist, free - , ghc-prim, hashable, microlens, mtl, network-uri, tasty + , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty , tasty-hunit, text, time, vector-sized }: mkDerivation { pname = "beam-core"; - version = "0.6.0.0"; - sha256 = "1pnxmy5xv84fng0391cckizwdrwzh0p0v3g0vc29z5vpksqr24kg"; + version = "0.7.0.0"; + sha256 = "1qpgcr5a1r7ck0mxh70akz32zb4vm30is2dpsxgcdza5zshmnvcb"; libraryHaskellDepends = [ aeson base bytestring containers dlist free ghc-prim hashable - microlens mtl network-uri text time vector-sized + microlens mtl network-uri tagged text time vector-sized ]; testHaskellDepends = [ base bytestring tasty tasty-hunit text time @@ -36545,10 +36782,8 @@ self: { }: mkDerivation { pname = "bits-extra"; - version = "0.0.0.1"; - sha256 = "1yggdh8j2hqhyskyqq4gci4hg1kdglzw7sfd7gdf4fsw9l6g8rq0"; - revision = "1"; - editedCabalFile = "13rmw51xqbz0zjn2g0135m2f5qqsba3l5w02pb16dkfq4gbhmblx"; + version = "0.0.0.2"; + sha256 = "067k2kczi56454mgv86x9r0fpzdc0v3m8z4rc0jb93bqd33knq7r"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog @@ -36967,27 +37202,26 @@ self: { }) {}; "blank-canvas" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, colour, containers, data-default-class, directory - , http-types, kansas-comet, mime-types, process, scotty, semigroups - , shake, stm, text, text-show, time, transformers, unix, vector - , wai, wai-extra, warp + ({ mkDerivation, aeson, base, base-compat-batteries + , base64-bytestring, bytestring, colour, containers + , data-default-class, directory, http-types, kansas-comet + , mime-types, process, scotty, semigroups, shake, stm, text + , text-show, time, transformers, unix, vector, wai, wai-extra, warp }: mkDerivation { pname = "blank-canvas"; - version = "0.6.2"; - sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; - revision = "3"; - editedCabalFile = "0fanap927iszy3vkymkjcmzd74gripbbp222zcmzl5gkn3l4g931"; + version = "0.6.3"; + sha256 = "1d10ngvsgi2hz6xick59rkq1wzfbsgckply2jmg6gz9mf3zj97bk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring colour - containers data-default-class http-types kansas-comet mime-types - scotty semigroups stm text text-show transformers vector wai - wai-extra warp + aeson base base-compat-batteries base64-bytestring bytestring + colour containers data-default-class http-types kansas-comet + mime-types scotty semigroups stm text text-show transformers vector + wai wai-extra warp ]; testHaskellDepends = [ - base containers directory process shake stm text time unix vector + base base-compat-batteries containers directory process shake stm + text time unix vector ]; homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; description = "HTML5 Canvas Graphics Library"; @@ -39027,6 +39261,8 @@ self: { pname = "brittany"; version = "0.9.0.1"; sha256 = "1ndmnakzq6kiyxlxmgrjmzzpknrn4ib5ck5vxxr90qw8rw6yqi88"; + revision = "1"; + editedCabalFile = "1ac9g160kaaz78xk6xdfpkm0qadgkanjghi8g0b9fy17983fiw7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39067,6 +39303,8 @@ self: { pname = "brittany"; version = "0.10.0.0"; sha256 = "1fm6l4ial8kp4mafwkp7w79nklc46c07i12p1in3dqxz9r5817r1"; + revision = "1"; + editedCabalFile = "1mq1hgakxwzk4k4d8gwfbngprcprjagnvkvq389z1m1vda3w80i8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40026,6 +40264,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytes_0_15_4" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest + , cereal, containers, directory, doctest, filepath, hashable, mtl + , scientific, text, time, transformers, transformers-compat + , unordered-containers, void + }: + mkDerivation { + pname = "bytes"; + version = "0.15.4"; + sha256 = "121x3iqlm8pghw8cd9g30cnqbl7jrdpfjxdanmqdqllajw6xivrm"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytestring cereal containers hashable mtl scientific + text time transformers transformers-compat unordered-containers + void + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "https://github.com/ekmett/bytes"; + description = "Sharing code for serialization between binary and cereal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "byteset" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -41846,6 +42107,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cache_0_1_1_0" = callPackage + ({ mkDerivation, base, clock, hashable, hspec, stm, transformers + , unordered-containers + }: + mkDerivation { + pname = "cache"; + version = "0.1.1.0"; + sha256 = "1zvq5dwckkngf6kzh04pa59kgxf44fx9kli0c7zaz4g9hf1nyx8l"; + libraryHaskellDepends = [ + base clock hashable stm transformers unordered-containers + ]; + testHaskellDepends = [ base clock hspec stm transformers ]; + homepage = "https://github.com/hverr/haskell-cache#readme"; + 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 { @@ -43011,12 +43290,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "casing_0_1_3_0" = callPackage + "casing_0_1_4_0" = callPackage ({ mkDerivation, base, split, tasty, tasty-hunit }: mkDerivation { pname = "casing"; - version = "0.1.3.0"; - sha256 = "08cklvgm2c2519c4xm22mxfkjmizky8j64a98cqgdgz9rl6ryq9m"; + version = "0.1.4.0"; + sha256 = "1mznhlbg8qd2yrjg23rq7s77bijn92nrfx7bvx9sw8sqxwqkd2lf"; libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Convert between various source code casing conventions"; @@ -46762,8 +47041,8 @@ self: { }: mkDerivation { pname = "cli-setup"; - version = "0.2.0.2"; - sha256 = "1pyfnrmn7jp9n9xjgq43kcr9gz0wnrsrwrg530vi11cc77np8piq"; + version = "0.2.0.3"; + sha256 = "1macadfh1dqd6n2cc5rlyn74fz450livy1bg0qns3kcijqilk0p4"; libraryHaskellDepends = [ base bytestring directory file-embed process ]; @@ -47886,8 +48165,8 @@ self: { }: mkDerivation { pname = "codec-beam"; - version = "0.1.0"; - sha256 = "0c5l4ss3pf55s8mwk01ncl5nnry9c1ha5drfmax53z40hyrxhmy8"; + version = "0.1.1"; + sha256 = "1d6dsa4di4wil6wqc2jpfqvf09vk4zw9c2905py5vygl87q1y9jq"; libraryHaskellDepends = [ base bytestring containers text zlib ]; testHaskellDepends = [ base bytestring filepath process text ]; homepage = "https://github.com/hkgumbs/codec-beam#readme"; @@ -48570,6 +48849,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "colour-accelerate_0_3_0_0" = callPackage + ({ mkDerivation, accelerate, base }: + mkDerivation { + pname = "colour-accelerate"; + version = "0.3.0.0"; + sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz"; + libraryHaskellDepends = [ accelerate base ]; + homepage = "https://github.com/tmcdonell/colour-accelerate"; + description = "Working with colours in Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "colour-space" = callPackage ({ mkDerivation, base, colour, constrained-categories, JuicyPixels , linear, linearmap-category, manifolds, semigroups, vector-space @@ -49515,8 +49807,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.5.3.0"; - sha256 = "0pmgrdlrk4l7bmbfvsbvysa3n2h14ca919fl7cr1bg9yk2mb2s7s"; + version = "0.5.4.0"; + sha256 = "08rmv82v5ipkcb46pcadx1s8c1v532l8ma2qlgiflq6jnxf7y0zn"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -49541,8 +49833,8 @@ self: { }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.5.3.0"; - sha256 = "07ps031qnkhd5yb7w0c9y69n22npa5y9rzxy934p6x32ni5v0mvz"; + version = "0.5.4.0"; + sha256 = "1x5vkxzj0afar4w2djx9s7h3vy9aa5my9wfks8n4ajlv92fch1zm"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -49559,8 +49851,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.5.3.0"; - sha256 = "0xz264i115nj2b6k74s1csi29lrszambbhy7ibz7nwqr2qs56yzw"; + version = "0.5.4.0"; + sha256 = "0brycxdwf4051qvad4b4ak47dl27qn3izv1bcqlpva01jvb6h21j"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -49575,15 +49867,14 @@ self: { }) {}; "composite-ekg" = callPackage - ({ mkDerivation, base, composite-base, ekg, ekg-core, lens, text - , vinyl + ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl }: mkDerivation { pname = "composite-ekg"; - version = "0.5.3.0"; - sha256 = "0fw6rsz7arndmp9d6xgvkx9vqqrv6kvhgchl0hqv4jfaxhwdv3gc"; + version = "0.5.4.0"; + sha256 = "051dw8ncpsk2k05ipvlnkwv2gy6719w69v1hhwrryy3dad0f4wc3"; libraryHaskellDepends = [ - base composite-base ekg ekg-core lens text vinyl + base composite-base ekg-core lens text vinyl ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "EKG Metrics for Vinyl/Frames records"; @@ -49597,8 +49888,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.5.3.0"; - sha256 = "09sjvs7bxca789pfrhgbsy2v08060mraciwl867byq3s8aq5c971"; + version = "0.5.4.0"; + sha256 = "1k71v4dz4vl70ignjp6hgw6j4c9hdgafd9x973dk7w332m2vjdpn"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -49614,6 +49905,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "composite-swagger" = callPackage + ({ mkDerivation, base, composite-aeson, composite-base, hspec + , insert-ordered-containers, lens, QuickCheck, swagger2 + , template-haskell, text, vinyl + }: + mkDerivation { + pname = "composite-swagger"; + version = "0.5.4.0"; + sha256 = "0i2jfchl88mrk9kmf8yv7cbv006ghilqsnbic7ddsbkzrjy1vdw0"; + libraryHaskellDepends = [ + base composite-base insert-ordered-containers lens swagger2 + template-haskell text vinyl + ]; + testHaskellDepends = [ + base composite-aeson composite-base hspec insert-ordered-containers + lens QuickCheck swagger2 template-haskell text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Swagger for Vinyl/Frames records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composition" = callPackage ({ mkDerivation }: mkDerivation { @@ -52259,18 +52572,18 @@ self: { }) {}; "convert" = callPackage - ({ mkDerivation, base, bytestring, containers, either, lens, mtl - , old-locale, old-time, template-haskell, text, time + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers + , data-default, lens, template-haskell, text, utf8-string }: mkDerivation { pname = "convert"; - version = "1.0.2"; - sha256 = "0vwy2j2b0jw435mxmi95q61zmldjqlahhlbf4x9x28qm6kmh519q"; + version = "1.4.2"; + sha256 = "0lmbshg6nx0ifnc6qmhvacr5lr5nlay3sjkjg2n5624qm7aiq806"; libraryHaskellDepends = [ - base bytestring containers either lens mtl old-locale old-time - template-haskell text time + ansi-wl-pprint base bytestring containers data-default lens + template-haskell text utf8-string ]; - homepage = "https://github.com/wdanilo/convert"; + homepage = "https://github.com/luna/convert"; description = "Safe and unsafe data conversion utilities with strong type-level operation. checking."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -52390,18 +52703,14 @@ self: { }) {}; "coordinate" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , QuickCheck, template-haskell, transformers - }: + ({ mkDerivation, base, HUnit, lens, papa, transformers }: mkDerivation { pname = "coordinate"; - version = "0.1.2"; - sha256 = "0lphvgjs9nkrp37hirhi88d285rqbgk7qjz23rbl94v6qrk3x8nv"; - libraryHaskellDepends = [ base lens transformers ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/coordinate"; + version = "0.2"; + sha256 = "1sph59d8008amhb4pi4gk8ymwjf2r6iy378phriqb42zy01bn0vb"; + libraryHaskellDepends = [ base lens papa transformers ]; + testHaskellDepends = [ base HUnit lens ]; + homepage = "https://github.com/qfpl/coordinate"; description = "A representation of latitude and longitude"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53870,8 +54179,8 @@ self: { pname = "criterion"; version = "1.3.0.0"; sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q"; - revision = "2"; - editedCabalFile = "1yyv34f9yk8d67x18l1al5csd383ypmdwnz73gq0agmw4k2f9c54"; + revision = "3"; + editedCabalFile = "0bdz45r1mf6ydcs7l333xn7da9p583g9y7n3dzvnry4by0fkcqw6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -53894,37 +54203,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_4_0_0" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary - , bytestring, cassava, code-page, containers, deepseq, directory - , exceptions, filepath, Glob, HUnit, js-flot, js-jquery - , microstache, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, semigroups, statistics, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, transformers-compat - , vector, vector-algorithms + "criterion_1_4_1_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat + , base-compat-batteries, binary, bytestring, cassava, code-page + , containers, deepseq, directory, exceptions, filepath, Glob, HUnit + , js-flot, js-jquery, microstache, mtl, mwc-random + , optparse-applicative, parsec, QuickCheck, semigroups, statistics + , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers + , transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.4.0.0"; - sha256 = "0shsqq36z1q8ckic3nfb3rdbxhlb0faxl5d7ly5a4wlka4fcfrfc"; - revision = "1"; - editedCabalFile = "056p7d95ynrpsm5jr479r9xk7ksniqkz4bza0zdn9a8vmrx591qh"; + version = "1.4.1.0"; + sha256 = "0v429araqkcw3wwwi6fsp0g7g1hy3l47p061lcy7r4m7d9khd4y4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat binary bytestring cassava - code-page containers deepseq directory exceptions filepath Glob - js-flot js-jquery microstache mtl mwc-random optparse-applicative - parsec semigroups statistics text time transformers - transformers-compat vector vector-algorithms + aeson ansi-wl-pprint base base-compat-batteries binary bytestring + cassava code-page containers deepseq directory exceptions filepath + Glob js-flot js-jquery microstache mtl mwc-random + optparse-applicative parsec semigroups statistics text time + transformers transformers-compat vector vector-algorithms ]; executableHaskellDepends = [ - base base-compat optparse-applicative semigroups + base base-compat-batteries optparse-applicative semigroups ]; testHaskellDepends = [ - aeson base base-compat bytestring deepseq directory HUnit - QuickCheck statistics tasty tasty-hunit tasty-quickcheck vector + aeson base base-compat base-compat-batteries bytestring deepseq + directory HUnit QuickCheck statistics tasty tasty-hunit + tasty-quickcheck vector ]; homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; @@ -54866,6 +55174,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openssl;}; + "cryptonite-openssl_0_7" = callPackage + ({ mkDerivation, base, basement, bytestring, cryptonite, memory + , openssl, tasty, tasty-hunit, tasty-kat, tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite-openssl"; + version = "0.7"; + sha256 = "1xj41354dx24rfh6i7av7qamvin34z4g6m1hxw1fc9jg4q41qkly"; + libraryHaskellDepends = [ + base basement bytestring cryptonite memory + ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ + base bytestring cryptonite tasty tasty-hunit tasty-kat + tasty-quickcheck + ]; + homepage = "https://github.com/haskell-crypto/cryptonite-openssl"; + description = "Crypto stuff using OpenSSL cryptographic library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -55973,6 +56303,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "czipwith_1_0_1_0" = callPackage + ({ mkDerivation, base, template-haskell, transformers }: + mkDerivation { + pname = "czipwith"; + version = "1.0.1.0"; + sha256 = "0s1gz76789w5grm121fikgrxz1hjca6v6dwmds5zg63j6iir3f0p"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base transformers ]; + homepage = "https://github.com/lspitzner/czipwith/"; + description = "CZipWith class and deriving via TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "d-bus" = callPackage ({ mkDerivation, async, attoparsec, base, binary, blaze-builder , bytestring, conduit, conduit-extra, containers @@ -56192,32 +56536,32 @@ self: { "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring - , binary, bytestring, cmdargs, containers, cryptohash, curl + , binary, bytestring, Cabal, cmdargs, containers, cryptohash, curl , data-ordlist, directory, fgl, filepath, FindBin, graphviz , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network , network-uri, old-time, parsec, process, QuickCheck, random - , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar - , terminfo, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-compat, unix, unix-compat, utf8-string, vector - , zip-archive, zlib + , regex-applicative, regex-compat-tdfa, sandi, shelly, split, stm + , tar, temporary, terminfo, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, unix + , unix-compat, utf8-string, vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; - version = "2.12.5"; - sha256 = "0lrm0sal5pl453mkqn8b9fc9l7lwinc140iqihya9g17bk408nrm"; + version = "2.14.0"; + sha256 = "00r8g27sgwlw5r8gx89q99n2hawcacfz1mjj0nmh6ps8l610iyhr"; revision = "1"; - editedCabalFile = "0if3ww0xhi8k5c8a9yb687gjjdp2k4q2896qn7vgwwzg360slx8n"; + editedCabalFile = "0kxvr0rv5936x460k5ydyy85lgjhmrlkrm60zhbqkqks304abs1h"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array async attoparsec base base16-bytestring binary bytestring containers cryptohash data-ordlist directory fgl filepath graphviz hashable haskeline html HTTP mmap mtl network network-uri old-time - parsec process random regex-applicative regex-compat-tdfa sandi tar - terminfo text time transformers transformers-compat unix - unix-compat utf8-string vector zip-archive zlib + parsec process random regex-applicative regex-compat-tdfa sandi stm + tar temporary terminfo text time transformers unix unix-compat + utf8-string vector zip-archive zlib ]; librarySystemDepends = [ curl ]; executableHaskellDepends = [ base ]; @@ -56233,7 +56577,7 @@ self: { ''; homepage = "http://darcs.net/"; description = "a distributed, interactive, smart revision control system"; - license = "GPL"; + license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) curl;}; @@ -63865,8 +64209,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "1"; - editedCabalFile = "0dcqfyp38f792nzsv4977dcv4zr4xdrg780lz6bpf2hn7ikdglz9"; + revision = "2"; + editedCabalFile = "1968b6i0azv0bi3x6cw85ga89md1dh1wdmly3ivvvyb6i9mgwrn6"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -65637,8 +65981,8 @@ self: { }: mkDerivation { pname = "dual-tree"; - version = "0.2.1"; - sha256 = "06azc2lwli9aw81a23g82yxiann2qjc3bk7cdyh9kiwimdyj8r94"; + version = "0.2.1.1"; + sha256 = "1wzv6rrhz2kz0v1wirgs28fdlr0r4nwxlix9xda4fphzpp922gzr"; libraryHaskellDepends = [ base monoid-extras newtype-generics semigroups ]; @@ -69699,8 +70043,8 @@ self: { }: mkDerivation { pname = "etc"; - version = "0.3.0.0"; - sha256 = "04cma6lzgz3sm9riyy8cx1dlkz90yxqqpyirvdn5n3bxdnj1sa3g"; + version = "0.3.1.0"; + sha256 = "0l938jhlx1jgb46b9ykdc741r0v7wkklrc1ga5v81r3b52civb1c"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base hashable rio text typed-process unliftio @@ -70128,6 +70472,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eve-cli" = callPackage + ({ mkDerivation, base, bytestring, eve, lens, mtl, text, vty }: + mkDerivation { + pname = "eve-cli"; + version = "0.2.0.0"; + sha256 = "0l9c7mpmw7i9kgmirnkb84q6lfw0ry5z5j2049sv47klczdv285a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring eve lens mtl text vty ]; + executableHaskellDepends = [ + base bytestring eve lens mtl text vty + ]; + testHaskellDepends = [ base bytestring eve lens mtl text vty ]; + homepage = "https://github.com/ChrisPenner/eve-cli#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "event" = callPackage ({ mkDerivation, base, containers, semigroups, transformers }: mkDerivation { @@ -71552,15 +71913,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "extensible-effects_2_5_1_2" = callPackage + "extensible-effects_2_5_2_0" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, mtl , QuickCheck, silently, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-th, transformers-base }: mkDerivation { pname = "extensible-effects"; - version = "2.5.1.2"; - sha256 = "0hz0vn2az6dsbhxzlz4xvz6gybmbmxqji4s7d325ybpapj4pky6f"; + version = "2.5.2.0"; + sha256 = "12rj2b1zn3lqk5anv01lf95mmadazripa6731jf3m2m5di00i4sc"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control QuickCheck silently test-framework @@ -72050,19 +72411,23 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, arithmoi, ats-pkg, base, Cabal, combinat + ({ mkDerivation, arithmoi, ats-pkg, base, Cabal, combinat-compat , composition-prelude, criterion, gmpint, hspec, numbertheory , QuickCheck }: mkDerivation { pname = "fast-arithmetic"; - version = "0.3.3.4"; - sha256 = "176qm6d9rqq85cbpq6n0fmqwvyi529ml6z346k9a1mfpzi85w3xy"; + version = "0.3.3.6"; + sha256 = "1crs7ymdvizb0s0i3didi429b3wym01iinm7ryy3z6i198ls1pga"; setupHaskellDepends = [ ats-pkg base Cabal ]; libraryHaskellDepends = [ base composition-prelude gmpint ]; librarySystemDepends = [ numbertheory ]; - testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; - benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; + testHaskellDepends = [ + arithmoi base combinat-compat hspec QuickCheck + ]; + benchmarkHaskellDepends = [ + arithmoi base combinat-compat criterion + ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; @@ -73634,6 +73999,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-embed-lzma" = callPackage + ({ mkDerivation, base, base-compat, bytestring, directory, filepath + , lzma, template-haskell, text, th-lift-instances, transformers + }: + mkDerivation { + pname = "file-embed-lzma"; + version = "0"; + sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; + revision = "1"; + editedCabalFile = "18q9dgfdsr7r5mlqzhhgbx0bp4bv2xkpcsrihl655pwaj1lz1v2s"; + libraryHaskellDepends = [ + base base-compat bytestring directory filepath lzma + template-haskell text th-lift-instances transformers + ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/phadej/file-embed-lzma"; + description = "Use Template Haskell to embed (LZMA compressed) data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "file-embed-poly" = callPackage ({ mkDerivation, base, bytestring, directory, file-embed, filepath , hspec, template-haskell @@ -75418,8 +75803,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.4.4"; - sha256 = "1bv7djak2ilirk7ajm8w6100bk6vx14znf3699blih72kyql6rgh"; + version = "0.5.4.5"; + sha256 = "17iqpnn0zgwifb937kllkfyz8qf37da90z8iyay348gy3siwjxic"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -78202,22 +78587,25 @@ self: { }) {}; "funcons-tools" = callPackage - ({ mkDerivation, base, bv, containers, directory, mtl, multiset - , parsec, split, text, vector + ({ mkDerivation, base, bv, containers, directory, funcons-values + , gll, mtl, multiset, random-strings, regex-applicative, split + , text, TypeCompose, vector }: mkDerivation { pname = "funcons-tools"; - version = "0.1.0.0"; - sha256 = "1vwnznj92cm2g1m2xlvj8b5qzaspl3zrygr5z7b8593qylm6bwlr"; - revision = "2"; - editedCabalFile = "0530f406ykmb4xxmh7knmaxgcpym7n2wl6d2ylvrn3azqfdsvsgy"; + version = "0.2.0.1"; + sha256 = "1a27xhzakvrc29kli293ivkzmqfma71s942a9bsyvss15g1881fn"; + revision = "1"; + editedCabalFile = "1lfqgrrc814j0zyx2z8v0nx367bgifr93gb86dd4hshz2vvq5b49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bv containers directory mtl multiset parsec split text vector + base bv containers directory funcons-values gll mtl multiset + random-strings regex-applicative split text TypeCompose vector ]; executableHaskellDepends = [ - base bv containers directory mtl multiset parsec split text vector + base bv containers directory funcons-values gll mtl multiset + random-strings regex-applicative split text TypeCompose vector ]; homepage = "http://plancomps.org"; description = "A modular interpreter for executing funcons"; @@ -78225,6 +78613,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "funcons-values" = callPackage + ({ mkDerivation, base, bv, containers, multiset, random-strings + , text, vector + }: + mkDerivation { + pname = "funcons-values"; + version = "0.1.0.2"; + sha256 = "0pywpqnjhwny1l1kz6hn135rbmgdglzpvfvq4ffjllzdj2w9ciy2"; + libraryHaskellDepends = [ + base bv containers multiset random-strings text vector + ]; + homepage = "http://plancomps.org"; + description = "Library providing values and operations on values"; + license = stdenv.lib.licenses.mit; + }) {}; + "function-combine" = callPackage ({ mkDerivation, base, data-type }: mkDerivation { @@ -78372,13 +78776,13 @@ self: { }) {}; "functor-utils" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, ghc-prim, lens }: mkDerivation { pname = "functor-utils"; - version = "1.1"; - sha256 = "1finmjwpw4sjzwifjmcpb90wmy7abhdnrhz2p5s7fxw68vccnm50"; - libraryHaskellDepends = [ base ghc-prim ]; - homepage = "https://github.com/wdanilo/functor-utils"; + version = "1.17.1"; + sha256 = "1ixssxdhw94l1kjxd5k4gvq8wz4b9d0vww5mg2al9q3vzb7d4pld"; + libraryHaskellDepends = [ base ghc-prim lens ]; + homepage = "https://github.com/luna/functor-utils"; description = "Collection of functor utilities, providing handy operators, like generalization of (.)."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -79715,6 +80119,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-lens_1_0_0_1" = 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 + ]; + homepage = "https://github.com/kcsongor/generic-lens"; + description = "Generically derive traversals, lenses and prisms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-lens-labels" = callPackage ({ mkDerivation, base, generic-lens }: mkDerivation { @@ -79910,22 +80335,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "generics-eot_0_3" = callPackage + "generics-eot_0_4" = callPackage ({ mkDerivation, base, directory, doctest, filepath, hspec - , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck - , shake + , interpolate, markdown-unlit, mockery, QuickCheck, shake, silently }: mkDerivation { pname = "generics-eot"; - version = "0.3"; - sha256 = "1r0qh27jpika9wfxk0i6kywsclrdqhaphl1qw26vfzka4dsfbjrb"; - libraryHaskellDepends = [ base markdown-unlit ]; + version = "0.4"; + sha256 = "16yfzv9aqyizm57r5m5ddwdnlh05fvlrxjn6m3vqz33kvy3drgjs"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath hspec interpolate markdown-unlit - mockery QuickCheck shake + mockery QuickCheck shake silently ]; - testToolDepends = [ hspec-discover ]; - homepage = "https://github.com/soenkehahn/generics-eot#readme"; + homepage = "https://generics-eot.readthedocs.io/"; description = "A library for generic programming that aims to be easy to understand"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -82493,8 +82916,8 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.17"; - sha256 = "1yf0wav5mgy0aj1j4jcmip71isz91m99rbjpmqgwakvjcs2x5gm3"; + version = "2.0.18"; + sha256 = "0h7liqxf63wmhjzgbjshv7pa4fx743jpvkphn5yyjkc0bnfcvsqk"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -84004,8 +84427,8 @@ self: { }: mkDerivation { pname = "githud"; - version = "2.0.1"; - sha256 = "0qmc51dpsmil72xvv3g7mylr39ignrm8az6jv92b767s8ijqk5lh"; + version = "2.0.2"; + sha256 = "0nhik30c7xzn3aqj8d8b8rk05viqmhl8q9ymswxxn9ws2nkm7rk8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process text unix ]; @@ -84739,8 +85162,8 @@ self: { }: mkDerivation { pname = "gll"; - version = "0.4.0.4"; - sha256 = "01qnvynldllb4qdvg29r64qq17qb1fs8yg7jgyj3f8ajgyi5jn9q"; + version = "0.4.0.5"; + sha256 = "09z7i4h5zwgyh3gg5w0l6p0ch1lhzmsnbmk1yfbc9b21gbxna5js"; libraryHaskellDepends = [ array base containers pretty regex-applicative text TypeCompose ]; @@ -84922,6 +85345,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gloss-accelerate_2_0_0_1" = callPackage + ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: + mkDerivation { + pname = "gloss-accelerate"; + version = "2.0.0.1"; + sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2"; + libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; + description = "Extras to interface Gloss and Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-algorithms" = callPackage ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { @@ -85072,8 +85507,8 @@ self: { pname = "gloss-raster-accelerate"; version = "2.0.0.0"; sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; - revision = "1"; - editedCabalFile = "07c56r31akmq7hq0cyw4lc4h5370laand231wjd5ffwk369x2prg"; + revision = "2"; + editedCabalFile = "0k0a562qa8khj39zpgp4sr8kh8h2q4krjjhbvpbsll4r83067ahj"; libraryHaskellDepends = [ accelerate base colour-accelerate gloss gloss-accelerate ]; @@ -89581,6 +90016,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "gtk-strut" = callPackage + ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }: + mkDerivation { + pname = "gtk-strut"; + version = "0.1.1.0"; + sha256 = "1g88afi75a727s85v37n4mvqr5zp4849s2kc1zdx3pvc9a15i9pd"; + libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ]; + homepage = "https://github.com/IvanMalison/gtk-strut#readme"; + description = "Libary for creating strut windows with gi-gtk"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gtk-toggle-button-list" = callPackage ({ mkDerivation, base, gtk }: mkDerivation { @@ -94410,8 +94857,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.2"; - sha256 = "1wjyqm606iflxsgjp7bj7b7avi07jhskxypahzlr02k7k7k9swm2"; + version = "0.0.0.4"; + sha256 = "0dclanbd07knph3bxn5a3kyl9qkqcwhy00y5jnah9sxk4qqhjkk5"; libraryHaskellDepends = [ base containers hasbolt lens neat-interpolation template-haskell text th-lift-instances @@ -100067,8 +100514,8 @@ self: { }: mkDerivation { pname = "heavy-logger"; - version = "0.3.1.0"; - sha256 = "0cmanxnahxgk52ffpni0zx4z22vdrh6r5my4llvsdd94bpfmxpi4"; + version = "0.3.2.0"; + sha256 = "1kx6l7ysniqjzzp7l74vjcfbi8qz5xqjqvisb49k18cnf22mikvv"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default fast-logger hsyslog lifted-base monad-control monad-logger mtl stm @@ -100096,6 +100543,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "heavy-logger-instances" = callPackage + ({ mkDerivation, base, binary, exceptions, heavy-logger, hsyslog + , mtl, template-haskell, text, text-format-heavy + }: + mkDerivation { + pname = "heavy-logger-instances"; + version = "0.2.0.0"; + sha256 = "0flh5j79ijkvdwhjg1gn3qkhybzspvg1jh8nib18fgzmvcx8zckm"; + libraryHaskellDepends = [ + base binary exceptions heavy-logger hsyslog mtl template-haskell + text text-format-heavy + ]; + testHaskellDepends = [ + base binary exceptions heavy-logger hsyslog mtl template-haskell + text text-format-heavy + ]; + homepage = "https://github.com/portnov/heavy-logger#readme"; + description = "Orphan instances for data types in heavy-logger package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -100389,22 +100857,22 @@ self: { "hedn" = callPackage ({ mkDerivation, attoparsec, base, base-compat, bytestring - , containers, deepseq, hspec, HUnit, mtl, QuickCheck, scientific - , stringsearch, template-haskell, text, time, time-locale-compat - , utf8-string, vector + , containers, deepseq, hspec, hspec-contrib, HUnit, mtl, QuickCheck + , scientific, stringsearch, template-haskell, text, time + , time-locale-compat, utf8-string, vector }: mkDerivation { pname = "hedn"; - version = "0.1.8.2"; - sha256 = "15f1zrp5cb1m2xhy974v8f67xg08yks6w43m3sbky4v5mbfy12ig"; + version = "0.1.9.0"; + sha256 = "077wf446x0rrac3bdzmyhpacb54smx02msdz45cra3yzn3n0rq7l"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq mtl scientific stringsearch text time time-locale-compat utf8-string vector ]; testHaskellDepends = [ - base bytestring containers hspec HUnit QuickCheck template-haskell - text time vector + base bytestring containers hspec hspec-contrib HUnit QuickCheck + template-haskell text time vector ]; homepage = "https://bitbucket.org/dpwiz/hedn"; description = "EDN parsing and encoding"; @@ -100474,6 +100942,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "heist_1_0_1_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder + , blaze-html, bytestring, containers, criterion, directory + , directory-tree, dlist, filepath, hashable, HUnit, lens + , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck + , random, statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unordered-containers, vector, xmlhtml + }: + mkDerivation { + pname = "heist"; + version = "1.0.1.3"; + sha256 = "0gy1s30sv9g1ybazh2md7scr1z2lqixl374h108zfp6f66iq450z"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers directory directory-tree dlist filepath hashable + lifted-base map-syntax monad-control mtl process random text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + testHaskellDepends = [ + aeson attoparsec base bifunctors blaze-builder blaze-html + bytestring containers directory directory-tree dlist filepath + hashable HUnit lens lifted-base map-syntax monad-control mtl + process QuickCheck random test-framework test-framework-hunit + test-framework-quickcheck2 text time transformers transformers-base + unordered-containers vector xmlhtml + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers criterion directory directory-tree dlist filepath + hashable HUnit lifted-base map-syntax monad-control mtl process + random statistics test-framework test-framework-hunit text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + homepage = "http://snapframework.com/"; + description = "An Haskell template system supporting both HTML5 and XML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heist-aeson" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , heist, monads-fd, text, vector, xmlhtml @@ -103912,6 +104420,8 @@ self: { pname = "hledger-iadd"; version = "1.3.3"; sha256 = "0fm5y2qyrg661q7y23f5abg78rbwz4jqkvlar8ns8wz9qwbml0ix"; + revision = "1"; + editedCabalFile = "09dvjyl9irq0cc8k4nwxdkjvj13dwk1n5lij7ykka6a658y9gzp5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -106976,19 +107486,19 @@ self: { "hpath" = callPackage ({ mkDerivation, base, bytestring, deepseq, doctest, exceptions - , hspec, HUnit, process, QuickCheck, simple-sendfile, unix + , hspec, HUnit, IfElse, process, QuickCheck, simple-sendfile, unix , unix-bytestring, utf8-string, word8 }: mkDerivation { pname = "hpath"; - version = "0.8.0"; - sha256 = "19xbzgz51dwjm5w11j170bp8nv0b19qk6b8mx75c367n4xshgxc3"; + version = "0.8.1"; + sha256 = "0k1g27lnm2c61wva03gh5qrjpc26xh6alxkv8xx36miw06fz88hv"; libraryHaskellDepends = [ - base bytestring deepseq exceptions hspec simple-sendfile unix - unix-bytestring utf8-string word8 + base bytestring deepseq exceptions hspec IfElse simple-sendfile + unix unix-bytestring utf8-string word8 ]; testHaskellDepends = [ - base bytestring doctest hspec HUnit process QuickCheck unix + base bytestring doctest hspec HUnit IfElse process QuickCheck unix unix-bytestring utf8-string ]; description = "Support for well-typed paths"; @@ -108431,6 +108941,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {xenctrl = null;}; + "hsaml2" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring + , bytestring, cryptonite, data-default, http-types, HUnit, hxt + , hxt-charproperties, hxt-http, hxt-unicode, invertible + , invertible-hxt, lens, libxml2, memory, mtl, network-uri, process + , semigroups, template-haskell, time, x509, zlib + }: + mkDerivation { + pname = "hsaml2"; + version = "0.1"; + sha256 = "0mpw13cicx16zhsk7km2qsndah9cdmyylz4r5ank5cxj0rzmkjck"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base base64-bytestring bytestring + cryptonite data-default http-types hxt hxt-charproperties + hxt-unicode invertible invertible-hxt lens memory mtl network-uri + process semigroups template-haskell time x509 zlib + ]; + libraryPkgconfigDepends = [ libxml2 ]; + testHaskellDepends = [ + base bytestring HUnit hxt hxt-http network-uri semigroups time x509 + ]; + description = "OASIS Security Assertion Markup Language (SAML) V2.0"; + license = stdenv.lib.licenses.asl20; + }) {inherit (pkgs) libxml2;}; + "hsass" = callPackage ({ mkDerivation, base, bytestring, data-default-class, filepath , hlibsass, hspec, hspec-discover, monad-loops, temporary @@ -109058,6 +109593,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hscharm" = callPackage + ({ mkDerivation, base, random, random-shuffle }: + mkDerivation { + pname = "hscharm"; + version = "0.0.2"; + sha256 = "17713j542kph74n8rvjrx847r19yk96dz80n04nl8w6vzabj5wng"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base random random-shuffle ]; + description = "minimal ncurses-like library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsclock" = callPackage ({ mkDerivation, base, cairo, glib, gtk, old-time }: mkDerivation { @@ -112276,16 +112825,16 @@ self: { "htoml-megaparsec" = callPackage ({ mkDerivation, aeson, base, bytestring, composition-prelude , containers, criterion, deepseq, file-embed, hspec, megaparsec - , mtl, old-locale, tasty, tasty-hspec, tasty-hunit, text, time + , mtl, tasty, tasty-hspec, tasty-hunit, text, time , unordered-containers, vector }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.1.0.2"; - sha256 = "0w59c20d4g64lldd6xfs82di56dbixmh6win6x80ddb1m0y9iaxd"; + version = "1.1.0.3"; + sha256 = "0bzja2n7hxj530d3pfh58zn29vapl341fy7x6ggvp5sfgsysg7ll"; libraryHaskellDepends = [ - base composition-prelude containers deepseq megaparsec mtl - old-locale text time unordered-containers vector + base composition-prelude containers deepseq megaparsec mtl text + time unordered-containers vector ]; testHaskellDepends = [ aeson base bytestring containers file-embed hspec megaparsec tasty @@ -114278,6 +114827,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hspec-hedgehog_0_1_0_3" = callPackage + ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: + mkDerivation { + pname = "hw-hspec-hedgehog"; + version = "0.1.0.3"; + sha256 = "0bnqvbh8jkpnannfgx1ghv5b4qvj37w1p29ap730s2bbfpsaldq2"; + libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; + testHaskellDepends = [ base hedgehog hspec ]; + homepage = "https://github.com/haskell-works/hw-hspec-hedgehog#readme"; + description = "Interoperability between hspec and hedgehog"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -117532,10 +118095,10 @@ self: { ({ mkDerivation, base, lens }: mkDerivation { pname = "impossible"; - version = "1.0.0"; - sha256 = "1qkpwa2am439bpngiiwgh14cg19d4mp6s9qqa890rvm5pqh8skvz"; + version = "1.1.1"; + sha256 = "0drq4rzbljql51hc2d8ldsm6xhsj7imlsxclivmf3lr9lykkp0p1"; libraryHaskellDepends = [ base lens ]; - homepage = "https://github.com/wdanilo/impossible"; + homepage = "https://github.com/luna/impossible"; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -121984,6 +122547,39 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_7_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances + , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.7.0.0"; + sha256 = "051rjqfskizgm9j927zh500q54lii3scldsymgcdfbaw40d0mncc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 + ]; + executableHaskellDepends = [ aeson base bytestring lens mtl ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + homepage = "https://github.com/frasertweedale/hs-jose"; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -122009,6 +122605,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jot" = callPackage + ({ mkDerivation, base, data-default, dhall, docopt, extra, filepath + , process, time, turtle, yaml + }: + mkDerivation { + pname = "jot"; + version = "0.1.0.3"; + sha256 = "1rw5ah60kfazycpf2f0sin98rba99d06gkqfci30m64wpkcm9l4g"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base data-default dhall docopt extra filepath process time turtle + yaml + ]; + homepage = "http://gitlab.com/locallycompact/jot"; + description = "Tiny markdown notebook"; + license = stdenv.lib.licenses.isc; + }) {}; + "jpeg" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -122776,8 +123391,8 @@ self: { pname = "json-rpc-server"; version = "0.2.6.0"; sha256 = "1xfcxbwri9a5p3xxbc4kvr1kqdnm4c1axd8kgb8dglabffbrk7hn"; - revision = "3"; - editedCabalFile = "1bn1w9vwif05hjdprc354if3mccaw9gari233x0l6p35188idmsc"; + revision = "4"; + editedCabalFile = "19nasv4sxjn3j0xvr1pd9x6bf8f8566wwd15y3wwll89bpnyd4z9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123865,8 +124480,8 @@ self: { }: mkDerivation { pname = "kansas-lava"; - version = "0.2.4.4"; - sha256 = "0pbciwh79y1pzqlpd2f8pm5w8bjq5bs47slqw71q09f7jlgs0i7d"; + version = "0.2.4.5"; + sha256 = "0pcxmsf18ykvf1mbm3w8qn86rdmr69ilcakrgidl1ag6liq1s6zc"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -126560,8 +127175,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.2.0.4"; - sha256 = "15rrikfj39ybcg6yq34zfbwjaics0kgxr5kvfvjq8q8plxlgwrj4"; + version = "1.2.0.5"; + sha256 = "13slgzdcgdbibxnk4nk6xgkvhsz2f87m6xj0mz5ccmjfb35hv63d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -127962,8 +128577,8 @@ self: { pname = "lattices"; version = "1.7.1"; sha256 = "0bcv28dazaz0n166jbd579vim0hr4c20rmg0s34284fdr6p50m3x"; - revision = "1"; - editedCabalFile = "1h68xxzy90i7nggyh67f4744zk9a4zv4lb5ag9dwp126acvg2c9n"; + revision = "2"; + editedCabalFile = "0ngxvs48hqdr5353fbblcrq5hqrwr89xl39akxg8rkridkr3hq96"; libraryHaskellDepends = [ base base-compat containers deepseq hashable semigroupoids tagged universe-base universe-reverse-instances unordered-containers @@ -128030,6 +128645,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "layered-state" = callPackage + ({ mkDerivation, base, constraints, criterion, data-default + , deepseq, either, exceptions, kan-extensions, lens, lens-utils + , monad-branch, monoid, mtl, mtl-c, primitive, profunctors + , prologue, timeit, transformers, typelevel + }: + mkDerivation { + pname = "layered-state"; + version = "1.1.2"; + sha256 = "1z9xz9nvzlqvzrp4dva9skci70g70lzzf5d5d38ilxvfk7kh56h6"; + libraryHaskellDepends = [ + base constraints data-default exceptions lens lens-utils + monad-branch monoid mtl primitive profunctors prologue transformers + typelevel + ]; + benchmarkHaskellDepends = [ + criterion deepseq either kan-extensions mtl-c timeit + ]; + homepage = "https://github.com/luna/layered-state"; + description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; + license = stdenv.lib.licenses.asl20; + }) {}; + "layers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -128101,6 +128739,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "layouting" = callPackage + ({ mkDerivation, base, container, layered-state, prologue + , terminal-text, text + }: + mkDerivation { + pname = "layouting"; + version = "1.1.2"; + sha256 = "1j3bki62ldi5gbl3asa31rjjlah2842rhgylxwab13c3r50a7p85"; + libraryHaskellDepends = [ + base container layered-state prologue terminal-text text + ]; + homepage = "https://github.com/luna/layouting"; + description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers."; + license = stdenv.lib.licenses.asl20; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -128560,6 +129214,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "left4deadrl" = callPackage + ({ mkDerivation, base, hscharm, random, random-shuffle }: + mkDerivation { + pname = "left4deadrl"; + version = "0.0.2"; + sha256 = "1lwpkhlhiy8dbw3ln0dz65ci8my7cmqs7d08f5wy728ixmmcn84w"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base hscharm random random-shuffle ]; + description = "left4dead-inspired roguelike"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "legion" = callPackage ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring , canteven-http, conduit, conduit-extra, containers @@ -128805,6 +129472,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-accelerate_0_2_0_0" = callPackage + ({ mkDerivation, accelerate, base, lens }: + mkDerivation { + pname = "lens-accelerate"; + version = "0.2.0.0"; + sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk"; + libraryHaskellDepends = [ accelerate base lens ]; + homepage = "https://github.com/tmcdonell/lens-accelerate"; + description = "Instances to mix lens with accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-action" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant , directory, doctest, filepath, lens, mtl, profunctors @@ -129079,13 +129759,17 @@ self: { }) {}; "lens-utils" = callPackage - ({ mkDerivation, base, lens }: + ({ mkDerivation, aeson, base, containers, data-default, lens + , monoid, template-haskell + }: mkDerivation { pname = "lens-utils"; - version = "1.2"; - sha256 = "1ysr9ph03f8klvnbhvzjn45vsnxbfp1ry34lbcrhdm6gy7x0maib"; - libraryHaskellDepends = [ base lens ]; - homepage = "https://github.com/wdanilo/lens-utils"; + version = "1.4.2"; + sha256 = "1sgsahb2cgfhbv3vw0h1cqls5g5kgbq9crx4w0rfjxcwk9d5jzds"; + libraryHaskellDepends = [ + aeson base containers data-default lens monoid template-haskell + ]; + homepage = "https://github.com/luna/lens-utils"; description = "Collection of missing lens utilities"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -129160,6 +129844,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "lentil_1_0_11_3" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip + , filepath, hspec, natural-sort, optparse-applicative, parsec + , pipes, regex-tdfa, semigroups, terminal-progress-bar, text + , transformers + }: + mkDerivation { + pname = "lentil"; + version = "1.0.11.3"; + sha256 = "0kb9fydcv0skp94bhvhbqggam8vrq2wv5iradxmggaf41h0ly123"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath natural-sort + optparse-applicative parsec pipes regex-tdfa semigroups + terminal-progress-bar text transformers + ]; + testHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath hspec + natural-sort optparse-applicative parsec pipes regex-tdfa + semigroups terminal-progress-bar text transformers + ]; + homepage = "http://www.ariis.it/static/articles/lentil/page.html"; + description = "frugal issue tracker"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lenz" = callPackage ({ mkDerivation, base, base-unicode-symbols, hs-functors , transformers @@ -130726,6 +131438,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear-accelerate_0_6_0_0" = callPackage + ({ mkDerivation, accelerate, base, Cabal, cabal-doctest + , distributive, doctest, lens, linear + }: + mkDerivation { + pname = "linear-accelerate"; + version = "0.6.0.0"; + sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + accelerate base distributive lens linear + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/linear-accelerate/"; + description = "Lifting linear vector spaces into Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-algebra-cblas" = callPackage ({ mkDerivation, base, ieee754, QuickCheck, storable-complex , test-framework, test-framework-quickcheck2, vector @@ -133051,6 +133782,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-warper_1_8_11" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, containers + , data-default, deepseq, directory, filepath, fmt, hspec + , hspec-discover, HUnit, lifted-async, markdown-unlit, microlens + , microlens-mtl, microlens-platform, mmorph, monad-control + , monad-loops, mtl, o-clock, QuickCheck, text, time, transformers + , transformers-base, universum, unix, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "log-warper"; + version = "1.8.11"; + sha256 = "0xhvipk5dlv7r2pmgn5mf46rrz092xhm6ar611y5lrr99i2kg172"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base containers deepseq directory filepath fmt + lifted-async microlens-platform mmorph monad-control monad-loops + mtl o-clock text time transformers transformers-base universum unix + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + base markdown-unlit microlens monad-control mtl o-clock text + universum yaml + ]; + testHaskellDepends = [ + async base data-default directory filepath hspec HUnit + microlens-mtl QuickCheck universum unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/serokell/log-warper"; + description = "Flexible, configurable, monadic and pretty logging"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log2json" = callPackage ({ mkDerivation, base, containers, json, parsec }: mkDerivation { @@ -133984,8 +134751,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "1"; - editedCabalFile = "0axg26s9gssg3ig613rnqj5v4aczki4kgyqmnd208kljkawq6c7k"; + revision = "2"; + editedCabalFile = "0ypilhv8im5vqwdy6wk9ql2dlpr4cykag6ikvyjapl8bpyfm44xa"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -134256,6 +135023,8 @@ self: { pname = "lucid"; version = "2.9.10"; sha256 = "14238cnrvkbr81hpaqg1r342sryj8k0p6igkwf140s9phfpdzry0"; + revision = "1"; + editedCabalFile = "0n94x2havrvks85z8azsa4pvz33amhb444cias3kfxmkyvypn5ah"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -135106,8 +135875,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.2"; - sha256 = "1g02ky5a1fy9g8sp1i3r7m1gjkajza3npj8dqr0chfxkm8ki6hfx"; + version = "4.0.2.6"; + sha256 = "079100sdqh4g7mlbf7p1j04r7g6c6b3q58nm4qiy8yrdvbzjdrhv"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -135383,6 +136152,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "main-tester" = callPackage + ({ mkDerivation, base, bytestring, directory, doctest, hspec + , hspec-core, QuickCheck, text + }: + mkDerivation { + pname = "main-tester"; + version = "0.1.0.0"; + sha256 = "0sagm9fkdgjv8x602bjj32glcrivjf3yz47gpbbm48k0mk0dj2dc"; + libraryHaskellDepends = [ base bytestring directory ]; + testHaskellDepends = [ + base bytestring doctest hspec hspec-core QuickCheck text + ]; + homepage = "https://gitlab.com/igrep/main-tester#readme"; + description = "Capture stdout/stderr/exit code, and replace stdin of your main function"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mainland-pretty" = callPackage ({ mkDerivation, base, containers, srcloc, text, transformers }: mkDerivation { @@ -137024,8 +137810,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "40800.0.0"; - sha256 = "0wzgy39halqd6bm0wvcsnk4l5ngdr4nwqbqk46jgnfb99nwsd3z6"; + version = "40800.0.2"; + sha256 = "0fgk0my3r0vcw545xqjcda8ikj5cbfzgg9vxfs3jzdcnsa0rgcyf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137041,8 +137827,8 @@ self: { base base-compat brick bytestring cheapskate checkers config-ini connection containers directory filepath hashable Hclip mattermost-api mattermost-api-qc microlens-platform mtl process - quickcheck-text stm strict string-conversions tasty tasty-hunit - tasty-quickcheck text text-zipper time timezone-olson + quickcheck-text semigroups stm strict string-conversions tasty + tasty-hunit tasty-quickcheck text text-zipper time timezone-olson timezone-series transformers Unique unordered-containers vector vty xdg-basedir ]; @@ -137060,8 +137846,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40800.0.0"; - sha256 = "0yjs97c4rf2idj88y5gnkdvshlaz49zna1ssx1d910gm5b5cnqy5"; + version = "40800.0.2"; + sha256 = "1l2yb9nvy2haw5kyjjij465g45w8xm8vm97jbkx5jb3p4cs44xl8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137085,8 +137871,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40800.0.0"; - sha256 = "1j9f291s51a8i55y338kcvfkmlb3xsd0c4cjh0nl97x7p30dxcm6"; + version = "40800.0.2"; + sha256 = "04whpcbcd5cqnwfrskk3r2gjmyvap2m7d8xsjdry56kil6iqznk5"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -140137,6 +140923,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mltool_0_2_0_0" = callPackage + ({ mkDerivation, ascii-progress, base, deepseq, hmatrix + , hmatrix-gsl, hmatrix-morpheus, HUnit, MonadRandom, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "mltool"; + version = "0.2.0.0"; + sha256 = "0yjq9wbvni9sgh966jccfcsm6ajicrfkgvwg08383rwnsqbbjm8q"; + libraryHaskellDepends = [ + ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-morpheus + MonadRandom random vector + ]; + testHaskellDepends = [ + base hmatrix hmatrix-morpheus HUnit MonadRandom random + test-framework test-framework-hunit test-framework-quickcheck2 + vector + ]; + homepage = "https://github.com/alexander-ignatyev/mltool"; + description = "Machine Learning Toolbox"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmap" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -140774,6 +141585,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-branch" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "monad-branch"; + version = "1.0.3"; + sha256 = "15nk9lvwz4s6lx8g08x5npai0bk13s6mj26vz6biwy3shpf5v11r"; + libraryHaskellDepends = [ base mtl transformers ]; + homepage = "https://github.com/luna/monad-branch"; + description = "Monadic abstraction for computations that can be branched and run independently"; + license = stdenv.lib.licenses.asl20; + }) {}; + "monad-classes" = callPackage ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph , monad-control, peano, reflection, tasty, tasty-hunit @@ -142323,6 +143146,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monoid" = callPackage + ({ mkDerivation, base, containers, lens, mtl }: + mkDerivation { + pname = "monoid"; + version = "0.1.8"; + sha256 = "15mwj4w46wszawhiabykamaf020m795zg017jb2j49gpzk8abqjf"; + libraryHaskellDepends = [ base containers lens mtl ]; + homepage = "https://github.com/luna/monoid"; + description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used."; + license = stdenv.lib.licenses.asl20; + }) {}; + "monoid-absorbing" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -142350,6 +143185,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoid-extras_0_4_3" = callPackage + ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups + }: + mkDerivation { + pname = "monoid-extras"; + version = "0.4.3"; + sha256 = "1c2zdsyq0iyagzp9y64j75nxvpbjr5y3fdg8cd1pkfqgms977qsr"; + revision = "1"; + editedCabalFile = "08961ibwiqks8qw5cwpkzpz3acrlrd48l2sl1qny96gycaslzrps"; + libraryHaskellDepends = [ base groups semigroupoids semigroups ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Various extra monoid-related definitions and utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoid-owns" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -146573,8 +147424,8 @@ self: { ({ mkDerivation, base, netlist, pretty }: mkDerivation { pname = "netlist-to-vhdl"; - version = "0.3.2"; - sha256 = "107pkkihj62qjkfwrnhwfscpph5r76lx6r3s0m3b0dbsf1jy2a61"; + version = "0.3.3"; + sha256 = "1f62l4i1l1z47gbrv49xx5y78ykcf6iq6bish3sx5fw46mhcr1j4"; libraryHaskellDepends = [ base netlist pretty ]; description = "Convert a Netlist AST to VHDL"; license = stdenv.lib.licenses.bsd3; @@ -148621,6 +149472,21 @@ self: { broken = true; }) {Nmis = null;}; + "nn" = callPackage + ({ mkDerivation, base, random, split, tasty, tasty-hspec + , tasty-quickcheck + }: + mkDerivation { + pname = "nn"; + version = "0.2.0"; + sha256 = "1jl267495x7rc34x35dzrwb05z57w1w97vzgj774ld6z2w1yri7l"; + libraryHaskellDepends = [ base random split ]; + testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ]; + homepage = "https://github.com/saschagrunert/nn#readme"; + description = "A tiny neural network"; + license = stdenv.lib.licenses.mit; + }) {}; + "nntp" = callPackage ({ mkDerivation, base, bytestring, monad-loops, mtl, network , old-locale, parsec, time @@ -149763,52 +150629,76 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask_0_2_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "numhask"; + version = "0.2.0.0"; + sha256 = "1n465rjgmpwjixnnwn054323rg55abbj98brqzw4ff17hrvy97g0"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/tonyday567/numhask#readme"; + description = "numeric classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, deepseq, dimensions - , distributive, doctest, ghc-typelits-natnormalise, numhask - , protolude, QuickCheck, singletons, tasty, tasty-quickcheck - , typelits-witnesses, vector + , distributive, doctest, numhask-prelude, protolude, QuickCheck + , singletons, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "numhask-array"; - version = "0.1.1.0"; - sha256 = "0qdlc8ipjb6p5hcp7kvjspa3yjjdsjah1k5c35w6njy0ld9rdi54"; + version = "0.2.0.1"; + sha256 = "05y41d8xnrzgrb5w6skkac5hr6c7npwzmryx308cd0lp4nbfmvql"; libraryHaskellDepends = [ - adjunctions base deepseq dimensions distributive - ghc-typelits-natnormalise numhask protolude QuickCheck singletons - typelits-witnesses vector + adjunctions base deepseq dimensions distributive numhask-prelude + protolude QuickCheck singletons vector ]; testHaskellDepends = [ - base doctest numhask QuickCheck tasty tasty-quickcheck + base doctest numhask-prelude tasty tasty-quickcheck ]; homepage = "https://github.com/tonyday567/numhask-array#readme"; - description = "See readme.md"; + description = "n-dimensional arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numhask-histogram" = callPackage - ({ mkDerivation, base, containers, doctest, foldl, HUnit, numhask - , numhask-range, protolude, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tdigest + ({ mkDerivation, base, containers, doctest, foldl, numhask-prelude + , numhask-range, protolude, tasty, tdigest }: mkDerivation { pname = "numhask-histogram"; - version = "0.0.1.0"; - sha256 = "1s8z2fwgrnsaq0w9zda5rpf9dcrd51dqaq118r6pi2r7y1vwzd6k"; + version = "0.1.0.0"; + sha256 = "1ql07s8l9ci4k69y8g7x4227z5shdi5y8crqxqv45m6xcafhrv46"; libraryHaskellDepends = [ - base containers foldl numhask numhask-range protolude tdigest - ]; - testHaskellDepends = [ - base doctest HUnit protolude QuickCheck tasty tasty-hunit - tasty-quickcheck + base containers foldl numhask-prelude numhask-range tdigest ]; + testHaskellDepends = [ base doctest protolude tasty ]; homepage = "https://github.com/tonyday567/numhask-histogram#readme"; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask-prelude" = callPackage + ({ mkDerivation, base, doctest, numhask, protolude, QuickCheck + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "numhask-prelude"; + version = "0.0.3.0"; + sha256 = "128hnq32826d2rmrlik4p0c72jnsy586gz9lgfk7hnx0fqpr94gy"; + libraryHaskellDepends = [ + base numhask protolude QuickCheck tasty tasty-quickcheck + ]; + testHaskellDepends = [ base doctest tasty ]; + homepage = "https://github.com/tonyday567/numhask#readme"; + description = "A numeric prelude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "numhask-range" = callPackage ({ mkDerivation, adjunctions, base, distributive, doctest, numhask , protolude, QuickCheck, semigroupoids, tasty @@ -149828,6 +150718,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "numhask-range_0_2_0_0" = callPackage + ({ mkDerivation, adjunctions, base, distributive, doctest + , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty + }: + mkDerivation { + pname = "numhask-range"; + version = "0.2.0.0"; + sha256 = "16al3f6w7g3616baz2xqp7pxlhzikchkr0l7qn7qif827qxmwgrz"; + libraryHaskellDepends = [ + adjunctions base distributive numhask-prelude protolude QuickCheck + semigroupoids + ]; + testHaskellDepends = [ base doctest numhask-prelude tasty ]; + homepage = "https://github.com/tonyday567/numhask-range#readme"; + description = "Numbers that are range representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nums" = callPackage ({ mkDerivation }: mkDerivation { @@ -150100,6 +151009,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "oasis-xrd" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , text, time, uri-bytestring, xml-conduit, xml-conduit-writer + }: + mkDerivation { + pname = "oasis-xrd"; + version = "1.0"; + sha256 = "105m258yqfdmp1n7gd824gsry07xqlhfnpla2kb7sn36nckqr3a0"; + revision = "1"; + editedCabalFile = "1jwvncyyn8njzhjdgqwakqfddp34h26abnhypzbdsgn4nyxad1qs"; + libraryHaskellDepends = [ + aeson base bytestring containers text time uri-bytestring + xml-conduit xml-conduit-writer + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers text time + uri-bytestring xml-conduit xml-conduit-writer + ]; + homepage = "https://gitlab.com/dpwiz/oasis-xrd"; + description = "Extensible Resource Descriptor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "oauth10a" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash, entropy, http-types, time, transformers @@ -151048,6 +151980,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "online_0_2_2_0" = callPackage + ({ mkDerivation, base, doctest, foldl, formatting, numhask-prelude + , optparse-generic, perf, protolude, scientific, tasty, tdigest + , text, vector, vector-algorithms + }: + mkDerivation { + pname = "online"; + version = "0.2.2.0"; + sha256 = "0k51wjj6ik7r65gp1kzkq1n7y8yxjiracs8i1yx2slz9jnfasgy5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base foldl numhask-prelude protolude tdigest vector + vector-algorithms + ]; + executableHaskellDepends = [ + base foldl formatting numhask-prelude optparse-generic perf + protolude scientific tdigest text + ]; + testHaskellDepends = [ base doctest protolude tasty ]; + homepage = "https://github.com/tonyday567/online#readme"; + description = "online statistics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "only" = callPackage ({ mkDerivation, base, parsec, regex-compat }: mkDerivation { @@ -151109,6 +152067,8 @@ self: { pname = "opaleye"; version = "0.6.1.0"; sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l"; + revision = "1"; + editedCabalFile = "07sz4a506hlx8da2ppiglja6hm9ipb2myh6s702ac6xx700cnl7f"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -153076,8 +154036,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "packcheck"; - version = "0.2.0"; - sha256 = "0frxr78vkwm0yjxz1rq71h8b01krdidi19ld1yragkfk54krcz1n"; + version = "0.3.0"; + sha256 = "02ixa91wp0jxdc046gi5qxyyw332znkgknfz5chf4j3ydn7qjlha"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; @@ -153321,6 +154281,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pads-haskell" = callPackage + ({ mkDerivation, base, byteorder, bytestring, Cabal, containers + , directory, Glob, haskell-src, haskell-src-meta, HUnit + , mainland-pretty, mtl, normaldistribution, old-locale, parsec + , QuickCheck, random, regex-posix, syb, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , th-lift, time, transformers + }: + mkDerivation { + pname = "pads-haskell"; + version = "0.0.0.1"; + sha256 = "1glf9zfzl8lg6hvqzh76y7kpi1d8jhxgxplnkzz4pdzrh1dfzm9a"; + revision = "1"; + editedCabalFile = "1nfh2i2g4xzqr534hkwa7gygkgsdvyjk4g075n78dp6r48zynbz6"; + libraryHaskellDepends = [ + base byteorder bytestring containers Glob haskell-src + haskell-src-meta HUnit mainland-pretty normaldistribution + old-locale parsec random regex-posix syb template-haskell th-lift + time transformers + ]; + testHaskellDepends = [ + base byteorder bytestring Cabal containers directory Glob + haskell-src haskell-src-meta HUnit mainland-pretty mtl old-locale + parsec QuickCheck regex-posix syb template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 th-lift time + transformers + ]; + homepage = "http://www.padsproj.org"; + description = "PADS data description language for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pagarme" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, lens, text , wreq @@ -154164,8 +155156,8 @@ self: { ({ mkDerivation, base, semigroups }: mkDerivation { pname = "papa-base-export"; - version = "0.3.1"; - sha256 = "13gd3ldpiwmms3di80smk68x4mf9nigy0irz506cayd9bwqpw3jv"; + version = "0.4"; + sha256 = "120b3ks9h3m9w6z365hmqrcp349kh3w8ii4kgki1zxjhh9z05mnm"; libraryHaskellDepends = [ base semigroups ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; @@ -156918,6 +157910,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "perf_0_4_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, doctest, foldl, rdtsc + , text, time, transformers + }: + mkDerivation { + pname = "perf"; + version = "0.4.0.1"; + sha256 = "1am2wzj43gi0naz5mwpvja9i005g05d6gpkqw0qvdy63mddz9b96"; + libraryHaskellDepends = [ + base containers deepseq foldl rdtsc text time transformers + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/tonyday567/perf#readme"; + description = "Low-level run time measurement"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "perfect-hash-generator" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-ordlist , directory, filepath, hashable, HUnit, optparse-applicative @@ -158574,6 +159584,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pig" = callPackage + ({ mkDerivation, base, containers, random, random-shuffle }: + mkDerivation { + pname = "pig"; + version = "0.0.1"; + sha256 = "0fh8lv85h2w6gs7zv1bqb4gc4id84c3vp3ivdrd9cvnxksr50ffr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers random random-shuffle ]; + executableHaskellDepends = [ + base containers random random-shuffle + ]; + description = "dice game"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "piki" = callPackage ({ mkDerivation, base, mtl, parsec, text }: mkDerivation { @@ -159739,16 +160765,17 @@ self: { ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest , foldl, free, microlens, pipes, pipes-bytestring , pipes-concurrency, pipes-group, pipes-parse, pipes-safe - , pipes-text, tasty, tasty-hunit, text, transformers, void + , pipes-text, streaming, tasty, tasty-hunit, text, transformers + , void }: mkDerivation { pname = "pipes-transduce"; - version = "0.4.1"; - sha256 = "10lf6fnnq1zf9v04l00f1nd4s6qq6a0pcdl72vxczmj6rn3c0kgq"; + version = "0.4.3.2"; + sha256 = "0q4xc2r0yzyj6gpg16z9scdxm0a3fjzsm1r6qihkr2zks9sac36x"; libraryHaskellDepends = [ base bifunctors bytestring conceit foldl free microlens pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse - pipes-safe pipes-text text transformers void + pipes-safe pipes-text streaming text transformers void ]; testHaskellDepends = [ base doctest foldl free pipes tasty tasty-hunit text @@ -160211,6 +161238,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "plex" = callPackage + ({ mkDerivation, async, base, bytestring, deepseq, hspec + , QuickCheck, unix + }: + mkDerivation { + pname = "plex"; + version = "0.2.0.0"; + sha256 = "0y0a3d30k4d3111smfidzzv1z7cq0i47wxvyh9iwbnn223s3446y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ async base bytestring deepseq unix ]; + testHaskellDepends = [ + async base bytestring deepseq hspec QuickCheck unix + ]; + homepage = "https://github.com/phlummox/hs-plex#readme"; + description = "run a subprocess, combining stdout and stderr"; + license = stdenv.lib.licenses.mit; + }) {}; + "plist" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, hxt }: mkDerivation { @@ -162985,23 +164031,20 @@ self: { "preamble" = callPackage ({ mkDerivation, aeson, base, basic-prelude, exceptions , fast-logger, lens, lifted-base, monad-control, monad-logger - , MonadRandom, mtl, network, resourcet, safe, shakers - , template-haskell, text, text-manipulate, time, transformers-base + , MonadRandom, mtl, network, resourcet, safe, template-haskell + , text, text-manipulate, time, transformers-base , unordered-containers, uuid }: mkDerivation { pname = "preamble"; - version = "0.0.59"; - sha256 = "0i9blxkdjm4fm288qr6isl3jyjrw6x6x58z6lvaj62xr3y4rqd43"; - isLibrary = true; - isExecutable = true; + version = "0.0.60"; + sha256 = "1ygpyaniv4f9ahmnrpkirhmfry40afqwaici4ksrnr3pz64fsll5"; libraryHaskellDepends = [ aeson base basic-prelude exceptions fast-logger lens lifted-base monad-control monad-logger MonadRandom mtl network resourcet safe template-haskell text text-manipulate time transformers-base unordered-containers uuid ]; - executableHaskellDepends = [ base shakers ]; homepage = "https://github.com/swift-nav/preamble"; description = "Yet another prelude"; license = stdenv.lib.licenses.mit; @@ -164453,8 +165496,8 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.9.2.1"; - sha256 = "1p1nfb09sg9krwm7k6j8y5ggbc28yddlkf2yifs06iqfkcmbsbm6"; + version = "0.9.3.0"; + sha256 = "06x2xcjbhwhnwyml8kxqa5wl89mr9fbbpgplysd68d01yhm2dnmr"; libraryHaskellDepends = [ base bifunctors bytestring conceit free kan-extensions pipes pipes-bytestring pipes-concurrency pipes-parse pipes-safe @@ -164643,6 +165686,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "product-profunctors_0_10_0_0" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, criterion + , deepseq, profunctors, tagged, template-haskell + }: + mkDerivation { + pname = "product-profunctors"; + version = "0.10.0.0"; + sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; + libraryHaskellDepends = [ + base bifunctors contravariant profunctors tagged template-haskell + ]; + testHaskellDepends = [ base profunctors ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + homepage = "https://github.com/tomjaguarpaw/product-profunctors"; + description = "product-profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prof2dot" = callPackage ({ mkDerivation, base, containers, filepath, haskell98, parsec }: mkDerivation { @@ -165045,20 +166107,25 @@ self: { }) {}; "prologue" = callPackage - ({ mkDerivation, base, bifunctors, binary, cond, container, convert - , data-default, data-layer, errors, functor-utils, impossible, lens - , lens-utils, mtl, pretty-show, string-qq, text, transformers - , transformers-base, tuple, typelevel, vector + ({ mkDerivation, base, bifunctors, binary, comonad, cond, container + , convert, data-default, deepseq, deriving-compat, either, errors + , exceptions, functor-utils, ghc-prim, impossible, lens, lens-utils + , monoid, mtl, neat-interpolation, placeholders, pointed + , pretty-show, primitive, raw-strings-qq, recursion-schemes + , semigroupoids, string-qq, template-haskell, text, transformers + , transformers-base, typelevel, vector }: mkDerivation { pname = "prologue"; - version = "1.0.7"; - sha256 = "0nwk6m93c2mgzagzad1zkp5p6wnjdz668bw109vwwb0yi23c3s1p"; + version = "3.1.3"; + sha256 = "1nzm4hgjwpbxmvd1y1x58smxbk5ahfyygi22jwwyzqaknrgs5ara"; libraryHaskellDepends = [ - base bifunctors binary cond container convert data-default - data-layer errors functor-utils impossible lens lens-utils mtl - pretty-show string-qq text transformers transformers-base tuple - typelevel vector + base bifunctors binary comonad cond container convert data-default + deepseq deriving-compat either errors exceptions functor-utils + ghc-prim impossible lens lens-utils monoid mtl neat-interpolation + placeholders pointed pretty-show primitive raw-strings-qq + recursion-schemes semigroupoids string-qq template-haskell text + transformers transformers-base typelevel vector ]; homepage = "https://github.com/wdanilo/prologue"; description = "Better, more general Prelude exporting common utilities"; @@ -165972,8 +167039,8 @@ self: { }: mkDerivation { pname = "ptr"; - version = "0.16.2"; - sha256 = "0sa3akkhydyxr7caig8z6bjwiaarr171qazfbwm9kh8x1pdah5dv"; + version = "0.16.4"; + sha256 = "0na3by8mh43cd0xn1s1l7hi3mmm3damr9swgv6mzyg9lhilsndxb"; libraryHaskellDepends = [ base base-prelude bug bytestring contravariant mtl profunctors semigroups text time transformers @@ -166782,6 +167849,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pusher-http-haskell_1_5_1_4" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, hashable, hspec, http-client, http-types, memory + , QuickCheck, scientific, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.5.1.4"; + sha256 = "1h6dl0h9ybbnjqs834bd1n5w4cx0vdbmi52mqdk2y9y267qc9k4a"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hashable + http-client http-types memory text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite hspec + http-client http-types QuickCheck scientific text time transformers + unordered-containers vector + ]; + homepage = "https://github.com/pusher-community/pusher-http-haskell"; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -167892,15 +168985,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-classes_0_4_8" = callPackage + "quickcheck-classes_0_4_9" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, primitive , QuickCheck, semigroupoids, semigroups, tagged, transformers , vector }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.8"; - sha256 = "1smsm1jjb2sr6b1d064yf7cj5bad22v4xv6rmjb3adaif34iw5fy"; + version = "0.4.9"; + sha256 = "1m5qszs50hjfycds84arfcfqj7z4l622479bd2w55vin49mp12pn"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups tagged transformers @@ -167935,6 +169028,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.18"; sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55"; + revision = "1"; + editedCabalFile = "1sngfq3v71bvgjsl8cj5kh65m3fziwy8dkvwjzs0kxfrzr87faly"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific tagged text time @@ -168104,6 +169199,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-simple_0_1_0_3" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "quickcheck-simple"; + version = "0.1.0.3"; + sha256 = "08f87mqnm04sgi21q5snvr4li3zm4m86jydc3s4b71i9czy4q8wg"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Test properties and default-mains for QuickCheck"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-special" = callPackage ({ mkDerivation, base, QuickCheck, special-values }: mkDerivation { @@ -168665,18 +169772,14 @@ self: { }) {}; "radian" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , profunctors, QuickCheck, template-haskell - }: + ({ mkDerivation, base, HUnit, lens, profunctors }: mkDerivation { pname = "radian"; - version = "0.0.6"; - sha256 = "0p6caw8vnlzmamcka9wfsbgsfffgp2y6jjf5yyibvnb9av8zdnzp"; + version = "0.1"; + sha256 = "150vb9wk73avh8rrsz92y1fcwlm30w4k23lbdncb8ivinqhdi4pv"; libraryHaskellDepends = [ base profunctors ]; - testHaskellDepends = [ - base directory doctest filepath lens QuickCheck template-haskell - ]; - homepage = "https://github.com/NICTA/radian"; + testHaskellDepends = [ base HUnit lens ]; + homepage = "https://github.com/qfpl/radian"; description = "Isomorphisms for measurements that use radians"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -175378,8 +176481,8 @@ self: { }: mkDerivation { pname = "rio"; - version = "0.0.3.0"; - sha256 = "1mbxd2v0n0hbrmb1xh27snxxp1r8k87g4ijqsp99hnis8vmqmz84"; + version = "0.1.0.0"; + sha256 = "0k3r7859in1dyybc7lr3bqh91harf7g5yknwxmmsqnhlffzc6ygr"; libraryHaskellDepends = [ base bytestring containers deepseq directory exceptions filepath hashable microlens mtl primitive process text time typed-process @@ -175395,6 +176498,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio-orphans" = callPackage + ({ mkDerivation, base, exceptions, hspec, monad-control, resourcet + , rio, transformers-base + }: + mkDerivation { + pname = "rio-orphans"; + version = "0.1.0.0"; + sha256 = "09wy9h6smh532lrh13qzmni91yfb702x8i97r24d3ny6i3krzqi7"; + libraryHaskellDepends = [ + base exceptions monad-control resourcet rio transformers-base + ]; + testHaskellDepends = [ + base exceptions hspec monad-control resourcet rio transformers-base + ]; + homepage = "https://github.com/commercialhaskell/rio#readme"; + description = "Orphan instances for the RIO type in the rio package"; + license = stdenv.lib.licenses.mit; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -179136,6 +180258,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scotty_0_11_1" = callPackage + ({ mkDerivation, aeson, async, base, blaze-builder, bytestring + , case-insensitive, data-default-class, directory, exceptions, fail + , hpc-coveralls, hspec, hspec-discover, hspec-wai, http-types + , lifted-base, monad-control, mtl, nats, network, regex-compat + , text, transformers, transformers-base, transformers-compat, wai + , wai-extra, warp + }: + mkDerivation { + pname = "scotty"; + version = "0.11.1"; + sha256 = "1xcdfx43v1p2a20jjmnb70v2sm34iprn17ssa81fcfnabcn4blhw"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class exceptions fail http-types monad-control mtl + nats network regex-compat text transformers transformers-base + transformers-compat wai wai-extra warp + ]; + testHaskellDepends = [ + async base bytestring data-default-class directory hpc-coveralls + hspec hspec-wai http-types lifted-base network text wai + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/scotty-web/scotty"; + description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scotty-binding-play" = callPackage ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl , scotty, template-haskell, text, transformers @@ -182020,6 +183171,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-github-webhook_0_4_1_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, github, github-webhooks, http-types, memory, servant + , servant-server, string-conversions, text, transformers + , unordered-containers, wai, warp + }: + mkDerivation { + pname = "servant-github-webhook"; + version = "0.4.1.0"; + sha256 = "0v6gd7swhl58x3sqbb5cmn5ac6x1p5mg7jqbwk9ny9bzggz9pglb"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite github + github-webhooks http-types memory servant servant-server + string-conversions text transformers unordered-containers wai + ]; + testHaskellDepends = [ + aeson base bytestring servant-server text transformers wai warp + ]; + homepage = "https://github.com/tsani/servant-github-webhook"; + description = "Servant combinators to facilitate writing GitHub webhooks"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , deepseq, either, exceptions, hashable, haxl, hspec, http-client @@ -182285,10 +183460,8 @@ self: { ({ mkDerivation, base, safe, servant, servant-server, text }: mkDerivation { pname = "servant-pagination"; - version = "1.0.0"; - sha256 = "1cxd9sqryk619ss7x55w8xh4y3dkxl0gcdr3kawryzcm64qlgyja"; - revision = "1"; - editedCabalFile = "0y9mg8jaag07f89krsk2n3y635rjgmcym1kx130s7hb3h3ly7713"; + version = "2.0.0"; + sha256 = "1z6sr43ir9sl85x65yfj21s77y1fqwzfmrfgjlqdas2zygd3fhh3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base safe servant servant-server text ]; @@ -183887,6 +185060,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shake_0_16_4" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, directory + , extra, filepath, hashable, js-flot, js-jquery, primitive, process + , QuickCheck, random, time, transformers, unix + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "shake"; + version = "0.16.4"; + sha256 = "0dhlkcn1zsg1w97vzs1yrpkn6iwhlzh36dwclx2lafzbdjja6cmp"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process random time transformers unix + unordered-containers utf8-string + ]; + executableHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process random time transformers unix + unordered-containers utf8-string + ]; + testHaskellDepends = [ + base binary bytestring deepseq directory extra filepath hashable + js-flot js-jquery primitive process QuickCheck random time + transformers unix unordered-containers utf8-string + ]; + homepage = "https://shakebuild.com"; + description = "Build system library, like Make, but more accurate dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hashable , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext @@ -183924,15 +185131,16 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, Cabal, composition-prelude, directory, shake - , template-haskell + ({ mkDerivation, base, Cabal, composition-prelude, cpphs, directory + , shake, template-haskell }: mkDerivation { pname = "shake-ext"; - version = "2.9.0.1"; - sha256 = "1znql8sddxm8xxzhz4ibhvc29ni345airily5ky51vq6qbs0g4r2"; + version = "2.11.0.0"; + sha256 = "1ny8fj8wdshwp5df8skl3lsl5rp30fa8yclhh696pwk433pijc8f"; libraryHaskellDepends = [ - base Cabal composition-prelude directory shake template-haskell + base Cabal composition-prelude cpphs directory shake + template-haskell ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; @@ -184086,19 +185294,15 @@ self: { }) {}; "shakers" = callPackage - ({ mkDerivation, base, basic-prelude, deepseq, directory - , lifted-base, regex-compat, shake + ({ mkDerivation, base, basic-prelude, directory, lifted-base, shake }: mkDerivation { pname = "shakers"; - version = "0.0.42"; - sha256 = "020j1j5lpl5x0hxgscy1skx1fqw77w184h86rvgkq1kli7pp9kpk"; - isLibrary = true; - isExecutable = true; + version = "0.0.45"; + sha256 = "0abzw28861k3larph3i6kaqsx4zcbk25f69y47v4i61riwdxcj0j"; libraryHaskellDepends = [ - base basic-prelude deepseq directory lifted-base regex-compat shake + base basic-prelude directory lifted-base shake ]; - executableHaskellDepends = [ base ]; homepage = "https://github.com/swift-nav/shakers"; description = "Shake helpers"; license = stdenv.lib.licenses.mit; @@ -185871,6 +187075,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-src-utils" = callPackage + ({ mkDerivation, base, extra, tasty, tasty-hunit, text }: + mkDerivation { + pname = "simple-src-utils"; + version = "0.1"; + sha256 = "0cfa2l7a0c8kgr0707jnk2qzh12a2564bdzzynjzcdjdqda6d5ch"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ base extra text ]; + testHaskellDepends = [ base extra tasty tasty-hunit text ]; + homepage = "https://github.com/elaforge/simple-src-utils"; + description = "source code editing utilities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-stacked-vm" = callPackage ({ mkDerivation, array, base, binary-state, containers, filepath , mtl, parsec @@ -186988,8 +188208,8 @@ self: { }: mkDerivation { pname = "slate"; - version = "0.9.0.0"; - sha256 = "19619ladqp1faqdn4z2yrxvffpcr9k0s942s6rjg73i229hccv8f"; + version = "0.10.0.0"; + sha256 = "0f21bmv0dckdim27mm5m7vphci45h6fjbxyzpahai2nlydilhnc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190269,15 +191489,15 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "sparse-linear-algebra_0_3" = callPackage + "sparse-linear-algebra_0_3_1" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck , scientific, transformers, vector, vector-algorithms }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.3"; - sha256 = "10s3z0mva8hf9f2ckbpfkzdkhnixp73xli5yigh4d44662rzwqn1"; + version = "0.3.1"; + sha256 = "1jfwydr0pzph932h7jvnmp1d8qqrhxsq7rbb6cjbmga55s5pfqn7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers exceptions hspec mtl primitive QuickCheck @@ -190890,8 +192110,8 @@ self: { pname = "splitmix"; version = "0"; sha256 = "0qa86iflw1v8vqci8krj4kdvp648hnl8wx3wyhnd1c95jrla0fpi"; - revision = "1"; - editedCabalFile = "0dh4p3rzvx3zwj0bh5flf4qsiw831rb4vxmbh5jq45qkvry8z8hy"; + revision = "2"; + editedCabalFile = "0fl7z9lxkyvqk0d14d778j3lk8zi8jgncwq41gqi4z78a20xb2pg"; libraryHaskellDepends = [ base random time ]; testHaskellDepends = [ base base-compat bytestring random tf-random @@ -191474,7 +192694,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "squeal-postgresql_0_2_0_1" = callPackage + "squeal-postgresql_0_2_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest , generics-sop, lifted-base, mmorph, monad-control, mtl, network-ip , postgresql-binary, postgresql-libpq, resource-pool, scientific @@ -191482,8 +192702,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql"; - version = "0.2.0.1"; - sha256 = "1flpjfgf7ahgaraab9d26c5imp03f6ljkl10jzdc6f0kf2529fg8"; + version = "0.2.1.0"; + sha256 = "1qfz1c4yzjshgvc64plahy3aar96yvcmn2m5giyp17nrfgq266qs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193796,6 +195016,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stocks" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit, semigroups + }: + mkDerivation { + pname = "stocks"; + version = "0.1.0.0"; + sha256 = "10ws7mg0236iqkjclajwph2lb5719adkay5imaxrsj13d10f8ssq"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit semigroups + ]; + homepage = "https://github.com/dabcoder/stocks#readme"; + description = "Library for the IEX Trading API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stomp-conduit" = callPackage ({ mkDerivation, base, conduit, mime, mtl, resourcet, stomp-queue , stompl @@ -194422,6 +195657,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_1_6" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl + , resourcet, smallcheck, streaming, tasty, tasty-smallcheck + , transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.1.6"; + sha256 = "1lsklavhk6wcsgjr2rcwkkv827gnd9spv4zwz5i5zf3njvy27my1"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions mmorph mtl resourcet streaming + transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring smallcheck streaming tasty tasty-smallcheck + transformers + ]; + homepage = "https://github.com/haskell-streaming/streaming-bytestring"; + description = "effectful byte steams, or: bytestring io done right"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -196799,6 +198057,8 @@ self: { pname = "swagger2"; version = "2.2.1"; sha256 = "11i0yg2g4bw8pjz9p0w7qz7hpriji9zkiz3y5gr26pwb3fzab5qz"; + revision = "1"; + editedCabalFile = "00snyp95rjh3h7yqfwg3x4y9gjhypm6zfv45i2sag4w5cydvkzb5"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers generics-sop hashable @@ -201062,6 +202322,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "terminal-text" = callPackage + ({ mkDerivation, ansi-terminal, base, container, layered-state + , prologue, text + }: + mkDerivation { + pname = "terminal-text"; + version = "1.1.1"; + sha256 = "1jgdxqck3ck65mppi694w0f5x0547148y5agi100zggp8r3yxsy3"; + libraryHaskellDepends = [ + ansi-terminal base container layered-state prologue text + ]; + homepage = "https://github.com/luna/terminal-text"; + description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)"; + license = stdenv.lib.licenses.asl20; + }) {}; + "termination-combinators" = callPackage ({ mkDerivation, base, containers, contravariant }: mkDerivation { @@ -201981,8 +203257,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.5.0"; - sha256 = "127h2pw3p9ixx34jiql9kgpjbjmkmwigm56iklaz6wxd69zr0sfx"; + version = "0.1.5.1"; + sha256 = "14hmzsxhbqr95r7sbpziv897akdw8p54fhwh56j0h9hqnpwxxwgd"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -202342,8 +203618,8 @@ self: { }: mkDerivation { pname = "text-regex-replace"; - version = "0.1.1.1"; - sha256 = "0n0jk3qdcdhy3b91x7xkyc87xk3405g49qrgcfzb3ksr9qyw89rg"; + version = "0.1.1.2"; + sha256 = "1v6gjimq4qzldpc3ihvf0mn24n3mfk4vs87b7xzgmzk63sbpijyk"; libraryHaskellDepends = [ attoparsec base text text-icu ]; testHaskellDepends = [ base hspec QuickCheck smallcheck text text-icu @@ -202445,8 +203721,8 @@ self: { pname = "text-show"; version = "3.7.2"; sha256 = "0gb7y83w81zvfi7szb62d17w0qi7ca7ybri81adqk141c3cxc83s"; - revision = "1"; - editedCabalFile = "1iaa9scqwys9da98ya62jz2lyqia79ys8zq4hhcgb3l45x0ngc27"; + revision = "2"; + editedCabalFile = "0fjysjlmvvzvndxsni2ja92kr1pyqgl4dyc5c7x2ffaf02g9h2d2"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -202472,6 +203748,47 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show_3_7_3" = callPackage + ({ mkDerivation, array, base, base-compat-batteries, base-orphans + , bifunctors, bytestring, bytestring-builder, containers + , contravariant, criterion, deepseq, deriving-compat + , generic-deriving, ghc-boot-th, ghc-prim, hspec, hspec-discover + , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups + , tagged, template-haskell, text, th-abstraction, th-lift + , transformers, transformers-compat, void + }: + mkDerivation { + pname = "text-show"; + version = "3.7.3"; + sha256 = "1d8wmdndl8qsz90fb67xxbrprlmmp47p4f3ik6psp5m6r0cdvpzg"; + libraryHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers contravariant generic-deriving + ghc-boot-th ghc-prim integer-gmp nats semigroups tagged + template-haskell text th-abstraction th-lift transformers + transformers-compat void + ]; + testHaskellDepends = [ + array base base-compat-batteries base-orphans bifunctors bytestring + bytestring-builder containers contravariant deriving-compat + generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats + QuickCheck quickcheck-instances semigroups tagged template-haskell + text th-lift transformers transformers-compat void + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base base-compat-batteries bifunctors bytestring + bytestring-builder containers contravariant criterion deepseq + generic-deriving ghc-boot-th ghc-prim integer-gmp nats semigroups + tagged template-haskell text th-lift transformers + transformers-compat void + ]; + homepage = "https://github.com/RyanGlScott/text-show"; + description = "Efficient conversion of values into Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-show-instances" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring , containers, directory, generic-deriving, ghc-boot-th, ghc-prim @@ -202506,6 +203823,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-show-instances_3_6_4" = callPackage + ({ mkDerivation, base, base-compat-batteries, bifunctors, binary + , bytestring, containers, directory, generic-deriving, ghc-boot-th + , ghc-prim, haskeline, hoopl, hpc, hspec, hspec-discover + , old-locale, old-time, pretty, process, QuickCheck + , quickcheck-instances, random, semigroups, tagged + , template-haskell, terminfo, text, text-show, th-orphans, time + , transformers, transformers-compat, unix, unordered-containers + , vector, xhtml + }: + mkDerivation { + pname = "text-show-instances"; + version = "3.6.4"; + sha256 = "1a2aacy6l58b49868hhvqws4900rq9dpb8zwkb5cz45gsb7zpgjf"; + libraryHaskellDepends = [ + base base-compat-batteries bifunctors binary bytestring containers + directory ghc-boot-th haskeline hoopl hpc old-locale old-time + pretty process random semigroups tagged template-haskell terminfo + text text-show time transformers transformers-compat unix + unordered-containers vector xhtml + ]; + testHaskellDepends = [ + base base-compat-batteries bifunctors binary bytestring containers + directory generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc + hspec old-locale old-time pretty process QuickCheck + quickcheck-instances random semigroups tagged template-haskell + terminfo text text-show th-orphans time transformers + transformers-compat unix unordered-containers vector xhtml + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/RyanGlScott/text-show-instances"; + description = "Additional instances for text-show"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-stream-decode" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text }: @@ -203027,8 +204380,8 @@ self: { }: mkDerivation { pname = "th-format"; - version = "0.1.0.0"; - sha256 = "0vyvw9m28xb2playrzc533173p26jnlr8w1sbjc9w81y17676z3x"; + version = "0.1.1.0"; + sha256 = "1axan3icxz9yxkra2kb9r66h9h51v4zbjncd1xsvgiplqmwf6fjl"; libraryHaskellDepends = [ base Earley haskell-src-meta template-haskell text ]; @@ -204072,6 +205425,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tibetan-utils_0_1_1_5" = callPackage + ({ mkDerivation, base, composition-prelude, either, hspec + , hspec-megaparsec, megaparsec, text, text-show + }: + mkDerivation { + pname = "tibetan-utils"; + version = "0.1.1.5"; + sha256 = "09bqix2a2js98rhp748qx2i0vnxya3c6zvpjizbbnf5fwpspy01q"; + revision = "1"; + editedCabalFile = "0wmfv4dxjhjwsnkc8n7jfhbkvc7zwgcmkj7pvabmhcjzn5ch0dck"; + libraryHaskellDepends = [ + base composition-prelude either megaparsec text text-show + ]; + testHaskellDepends = [ + base hspec hspec-megaparsec megaparsec text + ]; + homepage = "https://github.com/vmchale/tibetan-utils#readme"; + description = "Parse and display tibetan numerals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tic-tac-toe" = callPackage ({ mkDerivation, base, glade, gtk, haskell98 }: mkDerivation { @@ -204493,6 +205868,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-locale-compat_0_1_1_4" = callPackage + ({ mkDerivation, base, old-locale, time }: + mkDerivation { + pname = "time-locale-compat"; + version = "0.1.1.4"; + sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj"; + libraryHaskellDepends = [ base old-locale time ]; + homepage = "https://github.com/khibino/haskell-time-locale-compat"; + description = "Compatibile module for time-format locale"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-locale-vietnamese" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -204849,6 +206237,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "timemap_0_0_7" = callPackage + ({ mkDerivation, base, containers, criterion, focus, hashable + , list-t, QuickCheck, quickcheck-instances, stm, stm-containers + , tasty, tasty-quickcheck, time, unordered-containers + }: + mkDerivation { + pname = "timemap"; + version = "0.0.7"; + sha256 = "06rx5q1b0r4chiiy9wi9k0q9qc4yxjk794hcq8dr7gpixgcrjjrg"; + libraryHaskellDepends = [ + base containers focus hashable list-t stm stm-containers time + unordered-containers + ]; + testHaskellDepends = [ + base containers focus hashable list-t QuickCheck + quickcheck-instances stm stm-containers tasty tasty-quickcheck time + unordered-containers + ]; + benchmarkHaskellDepends = [ + base containers criterion focus hashable list-t stm stm-containers + time unordered-containers + ]; + homepage = "https://github.com/athanclark/timemap#readme"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timeout" = callPackage ({ mkDerivation, base, exceptions, mtl, QuickCheck, tasty , tasty-quickcheck, time @@ -206365,10 +207780,8 @@ self: { }: mkDerivation { pname = "tracetree"; - version = "0.1.0.1"; - sha256 = "05aigx15kyvy19gdzh9si2avl5a7g8c4yzrcp7sgy1d94dwypl0j"; - revision = "1"; - editedCabalFile = "0yppsjjvq2zpk9k3fpi7q9msww4biz6hn02waschca65s2gbc84y"; + version = "0.1.0.2"; + sha256 = "0ga78nkrfg2hlanqfd65il0yw596n7xy9jx76l7sffs438mx4wvr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206805,6 +208218,8 @@ self: { pname = "transformers-lift"; version = "0.2.0.1"; sha256 = "17g03r5hpnygx0c9ybr9za6208ay0cjvz47rkyplv1r9zcivzn0b"; + revision = "1"; + editedCabalFile = "1dy9vg0drkm9ria80hlfx6v72ji2fwmv3ik7lryv7i7hk0bdzk8l"; libraryHaskellDepends = [ base transformers writer-cps-transformers ]; @@ -208165,8 +209580,8 @@ self: { ({ mkDerivation, base, containers, stm }: mkDerivation { pname = "turn-loop"; - version = "0.0.0"; - sha256 = "08v4kswmj2phsm4mxgvifjgxky72xpml0kkabvgxn39i87p1y572"; + version = "0.1.0"; + sha256 = "180yplkjf0c4n17a5ad2pakjwnh7830rldzmaqjj7gwcl3pg0lc6"; libraryHaskellDepends = [ base containers stm ]; homepage = "https://github.com/jxv/turn-loop#readme"; description = "Manage multiple turned-based sessions"; @@ -209553,15 +210968,15 @@ self: { "type-tree" = callPackage ({ mkDerivation, base, base-compat, Cabal, cabal-doctest - , containers, doctest, mtl, pretty, template-haskell + , containers, doctest, mtl, pretty, template-haskell, zenc }: mkDerivation { pname = "type-tree"; - version = "0.1.0.1"; - sha256 = "13jcaq977yk7vjqlq2rndhryvfy3cb56mlgyim1aza17ibf67jmp"; + version = "0.2.0.1"; + sha256 = "1gwa8dklc9hipgwcx068p4a49m9hgjh97qp5q3p5yai6jdg24j94"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base base-compat Cabal containers mtl pretty template-haskell + base base-compat containers mtl pretty template-haskell zenc ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/pikajude/type-tree"; @@ -209767,13 +211182,18 @@ self: { }) {}; "typelevel" = callPackage - ({ mkDerivation, base, pretty, pretty-show }: + ({ mkDerivation, base, constraints, convert, exceptions, lens, mtl + , pretty, pretty-show, primitive, transformers + }: mkDerivation { pname = "typelevel"; - version = "1.0.4"; - sha256 = "1hhx8zgsxpd5y2lp72c7dpyp7p678fjp63cqd14wiy9cdqd17j0w"; - libraryHaskellDepends = [ base pretty pretty-show ]; - homepage = "https://github.com/wdanilo/typelevel"; + version = "1.2.2"; + sha256 = "0baigk89rd5cdy35v3abvdwh7g11fnz2rpnzfy4ahr0q1lj395f5"; + libraryHaskellDepends = [ + base constraints convert exceptions lens mtl pretty pretty-show + primitive transformers + ]; + homepage = "https://github.com/luna/typelevel"; description = "Useful type level operations (type families and related operators)"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -210914,6 +212334,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unicode-transforms_0_3_4" = callPackage + ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath + , gauge, getopt-generics, optparse-applicative, path, path-io + , QuickCheck, split, text + }: + mkDerivation { + pname = "unicode-transforms"; + version = "0.3.4"; + sha256 = "0lh8bj6kxvpkmc14qa34vdrmcsis82mvnq6gs11ddqyjlz5sr7l2"; + libraryHaskellDepends = [ base bitarray bytestring text ]; + testHaskellDepends = [ + base deepseq getopt-generics QuickCheck split text + ]; + benchmarkHaskellDepends = [ + base deepseq filepath gauge optparse-applicative path path-io text + ]; + homepage = "http://github.com/harendra-kumar/unicode-transforms"; + description = "Unicode normalization"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unicoder" = callPackage ({ mkDerivation, attoparsec, base, data-default, directory , filepath, text, twitch @@ -211073,8 +212515,8 @@ self: { }: mkDerivation { pname = "uniprot-kb"; - version = "0.1.1.0"; - sha256 = "1c1z7pp11mrg17c7sa1bdk1z7562jwp0wdx8kvyl5lb4z5nnb4fw"; + version = "0.1.1.2"; + sha256 = "15mlmappp5k8lamgmpkmyahi5vimxk3a1821c6cabs28r4d9rywy"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec neat-interpolation QuickCheck text @@ -211843,6 +213285,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unpacked-containers" = callPackage + ({ mkDerivation, base, data-default-class, deepseq, ghc-prim }: + mkDerivation { + pname = "unpacked-containers"; + version = "0"; + sha256 = "17hm6r84kark7akn18lsvb0z6q5hcy4ap89nbkhxfhkchrqc6bfr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default-class deepseq ghc-prim + ]; + executableHaskellDepends = [ base ]; + doHaddock = false; + homepage = "http://github.com/ekmett/unpacked-containers/"; + description = "Unpacked containers via backpack"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "unroll-ghc-plugin" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -214027,6 +215487,8 @@ self: { pname = "vec"; version = "0.1"; sha256 = "0m70ld5vy96vca4wdm45q1ixwznl3yfj8jzil2kjfkzzac5fym5y"; + revision = "1"; + editedCabalFile = "0ffzb4jps0grlpbq99vx30cp4g7mad87mwcng3s1w6xqa96xr6xh"; libraryHaskellDepends = [ adjunctions base base-compat deepseq distributive fin hashable lens semigroupoids @@ -214540,6 +216002,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-text" = callPackage + ({ mkDerivation, base, binary, prologue, text, vector + , vector-binary-instances + }: + mkDerivation { + pname = "vector-text"; + version = "1.1.1"; + sha256 = "0hwis2xqj86j3smk9dnq9rpf8hraxzjczpajbkzma50g2kagj5r8"; + libraryHaskellDepends = [ + base binary prologue text vector vector-binary-instances + ]; + homepage = "https://github.com/luna/vector-text"; + description = "Text implementation based on unboxed char vector"; + license = stdenv.lib.licenses.asl20; + }) {}; + "vector-th-unbox" = callPackage ({ mkDerivation, base, data-default, template-haskell, vector }: mkDerivation { @@ -216827,6 +218305,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-static_0_8_2" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite + , directory, expiring-cache-map, filepath, http-types, memory + , mime-types, mtl, old-locale, semigroups, text, time, wai + }: + mkDerivation { + pname = "wai-middleware-static"; + version = "0.8.2"; + sha256 = "1z5yapcf8j9w71f2na30snmalsajlyi8an2f9qrjdmajabyykr0b"; + libraryHaskellDepends = [ + base bytestring containers cryptonite directory expiring-cache-map + filepath http-types memory mime-types mtl old-locale semigroups + text time wai + ]; + homepage = "https://github.com/scotty-web/wai-middleware-static"; + description = "WAI middleware that serves requests to static files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-static-caching" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, directory, expiring-cache-map, filepath, http-types @@ -217600,20 +219098,17 @@ self: { "warped" = callPackage ({ mkDerivation, aeson, base, blaze-builder, conduit, http-types - , lifted-async, monad-control, preamble, shakers, uuid, wai - , wai-conduit, wai-cors, warp + , lifted-async, monad-control, preamble, uuid, wai, wai-conduit + , wai-cors, warp }: mkDerivation { pname = "warped"; - version = "0.0.3"; - sha256 = "11iw5shjclns2d8baj98scm4jc773fxyzbjwbvvs6scan9d31z7m"; - isLibrary = true; - isExecutable = true; + version = "0.0.4"; + sha256 = "0gvsqabl1kh0vkzqiijkndk77jdc6md2c2p1f8bilrliqq2p21gq"; libraryHaskellDepends = [ aeson base blaze-builder conduit http-types lifted-async monad-control preamble uuid wai wai-conduit wai-cors warp ]; - executableHaskellDepends = [ base shakers ]; homepage = "https://github.com/swift-nav/warped"; description = "Warp and Wai Library"; license = stdenv.lib.licenses.mit; @@ -217888,15 +219383,15 @@ self: { }: mkDerivation { pname = "web-inv-route"; - version = "0.1.1"; - sha256 = "16iv72jyay844668rnzmk3w98ia5cdijg8hpzy7qdhc29n3p2kzf"; + version = "0.1.2"; + sha256 = "1qhs2gi1591bphdr1wxbn2za7kfskywndz4bcr741q825m2bakhd"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text transformers unordered-containers wai ]; testHaskellDepends = [ base bytestring HUnit network-uri text ]; - description = "Composable, reversible, efficient web routing based on invertible invariants and bijections"; + description = "Composable, reversible, efficient web routing using invertible invariants and bijections"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -219749,13 +221244,13 @@ self: { "wolf" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring , conduit, directory, filepath, http-types, lifted-async - , lifted-base, optparse-generic, preamble, process, shakers, time - , uuid, yaml + , lifted-base, optparse-generic, preamble, process, time, uuid + , yaml }: mkDerivation { pname = "wolf"; - version = "0.3.42"; - sha256 = "078pzdwhdxgqd5lszwszzcwxla17a51ikcvvas6791lvwx1ddg0d"; + version = "0.3.43"; + sha256 = "1iy9qbpwnnzq8d7fvpl8iqn8bc3iz44rvxi4ijjj5xd4z1w6i5fv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219763,7 +221258,7 @@ self: { filepath http-types lifted-async lifted-base preamble process time uuid yaml ]; - executableHaskellDepends = [ base optparse-generic shakers ]; + executableHaskellDepends = [ base optparse-generic ]; homepage = "https://github.com/swift-nav/wolf"; description = "Amazon Simple Workflow Service Wrapper"; license = stdenv.lib.licenses.mit; @@ -222542,15 +224037,16 @@ self: { "xmobar" = callPackage ({ mkDerivation, alsa-core, alsa-mixer, base, bytestring - , containers, dbus, directory, filepath, hinotify, HTTP, iwlib - , libmpd, libXpm, libXrandr, libXrender, mtl, old-locale, parsec - , process, regex-compat, stm, time, timezone-olson, timezone-series - , transformers, unix, utf8-string, wirelesstools, X11, X11-xft + , containers, dbus, directory, filepath, hinotify, hspec, HTTP + , iwlib, libmpd, libXpm, libXrandr, libXrender, mtl, old-locale + , parsec, process, regex-compat, stm, time, timezone-olson + , timezone-series, transformers, unix, utf8-string, wirelesstools + , X11, X11-xft }: mkDerivation { pname = "xmobar"; - version = "0.25"; - sha256 = "0382r4vzqkz76jlp2069rdbwf4gh1a22r9w4rkphcn5qflw0dlb6"; + version = "0.26"; + sha256 = "19g40vqj3cs94i27f66194k7d5cazrv1lx54bz9kc0qy2npxjzgz"; configureFlags = [ "-fall_extensions" ]; isLibrary = false; isExecutable = true; @@ -222563,6 +224059,10 @@ self: { executableSystemDepends = [ libXpm libXrandr libXrender wirelesstools ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec mtl old-locale + parsec process regex-compat stm time transformers unix X11 + ]; homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; @@ -223612,8 +225112,8 @@ self: { pname = "yampa-canvas"; version = "0.2.2"; sha256 = "0g1yvb6snnsbvy2f74lrlqff5zgnvfh2f6r8xdwxi61dk71qsz0n"; - revision = "3"; - editedCabalFile = "1vh3v5hrd1y1m491g4h9p3c767h7kg3ffgi20vrafrg8i0r7hg3w"; + revision = "4"; + editedCabalFile = "1bqjfmssgg0jd6j5x727clk6wawbbh0hq8v0qpj4d5bfv4931pkb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; From a418676508bfaafed938c1cc19b07e31e4c566f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Apr 2018 00:11:01 -0700 Subject: [PATCH 102/105] ccnet: 6.1.0 -> 6.1.7 (#38593) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ccnet/versions. These checks were done: - built on NixOS - ran ‘/nix/store/pjhaffj25vr662q3xvxxqjdddny0r0rn-ccnet-6.1.7/bin/ccnet -h’ got 0 exit code - ran ‘/nix/store/pjhaffj25vr662q3xvxxqjdddny0r0rn-ccnet-6.1.7/bin/ccnet --help’ got 0 exit code - found 6.1.7 with grep in /nix/store/pjhaffj25vr662q3xvxxqjdddny0r0rn-ccnet-6.1.7 - directory tree listing: https://gist.github.com/b89fd3d2ea82f0d5a57dcfb186e1904d --- pkgs/tools/networking/ccnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index d4a279bcc42..408fd0f8c8f 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: stdenv.mkDerivation rec { - version = "6.1.0"; - seafileVersion = "6.1.0"; + version = "6.1.7"; + seafileVersion = "6.1.7"; name = "ccnet-${version}"; src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; - sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; + sha256 = "1kkzdxa9r7sw1niwniznfkvilgvb7q039wq07cfk73qs3231bj7r"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; From 922fcbb310c25adb66530316f6851df7142314f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 8 Apr 2018 00:23:50 -0700 Subject: [PATCH 103/105] archivemount: 0.8.9 -> 0.8.12 (#38276) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/archivemount/versions. These checks were done: - built on NixOS - ran `/nix/store/7dc19v4ibkd9a958mxrhbn8hi4dj6flw-archivemount-0.8.12/bin/archivemount -V` and found version 0.8.12 - ran `/nix/store/7dc19v4ibkd9a958mxrhbn8hi4dj6flw-archivemount-0.8.12/bin/archivemount --version` and found version 0.8.12 - found 0.8.12 with grep in /nix/store/7dc19v4ibkd9a958mxrhbn8hi4dj6flw-archivemount-0.8.12 - directory tree listing: https://gist.github.com/9f95a5aa5b6c354b2dd5db0351c8fb72 --- pkgs/tools/filesystems/archivemount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/archivemount/default.nix b/pkgs/tools/filesystems/archivemount/default.nix index b7ade4c5abc..e720634ca44 100644 --- a/pkgs/tools/filesystems/archivemount/default.nix +++ b/pkgs/tools/filesystems/archivemount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, fuse, libarchive }: let - name = "archivemount-0.8.9"; + name = "archivemount-0.8.12"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "http://www.cybernoia.de/software/archivemount/${name}.tar.gz"; - sha256 = "0v4si1ri6lhnq9q87gkx7fsh6lv6xz4bynknwndqncpvfp5cy1jg"; + sha256 = "12fb8fcmd1zwvfgzx4pay47md5cr2kgxcgq82cm6skmq75alfzi4"; }; nativeBuildInputs = [ pkgconfig ]; From 6593ce7ef91578df876df5d50ef7c150d5396d61 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 8 Apr 2018 01:00:05 -0700 Subject: [PATCH 104/105] otter-browser: 0.9.94 -> 0.9.96 (#37239) Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done: - built on NixOS - Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.) - found 0.9.96 with grep in /nix/store/hy3dyckwbq8x0ylgydqf3hsd0yyj38mf-otter-browser-0.9.96 - directory tree listing: https://gist.github.com/3ba5ac755cab96acd876703e94dff4b4 --- pkgs/applications/networking/browsers/otter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/otter/default.nix b/pkgs/applications/networking/browsers/otter/default.nix index 93cf220e499..0a8efb3aace 100644 --- a/pkgs/applications/networking/browsers/otter/default.nix +++ b/pkgs/applications/networking/browsers/otter/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, openssl, gst_all_1, fetchFromGitHub , qtbase, qtmultimedia, qtwebengine -, version ? "0.9.94" -, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5" +, version ? "0.9.96" +, sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p" }: stdenv.mkDerivation { name = "otter-browser-${version}"; From 18fa54032aef11e2250b4eb5c076ef893604eab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 8 Apr 2018 09:35:20 +0100 Subject: [PATCH 105/105] bcftools: python/perl is needed for shebangs --- pkgs/applications/science/biology/bcftools/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 1459f5b29a7..1ad1647c70e 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, bash }: +{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa"; }; - nativeBuildInputs = [ perl ]; - - buildInputs = [ htslib zlib bzip2 lzma curl ]; + buildInputs = [ htslib zlib bzip2 lzma curl perl python ]; makeFlags = [ "HSTDIR=${htslib}"