From cc1b9b408e26a1ce54f20534b8dc7b5164046f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:28:41 +0200 Subject: [PATCH 001/218] gst_all_1.gstreamer: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/core/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 5845c8c50db2..b4a324d68d96 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.14.0"; + name = "gstreamer-${version}"; + version = "1.14.2"; meta = with lib ;{ description = "Open source multimedia framework"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw"; + sha256 = "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb"; }; patches = [ From a29e9edfc0684539bc70dfe39ac5f70d06802538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:29:12 +0200 Subject: [PATCH 002/218] gst_all_1.gst-plugins-base: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/base/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index dd4007bd142b..a5f8e3406423 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -9,7 +9,8 @@ , enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.14.0"; + name = "gst-plugins-base-${version}"; + version = "1.14.2"; meta = with lib; { description = "Base plugins and helper libraries"; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "0h39bcp7fcd9kgb189lxr8l0hm0almvzpzgpdh1jpq2nzxh4d43y"; + sha256 = "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4"; }; outputs = [ "out" "dev" ]; From effef4f3ecfdb60f340091fd7091d99820e77d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:29:46 +0200 Subject: [PATCH 003/218] gst_all_1.gst-plugins-good: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/good/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 99d27523b1c9..45f700e158a9 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -15,7 +15,8 @@ let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "gst-plugins-good-1.14.0"; + name = "gst-plugins-good-${version}"; + version = "1.14.2"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "1226s30cf7pqg3fj8shd20l7sp93yw9sqplgxns3m3ajgms3byka"; + sha256 = "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0"; }; outputs = [ "out" "dev" ]; From 03c7e30aee9204b065fd98abb806ac8a1da8b6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:30:00 +0200 Subject: [PATCH 004/218] gst_all_1.gst-plugins-bad: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/bad/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 96e02c605f54..3f030b7469e1 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -17,7 +17,8 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.14.0"; + name = "gst-plugins-bad-${version}"; + version = "1.14.2"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "17sgzgx1c54k5rzz7ljyz3is0n7yj56k74vv05h8z1gjnsnjnppd"; + sha256 = "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil"; }; outputs = [ "out" "dev" ]; From 65b5563d12b44c78c5fe7c2b0a882a01f3922645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:30:13 +0200 Subject: [PATCH 005/218] gst_all_1.gst-plugins-ugly: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/ugly/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 004bb0715f26..b5256bf4b4c7 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -6,7 +6,8 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.14.0"; + name = "gst-plugins-ugly-${version}"; + version = "1.14.2"; meta = with lib; { description = "Gstreamer Ugly Plugins"; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "1la2nny9hfw3rf3wvqggkg8ivn52qrqqs4n4mqz4ppm2r1gymf9z"; + sha256 = "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m"; }; outputs = [ "out" "dev" ]; From d7b47e966ca6e990cd8dd5d0138aab5629d4d8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:30:39 +0200 Subject: [PATCH 006/218] gst_all_1.gst-editing-services: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/ges/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 895f298c8269..d2c3cbcc6ac3 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -4,7 +4,8 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-editing-services-1.14.0"; + name = "gstreamer-editing-services-${version}"; + version = "1.14.2"; meta = with stdenv.lib; { description = "Library for creation of audio/video non-linear editors"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz"; - sha256 = "14cdd6y9p4k603hsnyhdjw2igg855gwpx0362jmg8k1gagmr0pwd"; + sha256 = "0d0zqvgxp51mmffz5vvscsdzqqw9mjsv6bnk6ivg2dxnkv8q1ch5"; }; outputs = [ "out" "dev" ]; From 3947c7b2a4eeedc316868a25b6fb63490ac5c5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:31:18 +0200 Subject: [PATCH 007/218] gst_all_1.gst-vaapi: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/vaapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 7255894f3b1f..be7ee8f12787 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "gst-vaapi-${version}"; - version = "1.14.0"; + version = "1.14.2"; src = fetchurl { url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "1whxk428badv8ibji00sn6hj17cp8l9n93rr948bz2gjbq41zqz4"; + sha256 = "12hdyfma2lnfj38dj6y891vsxnxrlbqjbd36xx13mgasgzi6843z"; }; outputs = [ "out" "dev" ]; From 8c971f0fca72dacec3dec0540547f4cc0edb6548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:31:41 +0200 Subject: [PATCH 008/218] gst_all_1.gst-rtsp-server: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/rtsp-server/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 9ff799b0a27b..4166f357cdaa 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -3,7 +3,8 @@ }: stdenv.mkDerivation rec { - name = "gst-rtsp-server-1.14.0"; + name = "gst-rtsp-server-${version}"; + version = "1.14.2"; meta = with stdenv.lib; { description = "Gstreamer RTSP server"; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz"; - sha256 = "0mlp9ms5hfbyzyvmc9xgi7934g4zrh1sbgky2p9zc5fqprvs0rbb"; + sha256 = "161c49hg21xpkdw5ppc7ljbg6kyslxd1y3v1shsg7ibarxapff7p"; }; outputs = [ "out" "dev" ]; From 538c733c0da4d88f56a3e326cad1e18881657d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:32:04 +0200 Subject: [PATCH 009/218] gst_all_1.gst-validate: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/validate/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index bd33d9c52807..63893bbc523e 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -3,7 +3,8 @@ }: stdenv.mkDerivation rec { - name = "gst-validate-1.14.0"; + name = "gst-validate-${version}"; + version = "1.14.2"; meta = { description = "Integration testing infrastructure for the GStreamer framework"; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-validate/${name}.tar.xz"; - sha256 = "1pzzxqkv1spjrzpzpazdm2h4s2wk7gg5gag8nxj5v2gjfyzhiprk"; + sha256 = "17zilvmwv13l6rbj0a7dnbg4kz5bwwa1gshaibpqbvvhahz457pa"; }; outputs = [ "out" "dev" ]; From 00a879ccda2c34e385c811a84619718d114d660b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:32:23 +0200 Subject: [PATCH 010/218] gst_all_1.gst-libav: 1.14.0 -> 1.14.2 --- pkgs/development/libraries/gstreamer/libav/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 564b37fab794..f78015704fce 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -9,7 +9,8 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.14.0"; + name = "gst-libav-${version}"; + version = "1.14.2"; meta = { homepage = https://gstreamer.freedesktop.org; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "12gglx6rarnxbaj0h1wivlgkv467n1bz2bwjigplciq57r6ln4zv"; + sha256 = "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca"; }; outputs = [ "out" "dev" ]; From d87c8f6cad4afddcf1c28ca25cdbc318f6762906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 30 Aug 2018 13:48:05 +0200 Subject: [PATCH 011/218] =?UTF-8?q?pythonPackages.gst-python:=201.14.0=20?= =?UTF-8?q?=E2=86=92=201.14.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/gst-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index bc855b5bc1cf..49f44bb16e44 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -4,7 +4,7 @@ let pname = "gst-python"; - version = "1.14.0"; + version = "1.14.2"; name = "${pname}-${version}"; in buildPythonPackage rec { inherit pname version; @@ -15,7 +15,7 @@ in buildPythonPackage rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1rlr6gl4lg97ng4jxh3gb2ldmywm15vwsa72nvggr8qa2l8q3fg0"; + sha256 = "08nb011acyvlz48fqh8c084k0dlssz9b7wha7zzk797inidbwh6w"; }; outputs = [ "out" "dev" ]; From 2430a13bcaf96a9516e9347a4b675bb712e863bf Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 11 Sep 2018 02:23:16 -0400 Subject: [PATCH 012/218] installer: refactor --- .../cd-dvd/installation-cd-graphical-base.nix | 49 +++++++++++++++ .../installation-cd-graphical-gnome.nix | 63 +------------------ .../cd-dvd/installation-cd-graphical-kde.nix | 47 +++----------- 3 files changed, 61 insertions(+), 98 deletions(-) create mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix new file mode 100644 index 000000000000..228ef371d252 --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -0,0 +1,49 @@ +# This module contains the basic configuration for building a graphical NixOS +# installation CD. + +{ config, lib, pkgs, ... }: + +with lib; + +{ + imports = [ ./installation-cd-base.nix ]; + + services.xserver = { + enable = true; + + # Don't start the X server by default. + autorun = mkForce false; + + # Automatically login as root. + displayManager.slim = { + enable = true; + defaultUser = "root"; + autoLogin = true; + }; + + }; + + # Provide networkmanager for easy wireless configuration. + networking.networkmanager.enable = true; + networking.wireless.enable = mkForce false; + + # KDE complains if power management is disabled (to be precise, if + # there is no power management backend such as upower). + powerManagement.enable = true; + + environment.systemPackages = [ + # Include gparted for partitioning disks. + pkgs.gparted + + # Include some editors. + pkgs.vim + pkgs.bvi # binary editor + pkgs.joe + + # Firefox for reading the manual. + pkgs.firefox + + pkgs.glxinfo + ]; + +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 4c4e69d60d9c..42b5ec882272 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -6,47 +6,11 @@ with lib; { - imports = [ ./installation-cd-base.nix ]; + imports = [ ./installation-cd-graphical-base.nix ]; - services.xserver = { - enable = true; - # GDM doesn't start in virtual machines with ISO - displayManager.slim = { - enable = true; - defaultUser = "root"; - autoLogin = true; - }; - desktopManager.gnome3 = { - enable = true; - extraGSettingsOverrides = '' - [org.gnome.desktop.background] - show-desktop-icons=true + services.xserver.desktopManager.gnome3.enable = true; - [org.gnome.nautilus.desktop] - trash-icon-visible=false - volumes-visible=false - home-icon-visible=false - network-icon-visible=false - ''; - - extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ]; - }; - }; - - environment.systemPackages = - [ # Include gparted for partitioning disks. - pkgs.gparted - - # Include some editors. - pkgs.vim - pkgs.bvi # binary editor - pkgs.joe - - pkgs.glxinfo - ]; - - # Don't start the X server by default. - services.xserver.autorun = mkForce false; + services.xserver.displayManager.slim.enable = mkForce false; # Auto-login as root. services.xserver.displayManager.gdm.autoLogin = { @@ -54,25 +18,4 @@ with lib; user = "root"; }; - system.activationScripts.installerDesktop = let - # Must be executable - desktopFile = pkgs.writeScript "nixos-manual.desktop" '' - [Desktop Entry] - Version=1.0 - Type=Link - Name=NixOS Manual - URL=${config.system.build.manual.manual}/share/doc/nixos/index.html - Icon=system-help - ''; - - # use cp and chmod +x, we must be sure the apps are in the nix store though - in '' - mkdir -p /root/Desktop - ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop - cp ${pkgs.gnome3.gnome-terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop - chmod a+rx /root/Desktop/gnome-terminal.desktop - cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop - chmod a+rx /root/Desktop/gparted.desktop - ''; - } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 63227d573495..f71ed46c7e9e 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -1,23 +1,14 @@ # This module defines a NixOS installation CD that contains X11 and -# KDE 5. +# Plasma5. { config, lib, pkgs, ... }: with lib; { - imports = [ ./installation-cd-base.nix ]; + imports = [ ./installation-cd-graphical-base.nix ]; services.xserver = { - enable = true; - - # Automatically login as root. - displayManager.slim = { - enable = true; - defaultUser = "root"; - autoLogin = true; - }; - desktopManager.plasma5 = { enable = true; enableQt4Support = false; @@ -27,34 +18,14 @@ with lib; synaptics.enable = true; }; - environment.systemPackages = - [ pkgs.glxinfo - - # Include gparted for partitioning disks. - pkgs.gparted - - # Firefox for reading the manual. - pkgs.firefox - - # Include some editors. - pkgs.vim - pkgs.bvi # binary editor - pkgs.joe - ]; - - # Provide networkmanager for easy wireless configuration. - networking.networkmanager.enable = true; - networking.wireless.enable = mkForce false; - - # KDE complains if power management is disabled (to be precise, if - # there is no power management backend such as upower). - powerManagement.enable = true; - - # Don't start the X server by default. - services.xserver.autorun = mkForce false; + environment.systemPackages = with pkgs; [ + # Graphical text editor + kate + ]; system.activationScripts.installerDesktop = let - desktopFile = pkgs.writeText "nixos-manual.desktop" '' + + manualDesktopFile = pkgs.writeScript "nixos-manual.desktop" '' [Desktop Entry] Version=1.0 Type=Application @@ -65,7 +36,7 @@ with lib; in '' mkdir -p /root/Desktop - ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop + ln -sfT ${manualDesktopFile} /root/Desktop/nixos-manual.desktop ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop ''; From 3ffca639a42077048dd6719a7b4d73b9e9e4bb10 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 26 Jun 2018 16:18:17 +0200 Subject: [PATCH 013/218] pythonPackages.base58: init at 1.0.0 --- .../python-modules/base58/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/base58/default.nix diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix new file mode 100644 index 000000000000..43b2761f6bca --- /dev/null +++ b/pkgs/development/python-modules/base58/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, pytest, pyhamcrest }: + +buildPythonPackage rec { + pname = "base58"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "keis"; + repo = "base58"; + rev = "v${version}"; + sha256 = "0f8isdpvbgw0sqn9bj7hk47y8akpvdl8sn6rkszla0xb92ywj0f6"; + }; + + buildInputs = [ pytest pyhamcrest ]; + checkPhase = '' + pytest + ''; + + meta = with stdenv.lib; { + description = "Base58 and Base58Check implementation"; + homepage = https://github.com/keis/base58; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b98a1af7891..940c832afa2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -980,6 +980,8 @@ in { inherit (pkgs) gcc wirelesstools; }; + base58 = callPackage ../development/python-modules/base58 {}; + batinfo = callPackage ../development/python-modules/batinfo {}; bcdoc = callPackage ../development/python-modules/bcdoc {}; From 71a8aafbb8a287fc6f8a7403d6b2847d14598f59 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 26 Jun 2018 16:28:36 +0200 Subject: [PATCH 014/218] pythonPackages.block-io: init at 1.1.8 --- .../python-modules/block-io/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/block-io/default.nix diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix new file mode 100644 index 000000000000..c0df26143ec3 --- /dev/null +++ b/pkgs/development/python-modules/block-io/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }: + +buildPythonPackage rec { + pname = "block-io"; + version = "1.1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "15468pvpcp41ly7kjpmikpyi4av57d9zhf5j1v01j78r1xqqk56g"; + }; + + propagatedBuildInputs = [ + base58 + ecdsa + pycryptodome + requests + six + ]; + + # Tests needs a BlockIO API key to run properly + # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18 + doCheck = false; + + meta = with stdenv.lib; { + description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io"; + homepage = https://github.com/BlockIo/block_io-python; + license = licenses.mit; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 940c832afa2c..4e488cfd2947 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1095,6 +1095,8 @@ in { }; blessed = callPackage ../development/python-modules/blessed {}; + + block-io = callPackage ../development/python-modules/block-io {}; # Build boost for this specific Python version # TODO: use separate output for libboost_python.so From 03a1adddd3616bb1b7b150322761e1b1fe2a00c9 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 12 Sep 2018 13:26:56 +0200 Subject: [PATCH 015/218] lmdbxx: change repo location Owner changed from bendiken to drycpp --- pkgs/development/libraries/lmdbxx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 34dfe26ad70b..232a67c23f3b 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "0.9.14.0"; src = fetchFromGitHub { - owner = "bendiken"; + owner = "drycpp"; repo = "lmdbxx"; rev = "${version}"; sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = "https://github.com/bendiken/lmdbxx#readme"; + homepage = "https://github.com/drycpp/lmdbxx#readme"; description = "C++11 wrapper for the LMDB embedded B+ tree database library"; license = stdenv.lib.licenses.unlicense; maintainers = with stdenv.lib.maintainers; [ fgaz ]; From d3f49bf5d852d406a8b7f5c543ee0cb58fef96a3 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 16 Sep 2018 18:20:18 +0200 Subject: [PATCH 016/218] goimports: Remove in favor of gotools --- pkgs/development/tools/goimports/default.nix | 16 ---------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/tools/goimports/default.nix diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix deleted file mode 100644 index 14c319320d0c..000000000000 --- a/pkgs/development/tools/goimports/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, buildGoPackage, fetchgit }: - -buildGoPackage rec { - name = "goimports-${version}"; - version = "20160519-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; - - goPackagePath = "golang.org/x/tools"; - subPackages = [ "cmd/goimports" ]; - - src = fetchgit { - inherit rev; - url = "https://go.googlesource.com/tools"; - sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b8298b76d778..26bc7ebc6f1a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -106,6 +106,7 @@ mapAliases ({ gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 gnustep-make = gnustep.make; # added 2016-7-6 go-pup = pup; # added 2017-12-19 + goimports = gotools; # added 2018-09-16 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 493f0d8ae6e7..571c900e27dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14488,8 +14488,6 @@ with pkgs; godef = callPackage ../development/tools/godef { }; - goimports = callPackage ../development/tools/goimports { }; - gopkgs = callPackage ../development/tools/gopkgs { }; govers = callPackage ../development/tools/govers { }; From 09a5d8710a2186461d8b51accae850207e2ca42e Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 16 Sep 2018 18:21:05 +0200 Subject: [PATCH 017/218] gotools: 2018-07-20 -> 2018-09-11 --- pkgs/development/tools/gotools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 05e87d084606..76023faf3209 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "gotools-unstable-${version}"; - version = "2018-07-20"; - rev = "be728107ea8275e6f58ba07e246b94181acaab24"; + version = "2018-09-11"; + rev = "677d2ff680c188ddb7dcd2bfa6bc7d3f2f2f75b2"; goPackagePath = "golang.org/x/tools"; goPackageAliases = [ "code.google.com/p/go.tools" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "1vkc87qcnfybfcgq9kbwbwzvvzrwm6ar25q5i8z3q26b8dpaxmlw"; + sha256 = "0vp1w1haqcjd82dxd6x9xrllbfwvm957rxwkpji96cgvhsli2bq5"; }; goDeps = ./deps.nix; From 4a8a3de99f0b6cbbe20577a0ae3938b1d050bf62 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 16 Sep 2018 18:21:50 +0200 Subject: [PATCH 018/218] go2nix: goimports -> gotools --- pkgs/development/tools/go2nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 5ef12d88c06c..585f10336567 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper, +{ stdenv, buildGoPackage, go-bindata, gotools, nix-prefetch-git, git, makeWrapper, fetchFromGitHub }: buildGoPackage rec { @@ -19,7 +19,7 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; - buildInputs = [ go-bindata goimports makeWrapper ]; + buildInputs = [ go-bindata gotools makeWrapper ]; preBuild = ''go generate ./...''; postInstall = '' From be506296d233d2f9112853fc8880a07240f335a9 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 16 Sep 2018 18:22:44 +0200 Subject: [PATCH 019/218] godef: 20170920 -> 1.0.0 --- pkgs/development/tools/godef/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 3227ed8eec2e..497c765b5b1c 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "godef-${version}"; - version = "20170920-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "b692db1de5229d4248e23c41736b431eb665615d"; + version = "1.0.0"; + rev = "7b4626be9fa8081987905fd4719d2f6628f9d8b5"; goPackagePath = "github.com/rogpeppe/godef"; excludedPackages = "go/printer/testdata"; @@ -11,13 +11,13 @@ buildGoPackage rec { src = fetchgit { inherit rev; url = "https://github.com/rogpeppe/godef"; - sha256 = "0xqp9smfyznm8v2iy4wyy3kd24mga12fx0y0896qimac4hj2al15"; + sha256 = "0zhw4ba19hy0kv74c58ax759h8721khmwj04fak2y5800ymsgndg"; }; meta = { description = "Print where symbols are defined in Go source code"; homepage = https://github.com/rogpeppe/godef/; - maintainers = with stdenv.lib.maintainers; [ vdemeester ]; + maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ]; license = stdenv.lib.licenses.bsd3; }; } From e4f196810098ba7fce635705a9e6a1298665a27b Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Mon, 17 Sep 2018 09:22:29 +0100 Subject: [PATCH 020/218] brotli: ensure CMAKE_SYSTEM_NAME=Windows on mingw cross builds CMAKE passes the flag -rdynamic otherwise (which is not recognized by mingw). Setting the appropriate flag avoids this problem and allows the build to succeed. --- pkgs/tools/compression/brotli/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index a63721466dbc..971a90a84f4c 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = stdenv.lib.optional + (stdenv.hostPlatform.libc == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; + outputs = [ "out" "dev" "lib" ]; doCheck = true; From 06eeeed171e53119ca6843fabfa2f490125e61c2 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Mon, 17 Sep 2018 11:44:04 -0700 Subject: [PATCH 021/218] mattermost: 5.1.0 -> 5.3.0 --- pkgs/servers/mattermost/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 0654da927769..91ca3219a826 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }: let - version = "5.1.0"; + version = "5.3.0"; mattermost-server = buildGoPackage rec { name = "mattermost-server-${version}"; @@ -10,7 +10,7 @@ let owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "069ihmfr6np991mbgg001y0kyafghn57nsv3kpyyvfmhv07p0qbc"; + sha256 = "0hll62ad12drlqarr7y7zvjj0b12snqm8j5k923lj0064nlpc47z"; }; goPackagePath = "github.com/mattermost/mattermost-server"; @@ -27,7 +27,7 @@ let src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "1bm5nqnhk2w3sy8mvm81k7d65j6bgpvakgphgwqgnlm864i4253z"; + sha256 = "1yzhy37frbhik6iq5z8bglpfcjlwnbgcf5iy1davkh7iqpcbxb0s"; }; installPhase = '' From 4200e68e040c689ff0d4bb17a5eca6d7b63f0809 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Tue, 18 Sep 2018 20:48:21 +1000 Subject: [PATCH 022/218] nix-pin: 0.3.4 -> 0.4.0 --- pkgs/tools/package-management/nix-pin/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix index 10afb1d90976..f5d62b250e22 100644 --- a/pkgs/tools/package-management/nix-pin/default.nix +++ b/pkgs/tools/package-management/nix-pin/default.nix @@ -1,12 +1,12 @@ { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }: let self = stdenv.mkDerivation rec { name = "nix-pin-${version}"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "timbertson"; repo = "nix-pin"; - rev = "version-0.3.4"; - sha256 = "03wdxai3hpv2v9jp7r91x8y36ryz6v1cczmx3d26g1bf0ij5svb8"; + rev = "version-${version}"; + sha256 = "1pccvc0iqapms7kidrh09g5fdx44x622r5l9k7bkmssp3v4c68vy"; }; buildInputs = [ python3 mypy makeWrapper ]; checkPhase = '' @@ -36,6 +36,7 @@ let self = stdenv.mkDerivation rec { --set repo nix-pin \ --set type fetchFromGitHub \ --set rev 'version-{version}' \ + --substitute rev 'version-''${{version}}' \ --modify-nix default.nix ''; }; From fc93264f5985660c4f50c6cd762f45c06a3eb450 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 18 Sep 2018 17:07:46 +0200 Subject: [PATCH 023/218] codimd: fix option `configuration.saml.idpCert` --- nixos/modules/services/web-apps/codimd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index 5368e8b0e664..5b4a53f00ede 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -834,7 +834,7 @@ in IdP authentication endpoint. ''; }; - idPCert = mkOption { + idpCert = mkOption { type = types.str; default = ""; example = "/path/to/cert.pem"; From 3961cab52f45bd2b0ffb54d20ea1caf14bbcd483 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 18 Sep 2018 18:23:03 +0200 Subject: [PATCH 024/218] codimd: remove unneeded defaults --- nixos/modules/services/web-apps/codimd.nix | 40 +--------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index 5b4a53f00ede..a0af28eac7cc 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -407,21 +407,18 @@ in options = { accessKey = mkOption { type = types.str; - default = ""; description = '' Minio access key. ''; }; secretKey = mkOption { type = types.str; - default = ""; description = '' Minio secret key. ''; }; endpoint = mkOption { type = types.str; - default = ""; description = '' Minio endpoint. ''; @@ -450,21 +447,18 @@ in options = { accessKeyId = mkOption { type = types.str; - default = ""; description = '' AWS access key id. ''; }; secretAccessKey = mkOption { type = types.str; - default = ""; description = '' AWS access key. ''; }; region = mkOption { type = types.str; - default = ""; description = '' AWS S3 region. ''; @@ -500,14 +494,12 @@ in options = { connectionString = mkOption { type = types.str; - default = ""; description = '' Azure Blob Storage connection string. ''; }; container = mkOption { type = types.str; - default = ""; description = '' Azure Blob Storage container name. It will be created if non-existent. @@ -523,28 +515,24 @@ in options = { authorizationURL = mkOption { type = types.str; - default = ""; description = '' Specify the OAuth authorization URL. ''; }; tokenURL = mkOption { type = types.str; - default = ""; description = '' Specify the OAuth token URL. ''; }; clientID = mkOption { type = types.str; - default = ""; description = '' Specify the OAuth client ID. ''; }; clientSecret = mkOption { type = types.str; - default = ""; description = '' Specify the OAuth client secret. ''; @@ -559,14 +547,12 @@ in options = { clientID = mkOption { type = types.str; - default = ""; description = '' Facebook API client ID. ''; }; clientSecret = mkOption { type = types.str; - default = ""; description = '' Facebook API client secret. ''; @@ -581,14 +567,12 @@ in options = { consumerKey = mkOption { type = types.str; - default = ""; description = '' Twitter API consumer key. ''; }; consumerSecret = mkOption { type = types.str; - default = ""; description = '' Twitter API consumer secret. ''; @@ -603,14 +587,12 @@ in options = { clientID = mkOption { type = types.str; - default = ""; description = '' GitHub API client ID. ''; }; clientSecret = mkOption { type = types.str; - default = ""; description = '' Github API client secret. ''; @@ -633,14 +615,12 @@ in }; clientID = mkOption { type = types.str; - default = ""; description = '' GitLab API client ID. ''; }; clientSecret = mkOption { type = types.str; - default = ""; description = '' GitLab API client secret. ''; @@ -663,21 +643,18 @@ in options = { baseURL = mkOption { type = types.str; - default = ""; description = '' Mattermost authentication endpoint. ''; }; clientID = mkOption { type = types.str; - default = ""; description = '' Mattermost API client ID. ''; }; clientSecret = mkOption { type = types.str; - default = ""; description = '' Mattermost API client secret. ''; @@ -692,21 +669,18 @@ in options = { clientID = mkOption { type = types.str; - default = ""; description = '' Dropbox API client ID. ''; }; clientSecret = mkOption { type = types.str; - default = ""; description = '' Dropbox API client secret. ''; }; appKey = mkOption { type = types.str; - default = ""; description = '' Dropbox app key. ''; @@ -721,14 +695,12 @@ in options = { clientID = mkOption { type = types.str; - default = ""; description = '' Google API client ID. ''; }; clientSecret = mkOption { type = types.str; - default = ""; description = '' Google API client secret. ''; @@ -750,7 +722,6 @@ in }; url = mkOption { type = types.str; - default = ""; example = "ldap://localhost"; description = '' URL of LDAP server. @@ -758,21 +729,18 @@ in }; bindDn = mkOption { type = types.str; - default = ""; description = '' Bind DN for LDAP access. ''; }; bindCredentials = mkOption { type = types.str; - default = ""; description = '' Bind credentials for LDAP access. ''; }; searchBase = mkOption { type = types.str; - default = ""; example = "o=users,dc=example,dc=com"; description = '' LDAP directory to begin search from. @@ -780,7 +748,6 @@ in }; searchFilter = mkOption { type = types.str; - default = ""; example = "(uid={{username}})"; description = '' LDAP filter to search with. @@ -788,7 +755,6 @@ in }; searchAttributes = mkOption { type = types.listOf types.str; - default = []; example = [ "displayName" "mail" ]; description = '' LDAP attributes to search with. @@ -804,7 +770,6 @@ in }; useridField = mkOption { type = types.str; - default = ""; example = "uid"; description = '' LDAP field which is a unique identifier for users on CodiMD. @@ -812,7 +777,6 @@ in }; tlsca = mkOption { type = types.str; - default = ""; example = "server-cert.pem,root.pem"; description = '' Root CA for LDAP TLS in PEM format. @@ -828,15 +792,13 @@ in options = { idpSsoUrl = mkOption { type = types.str; - default = ""; example = "https://idp.example.com/sso"; description = '' IdP authentication endpoint. ''; }; idpCert = mkOption { - type = types.str; - default = ""; + type = types.path; example = "/path/to/cert.pem"; description = '' Path to IdP certificate file in PEM format. From 8b778c77982d20969c97e761f39e1345455b90f3 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Tue, 18 Sep 2018 17:49:11 -0400 Subject: [PATCH 025/218] ddccontrol: 0.4.2 -> 0.4.4 --- pkgs/tools/misc/ddccontrol/automake.patch | 14 --------- pkgs/tools/misc/ddccontrol/default.nix | 36 ++++++++++++----------- 2 files changed, 19 insertions(+), 31 deletions(-) delete mode 100644 pkgs/tools/misc/ddccontrol/automake.patch diff --git a/pkgs/tools/misc/ddccontrol/automake.patch b/pkgs/tools/misc/ddccontrol/automake.patch deleted file mode 100644 index a890654ca7c7..000000000000 --- a/pkgs/tools/misc/ddccontrol/automake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am -index d85ff56..b13e74c 100644 ---- a/src/gnome-ddcc-applet/Makefile.am -+++ b/src/gnome-ddcc-applet/Makefile.am -@@ -6,7 +6,8 @@ DDCC_LDADD = ../lib/libddccontrol.la - - EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml - --pkglib_PROGRAMS = ddcc-applet -+programfilesdir = $(pkglibdir) -+programfiles_PROGRAMS = ddcc-applet - ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h - - ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index b03a286d2022..8453aa677477 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,36 +1,39 @@ -{ stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2 +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 , pciutils, pkgconfig, gtk2, ddccontrol-db , makeDesktopItem }: -let version = "0.4.2"; in +let version = "0.4.4"; in stdenv.mkDerivation rec { name = "ddccontrol-${version}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; - sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + src = fetchFromGitHub { + owner = "ddccontrol"; + repo = "ddccontrol"; + rev = "0.4.4"; + sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; }; nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; buildInputs = [ - perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db + libxml2 + pciutils + gtk2 + ddccontrol-db ]; - patches = [ ./automake.patch ]; - hardeningDisable = [ "format" "bindnow" ]; prePatch = '' - newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") - mv configure.ac configure.ac.old - oldPath="\$" - oldPath+="{datadir}\/ddccontrol-db" - sed "s/$oldPath/$newPath/" configure.ac - rm configure.ac.old + oldPath="\$""{datadir}/ddccontrol-db" + newPath="${ddccontrol-db}/share/ddccontrol-db" + sed -i -e "s|$oldPath|$newPath|" configure.ac + sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile* + ''; - sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile* + preConfigure = '' + intltoolize --force ''; postInstall = '' @@ -53,10 +56,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = http://ddccontrol.sourceforge.net/; + homepage = https://github.com/ddccontrol/ddccontrol; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } - From ea326dd4b52a57f812c72cba3d3d21dd9a343a85 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 18 Sep 2018 17:03:57 -0500 Subject: [PATCH 026/218] musl: convert CFLAGS to array --- pkgs/os-specific/linux/musl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index a24900ce337a..f88e1850bad5 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--syslibdir=$out/lib") ''; - CFLAGS="-fstack-protector-strong" + lib.optionalString stdenv.hostPlatform.isPower " -mlong-double-64"; + CFLAGS = [ "-fstack-protector-strong" ] + ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; configureFlags = [ "--enable-shared" From 4305e7d5ecee69b82101c0cb273fddf23aa5c6e2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 18 Sep 2018 17:11:12 -0500 Subject: [PATCH 027/218] musl: apply upstream fix for file locking race --- pkgs/os-specific/linux/musl/default.nix | 3 ++ .../linux/musl/fix-file-locking-race.patch | 54 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/os-specific/linux/musl/fix-file-locking-race.patch diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index f88e1850bad5..ccabe97969a6 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -56,6 +56,9 @@ stdenv.mkDerivation rec { url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) + # Upstream bugfix, see: https://git.musl-libc.org/cgit/musl/commit/?id=0db393d3a77bb9f300a356c6a5484fc2dddb161d + # Explicitly flagged for inclusion by distributions using musl + ./fix-file-locking-race.patch ]; preConfigure = '' configureFlagsArray+=("--syslibdir=$out/lib") diff --git a/pkgs/os-specific/linux/musl/fix-file-locking-race.patch b/pkgs/os-specific/linux/musl/fix-file-locking-race.patch new file mode 100644 index 000000000000..2ef91390a691 --- /dev/null +++ b/pkgs/os-specific/linux/musl/fix-file-locking-race.patch @@ -0,0 +1,54 @@ +From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001 +From: Kaarle Ritvanen +Date: Tue, 18 Sep 2018 10:03:27 +0300 +Subject: fix race condition in file locking + +The condition occurs when +- thread #1 is holding the lock +- thread #2 is waiting for it on __futexwait +- thread #1 is about to release the lock and performs a_swap +- thread #3 enters the __lockfile function and manages to grab the lock + before thread #1 calls __wake, resetting the MAYBE_WAITERS flag +- thread #1 calls __wake +- thread #2 wakes up but goes again to __futexwait as the lock is + held by thread #3 +- thread #3 releases the lock but does not call __wake as the + MAYBE_WAITERS flag is not set + +This condition results in thread #2 not being woken up. This patch fixes +the problem by making the woken up thread ensure that the flag is +properly set before going to sleep again. + +Mainainer's note: This fixes a regression introduced in commit +c21f750727515602a9e84f2a190ee8a0a2aeb2a1. +--- + src/stdio/__lockfile.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c +index 2ff75d8a..0dcb2a42 100644 +--- a/src/stdio/__lockfile.c ++++ b/src/stdio/__lockfile.c +@@ -8,13 +8,13 @@ int __lockfile(FILE *f) + int owner = f->lock, tid = __pthread_self()->tid; + if ((owner & ~MAYBE_WAITERS) == tid) + return 0; +- for (;;) { +- owner = a_cas(&f->lock, 0, tid); +- if (!owner) return 1; +- if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break; ++ owner = a_cas(&f->lock, 0, tid); ++ if (!owner) return 1; ++ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) { ++ if ((owner & MAYBE_WAITERS) || ++ a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) ++ __futexwait(&f->lock, owner|MAYBE_WAITERS, 1); + } +- while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) +- __futexwait(&f->lock, owner, 1); + return 1; + } + +-- +cgit v1.2.1 + From 697859fdc562082eae339ccb8cb8c560ab97278d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 18 Sep 2018 17:41:58 -0500 Subject: [PATCH 028/218] musl: apply other upstream fixes, selected for relevance to NixOS usage --- ..._trylock-EBUSY-out-more-directly-whe.patch | 37 ++++++++++++++ ..._timedlock-avoid-repeatedly-reading-.patch | 41 +++++++++++++++ ...ce-violation-for-c11-mutex-functions.patch | 35 +++++++++++++ pkgs/os-specific/linux/musl/default.nix | 8 +++ .../linux/musl/fexecve-execveat.patch | 33 ++++++++++++ .../linux/musl/tty-more-precise-errors.patch | 51 +++++++++++++++++++ 6 files changed, 205 insertions(+) create mode 100644 pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch create mode 100644 pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch create mode 100644 pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch create mode 100644 pkgs/os-specific/linux/musl/fexecve-execveat.patch create mode 100644 pkgs/os-specific/linux/musl/tty-more-precise-errors.patch diff --git a/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch b/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch new file mode 100644 index 000000000000..5e691ae99e6e --- /dev/null +++ b/pkgs/os-specific/linux/musl/0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch @@ -0,0 +1,37 @@ +From 4e4a162d9af283cf71f7310c497672e0c2b8ca3b Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Tue, 4 Sep 2018 21:28:38 -0400 +Subject: [PATCH 1/3] in pthread_mutex_trylock, EBUSY out more directly when + possible + +avoid gratuitously setting up and tearing down the robust list pending +slot. +--- + src/thread/pthread_mutex_trylock.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c +index 54876a61..783ca0c4 100644 +--- a/src/thread/pthread_mutex_trylock.c ++++ b/src/thread/pthread_mutex_trylock.c +@@ -15,6 +15,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) + return 0; + } + if (own == 0x7fffffff) return ENOTRECOVERABLE; ++ if (own && (!(own & 0x40000000) || !(type & 4))) return EBUSY; + + if (m->_m_type & 128) { + if (!self->robust_list.off) { +@@ -25,8 +26,7 @@ int __pthread_mutex_trylock_owner(pthread_mutex_t *m) + self->robust_list.pending = &m->_m_next; + } + +- if ((own && (!(own & 0x40000000) || !(type & 4))) +- || a_cas(&m->_m_lock, old, tid) != old) { ++ if (a_cas(&m->_m_lock, old, tid) != old) { + self->robust_list.pending = 0; + return EBUSY; + } +-- +2.19.0 + diff --git a/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch b/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch new file mode 100644 index 000000000000..2f611fc467e7 --- /dev/null +++ b/pkgs/os-specific/linux/musl/0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch @@ -0,0 +1,41 @@ +From d1fa28860634af4f0efd70d533a756b51a45f83e Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Tue, 4 Sep 2018 21:31:47 -0400 +Subject: [PATCH 2/3] in pthread_mutex_timedlock, avoid repeatedly reading + mutex type field + +compiler cannot cache immutable fields of the mutex object across +external calls it can't see, much less across atomics. +--- + src/thread/pthread_mutex_timedlock.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c +index 0a240e79..f91f4a61 100644 +--- a/src/thread/pthread_mutex_timedlock.c ++++ b/src/thread/pthread_mutex_timedlock.c +@@ -6,7 +6,8 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec + && !a_cas(&m->_m_lock, 0, EBUSY)) + return 0; + +- int r, t, priv = (m->_m_type & 128) ^ 128; ++ int type = m->_m_type; ++ int r, t, priv = (type & 128) ^ 128; + + r = pthread_mutex_trylock(m); + if (r != EBUSY) return r; +@@ -15,9 +16,9 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec + while (spins-- && m->_m_lock && !m->_m_waiters) a_spin(); + + while ((r=pthread_mutex_trylock(m)) == EBUSY) { +- if (!(r=m->_m_lock) || ((r&0x40000000) && (m->_m_type&4))) ++ if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4))) + continue; +- if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK ++ if ((type&3) == PTHREAD_MUTEX_ERRORCHECK + && (r&0x7fffffff) == __pthread_self()->tid) + return EDEADLK; + +-- +2.19.0 + diff --git a/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch b/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch new file mode 100644 index 000000000000..783873732afd --- /dev/null +++ b/pkgs/os-specific/linux/musl/0003-fix-namespace-violation-for-c11-mutex-functions.patch @@ -0,0 +1,35 @@ +From 2de29bc994029b903a366b8a4a9f8c3c3ee2be90 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Tue, 4 Sep 2018 22:56:57 -0400 +Subject: [PATCH 3/3] fix namespace violation for c11 mutex functions + +__pthread_mutex_timedlock is used to implement c11 mutex functions, +and therefore cannot call pthread_mutex_trylock by name. +--- + src/thread/pthread_mutex_timedlock.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c +index f91f4a61..d2bd1960 100644 +--- a/src/thread/pthread_mutex_timedlock.c ++++ b/src/thread/pthread_mutex_timedlock.c +@@ -1,5 +1,7 @@ + #include "pthread_impl.h" + ++int __pthread_mutex_trylock(pthread_mutex_t *); ++ + int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at) + { + if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL +@@ -15,7 +17,7 @@ int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec + int spins = 100; + while (spins-- && m->_m_lock && !m->_m_waiters) a_spin(); + +- while ((r=pthread_mutex_trylock(m)) == EBUSY) { ++ while ((r=__pthread_mutex_trylock(m)) == EBUSY) { + if (!(r=m->_m_lock) || ((r&0x40000000) && (type&4))) + continue; + if ((type&3) == PTHREAD_MUTEX_ERRORCHECK +-- +2.19.0 + diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index ccabe97969a6..376d824a0438 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -59,6 +59,14 @@ stdenv.mkDerivation rec { # Upstream bugfix, see: https://git.musl-libc.org/cgit/musl/commit/?id=0db393d3a77bb9f300a356c6a5484fc2dddb161d # Explicitly flagged for inclusion by distributions using musl ./fix-file-locking-race.patch + # More specific error reporting + ./tty-more-precise-errors.patch + # Use execveat to impl fexecve when avail (useful for containers) + ./fexecve-execveat.patch + # improve behavior in few cases + ./0001-in-pthread_mutex_trylock-EBUSY-out-more-directly-whe.patch + ./0002-in-pthread_mutex_timedlock-avoid-repeatedly-reading-.patch + ./0003-fix-namespace-violation-for-c11-mutex-functions.patch ]; preConfigure = '' configureFlagsArray+=("--syslibdir=$out/lib") diff --git a/pkgs/os-specific/linux/musl/fexecve-execveat.patch b/pkgs/os-specific/linux/musl/fexecve-execveat.patch new file mode 100644 index 000000000000..6b3894a916c8 --- /dev/null +++ b/pkgs/os-specific/linux/musl/fexecve-execveat.patch @@ -0,0 +1,33 @@ +From e36f80cba6d5eefcc1ee664f16c2c72054b83134 Mon Sep 17 00:00:00 2001 +From: "Joseph C. Sible" +Date: Sun, 2 Sep 2018 13:42:26 -0400 +Subject: implement fexecve in terms of execveat when it exists + +This lets fexecve work even when /proc isn't mounted. +--- + src/process/fexecve.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/process/fexecve.c b/src/process/fexecve.c +index 6507b429..8be3f760 100644 +--- a/src/process/fexecve.c ++++ b/src/process/fexecve.c +@@ -1,10 +1,15 @@ ++#define _GNU_SOURCE + #include + #include ++#include ++#include "syscall.h" + + void __procfdname(char *, unsigned); + + int fexecve(int fd, char *const argv[], char *const envp[]) + { ++ int r = __syscall(SYS_execveat, fd, "", argv, envp, AT_EMPTY_PATH); ++ if (r != -ENOSYS) return __syscall_ret(r); + char buf[15 + 3*sizeof(int)]; + __procfdname(buf, fd); + execve(buf, argv, envp); +-- +cgit v1.2.1 + diff --git a/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch b/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch new file mode 100644 index 000000000000..06b108559e46 --- /dev/null +++ b/pkgs/os-specific/linux/musl/tty-more-precise-errors.patch @@ -0,0 +1,51 @@ +From c84971995b3a6d5118f9357c040572f4c78bcd55 Mon Sep 17 00:00:00 2001 +From: Benjamin Peterson +Date: Thu, 13 Sep 2018 14:23:42 -0700 +Subject: improve error handling of ttyname_r and isatty + +POSIX allows ttyname(_r) and isatty to return EBADF if passed file +descriptor is invalid. + +maintainer's note: these are optional ("may fail") errors, but it's +non-conforming for ttyname_r to return ENOTTY when it failed for a +different reason. +--- + src/unistd/isatty.c | 6 +++++- + src/unistd/ttyname_r.c | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/unistd/isatty.c b/src/unistd/isatty.c +index c8badaf5..75a9c186 100644 +--- a/src/unistd/isatty.c ++++ b/src/unistd/isatty.c +@@ -1,9 +1,13 @@ + #include ++#include + #include + #include "syscall.h" + + int isatty(int fd) + { + struct winsize wsz; +- return !__syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz); ++ unsigned long r = syscall(SYS_ioctl, fd, TIOCGWINSZ, &wsz); ++ if (r == 0) return 1; ++ if (errno != EBADF) errno = ENOTTY; ++ return 0; + } +diff --git a/src/unistd/ttyname_r.c b/src/unistd/ttyname_r.c +index cb364c29..82acb75e 100644 +--- a/src/unistd/ttyname_r.c ++++ b/src/unistd/ttyname_r.c +@@ -9,7 +9,7 @@ int ttyname_r(int fd, char *name, size_t size) + char procname[sizeof "/proc/self/fd/" + 3*sizeof(int) + 2]; + ssize_t l; + +- if (!isatty(fd)) return ENOTTY; ++ if (!isatty(fd)) return errno; + + __procfdname(procname, fd); + l = readlink(procname, name, size); +-- +cgit v1.2.1 + From 750933a17ceb4a6fed892c11f5d5219dbd91ad5b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 18 Sep 2018 18:49:58 -0400 Subject: [PATCH 029/218] haskell infra: Also pass `--with-ar` in cross builds --- pkgs/development/haskell-modules/generic-builder.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 1b33954662db..be104a82fd77 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -120,6 +120,7 @@ let "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" "--with-gcc=${stdenv.cc.targetPrefix}cc" "--with-ld=${stdenv.cc.bintools.targetPrefix}ld" + "--with-ar=${stdenv.cc.bintools.targetPrefix}ar" # use the one that comes with the cross compiler. "--with-hsc2hs=${ghc.targetPrefix}hsc2hs" "--with-strip=${stdenv.cc.bintools.targetPrefix}strip" From 4c56eb81e9522c74b85f2aadf14f619288191dad Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 18 Sep 2018 20:13:46 -0500 Subject: [PATCH 030/218] noti: fix darwin build --- pkgs/tools/misc/noti/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index ac5b4199c216..23646abe7875 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, Cocoa }: buildGoPackage rec { name = "noti-${version}"; @@ -11,6 +11,10 @@ buildGoPackage rec { sha256 = "1chsqfqk0pnhx5k2nr4c16cpb8m6zv69l1jvv4v4903zgfzcm823"; }; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + # TODO: Remove this when we update apple_sdk + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ "-fno-objc-arc" ]; + goPackagePath = "github.com/variadico/noti"; preBuild = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07133473b808..f0ba3a1552e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1467,7 +1467,9 @@ with pkgs; noteshrink = callPackage ../tools/misc/noteshrink { }; - noti = callPackage ../tools/misc/noti { }; + noti = callPackage ../tools/misc/noti { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; nrsc5 = callPackage ../applications/misc/nrsc5 { }; From 426c2856d77872fa9429397d0020dfcf8f73919a Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Tue, 18 Sep 2018 21:44:27 -0400 Subject: [PATCH 031/218] pythonPackages.python-binance: init at 0.7.0 Library for communicating with the Binance REST API. --- .../python-modules/python-binance/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/python-binance/default.nix diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix new file mode 100644 index 000000000000..74d04cfd9277 --- /dev/null +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest, requests-mock, tox +, autobahn, certifi, chardet, cryptography, dateparser, pyopenssl, requests, service-identity, twisted }: + +buildPythonPackage rec { + version = "0.7.0"; + pname = "python-binance"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h8kd88j53w6yfc60fr8a45zi30p09l98vm8yzqym4lcgx76nvps"; + }; + + doCheck = false; # Tries to test multiple interpreters with tox + checkInputs = [ pytest requests-mock tox ]; + + propagatedBuildInputs = [ autobahn certifi chardet cryptography dateparser pyopenssl requests service-identity twisted ]; + + meta = { + description = "Binance Exchange API python implementation for automated trading"; + homepage = https://github.com/sammchardy/python-binance; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bhipple ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2efbdf88a579..0043cf0a1d51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -511,6 +511,8 @@ in { pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + python-binance = callPackage ../development/python-modules/python-binance { }; + python-hosts = callPackage ../development/python-modules/python-hosts { }; python-lz4 = callPackage ../development/python-modules/python-lz4 { }; From af5eab6ea6be8a5a263114e77ac5cad111647516 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Wed, 19 Sep 2018 16:13:15 +1000 Subject: [PATCH 032/218] dockerTools.pullImage: correct default arch --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index bc79f9ff12fd..93b715659eb0 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -40,7 +40,7 @@ rec { , imageDigest , sha256 , os ? "linux" - , arch ? "x86_64" + , arch ? "amd64" # This used to set a tag to the pulled image , finalImageTag ? "latest" , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar" From b026786e77ac4752aee44da47f0597917049dee6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 4 Sep 2018 16:25:51 -0500 Subject: [PATCH 033/218] sudo: 1.8.24 -> 1.8.25 (#46057) https://www.sudo.ws/stable.html (may need to scroll to the 1.8.25 notes afternewer versions are released) (cherry picked from commit d93aa1c50fc8a83be1c709f905d8c94e1677845f) --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 71cf239d72cb..03c400751451 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.24"; + name = "sudo-1.8.25"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1s2v49n905wf3phmdnaa6v1dwck2lrcin0flg85z7klf35x5b25l"; + sha256 = "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx"; }; prePatch = '' From 2608649de70a77f13306d155a1d96a0763a09d9d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 14 Sep 2018 23:41:29 -0500 Subject: [PATCH 034/218] sudo: 1.8.25 -> 1.8.25p1 (bugfix for systems w/o ppoll) (cherry picked from commit b4308beb164c1e7e93bbed95697c734ef66e2da5) --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 03c400751451..975e533d4771 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.25"; + name = "sudo-1.8.25p1"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0hfw6pcwjvv1vvnhb4n1p210306jm4npz99p9cfhbd33yrhhzkwx"; + sha256 = "0nqri46d4dpycj96zin2f2wszmhm7q9mr68hhj9sp81pgmx9rjcx"; }; prePatch = '' From 71c43f8c4a8b26026a3e837c77026926c53a9a92 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 19 Sep 2018 03:33:07 -0400 Subject: [PATCH 035/218] ddccontrol-db: 20061014 -> 20180908 (#46865) The project has moved to Github and has a totally different build process since 2006 --- pkgs/data/misc/ddccontrol-db/default.nix | 41 ++++++++++++------------ 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 1cbf5e2adafa..2dbd062d4fb2 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -1,34 +1,35 @@ { stdenv -, fetchurl -, perl -, perlPackages -, libxml2 -, pciutils -, pkgconfig -, gtk2 +, autoconf +, automake +, libtool +, intltool +, fetchFromGitHub }: -let version = "20061014"; in -let verName = "${version}"; in stdenv.mkDerivation { - name = "ddccontrol-db-${verName}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-db/${verName}/ddccontrol-db-${verName}.tar.bz2"; - sha1 = "9d06570fdbb4d25e397202a518265cc1173a5de3"; + name = "ddccontrol-db-20180908"; + src = fetchFromGitHub { + owner = "ddccontrol"; + repo = "ddccontrol-db"; + rev = "5f211be363f77dc43e39f911b30f4fb19a2d7a84"; + sha256 = "0vi3bzxpjdkn791vri68k7dah4v2liscniz7hxrarhl4fxlicc0w"; }; + + preConfigure = '' + ./autogen.sh + ''; + buildInputs = [ - perl - perlPackages.libxml_perl - libxml2 - pciutils - pkgconfig - gtk2 + autoconf + automake + libtool + intltool ]; meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = http://ddccontrol.sourceforge.net/; + homepage = http://github.com/ddccontrol/ddccontrol-db; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; From 08b94e3c4580a843b82d662d94afcff6af441f81 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Wed, 19 Sep 2018 12:03:44 +0200 Subject: [PATCH 036/218] Revert "iasl: 20180313 -> 20180629 (#46272)" This reverts commit 11d0ae36326ebe127ae9d5637d3cfbf4aa741714. It broke xen. --- pkgs/development/compilers/iasl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 84265151dc41..22f80ae559f7 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iasl-${version}"; - version = "20180629"; + version = "20180313"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0kwssazw7pqgxvxj41q5r0g83bqqk64f2lrpnfjn9p6v58zizlbh"; + sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm"; }; NIX_CFLAGS_COMPILE = "-O3"; From 48d1c50f7ab8da79b24e567e546e876dd602c106 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 19 Sep 2018 14:26:13 +0200 Subject: [PATCH 037/218] python/hetzner: 0.8.0 -> 0.8.1 This is only a minor bugfix release and updates the fallback CA root certificates. For NixOS this is usually not required as the probe paths will match there, but for non-NixOS users it might be helpful. Signed-off-by: aszlig --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0043cf0a1d51..20ba493da153 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6116,13 +6116,13 @@ in { hetzner = buildPythonPackage rec { name = "hetzner-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = pkgs.fetchFromGitHub { repo = "hetzner"; owner = "aszlig"; rev = "v${version}"; - sha256 = "04q2q2w2qkhfly8rfjg2h5pnh42gs18l6cmipqc37yf7qvkw3nd0"; + sha256 = "1xd1klvjskv0pg8ginih597jkk491a55b8dq80dsm61m5sbsx3vq"; }; meta = { From 5843e43d231abc6eb6509cfca4b3aa10f232ebc1 Mon Sep 17 00:00:00 2001 From: Maciej Mazur Date: Wed, 19 Sep 2018 14:35:47 +0200 Subject: [PATCH 038/218] mr: 1.20170129 -> 1.20180726 --- pkgs/applications/version-management/mr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 16948003a7a1..94979056b933 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - version = "1.20170129"; + version = "1.20180726"; name = "mr-${version}"; src = fetchgit { From 047c23782c1a0b77734e2334118156cbcea4bcae Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 19 Sep 2018 15:05:17 +0200 Subject: [PATCH 039/218] homebank: 5.1.8 -> 5.2.1 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 94e0e46767a0..039e2fc1fde9 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.1.8"; + name = "homebank-5.2.1"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "0fzjmwz2pgi0nw49xljp1za3vp67kjh88gf688d9ig4wc2ygr0qh"; + sha256 = "0i3pb4v4fs98xd6d4x2gjvhqrsrjvssaws3nkpjia4fagd4dvqbz"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; From af1c268b551270cae649bb6be3274455cde335bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 19 Sep 2018 10:57:59 -0300 Subject: [PATCH 040/218] zuki-themes: 3.28-1 -> 3.28-3 --- pkgs/misc/themes/zuki/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index 35c8e58b0ae9..2c293ecbc4ac 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -1,32 +1,30 @@ -{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { name = "zuki-themes-${version}"; - version = "3.28-1"; + version = "3.28-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; rev = "v${version}"; - sha256 = "1if39k8vgk4cpshl625vdf8lz6jgicgybd5nilycj66sf1k5jgb9"; + sha256 = "0sgp41fpd8lyyb0v82y41v3hmb0ayv3zqqrv0m3ln0dzkr7ym9g7"; }; - buildInputs = [ gdk_pixbuf gtk_engines ]; + buildInputs = [ gdk_pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - dontBuild = true; - installPhase = '' install -dm 755 $out/share/themes cp -a Zuki* $out/share/themes/ ''; - meta = { + meta = with stdenv.lib; { description = "Themes for GTK3, gnome-shell and more"; homepage = https://github.com/lassekongo83/zuki-themes; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; }; } From 32cd582645856dfa19e2471dfa3810276b3d629b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 19 Sep 2018 11:02:33 -0300 Subject: [PATCH 041/218] plano-theme: 3.28-2 -> 3.28-3 (#46892) --- pkgs/misc/themes/plano/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix index 090cdd04f5b0..e1d319ba8c14 100644 --- a/pkgs/misc/themes/plano/default.nix +++ b/pkgs/misc/themes/plano/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "plano-theme-${version}"; - version = "3.28-2"; + version = "3.28-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "plano-theme"; rev = "v${version}"; - sha256 = "1xd8xpd8pxxsx6nqrxv2scm9fy6vig8qyxdydgkzhpscrjg9iq9f"; + sha256 = "0k9jgnifc2s8vsw9fanknx1mg8vlh6qa1cbb910nm4vgrxsbrc74"; }; buildInputs = [ gdk_pixbuf gtk_engines ]; @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { rm $out/share/themes/Plano/LICENSE ''; - meta = { + meta = with stdenv.lib; { description = "Flat theme for GNOME & Xfce4"; homepage = https://github.com/lassekongo83/plano-theme; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } From b224eef1081cd8ca9f4b5564dd33b09a1e274529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 19 Sep 2018 15:08:20 +0100 Subject: [PATCH 042/218] python3.pkgs.typeguard: fix builds by applying utf-8 locales ZHF #45960 --- pkgs/development/python-modules/typeguard/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 6ccde34f48a0..7fb6f8fef435 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -4,6 +4,7 @@ , stdenv , setuptools_scm , pytest +, glibcLocales }: buildPythonPackage rec { @@ -16,6 +17,9 @@ buildPythonPackage rec { }; buildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ glibcLocales ]; + + LC_ALL="en_US.utf-8"; postPatch = '' substituteInPlace setup.cfg --replace " --cov" "" From 970393c34a14e32d10d747eb08e4ebbecba9b390 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 19 Sep 2018 16:15:02 +0200 Subject: [PATCH 043/218] pythonPackages.nilearn: fix test_signal tests (#46850) These tests failed on some machines, probably due to lower arithmetic presicion. Reduce required precision from 13 to 8 decimal digits. --- pkgs/development/python-modules/nilearn/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index bf8ae217705c..14bb15184b59 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -19,6 +19,13 @@ buildPythonPackage rec { checkInputs = [ nose ]; + # These tests fail on some builder machines, probably due to lower + # arithmetic precision. Reduce required precision from 13 to 8 decimals. + postPatch = '' + substituteInPlace nilearn/tests/test_signal.py \ + --replace 'decimal=13' 'decimal=8' + ''; + propagatedBuildInputs = [ matplotlib nibabel From c9969162ab4c3a902febc7c91a27ee9d4b618a48 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 19 Sep 2018 16:15:51 +0200 Subject: [PATCH 044/218] czmq: 4.0.2 -> 4.1.1 (#46855) --- pkgs/development/libraries/czmq/4.x.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix index 840fa34d6ae1..67e005943fa5 100644 --- a/pkgs/development/libraries/czmq/4.x.nix +++ b/pkgs/development/libraries/czmq/4.x.nix @@ -1,21 +1,14 @@ { stdenv, fetchurl, fetchpatch, zeromq }: stdenv.mkDerivation rec { - version = "4.0.2"; + version = "4.1.1"; name = "czmq-${version}"; src = fetchurl { url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz"; - sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340"; + sha256 = "1h5hrcsc30fcwb032vy5gxkq4j4vv1y4dj460rfs1hhxi0cz83zh"; }; - patches = [ - (fetchpatch { - url = https://patch-diff.githubusercontent.com/raw/zeromq/czmq/pull/1618.patch; - sha256 = "1dssy7k0fni6djail8rz0lk8p777158jvrqhgn500i636gkxaxhp"; - }) - ]; - # Needs to be propagated for the .pc file to work propagatedBuildInputs = [ zeromq ]; From 012682222fc733ad52a28d58eb69b255779e4810 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 19 Sep 2018 16:16:19 +0200 Subject: [PATCH 045/218] openxpki: fix build, use current python3Packages (#46860) Build used python34Packages and failed because python34Packages.pytest didn't build anymore. Use python3Packages instead. --- pkgs/servers/openxpki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index f68e1f5e9816..ccfbbd60903b 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPerlPackage, fetchgit, perl, openssl, perlPackages, gettext, python34Packages +{ stdenv, buildPerlPackage, fetchgit, perl, openssl, perlPackages, gettext, python3Packages # TODO: Remove extra dependencies once it is clear that they are NOT needed somewhere. , extraDependencies1 ? false, extraDependencies2 ? false, extraDependencies3 ? false }: @@ -11,7 +11,7 @@ buildPerlPackage { sha256 = "05bmhani2c7ays488xv3hx5xbxb612bnwq5rdjwmsj51xpaz454p"; }; - buildInputs = [ perl openssl gettext python34Packages.sphinx ]; + buildInputs = [ perl openssl gettext python3Packages.sphinx ]; propagatedBuildInputs = with perlPackages; [ # dependencies from Makefile.PL libintl_perl ConfigVersioned LWP ClassAccessorChained IOSocketSSL ClassStd From daf40ab165089f2b5f30ebf3dc047f5dfd309d97 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 19 Sep 2018 16:19:31 +0200 Subject: [PATCH 046/218] nixos/tests/containers-imperative: fix on i686 (#46874) Test failed on i686 in a sandbox because some packages required to build the nixos manual for the container were missing. Add them. --- nixos/tests/containers-imperative.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 913d8bed19d0..6f86819f4e88 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -13,6 +13,7 @@ import ./make-test.nix ({ pkgs, ...} : { # XXX: Sandbox setup fails while trying to hardlink files from the host's # store file system into the prepared chroot directory. nix.useSandbox = false; + nix.binaryCaches = []; # don't try to access cache.nixos.org virtualisation.writableStore = true; virtualisation.memorySize = 1024; @@ -27,9 +28,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; }; - in [ - pkgs.stdenv pkgs.stdenvNoCC emptyContainer.config.containers.foo.path - pkgs.libxslt + in with pkgs; [ + stdenv stdenvNoCC emptyContainer.config.containers.foo.path + libxslt desktop-file-utils texinfo docbook5 libxml2 + docbook_xsl_ns xorg.lndir documentation-highlighter ]; }; From beb8ca288717a7b4059e27018e708de9c0e1dbde Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 19 Sep 2018 16:19:45 +0200 Subject: [PATCH 047/218] nixos/tests/hibernate: prevent non-deterministic failure (#46882) ... that occurred mostly on i686. Improve timing. With this, the failures are no longer reproducible on my machine. --- nixos/tests/hibernate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 1f98bb739f21..274aa7becc82 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -35,8 +35,8 @@ import ./make-test.nix (pkgs: { $machine->waitForOpenPort(4444); $machine->succeed("systemctl hibernate &"); $machine->waitForShutdown; + $probe->waitForUnit("multi-user.target"); $machine->start; - $probe->waitForUnit("network.target"); $probe->waitUntilSucceeds("echo test | nc machine 4444 -N"); ''; From d57c9ec40757e1c9a9cdf81a51c1a6a94ce052df Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 19 Sep 2018 16:20:00 +0200 Subject: [PATCH 048/218] exempi: fix i686 build (#46884) failed with `unknown symbol __divmoddi4`. Standard fix is to use gcc6. --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0ba3a1552e3..b33088174734 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2396,7 +2396,9 @@ with pkgs; exa = callPackage ../tools/misc/exa { }; - exempi = callPackage ../development/libraries/exempi { }; + exempi = callPackage ../development/libraries/exempi { + stdenv = if stdenv.isi686 then overrideCC stdenv gcc6 else stdenv; + }; execline = skawarePackages.execline; From 1a15b10ae3b6d4f82e02810b8aab58346f9791ad Mon Sep 17 00:00:00 2001 From: Edmund Wu <22758444+eadwu@users.noreply.github.com> Date: Wed, 19 Sep 2018 10:54:13 -0400 Subject: [PATCH 049/218] lightdm: fix tmpfiles path (#46886) --- nixos/modules/services/x11/display-managers/lightdm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index ae2b05797fd0..8078b93a7574 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -252,7 +252,7 @@ in }; systemd.tmpfiles.rules = [ - "d /var/run/lightdm 0711 lightdm lightdm 0" + "d /run/lightdm 0711 lightdm lightdm 0" "d /var/cache/lightdm 0711 root lightdm -" "d /var/lib/lightdm 1770 lightdm lightdm -" "d /var/lib/lightdm-data 1775 lightdm lightdm -" From cc83d5933373e256e4d31599d3f4e85ee80915a6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 19 Sep 2018 12:10:09 -0400 Subject: [PATCH 050/218] zlib: Fix iOS cross build 1. CHOST is how one specifies the cross host platform with this non-standard configure script. We were just getting lucky with Linux cross. 2. install_name_tool needs the the binutils prefix. --- pkgs/development/libraries/zlib/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index d3fb0970cd00..d348f877f722 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -3,7 +3,7 @@ , static ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "zlib-${version}"; version = "1.2.11"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # what causes this difference. + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/*.so* $out/lib/*.dylib* ; do - install_name_tool -id "$file" $file + ${stdenv.cc.bintools.targetPrefix}install_name_tool -id "$file" $file done '' # Non-typical naming confuses libtool which then refuses to use zlib's DLL @@ -78,4 +78,8 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.all; }; -} +} // stdenv.lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + preConfigure = '' + export CHOST=${stdenv.hostPlatform.config} + ''; +}) From 3410dcd90e0d1ddcf3e3ec483bab7c0cbfc152c9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Sep 2018 18:23:18 +0200 Subject: [PATCH 051/218] signal-desktop: 1.16.0 -> 1.16.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 99cd8371aa94..040f5912db4b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0hw5h1m8fijhqybx0xijrkifn5wl50qibaxkn2mxqf4mjwlvaw9a"; + sha256 = "1qlibn6k5zbjw9bni2l20qx58jcpwrl99awdmgha1fzmpjkn6bl5"; }; phases = [ "unpackPhase" "installPhase" ]; From 5fb0ed64d0dfcb68d1e60e8a220f68ecc22c3967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till=20H=C3=B6ppner?= Date: Wed, 19 Sep 2018 18:42:13 +0200 Subject: [PATCH 052/218] appimage-run: Support type-1 Appimages (#45973) This attempts to detect older appimages and extract them in the same manner as new ones, without changing filesystem paths --- .../tools/package-management/appimage-run/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index a7fb8da99669..8e236aa426fd 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeScript, buildFHSUserEnv, coreutils +{ stdenv, writeScript, buildFHSUserEnv, coreutils, file, libarchive , extraPkgs ? pkgs: [] }: buildFHSUserEnv { @@ -131,7 +131,14 @@ buildFHSUserEnv { export APPDIR="$SQUASHFS_ROOT/squashfs-root" if [ ! -x "$APPDIR" ]; then cd "$SQUASHFS_ROOT" - "$APPIMAGE" --appimage-extract 2>/dev/null + + if ${file}/bin/file --mime-type --brief --keep-going "$APPIMAGE" | grep -q iso; then + # is type-1 appimage + ${libarchive}/bin/bsdtar -x -C "$SQUASHFS_ROOT" -f "$APPIMAGE" + else + # is type-2 appimage + "$APPIMAGE" --appimage-extract 2>/dev/null + fi fi cd "$APPDIR" From a3c820d79c60e64e19ffc2807ae5475f1107419e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 19 Sep 2018 16:50:21 +0000 Subject: [PATCH 053/218] ocamlPackages.cohttp: 1.0.2 -> 1.1.1 --- pkgs/development/ocaml-modules/cohttp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 79dc919556ae..0508f2b74f75 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.1.1"; name = "ocaml${ocaml.version}-cohttp-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-cohttp"; rev = "v${version}"; - sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka"; + sha256 = "1dzd6vy43b7p9xplzg2whylz5br59zxaqywa14b4l377f31gnwq1"; }; buildInputs = [ ocaml findlib dune jsonm ppx_fields_conv ppx_sexp_conv ]; From 265c5fc485267a2be8ca5d555bc247766bc72dbc Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Sep 2018 18:47:59 +0200 Subject: [PATCH 054/218] gollum: 4.1.2 -> 4.1.3 --- pkgs/applications/misc/gollum/Gemfile.lock | 42 +++++----- pkgs/applications/misc/gollum/default.nix | 1 + pkgs/applications/misc/gollum/gemset.nix | 89 +++++++++++++++------- 3 files changed, 88 insertions(+), 44 deletions(-) diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 7315c0a8d724..f63ffa091a07 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,26 +1,26 @@ GEM remote: https://rubygems.org/ specs: - charlock_holmes (0.7.3) + charlock_holmes (0.7.6) diff-lcs (1.3) gemojione (3.3.0) json - github-markup (1.6.1) - gitlab-grit (2.8.1) + github-markup (1.7.0) + gitlab-grit (2.8.2) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) + mime-types (>= 1.16) posix-spawn (~> 0.3) - gollum (4.1.2) + gollum (4.1.3) gemojione (~> 3.2) - gollum-lib (>= 4.2.7) + gollum-lib (>= 4.2.9) kramdown (~> 1.9.0) mustache (>= 0.99.5, < 1.0.0) sinatra (~> 1.4, >= 1.4.4) useragent (~> 0.16.2) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.2.7) + gollum-lib (4.2.9) gemojione (~> 3.2) github-markup (~> 1.6) gollum-grit_adapter (~> 1.0) @@ -28,27 +28,35 @@ GEM rouge (~> 2.1) sanitize (~> 2.1) stringex (~> 2.6) + twitter-text (= 1.14.7) json (2.1.0) kramdown (1.9.0) - mime-types (2.99.3) - mini_portile2 (2.2.0) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2018.0812) + mini_portile2 (2.3.0) mustache (0.99.8) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) posix-spawn (0.3.13) - rack (1.6.8) - rack-protection (1.5.3) + rack (1.6.10) + rack-protection (1.5.5) rack - rouge (2.1.1) + rouge (2.2.1) sanitize (2.1.0) nokogiri (>= 1.4.4) sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - stringex (2.7.1) + stringex (2.8.4) tilt (2.0.8) - useragent (0.16.8) + twitter-text (1.14.7) + unf (~> 0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.5) + useragent (0.16.10) PLATFORMS ruby @@ -57,4 +65,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.15.3 + 1.16.3 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 4ad32c5fd7f5..4a0a4e38a61b 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -4,6 +4,7 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "gollum"; + # nix-shell -p bundix icu zlib version = (import ./gemset.nix).gollum.version; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index cff774d7daa0..1b3cda168ac2 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -2,10 +2,10 @@ charlock_holmes = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7"; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.6"; }; diff-lcs = { source = { @@ -27,28 +27,28 @@ github-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq"; + sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; type = "gem"; }; - version = "1.6.1"; + version = "1.7.0"; }; gitlab-grit = { dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n"; + sha256 = "0xgs3l81ghlc5nm75n0pz7b2cj3hpscfq5iy27c483nnjn2v5mc4"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; gollum = { dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a"; + sha256 = "1146irmnm0xyzjzw8k14wvb6h4cqh4q53ds92wk6jpsfs6r1pjq6"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; gollum-grit_adapter = { dependencies = ["gitlab-grit"]; @@ -60,13 +60,13 @@ version = "1.0.1"; }; gollum-lib = { - dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"]; + dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq"; + sha256 = "1w48mrjgy4ykd1ix421n96nx0w15iid2aj3sgglpl3bdkizxhfqj"; type = "gem"; }; - version = "4.2.7"; + version = "4.2.9"; }; json = { source = { @@ -85,20 +85,29 @@ version = "1.9.0"; }; mime-types = { + dependencies = ["mime-types-data"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; + sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; type = "gem"; }; - version = "2.99.3"; + version = "3.2.2"; + }; + mime-types-data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; + type = "gem"; + }; + version = "3.2018.0812"; }; mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm"; + sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; mustache = { source = { @@ -112,10 +121,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn"; + sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.4"; }; posix-spawn = { source = { @@ -128,27 +137,27 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.10"; }; rack-protection = { dependencies = ["rack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.5"; }; rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p"; + sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.1"; }; sanitize = { dependencies = ["nokogiri"]; @@ -171,10 +180,10 @@ stringex = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv"; + sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1"; type = "gem"; }; - version = "2.7.1"; + version = "2.8.4"; }; tilt = { source = { @@ -184,12 +193,38 @@ }; version = "2.0.8"; }; + twitter-text = { + dependencies = ["unf"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1732h7hy1k152w8wfvjsx7b79alk45i5imwd37ia4qcx8hfm3gvg"; + type = "gem"; + }; + version = "1.14.7"; + }; + unf = { + dependencies = ["unf_ext"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; + type = "gem"; + }; + version = "0.0.7.5"; + }; useragent = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1139cjqyv1hk1qcw89k81ajjkqyakqgbcyvmfrsmjqi8yn9kgqhq"; + sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p"; type = "gem"; }; - version = "0.16.8"; + version = "0.16.10"; }; } \ No newline at end of file From e8a35913e138c169e0a2bbcc06efadd9363b24e6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 19 Sep 2018 19:13:14 +0200 Subject: [PATCH 055/218] jekyll: 3.8.3 -> 3.8.4 (security) --- .../misc/jekyll/basic/Gemfile.lock | 18 +++--- .../applications/misc/jekyll/basic/gemset.nix | 32 +++++----- .../misc/jekyll/full/Gemfile.lock | 32 +++++----- pkgs/applications/misc/jekyll/full/gemset.nix | 60 +++++++++---------- 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 15beb8a88fb1..a714cdbb0d06 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -17,13 +17,13 @@ GEM ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.8.0) + html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.3) + jekyll (3.8.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -38,7 +38,7 @@ GEM safe_yaml (~> 1.0) jekyll-avatar (0.6.0) jekyll (~> 3.0) - jekyll-mentions (1.4.0) + jekyll-mentions (1.4.1) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-sass-converter (1.5.2) @@ -49,7 +49,7 @@ GEM jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.10.0) + jemoji (0.10.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) @@ -62,18 +62,18 @@ GEM mercenary (0.3.6) mini_portile2 (2.3.0) minitest (5.11.3) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) pathutil (0.16.1) forwardable-extended (~> 2.6) - public_suffix (3.0.2) + public_suffix (3.0.3) rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rouge (3.1.1) + rouge (3.2.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.6) + sass (3.5.7) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -96,4 +96,4 @@ DEPENDENCIES rouge BUNDLED WITH - 1.14.6 + 1.16.3 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index a75f74119ca7..7ab1c70a98b4 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -78,10 +78,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf"; + sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.4"; }; "http_parser.rb" = { source = { @@ -104,10 +104,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk"; + sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw"; type = "gem"; }; - version = "3.8.3"; + version = "3.8.4"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -122,10 +122,10 @@ dependencies = ["html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb"; + sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; jekyll-sass-converter = { dependencies = ["sass"]; @@ -167,10 +167,10 @@ dependencies = ["gemoji" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25"; + sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.1"; }; kramdown = { source = { @@ -225,10 +225,10 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; + sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.4"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -242,10 +242,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; rb-fsevent = { source = { @@ -267,10 +267,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3"; + sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.1"; }; ruby_dep = { source = { @@ -292,10 +292,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61"; type = "gem"; }; - version = "3.5.6"; + version = "3.5.7"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 0689bad59806..01e4f368223c 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -22,19 +22,19 @@ GEM http_parser.rb (~> 0.6.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (0.15.2) + faraday (0.15.3) multipart-post (>= 1.2, < 3) fast-stemmer (1.0.2) ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) - html-pipeline (2.8.0) + html-pipeline (2.8.4) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.3) + jekyll (3.8.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -52,15 +52,15 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-feed (0.10.0) + jekyll-feed (0.11.0) jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) - jekyll-mentions (1.4.0) + jekyll-mentions (1.4.1) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.13.0) + jekyll-redirect-from (0.14.0) jekyll (~> 3.3) jekyll-sass-converter (1.5.2) sass (~> 3.4) @@ -70,7 +70,7 @@ GEM jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.10.0) + jemoji (0.10.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) @@ -83,20 +83,20 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) mercenary (0.3.6) - mime-types (3.1) + mime-types (3.2.2) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) + mime-types-data (3.2018.0812) mini_portile2 (2.3.0) minitest (5.11.3) multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) - octokit (4.9.0) + octokit (4.12.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.1) forwardable-extended (~> 2.6) - public_suffix (3.0.2) + public_suffix (3.0.3) pygments.rb (1.2.1) multi_json (>= 1.0.0) rb-fsevent (0.10.3) @@ -105,10 +105,10 @@ GEM rdiscount (2.2.0.1) rdoc (6.0.4) redcarpet (3.4.0) - rouge (3.1.1) + rouge (3.2.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.6) + sass (3.5.7) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -117,7 +117,7 @@ GEM addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) thread_safe (0.3.6) - tomlrb (1.2.6) + tomlrb (1.2.7) tzinfo (1.2.5) thread_safe (~> 0.1) yajl-ruby (1.3.1) @@ -152,4 +152,4 @@ DEPENDENCIES yajl-ruby (~> 1.3.1) BUNDLED WITH - 1.14.6 + 1.16.3 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index e5eb6d62a706..3e92d3f28a01 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -96,10 +96,10 @@ dependencies = ["multipart-post"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg"; + sha256 = "16hwxc8v0z6gkanckjhx0ffgqmzpc4ywz4dfhxpjlz2mbz8d5m52"; type = "gem"; }; - version = "0.15.2"; + version = "0.15.3"; }; fast-stemmer = { source = { @@ -137,10 +137,10 @@ dependencies = ["activesupport" "nokogiri"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf"; + sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.4"; }; "http_parser.rb" = { source = { @@ -163,10 +163,10 @@ dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk"; + sha256 = "01rnf0y7wx4rzh2ag74bg37vkxbg8m4nf450lypgh4khrarr3bhw"; type = "gem"; }; - version = "3.8.3"; + version = "3.8.4"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -190,10 +190,10 @@ dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5w2bd6dsjnc623qjw5h06n0wslh32rqkkjlkymga24cplbln8j"; + sha256 = "11mlqqbkmddnyh8xfjv5k6v7c73bbi92w7vw4x1c9xvggxrjzicp"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.0"; }; jekyll-gist = { dependencies = ["octokit"]; @@ -208,10 +208,10 @@ dependencies = ["html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb"; + sha256 = "0hg1rlra12im62z5yml4rlll3icz1146hkcv98mk2a96fsgniwqf"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; jekyll-paginate = { source = { @@ -225,10 +225,10 @@ dependencies = ["jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1crm5xqgv5asbbbaxfgky4ppib5rih59yzpa3yc94gh8b9cjixrj"; + sha256 = "08xfd7fvqcq6skybxsn4d60rqn4ws2y9hkhl71wz9zrc55xhgxa4"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; jekyll-sass-converter = { dependencies = ["sass"]; @@ -270,10 +270,10 @@ dependencies = ["gemoji" "html-pipeline" "jekyll"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25"; + sha256 = "1yjbgawzmlcppmlhz5sdhjim6ki0vh0vh07mbyf05qa4994ckihs"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.1"; }; kramdown = { source = { @@ -321,18 +321,18 @@ dependencies = ["mime-types-data"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; type = "gem"; }; - version = "3.1"; + version = "3.2.2"; }; mime-types-data = { source = { remotes = ["https://rubygems.org"]; - sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + sha256 = "07wvp0aw2gjm4njibb70as6rh5hi1zzri5vky1q6jx95h8l56idc"; type = "gem"; }; - version = "3.2016.0521"; + version = "3.2018.0812"; }; mini_portile2 = { source = { @@ -370,19 +370,19 @@ dependencies = ["mini_portile2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq"; + sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.4"; }; octokit = { dependencies = ["sawyer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298"; + sha256 = "1lki5vlsiijdmhaqdvr29zmcyvrlmkgi0x92hgan2194l2ikfjlh"; type = "gem"; }; - version = "4.9.0"; + version = "4.12.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -396,10 +396,10 @@ public_suffix = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s"; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; "pygments.rb" = { dependencies = ["multi_json"]; @@ -454,10 +454,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3"; + sha256 = "0h79gn2wmn1wix2d27lgiaimccyj8gvizrllyym500pir408x62f"; type = "gem"; }; - version = "3.1.1"; + version = "3.2.1"; }; ruby_dep = { source = { @@ -479,10 +479,10 @@ dependencies = ["sass-listen"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + sha256 = "1sy7xsbgpcy90j5ynbq967yplffp74pvph3r8ivn2sv2b44q6i61"; type = "gem"; }; - version = "3.5.6"; + version = "3.5.7"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -513,10 +513,10 @@ tomlrb = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09gh67v8s1pr7c37490sjp782gi4wf9k9cadp4l926h1sp27bcgz"; + sha256 = "1x3bg9mmma1gsl5j5kc9m8m77w6qwcq6ix2d0kwi5rcwpr7siyx6"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; tzinfo = { dependencies = ["thread_safe"]; From 5715aa1951b7b59d5332e5fdbbadb0e5b469887f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 19 Sep 2018 18:53:11 +0100 Subject: [PATCH 056/218] datadog-agent: remove privateTmp=true This allows postgres integration to connect to socket in /tmp --- nixos/modules/services/monitoring/datadog-agent.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 35c08f5e7e30..8fd3455a238f 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -213,7 +213,6 @@ in { Group = "datadog"; Restart = "always"; RestartSec = 2; - PrivateTmp = true; }; restartTriggers = [ datadogPkg ] ++ map (etc: etc.source) etcfiles; } attrs; From 6bb07ecbbc969d9afd9dccdd23c8ff4eaeba560c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 13:16:17 -0500 Subject: [PATCH 057/218] i7z: move to maintained fork (FreeBSD folks), 0.27.2 -> 0.27.3 --- pkgs/os-specific/linux/i7z/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 48d28036aa4f..3bf9fbd74d38 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -1,12 +1,15 @@ -{ stdenv, lib, fetchurl, ncurses +{ stdenv, lib, fetchFromGitHub, ncurses , withGui ? false, qt4 ? null }: stdenv.mkDerivation rec { - name = "i7z-0.27.2"; + name = "i7z-${version}"; + version = "0.27.3"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/i7z/${name}.tar.gz"; - sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7"; + src = fetchFromGitHub { + owner = "DimitryAndric"; + repo = "i7z"; + rev = "v${version}"; + sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds"; }; buildInputs = [ ncurses ] ++ lib.optional withGui qt4; From e1ed5b26c9bfb1880134ae1ee68a9f2c8026b1ed Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 19 Sep 2018 09:45:15 -0400 Subject: [PATCH 058/218] haskellPackages.pandoc-crossref: refactor disable tests for 0.3.2.1 Author acknowleges test failing (change when no longer 0.3.2.1). https://github.com/lierdakil/pandoc-crossref/issues/199 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 399bb21f6e62..0fc9a1b168e5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -360,6 +360,7 @@ self: super: { optional = dontCheck super.optional; orgmode-parse = dontCheck super.orgmode-parse; os-release = dontCheck super.os-release; + pandoc-crossref = dontCheck super.pandoc-crossref; # (most likely change when no longer 0.3.2.1) https://github.com/lierdakil/pandoc-crossref/issues/199 persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; From 234a24cbeb66f70afaab9f13a5a9973c2fb956e0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2018 13:35:51 +0200 Subject: [PATCH 059/218] LTS Haskell 12.10 --- .../configuration-hackage2nix.yaml | 81 ++++++++++--------- 1 file changed, 43 insertions(+), 38 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 467234b8a25d..2eefe636ca97 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: default-package-overrides: # Newer versions require contravariant-1.5.*, which many builds refuse at the moment. - base-compat-batteries ==0.10.1 - # LTS Haskell 12.9 + # LTS Haskell 12.10 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -177,7 +177,7 @@ default-package-overrides: - amazonka-xray ==1.6.0 - amqp ==0.18.1 - annotated-wl-pprint ==0.7.0 - - ansi-terminal ==0.8.0.4 + - ansi-terminal ==0.8.1 - ansi-wl-pprint ==0.6.8.2 - ANum ==0.2.0.2 - api-field-json-th ==0.1.0.2 @@ -217,9 +217,9 @@ default-package-overrides: - authenticate ==1.3.4 - authenticate-oauth ==1.6 - auto ==0.4.3.1 - - autoexporter ==1.1.10 + - autoexporter ==1.1.11 - auto-update ==0.1.4 - - avro ==0.3.4.2 + - avro ==0.3.5.1 - avwx ==0.3.0.2 - backprop ==0.2.5.0 - bank-holidays-england ==0.1.0.7 @@ -350,6 +350,7 @@ default-package-overrides: - cassava-records ==0.1.0.4 - cast ==0.1.0.2 - category ==0.2.0.1 + - cayley-client ==0.4.7 - cborg ==0.2.0.0 - cereal ==0.5.7.0 - cereal-conduit ==0.8.0 @@ -654,7 +655,7 @@ default-package-overrides: - eliminators ==0.4.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - email-validate ==2.3.2.6 + - email-validate ==2.3.2.7 - enclosed-exceptions ==1.0.3 - entropy ==0.4.1.1 - enummapset ==0.5.2.2 @@ -679,7 +680,7 @@ default-package-overrides: - eventful-sqlite ==0.2.0 - eventful-test-helpers ==0.2.0 - event-list ==0.1.2 - - eventstore ==1.1.5 + - eventstore ==1.1.6 - every ==0.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.4 @@ -726,8 +727,8 @@ default-package-overrides: - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - filtrable ==0.1.1.0 - - Fin ==0.2.5.0 - fin ==0.0.1 + - Fin ==0.2.5.0 - FindBin ==0.0.5 - find-clumpiness ==0.2.3.1 - fingertree ==0.1.4.1 @@ -743,14 +744,14 @@ default-package-overrides: - flay ==0.4 - flexible-defaults ==0.0.2 - floatshow ==0.2.4 - - flow ==1.0.14 + - flow ==1.0.15 - fmlist ==0.9.2 - fn ==0.3.0.2 - focus ==0.1.5.2 - foldable1 ==0.1.0.0 - fold-debounce ==0.2.0.7 - fold-debounce-conduit ==0.2.0.1 - - foldl ==1.4.3 + - foldl ==1.4.4 - folds ==0.7.4 - FontyFruity ==0.5.3.3 - force-layout ==0.4.0.6 @@ -817,7 +818,7 @@ default-package-overrides: - getopt-generics ==0.13.0.2 - ghc-core ==0.5.6 - ghc-exactprint ==0.5.6.1 - - ghcid ==0.7 + - ghcid ==0.7.1 - ghcjs-base-stub ==0.2.0.0 - ghcjs-codemirror ==0.0.0.2 - ghc-parser ==0.2.0.2 @@ -872,7 +873,7 @@ default-package-overrides: - gravatar ==0.8.0 - graylog ==0.1.0.1 - greskell ==0.2.1.0 - - greskell-core ==0.1.2.2 + - greskell-core ==0.1.2.3 - greskell-websocket ==0.1.1.0 - groom ==0.1.2.1 - groups ==0.4.1.0 @@ -950,7 +951,7 @@ default-package-overrides: - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.2 - hex ==0.1.2 - - hexml ==0.3.3 + - hexml ==0.3.4 - hexml-lens ==0.2.1 - hexpat ==0.20.13 - hexstring ==0.11.1 @@ -1011,7 +1012,7 @@ default-package-overrides: - hslua ==0.9.5.2 - hslua-aeson ==0.3.0.2 - hslua-module-text ==0.1.2.1 - - HsOpenSSL ==0.11.4.14 + - HsOpenSSL ==0.11.4.15 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - hspec ==2.5.5 @@ -1080,7 +1081,7 @@ default-package-overrides: - hw-mquery ==0.1.0.1 - hworker ==0.1.0.1 - hw-parser ==0.0.0.3 - - hw-prim ==0.6.2.14 + - hw-prim ==0.6.2.15 - hw-rankselect ==0.10.0.3 - hw-rankselect-base ==0.3.2.1 - hw-string-parse ==0.0.0.4 @@ -1119,7 +1120,7 @@ default-package-overrides: - indents ==0.5.0.0 - indexed-list-literals ==0.2.1.1 - inflections ==0.4.0.3 - - influxdb ==1.6.0.7 + - influxdb ==1.6.0.9 - ini ==0.3.6 - inline-c ==0.6.1.0 - inline-java ==0.8.4 @@ -1127,7 +1128,7 @@ default-package-overrides: - insert-ordered-containers ==0.2.1.0 - inspection-testing ==0.2.0.1 - instance-control ==0.1.2.0 - - integer-logarithms ==1.0.2.1 + - integer-logarithms ==1.0.2.2 - integration ==0.2.1 - intern ==0.9.2 - interpolate ==0.2.0 @@ -1151,6 +1152,7 @@ default-package-overrides: - ip6addr ==1.0.0 - iproute ==1.7.5 - IPv6Addr ==1.1.0 + - IPv6DB ==0.3.1 - ipython-kernel ==0.9.1.0 - irc ==0.6.1.0 - irc-client ==1.1.0.4 @@ -1222,9 +1224,9 @@ default-package-overrides: - lawful ==0.1.0.0 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.7.3 + - leancheck ==0.7.4 - leapseconds-announced ==2017.1.0.1 - - learn-physics ==0.6.2 + - learn-physics ==0.6.3 - lens ==4.16.1 - lens-action ==0.2.3 - lens-aeson ==1.0.2 @@ -1232,7 +1234,7 @@ default-package-overrides: - lens-family ==1.2.2 - lens-family-core ==1.2.2 - lens-family-th ==0.5.0.2 - - lens-labels ==0.2.0.1 + - lens-labels ==0.2.0.2 - lens-misc ==0.0.2.0 - lens-properties ==4.11.1 - lens-regex ==0.1.0 @@ -1343,7 +1345,7 @@ default-package-overrides: - minisat-solver ==0.1 - miniutter ==0.4.7.0 - mintty ==0.1.2 - - miso ==0.21.1.0 + - miso ==0.21.2.0 - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - mixed-types-num ==0.3.1.4 @@ -1461,6 +1463,7 @@ default-package-overrides: - non-empty ==0.3.0.1 - non-empty-sequence ==0.2.0.2 - non-negative ==0.1.2 + - not-gloss ==0.7.7.0 - nsis ==0.3.2 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1641,7 +1644,7 @@ default-package-overrides: - promises ==0.3 - prompt ==0.1.1.2 - protobuf ==0.2.1.2 - - protobuf-simple ==0.1.0.5 + - protobuf-simple ==0.1.1.0 - protocol-buffers ==2.4.11 - protocol-buffers-descriptor ==2.4.11 - protocol-radius ==0.0.1.1 @@ -1649,7 +1652,7 @@ default-package-overrides: - proto-lens ==0.3.1.0 - proto-lens-arbitrary ==0.1.2.2 - proto-lens-combinators ==0.1.0.11 - - proto-lens-optparse ==0.1.1.2 + - proto-lens-optparse ==0.1.1.3 - proto-lens-protobuf-types ==0.3.0.1 - proto-lens-protoc ==0.3.1.2 - protolude ==0.2.2 @@ -1668,7 +1671,7 @@ default-package-overrides: - QuickCheck ==2.11.3 - quickcheck-arbitrary-adt ==0.3.1.0 - quickcheck-assertions ==0.3.0 - - quickcheck-instances ==0.3.18 + - quickcheck-instances ==0.3.19 - quickcheck-io ==0.2.0 - quickcheck-simple ==0.1.0.4 - quickcheck-special ==0.1.0.6 @@ -1705,7 +1708,7 @@ default-package-overrides: - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - rebase ==1.2.4 - - record-dot-preprocessor ==0.1.3 + - record-dot-preprocessor ==0.1.4 - recursion-schemes ==5.0.3 - reducers ==3.12.3 - refact ==0.3.0.2 @@ -1777,8 +1780,8 @@ default-package-overrides: - sandman ==0.2.0.1 - say ==0.1.0.1 - sbp ==2.3.17 - - SCalendar ==1.1.0 - scalendar ==1.2.0 + - SCalendar ==1.1.0 - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 @@ -1894,10 +1897,11 @@ default-package-overrides: - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.6 - - sox ==0.2.3 - - soxlib ==0.0.3 + - sox ==0.2.3.1 + - soxlib ==0.0.3.1 - sparkle ==0.7.4 - sparse-linear-algebra ==0.3.1 + - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - speculate ==0.3.5 - speculation ==1.5.0.3 @@ -1908,7 +1912,7 @@ default-package-overrides: - split ==0.2.3.3 - splitmix ==0.0.1 - spoon ==0.3.1 - - spreadsheet ==0.1.3.7 + - spreadsheet ==0.1.3.8 - sqlite-simple ==0.4.16.0 - sqlite-simple-errors ==0.6.1.0 - sql-words ==0.1.6.2 @@ -1925,7 +1929,7 @@ default-package-overrides: - statistics ==0.14.0.2 - stb-image-redux ==0.2.1.2 - step-function ==0.2 - - stm ==2.4.5.0 + - stm ==2.4.5.1 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.0 - stm-containers ==0.2.16 @@ -1981,10 +1985,10 @@ default-package-overrides: - symengine ==0.1.2.0 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - - system-fileio ==0.3.16.3 + - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - tabular ==0.2.2.7 - - tagchup ==0.4.1 + - tagchup ==0.4.1.1 - tagged ==0.8.5 - tagged-binary ==0.2.0.1 - tagged-identity ==0.1.2 @@ -2026,12 +2030,12 @@ default-package-overrides: - terminal-size ==0.3.2.1 - test-framework ==0.8.2.0 - test-framework-hunit ==0.3.0.2 - - test-framework-quickcheck2 ==0.3.0.4 + - test-framework-quickcheck2 ==0.3.0.5 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.11.0.1 + - texmath ==0.11.1 - text ==1.2.3.0 - text-binary ==0.2.1.1 - text-builder ==0.5.4.3 @@ -2114,6 +2118,7 @@ default-package-overrides: - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - turtle ==1.5.10 + - TypeCompose ==0.9.13 - typed-process ==0.2.3.0 - type-fun ==0.1.1 - type-hint ==0.1 @@ -2137,7 +2142,7 @@ default-package-overrides: - unconstrained ==0.1.0.2 - unfoldable ==0.9.6 - unfoldable-restricted ==0.0.3 - - unicode ==0.0.1 + - unicode ==0.0.1.1 - unicode-show ==0.1.0.3 - unicode-transforms ==0.3.4 - unification-fd ==0.10.0.1 @@ -2158,7 +2163,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.1 - unix-time ==0.3.8 - - unliftio ==0.2.7.1 + - unliftio ==0.2.8.0 - unliftio-core ==0.1.2.0 - unlit ==0.4.0.0 - unordered-containers ==0.2.9.0 @@ -2208,7 +2213,7 @@ default-package-overrides: - verbosity ==0.2.3.0 - versions ==3.4.0.1 - ViennaRNAParser ==1.3.3 - - viewprof ==0.0.0.22 + - viewprof ==0.0.0.23 - vinyl ==0.8.1.1 - vivid ==0.3.0.2 - vivid-osc ==0.3.0.0 @@ -2237,7 +2242,7 @@ default-package-overrides: - wai-slack-middleware ==0.2.0 - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - - warp ==3.2.23 + - warp ==3.2.25 - warp-tls ==3.2.4.3 - warp-tls-uid ==0.2.0.5 - wave ==0.1.5 @@ -2301,7 +2306,7 @@ default-package-overrides: - xls ==0.1.1 - xlsx ==0.7.2 - xml ==1.3.14 - - xml-basic ==0.1.3 + - xml-basic ==0.1.3.1 - xmlbf ==0.4.1 - xmlbf-xeno ==0.1.1 - xml-conduit ==1.8.0 From 4b129a73db2e267b4c98b652f9a1313e052f431d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 13 Sep 2018 02:30:45 +0200 Subject: [PATCH 060/218] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.11.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/d5215acecc540c5969196ce0dbc2b51ff577dcc8. --- .../haskell-modules/hackage-packages.nix | 2218 +++++++++-------- 1 file changed, 1225 insertions(+), 993 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 003d9d259ace..dc245e85bc5d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2469,7 +2469,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_2_4_0_0" = callPackage + "Cabal_2_4_0_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, binary , bytestring, containers, deepseq, Diff, directory, filepath , integer-logarithms, mtl, optparse-applicative, parsec, pretty @@ -2479,8 +2479,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "2.4.0.0"; - sha256 = "1zz0vadgr8vn2x7fzv4hcip1mcvxah50sx6zzrxhn9c1lw0l0cgl"; + version = "2.4.0.1"; + sha256 = "161l9lgayzpb3wrp9bcp8k0a3rq5dpyiyrxjb87dhximi2mc16rv"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -9859,20 +9859,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.4.14"; - sha256 = "12blnh5x69wvhw1lx3vk14lm1klhqblgd539ffqnrg2dn9qh4ga4"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_4_15" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -9884,7 +9870,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -13908,6 +13893,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Oslo-Vectize" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Oslo-Vectize"; + version = "0.2"; + sha256 = "05lgpaw6glwflczsa3400fhih717ry4sikhs9ypyd7xlqvraad57"; + revision = "1"; + editedCabalFile = "03fchm31c0yl36l8nn3bykgncidrhp3ql44j0r3853s3vknai9gp"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + description = "Tests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "PArrows" = callPackage ({ mkDerivation, base, containers, ghc-prim, mtl }: mkDerivation { @@ -14385,8 +14385,8 @@ self: { }: mkDerivation { pname = "Persistence"; - version = "1.1.3"; - sha256 = "1v3agyf5dw7dckn3c8lww135dqyyrgb6mws4sy51lqm8zbqdnqb3"; + version = "1.1.4.2"; + sha256 = "0lvzzcmsmpmsj63ysf3ad6a2v14cf61daz767fxkcf7b7cl50cjp"; libraryHaskellDepends = [ base containers maximal-cliques parallel vector ]; @@ -14973,14 +14973,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "QuickCheck_2_12_2" = callPackage + "QuickCheck_2_12_4" = callPackage ({ mkDerivation, base, containers, deepseq, erf, process, random , template-haskell, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.12.2"; - sha256 = "0cqjxwjn0374baf3qs059jmj8qr147i2fqxn6cjhsn4wbzxnc48r"; + version = "2.12.4"; + sha256 = "0pagxjsj2anyy1af0qc7b5mydblhnk3976bda3qxv47qp4kb5xn9"; libraryHaskellDepends = [ base containers deepseq erf random template-haskell tf-random transformers @@ -21125,6 +21125,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "activitypub" = callPackage + ({ mkDerivation, aeson, base, network-uri, text, time }: + mkDerivation { + pname = "activitypub"; + version = "0.1.0.0"; + sha256 = "1a9x42x0bysia00672qala6q6g5dgdfzwlzk2969c7q9gsxf63y9"; + libraryHaskellDepends = [ aeson base network-uri text time ]; + description = "ActivityPub Haskell Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "activitystreams-aeson" = callPackage ({ mkDerivation, aeson, base, text, time, unordered-containers }: mkDerivation { @@ -22450,28 +22461,29 @@ self: { }) {}; "aip" = callPackage - ({ mkDerivation, base, bytestring, digit, directory, doctest - , filepath, HTTP, lens, network-uri, papa, parsec, parsers - , QuickCheck, quickcheck-text, tagsoup, tagsoup-selection - , template-haskell, transformers + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, checkers + , Crypto, directory, exceptions, filepath, HTTP, lens, network-uri + , optparse-applicative, parsec, parsers, QuickCheck, tagsoup + , tagsoup-selection, tasty, tasty-hunit, tasty-quickcheck, time + , transformers, unordered-containers, utf8-string }: mkDerivation { pname = "aip"; - version = "0.0.1"; - sha256 = "162mmwniiwlyi3h7d4xxmk2a8pr3ldnl1mx9m9yjpl5vy0926lyd"; + version = "0.1.0"; + sha256 = "0b2jr4z0mdkpqzay2c8m2zbbsrs5ia1l5m7zy02nh63ifl5avw2k"; + revision = "1"; + editedCabalFile = "13n79gq17kj5q81512j51gz0ld772anyxixfdx1q8inay4araplx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring digit directory filepath HTTP lens network-uri papa - parsec parsers tagsoup tagsoup-selection transformers - ]; - executableHaskellDepends = [ - base bytestring digit directory filepath HTTP lens network-uri papa - parsec parsers tagsoup tagsoup-selection transformers + aeson aeson-pretty base bytestring Crypto directory exceptions + filepath HTTP lens network-uri optparse-applicative parsec parsers + tagsoup tagsoup-selection time transformers unordered-containers + utf8-string ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base directory doctest filepath parsec QuickCheck quickcheck-text - template-haskell + base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Aeronautical Information Package (AIP)"; license = stdenv.lib.licenses.bsd3; @@ -22973,6 +22985,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alg_0_2_7_0" = callPackage + ({ mkDerivation, base, util }: + mkDerivation { + pname = "alg"; + version = "0.2.7.0"; + sha256 = "00ih68mh1494s856ygkc887m0vhrs2sfchjgqrsgw8v7lqcqjsx6"; + libraryHaskellDepends = [ base util ]; + description = "Algebraic structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alga" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions , file-embed, filepath, formatting, haskeline, hspec, hxt @@ -26738,19 +26762,6 @@ self: { }) {}; "ansi-terminal" = callPackage - ({ mkDerivation, base, colour }: - mkDerivation { - pname = "ansi-terminal"; - version = "0.8.0.4"; - sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base colour ]; - description = "Simple ANSI terminal support, with Windows compatibility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ansi-terminal_0_8_1" = callPackage ({ mkDerivation, base, colour }: mkDerivation { pname = "ansi-terminal"; @@ -26761,7 +26772,6 @@ self: { libraryHaskellDepends = [ base colour ]; description = "Simple ANSI terminal support, with Windows compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ansi-terminal-game" = callPackage @@ -26919,8 +26929,8 @@ self: { }: mkDerivation { pname = "antiope-athena"; - version = "6.0.1"; - sha256 = "0y8a3rs5sy2qv2pwqb6ap6bl64qhp7x0jqqy1q237vfm2w6vrj6v"; + version = "6.0.3"; + sha256 = "0w50dw9fig4fhk40fjgj1hggs1jbw0yhdrzinmwr2a8lg3nxx5z6"; libraryHaskellDepends = [ amazonka amazonka-athena amazonka-core base lens resourcet text unliftio-core @@ -26932,6 +26942,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "antiope-contract" = callPackage + ({ mkDerivation, aeson, antiope-s3, avro, base, bytestring, text }: + mkDerivation { + pname = "antiope-contract"; + version = "6.0.3"; + sha256 = "001qywhyk013148g4cjw5xkr6b006zvn9f18m98mj5wg6wm1yxzc"; + libraryHaskellDepends = [ + aeson antiope-s3 avro base bytestring text + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "antiope-core" = callPackage ({ mkDerivation, amazonka, amazonka-core, base, bytestring , generic-lens, http-client, lens, monad-logger, mtl, resourcet @@ -26939,8 +26961,8 @@ self: { }: mkDerivation { pname = "antiope-core"; - version = "6.0.1"; - sha256 = "1h7yd3p5dqkq118xvmp9ifydgak311pfibkpgy3il0qj4gj2g8sa"; + version = "6.0.3"; + sha256 = "1zrp7dp86vgcj215ykwagjwpqnz137qbi1czhasxq3bby6rmkvca"; libraryHaskellDepends = [ amazonka amazonka-core base bytestring generic-lens http-client lens monad-logger mtl resourcet transformers unliftio-core @@ -26960,8 +26982,8 @@ self: { }: mkDerivation { pname = "antiope-dynamodb"; - version = "6.0.1"; - sha256 = "1f8ixkvh7f5dgxl76823f275c3r6f1xmwhx4rfcmd6z90dn8damm"; + version = "6.0.3"; + sha256 = "1s4x1y88zzac8i5p2yg28q91lknh4cxm72fsxqbpdwq43p1iynb0"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-dynamodb antiope-core base generic-lens lens text unliftio-core unordered-containers @@ -26981,8 +27003,8 @@ self: { }: mkDerivation { pname = "antiope-messages"; - version = "6.0.1"; - sha256 = "1ib2j0jlcfzq89a4vs7r282hpmqnqg2gw8l1ibfiahl4ac91z7zn"; + version = "6.0.3"; + sha256 = "1mvg36wbj5knqrzmrvh9pn7aw1a22pcv1j8dafvg9qzm6wkr2liw"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-s3 base generic-lens lens lens-aeson monad-loops network-uri text @@ -27005,8 +27027,8 @@ self: { }: mkDerivation { pname = "antiope-s3"; - version = "6.0.1"; - sha256 = "1cjvzd47vprn916d1fks6lf08plns326xircfhc69qblkzvqzljs"; + version = "6.0.3"; + sha256 = "17ffjl3myk0575cds8z49rv9nkc72yvx37ka5l4r43p8faj82q2m"; libraryHaskellDepends = [ amazonka amazonka-core amazonka-s3 base bytestring conduit conduit-extra exceptions generic-lens http-types lens monad-logger @@ -27027,8 +27049,8 @@ self: { }: mkDerivation { pname = "antiope-sns"; - version = "6.0.1"; - sha256 = "0hqvh3vzpdr9g6v778qn17nfrqvg8i2lszqgss9fb8290mlm8x01"; + version = "6.0.3"; + sha256 = "1zxwhlaypk0pykrg39zi1zlz7zs0dha4ri3b6cb0qdbprcwbfvvx"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-sns base generic-lens lens text unliftio-core @@ -27048,8 +27070,8 @@ self: { }: mkDerivation { pname = "antiope-sqs"; - version = "6.0.1"; - sha256 = "0pfhhgc7dkp4dn2k0dxy2pkmbml9js351ab2y2hln5jpsni9qfc0"; + version = "6.0.3"; + sha256 = "0clljlvbz6irxpfjrzhc541991r9spsw8aj5mblb666llc34nbax"; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-sqs antiope-messages antiope-s3 base generic-lens lens lens-aeson @@ -27141,6 +27163,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aos-signature" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, memory, mtl + , protolude, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "aos-signature"; + version = "0.1.0"; + sha256 = "1nyizswc7jc6hylb57nsmpqndvqm8mk1wi2fi1l1cqgbkisrxmy5"; + libraryHaskellDepends = [ + base bytestring cryptonite memory mtl protolude random + ]; + testHaskellDepends = [ + base bytestring cryptonite memory mtl protolude QuickCheck random + tasty tasty-hunit tasty-quickcheck + ]; + description = "An implementation of the AOS signatures"; + license = stdenv.lib.licenses.asl20; + }) {}; + "aosd" = callPackage ({ mkDerivation, base, bindings-DSL, cairo, colour , language-haskell-extract, libaosd, monad-control, pango @@ -30170,6 +30212,8 @@ self: { pname = "attoparsec"; version = "0.13.2.2"; sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx"; + revision = "2"; + editedCabalFile = "1j06na26rsahrbkzrs71nl7ym8fk390pnvh577wlxs4ik6hsn2va"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -30803,20 +30847,6 @@ self: { }) {}; "autoexporter" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; - version = "1.1.10"; - sha256 = "0rf28h7nzm5ngcrj1900d0vgwbfr1y3s4q7wwbvdw2mg29rw4f0r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base Cabal directory filepath ]; - description = "Automatically re-export modules"; - license = stdenv.lib.licenses.mit; - }) {}; - - "autoexporter_1_1_11" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; @@ -30828,7 +30858,6 @@ self: { executableHaskellDepends = [ base Cabal directory filepath ]; description = "Automatically re-export modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autom" = callPackage @@ -30945,12 +30974,15 @@ self: { }) {}; "avahi" = callPackage - ({ mkDerivation, base, dbus-core, text }: + ({ mkDerivation, base, bytestring, dbus, text }: mkDerivation { pname = "avahi"; - version = "0.1.1"; - sha256 = "0b2bw0rp33g8s1y6hyqji3ycv26a4ixgjmkph93isnjxglfl6ah0"; - libraryHaskellDepends = [ base dbus-core text ]; + version = "0.2.0"; + sha256 = "1l1z1yvldhdw36ar40ca9y5zpjfahspv40cbq8kgn2246gcgc8am"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring dbus text ]; + executableHaskellDepends = [ base bytestring dbus text ]; description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -31133,32 +31165,6 @@ self: { }) {}; "avro" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, binary - , bytestring, containers, data-binary-ieee754, directory, entropy - , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib - , QuickCheck, scientific, semigroups, tagged, template-haskell - , text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "avro"; - version = "0.3.4.2"; - sha256 = "0g6y8f6j38n52vqwj185lyqc666cqrmgd6pn3427cqlhcj927b7v"; - libraryHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific - semigroups tagged template-haskell text unordered-containers vector - ]; - testHaskellDepends = [ - aeson array base base16-bytestring binary bytestring containers - directory entropy extra fail hashable hspec lens lens-aeson mtl - pure-zlib QuickCheck scientific semigroups tagged template-haskell - text transformers unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_3_5_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, binary , bytestring, containers, data-binary-ieee754, directory, entropy , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib @@ -31182,7 +31188,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avwx" = callPackage @@ -33849,8 +33854,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; - version = "0.2.2.10"; - sha256 = "1irrdx2l6pj96cc983jvpkfnkg43zrz1rk1qnin8c2l8kvpwbc76"; + version = "0.2.2.11"; + sha256 = "07blpjp84f3xycnrg0dwz3rvlm665dxri2ch54145qd4rxy9hlln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl time ]; @@ -37802,6 +37807,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blunk-hask-tests" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "blunk-hask-tests"; + version = "0.2"; + sha256 = "10x4xjlp1mj9gmsibvd21k76gj97prdsgwxxpg39425xgrzph6ll"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + description = "Tests for the Blunk sequencer library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blunt" = callPackage ({ mkDerivation, aeson, base, bytestring, clay, flow, http-types , jmacro, lucid, pointfree, pointful, text, wai, wai-extra @@ -38206,8 +38224,8 @@ self: { }: mkDerivation { pname = "boolector"; - version = "0.0.0.5"; - sha256 = "0wgz2x8jwv5zwh9g7jpvl1q6inyvhjlh4jf3983r3zxr3k2jmxq5"; + version = "0.0.0.7"; + sha256 = "1mb897br307c84p0aj8r20qjwryinhy0bxgm62hphz7mvxlak1pb"; libraryHaskellDepends = [ base containers directory mtl temporary ]; @@ -38824,6 +38842,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "brick-dropdownmenu" = callPackage + ({ mkDerivation, base, brick, containers, microlens, microlens-ghc + , microlens-th, pointedlist, vector, vty + }: + mkDerivation { + pname = "brick-dropdownmenu"; + version = "0.1.0"; + sha256 = "1801l15xrl5a822v0cdrf8d41iklfqlp6gzkyj14a7fqf3ycc7rw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick containers microlens microlens-ghc microlens-th + pointedlist vector vty + ]; + description = "A drop-down menu widget for brick"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "brick-skylighting" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty @@ -39614,21 +39650,21 @@ self: { "bulletproofs" = callPackage ({ mkDerivation, arithmoi, base, containers, cryptonite, memory - , protolude, QuickCheck, tasty, tasty-discover, tasty-hunit - , tasty-quickcheck, text + , MonadRandom, protolude, QuickCheck, random-shuffle, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "bulletproofs"; - version = "0.2.0"; - sha256 = "0njc7wd1vn6i9zw35vjzm73gzv20b6qn3zci61lpnp3zclbclnmb"; - revision = "1"; - editedCabalFile = "0im8y3699rvl0ak3smwry3rafyvrypxan9jb5d39xanwmny2qnky"; + version = "0.3.0"; + sha256 = "10ga057zp6sgc177difnb1jjvrsq2d083jchgry7xha2yn0cq0r7"; libraryHaskellDepends = [ - arithmoi base containers cryptonite memory protolude text + arithmoi base containers cryptonite memory MonadRandom protolude + random-shuffle text ]; testHaskellDepends = [ - arithmoi base containers cryptonite memory protolude QuickCheck - tasty tasty-discover tasty-hunit tasty-quickcheck text + arithmoi base containers cryptonite memory MonadRandom protolude + QuickCheck random-shuffle tasty tasty-discover tasty-hunit + tasty-quickcheck text ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.asl20; @@ -41090,23 +41126,25 @@ self: { ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, containers, cryptohash-sha256, deepseq , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, mtl, network, network-uri, pretty, process - , random, resolv, stm, tar, time, unix, zlib + , hashable, HTTP, mtl, network, network-uri, parsec, pretty + , process, random, resolv, stm, tar, text, time, unix, zip-archive + , zlib }: mkDerivation { pname = "cabal-install"; - version = "2.2.0.0"; - sha256 = "1nd3ch7qr4dpfxhgkcq2lnhvszx2kjgnn1kwb44vk9y5jgfs4mn8"; + version = "2.4.0.0"; + sha256 = "1xmyl0x8wqfrnray6ky5wy0g0samv4264fbdlzxhqsvk9dbfja8k"; revision = "1"; - editedCabalFile = "0f1svlhh4cpj3p5fs9bcjpv15qp291lnvlaxxcw7aib8a1gn3wim"; - isLibrary = true; + editedCabalFile = "0cni9i6f6kbfl6f5gypb9ky94ib1w6d0nkd05j4lmrjadnxss49a"; + isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; executableHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal containers cryptohash-sha256 deepseq directory echo edit-distance filepath hackage-security hashable HTTP mtl network network-uri - pretty process random resolv stm tar time unix zlib + parsec pretty process random resolv stm tar text time unix + zip-archive zlib ]; doCheck = false; postInstall = '' @@ -41620,8 +41658,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.11"; - sha256 = "1wsxris61139j0bvrmzjmjqn186nmr5gvpddv098154d2w8hqn41"; + version = "2.11.1"; + sha256 = "16ghy26lzf756197xdm8i3lg5qd8bgzjv80llbkpayibh55rkq72"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43911,8 +43949,8 @@ self: { }: mkDerivation { pname = "cdeps"; - version = "0.1.1.7"; - sha256 = "15acmkp512bzpq9d0yz4dclpvb71fr2wv292ygv371nhyzs8vilp"; + version = "0.1.1.8"; + sha256 = "15a3sk4xsr9qz30chf4bzpkhp1s24vw30nhi0vibgshlminfbxv4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47333,8 +47371,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.3"; - sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179"; + version = "1.7.4"; + sha256 = "0vpsb7sngc8q7bkdg737bfzqfkl14mwjzaycfs0x0fwl6f8l5a8a"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -49450,6 +49488,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compdata-fixplate" = callPackage + ({ mkDerivation, base, composition, containers, deriving-compat + , fixplate, tree-view + }: + mkDerivation { + pname = "compdata-fixplate"; + version = "0.1.2"; + sha256 = "1ljnmwgjllpcrgibfxxb4zghfl76g7951i2r9haycpwmikz7dggz"; + libraryHaskellDepends = [ + base composition containers deriving-compat fixplate tree-view + ]; + description = "Compdata basics implemented on top of Fixplate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compdata-param" = callPackage ({ mkDerivation, base, compdata, containers, HUnit, mtl , template-haskell, test-framework, test-framework-hunit @@ -50259,8 +50312,8 @@ self: { }: mkDerivation { pname = "concurrency-benchmarks"; - version = "0.1.0"; - sha256 = "1qsn726ic2v7mxm7f05n1vlpcvn0xwys2yj0vn243fsmw3075gzi"; + version = "0.1.1"; + sha256 = "1zbkyyryh24k67kh3amzscfh7mljj1l6yqd926bkl4ps4d1mdn5d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -51616,12 +51669,12 @@ self: { }) {}; "constrained-categories" = callPackage - ({ mkDerivation, base, tagged, void }: + ({ mkDerivation, base, semigroups, tagged, void }: mkDerivation { pname = "constrained-categories"; - version = "0.3.1.0"; - sha256 = "0xxmbvzxa2phwn25haxbr6gv0cnh92c1i2l5anhckqizx29gl668"; - libraryHaskellDepends = [ base tagged void ]; + version = "0.3.1.1"; + sha256 = "00h8pw0pqj7lmngwzmz27lmvglpidgxhhxrdf275s49cdnkf8cvk"; + libraryHaskellDepends = [ base semigroups tagged void ]; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -52908,6 +52961,8 @@ self: { pname = "corecursive-main"; version = "0.1.0.0"; sha256 = "14ckdqmy3r06kqhlp7mpapmx01369vcfmaj78gjywlqznchpw6dk"; + revision = "1"; + editedCabalFile = "0ffdav9hqn3vn3a2fpxcjlflir0f2lay800rsdi1qg67jycdfk73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; @@ -54535,6 +54590,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-enigma_0_0_2_13" = callPackage + ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck + , split + }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.0.2.13"; + sha256 = "0w82f9hbhhksqkgj3d846l3cgg210ra5133rji2k41mc74l0r0dl"; + libraryHaskellDepends = [ base containers MissingH mtl split ]; + testHaskellDepends = [ base HUnit QuickCheck ]; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "crypto-multihash" = callPackage ({ mkDerivation, base, base58-bytestring, bytestring, containers , cryptonite, hspec, memory, QuickCheck, string-conversions @@ -54845,8 +54915,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.100.1"; sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"; - revision = "2"; - editedCabalFile = "0vyb9cfvpfxpslxvvhd48gw37i9g8ry5x63xwxd9q7xfiqhs7p3a"; + revision = "3"; + editedCabalFile = "0ld224mdmw9mgzcl20q82rqkyl7d5vmi1iknsyymq58gcvcwdi2m"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -54865,8 +54935,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.100.1"; sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; - revision = "2"; - editedCabalFile = "0xas0nbq9bfdzlj6k565ibizv1cqvzfzsdj6q9pdiiwyxqblqc3m"; + revision = "3"; + editedCabalFile = "0i30cc85732v27baibdjy2kjjkdfv335ib5sk5ggwvsysvvvr66l"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -54885,8 +54955,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.101.0"; sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; - revision = "1"; - editedCabalFile = "19birnmwga1yh82l4jqc3fygqkqcf5y8dlldnxfswngkzc3rvwp3"; + revision = "2"; + editedCabalFile = "0m5h68xm60wrjv88gg6cn1q5qki5674mxl4d6sn3vxpbcj9b5417"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -54907,8 +54977,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.100.1"; sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h"; - revision = "2"; - editedCabalFile = "1xy1j3bn2w8my0q04s7z460rddmnqfdh43l95m86rpk75xpiryil"; + revision = "3"; + editedCabalFile = "19m1fp0i7ba84aa72d5wf59c7j0p4yr1bc43in8pspgywhsr3lfl"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -59925,8 +59995,8 @@ self: { }: mkDerivation { pname = "deferred-folds"; - version = "0.9.7"; - sha256 = "18kyf6li2n3gzsvvdqsf4vwb1l0la755m1dl7gddg2ysnb8kkqb0"; + version = "0.9.7.1"; + sha256 = "1mnibf7k40p8y8iqfd28q51nmdz5l3lpmillma2lzbysw24xr6qk"; libraryHaskellDepends = [ base bytestring containers foldl hashable primitive transformers unordered-containers vector @@ -60305,6 +60375,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dense-int-set" = callPackage + ({ mkDerivation, base, cereal, cereal-vector, deferred-folds + , hashable, vector, vector-algorithms + }: + mkDerivation { + pname = "dense-int-set"; + version = "0.1.5"; + sha256 = "0xhr7iyhh38nipqb0dkxflh4xr5a10i8zsf8vv11pfqy62irhj6g"; + libraryHaskellDepends = [ + base cereal cereal-vector deferred-folds hashable vector + vector-algorithms + ]; + description = "Dense int-set"; + license = stdenv.lib.licenses.mit; + }) {}; + "dependency" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, containers , criterion, deepseq, hspec, microlens @@ -60445,6 +60531,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "deptrack-core" = callPackage + ({ mkDerivation, base, containers, dlist, mtl, parsec }: + mkDerivation { + pname = "deptrack-core"; + version = "0.1.0.0"; + sha256 = "11v9yvvsp3m3igpqqqqkx1cp648s87xpa4d06vbsxnz4k6yp4bjj"; + libraryHaskellDepends = [ base containers dlist mtl parsec ]; + description = "DepTrack Core types and model"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "deptrack-devops" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring, binary + , bytestring, containers, deptrack-core, distributed-closure + , dotgen, hashable, lens, mtl, safe, stm, text + }: + mkDerivation { + pname = "deptrack-devops"; + version = "0.1.0.0"; + sha256 = "13m6y88icsy6068h6n8klv480hnrjsmqy0szmssrcgsqjnjzpdzh"; + libraryHaskellDepends = [ + array async base base64-bytestring binary bytestring containers + deptrack-core distributed-closure dotgen hashable lens mtl safe stm + text + ]; + description = "DepTrack applied to DevOps"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "deptrack-dot" = callPackage + ({ mkDerivation, base, containers, deptrack-core, dotgen }: + mkDerivation { + pname = "deptrack-dot"; + version = "0.1.0.0"; + sha256 = "1lxkab4c3qwgsv0wldvii8qspzq57j82y4bdc28kpp023g38gvb6"; + libraryHaskellDepends = [ base containers deptrack-core dotgen ]; + testHaskellDepends = [ base containers deptrack-core dotgen ]; + description = "Facilitate Graphviz representations of DepTrack dependencies"; + license = stdenv.lib.licenses.asl20; + }) {}; + "deque" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -60683,6 +60810,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "deriving-compat_0_5_2" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, containers + , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged + , template-haskell, th-abstraction, transformers + , transformers-compat + }: + mkDerivation { + pname = "deriving-compat"; + version = "0.5.2"; + sha256 = "0h5jfpwawp7xn9vi82zqskaypa3vypm97lz2farmmfqvnkw60mj9"; + libraryHaskellDepends = [ + base containers ghc-boot-th ghc-prim template-haskell + th-abstraction transformers transformers-compat + ]; + testHaskellDepends = [ + base base-compat base-orphans hspec QuickCheck tagged + template-haskell transformers transformers-compat + ]; + testToolDepends = [ hspec-discover ]; + description = "Backports of GHC deriving extensions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -62535,6 +62686,8 @@ self: { pname = "digit"; version = "0.7"; sha256 = "0451nlmf2ggg1dy82qkdxqlg4lgnsvkrxl3qrcjr5dzmi2ghk3ql"; + revision = "1"; + editedCabalFile = "1zdy8jmsn3a065vapl8lf4kzxafbqdwhp99b9s3ff8dj8q5nx4qj"; libraryHaskellDepends = [ base lens parsers scientific semigroupoids semigroups template-haskell @@ -63140,6 +63293,19 @@ self: { license = stdenv.lib.licenses.mit; }) {markdown = null;}; + "discrete" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "discrete"; + version = "0.1.0.0"; + sha256 = "1888rv1lqmzip0g2c6f12b01kpwcd5vwk2ixby0g2291xnl7zs2w"; + revision = "1"; + editedCabalFile = "1ary1xyh2gy099p1madapfqhw2r1ys1pd8xg396xxaas4vjmqqkh"; + libraryHaskellDepends = [ base ]; + description = "replacement for enum"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "discrete-intervals" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -64192,6 +64358,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_5" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.5"; + sha256 = "0hqvjld86vna9m0za4g37nv2gml2s8q01208igp4l3dl76l8ma4q"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -64531,19 +64710,24 @@ self: { }) {}; "docker-build-cacher" = callPackage - ({ mkDerivation, base, containers, foldl, language-docker + ({ mkDerivation, aeson, base, containers, foldl, language-docker , system-filepath, text, turtle }: mkDerivation { pname = "docker-build-cacher"; - version = "2.0.0"; - sha256 = "1y5w6l75fvszx33f254a6sncvb3wab0iq7dci3qbj7s2147vl63n"; - isLibrary = false; + version = "2.1.1"; + sha256 = "0n8x0mcb0rznazbwf9yrnl4mha6zxvpn9kqwna7xd9rxqasqzv0n"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ - base containers foldl language-docker system-filepath text turtle + libraryHaskellDepends = [ + aeson base containers foldl language-docker system-filepath text + turtle ]; - description = "Builds a services with docker and caches all of its intermediate stages"; + executableHaskellDepends = [ + aeson base containers foldl language-docker system-filepath text + turtle + ]; + description = "Builds a docker image and caches all of its intermediate stages"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64592,6 +64776,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dockerfile_0_2_0" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "dockerfile"; + version = "0.2.0"; + sha256 = "1amm7xrfry3fnd53wj50b684lp1vkv98yrz52xxhlldzb4jrk8cp"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "A Haskell DSL for generating Dockerfiles"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "docopt" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text, th-lift @@ -65527,6 +65724,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "drifter-sqlite" = callPackage + ({ mkDerivation, base, containers, directory, drifter, mtl + , sqlite-simple, tasty, tasty-hunit, text, time, transformers + }: + mkDerivation { + pname = "drifter-sqlite"; + version = "0.1.0.0"; + sha256 = "07267h287bpn2smr50m7cf179kfmv8vhv4cwa4qdi1wpifiz8pic"; + libraryHaskellDepends = [ + base containers drifter mtl sqlite-simple time transformers + ]; + testHaskellDepends = [ + base containers directory drifter mtl sqlite-simple tasty + tasty-hunit text time transformers + ]; + description = "SQLite support for the drifter schema migraiton tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "drinkery" = callPackage ({ mkDerivation, base, exceptions, mtl, transformers }: mkDerivation { @@ -67943,8 +68159,8 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.4.3"; - sha256 = "154i3vwqw5qyam14x8dvpgffcgh2ljdl1hc9zw6xhiwb82vazy3z"; + version = "0.5.0"; + sha256 = "1laa86kkw2w4bz2z69fnp1vwyjnhz2w2zy6va93fgvxmn0cf7mj3"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -68429,22 +68645,6 @@ self: { }) {}; "email-validate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec - , QuickCheck, template-haskell - }: - mkDerivation { - pname = "email-validate"; - version = "2.3.2.6"; - sha256 = "0chgylvc8xmhp933rdbmpg5sv4y7yg2h6kbf0ip1dzmbd5p55pa5"; - libraryHaskellDepends = [ - attoparsec base bytestring template-haskell - ]; - testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; - description = "Email address validation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "email-validate_2_3_2_7" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec , QuickCheck, template-haskell }: @@ -68458,7 +68658,6 @@ self: { testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; description = "Email address validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "email-validate-json" = callPackage @@ -70776,41 +70975,6 @@ self: { }) {}; "eventstore" = callPackage - ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring - , cereal, clock, connection, containers, dns, dotnet-timespan - , ekg-core, exceptions, fast-logger, hashable, http-client - , interpolate, lifted-async, lifted-base, machines, monad-control - , monad-logger, mono-traversable, mtl, protobuf, random - , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec - , tasty-hunit, text, time, transformers-base, unordered-containers - , uuid - }: - mkDerivation { - pname = "eventstore"; - version = "1.1.5"; - sha256 = "1c8iiq943smldh5yvjpfycfjzy8hnsb2dmvcnbzk41cpcdq2zkx8"; - libraryHaskellDepends = [ - aeson array base bifunctors bytestring cereal clock connection - containers dns dotnet-timespan ekg-core exceptions fast-logger - hashable http-client interpolate lifted-async lifted-base machines - monad-control monad-logger mono-traversable mtl protobuf random - safe-exceptions semigroups stm stm-chans text time - transformers-base unordered-containers uuid - ]; - testHaskellDepends = [ - aeson async base bytestring cereal connection containers - dotnet-timespan exceptions fast-logger hashable lifted-async - lifted-base monad-control mono-traversable protobuf safe-exceptions - semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time - transformers-base unordered-containers uuid - ]; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventstore_1_1_6" = callPackage ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring , cereal, clock, connection, containers, dns, dotnet-timespan , ekg-core, exceptions, fast-logger, hashable, http-client @@ -71729,8 +71893,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.1.9"; - sha256 = "1620ljwnprqsrbp2dp0c2f7kpjg7j1xz12x794kpq3csbdp52afk"; + version = "0.2"; + sha256 = "1mqkz354w29fyc1sihr8bv10j6igcjhdn807ga9608r1lccgqf2d"; libraryHaskellDepends = [ attoparsec base containers free lattices singletons text transformers @@ -71746,8 +71910,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.6"; - sha256 = "0la7acpr9vd67crgj87920wlckyhzvilz9jv86ms1hiwwmvl1c7a"; + version = "0.2"; + sha256 = "17q4mjlh8dxs1al3mw6xm9maxhbmmqprckqnyq9mwqc5j6c26b84"; libraryHaskellDepends = [ base containers expressions list-t singletons transformers z3 ]; @@ -72107,6 +72271,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "f-ree-hack-cheats-free-v-bucks-generator" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "f-ree-hack-cheats-free-v-bucks-generator"; + version = "0.2"; + sha256 = "0dk9bfcwalwlq52hnl4g4ypz2bip0d8yy45k9dib7cv6v09xfwhi"; + revision = "3"; + editedCabalFile = "0dsj8dbdkljcrk0qkmym2pciwcni602yrc90f47v1nm37hs46c6m"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + description = "Spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "faceted" = callPackage ({ mkDerivation, base, free }: mkDerivation { @@ -72561,11 +72740,10 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "1.4.2"; - sha256 = "19z36f76w2cp763ija5di0zn1p9c9i1albx6q429f0afrpxymzp5"; + version = "1.5.0"; + sha256 = "0cchakbbs7sfjrsg6p45kv9bv1dsxp5mj6q3900v0hf8n7is3qqb"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; libraryHaskellDepends = [ array async base bytestring containers cpphs deepseq directory filepath mtl text utf8-string @@ -74697,8 +74875,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "first-class-families"; - version = "0.1.0.0"; - sha256 = "19lm7p45rn3rlz51pi08ka2sc6nd01ba56pdp6nxakynmc44mw25"; + version = "0.2.0.0"; + sha256 = "0lwxz2dv0mcls0ww00h1x92gn4gdrz49arrl21lwqs1lf3q748f5"; libraryHaskellDepends = [ base ]; description = "First class type families"; license = stdenv.lib.licenses.mit; @@ -75680,18 +75858,6 @@ self: { }) {}; "flow" = callPackage - ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: - mkDerivation { - pname = "flow"; - version = "1.0.14"; - sha256 = "0k6j0mh3lr2fpvjs2jl1agybng32g9z8w3qf5b542ydjl02nvk08"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Write more understandable Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flow_1_0_15" = callPackage ({ mkDerivation, base, doctest, QuickCheck, template-haskell }: mkDerivation { pname = "flow"; @@ -75701,7 +75867,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flow-er" = callPackage @@ -76267,28 +76432,6 @@ self: { }) {}; "foldl" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers - , contravariant, criterion, hashable, mwc-random, primitive - , profunctors, semigroupoids, semigroups, text, transformers - , unordered-containers, vector, vector-builder - }: - mkDerivation { - pname = "foldl"; - version = "1.4.3"; - sha256 = "13n0ca3hw5jzqf6rxsdbhbwkn61a9zlm13f0f205s60j3sc72jzk"; - revision = "1"; - editedCabalFile = "043axkgbjwvzlh5il1cmrb36svri3v0zja00iym9p0vm9gldh81c"; - libraryHaskellDepends = [ - base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors semigroupoids semigroups text - transformers unordered-containers vector vector-builder - ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Composable, streaming, and efficient left folds"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "foldl_1_4_4" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, hashable, mwc-random, primitive , profunctors, semigroupoids, semigroups, text, transformers @@ -76306,7 +76449,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Composable, streaming, and efficient left folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-incremental" = callPackage @@ -76462,6 +76604,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "follow" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, feed + , HandsomeSoup, hspec, hxt, req, text, time, transformers + , unordered-containers, yaml + }: + mkDerivation { + pname = "follow"; + version = "0.1.0.0"; + sha256 = "18j7m8dsmnrq7cnmin48zl1g8yidsh8sgqnlr42qldi49ciam4j0"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring exceptions feed HandsomeSoup hxt req text + time transformers unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base bytestring exceptions feed HandsomeSoup hxt req text + time transformers unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring exceptions feed HandsomeSoup hspec hxt req + text time transformers unordered-containers yaml + ]; + description = "Haskell library to follow content published on any subject"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "follow-file" = callPackage ({ mkDerivation, attoparsec, attoparsec-path, base, bytestring , conduit, conduit-combinators, directory, exceptions, hinotify @@ -77661,6 +77831,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "free-v-bucks-generator-no-survey" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "free-v-bucks-generator-no-survey"; + version = "0.3"; + sha256 = "1bqba8hx0za9i6kpjv9dapqcaiflcs3wrqz00m2icffjkacf954q"; + revision = "1"; + editedCabalFile = "11v9iam3jy1av85bjq4zzl93r2sv6ph72pvkbvhnfzjjhw0kbr42"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + description = "Spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "free-v-bucks-generator-ps4-no-survey" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "free-v-bucks-generator-ps4-no-survey"; + version = "0.2"; + sha256 = "1blsfj6zppi2fi4kkq0b9704qrdkzindx9p3430frxzjz1zrrbaf"; + revision = "1"; + editedCabalFile = "0qxnhd5i6b1i4pq6xkisa74cgqgj749pbipw07khzqs8xvgj83wh"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + description = "Spam"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "free-vector-spaces" = callPackage ({ mkDerivation, base, lens, linear, MemoTrie, pragmatic-show , vector, vector-space @@ -80186,14 +80386,16 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, base, contravariant, show-combinators, tasty - , tasty-hunit + ({ mkDerivation, base, base-orphans, contravariant + , show-combinators, tasty, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "0.1.1.0"; - sha256 = "1a7pjpr5xmwdmy9l2243a0259n9ndmh868x99ckhm4r7gnra9gg6"; - libraryHaskellDepends = [ base contravariant show-combinators ]; + version = "0.2.0.0"; + sha256 = "0md52nnc8zhi26hywmqyfcxjzh4kvc0jl5ia005mi8c3dvr5l819"; + libraryHaskellDepends = [ + base base-orphans contravariant show-combinators + ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Utilities for GHC.Generics"; license = stdenv.lib.licenses.mit; @@ -81773,15 +81975,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-exactprint_0_5_7_1" = callPackage + "ghc-exactprint_0_5_8_0" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.7.1"; - sha256 = "0w33vp4k2479xhq0b87ngznxwdklh43k19mzcb63dwh6cvh35kn4"; + version = "0.5.8.0"; + sha256 = "1hmyk5d0sbf4kqp4bzcl6q3vf6dpbx2imqky7r206g39xkx3y3fh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82373,6 +82575,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-extra_0_3" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra + , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp + , tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-extra"; + version = "0.3"; + sha256 = "1khkchxic6i3sg3g3dzdg8dsdgk86xy5j5lnh5n5hr7fpdm9ppj7"; + libraryHaskellDepends = [ + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat + ghc-typelits-natnormalise integer-gmp transformers + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat ghc-typelits-natnormalise tasty + tasty-hunit template-haskell + ]; + description = "Additional type-level operations on GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck @@ -82393,6 +82617,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_6" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.6"; + sha256 = "0dzjqzfh1mywx2dzki6yhrac5l2y2h58zjwmgps3vk16n8krnljb"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell, transformers @@ -82570,32 +82815,6 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.7"; - sha256 = "1dcx12vkjw5w1np4bz8ypaf8bdw1s8yrlhq6i5x2pilvsf1dljqg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_7_1" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time, unix @@ -82619,7 +82838,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -83936,10 +84154,10 @@ self: { }) {}; "git-annex" = callPackage - ({ mkDerivation, aeson, async, base, bloomfilter, bup, byteable - , bytestring, Cabal, case-insensitive, concurrent-output, conduit - , connection, containers, crypto-api, cryptonite, curl - , data-default, DAV, dbus, directory, disk-free-space, dlist, dns + ({ mkDerivation, aeson, async, attoparsec, base, bloomfilter, bup + , byteable, bytestring, Cabal, case-insensitive, concurrent-output + , conduit, connection, containers, crypto-api, cryptonite, curl + , data-default, DAV, dbus, directory, disk-free-space, dlist , edit-distance, esqueleto, exceptions, fdo-notify, feed, filepath , free, git, gnupg, hinotify, hslogger, http-client , http-client-tls, http-conduit, http-types, IfElse, lsof, magic @@ -83954,8 +84172,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20180807"; - sha256 = "1wkqh1y58m0z1mf2j33qhndpxcjwv8mbv384kdk17vn0lp9zas1s"; + version = "6.20180913"; + sha256 = "0rsmzbfd4i275c6baa1l9rnyd9a510yyb7g9g8dk8d89f5v6dddb"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-f-s3" @@ -83969,19 +84187,19 @@ self: { hslogger IfElse process split transformers unix-compat utf8-string ]; executableHaskellDepends = [ - aeson async base bloomfilter byteable bytestring case-insensitive - concurrent-output conduit connection containers crypto-api - cryptonite data-default DAV dbus directory disk-free-space dlist - dns edit-distance esqueleto exceptions fdo-notify feed filepath - free hinotify hslogger http-client http-client-tls http-conduit - http-types IfElse magic memory monad-control monad-logger - mountpoints mtl network network-info network-multicast network-uri - old-locale optparse-applicative persistent persistent-sqlite - persistent-template process QuickCheck random regex-tdfa resourcet - SafeSemaphore sandi securemem socks split stm stm-chans tagsoup - tasty tasty-hunit tasty-quickcheck tasty-rerun text time torrent - transformers unix unix-compat unordered-containers utf8-string uuid - vector + aeson async attoparsec base bloomfilter byteable bytestring + case-insensitive concurrent-output conduit connection containers + crypto-api cryptonite data-default DAV dbus directory + disk-free-space dlist edit-distance esqueleto exceptions fdo-notify + feed filepath free hinotify hslogger http-client http-client-tls + http-conduit http-types IfElse magic memory monad-control + monad-logger mountpoints mtl network network-info network-multicast + network-uri old-locale optparse-applicative persistent + persistent-sqlite persistent-template process QuickCheck random + regex-tdfa resourcet SafeSemaphore sandi securemem socks split stm + stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun + text time torrent transformers unix unix-compat + unordered-containers utf8-string uuid vector ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -85335,8 +85553,8 @@ self: { pname = "glirc"; version = "2.28"; sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk"; - revision = "1"; - editedCabalFile = "142909apkky5z443qifchd2cm1dakw2zpbcfyxpvpi7crzhq0h1d"; + revision = "2"; + editedCabalFile = "082abvc99w4pkv41dzbqbmz3kcyi3zl7i201vr2rdfpwjv8r40pa"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -89291,27 +89509,6 @@ self: { }) {}; "greskell-core" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, doctest - , doctest-discover, hashable, hspec, QuickCheck, scientific - , semigroups, text, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "greskell-core"; - version = "0.1.2.2"; - sha256 = "1h9sx4sdfh2flbvnrmhwy7g5lrzg018w9qrqrrkd4szi499dxc0d"; - libraryHaskellDepends = [ - aeson base containers hashable scientific semigroups text - unordered-containers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec QuickCheck - text unordered-containers vector - ]; - description = "Haskell binding for Gremlin graph query language - core data types and tools"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-core_0_1_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific , semigroups, text, unordered-containers, uuid, vector @@ -89330,7 +89527,6 @@ self: { ]; description = "Haskell binding for Gremlin graph query language - core data types and tools"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greskell-websocket" = callPackage @@ -89582,8 +89778,10 @@ self: { }: mkDerivation { pname = "groundhog-inspector"; - version = "0.8.0.2"; - sha256 = "1wbsx0qjbhliglwk4yhh44ra54i34cypvki9zvw28khpc8mxdfmz"; + version = "0.9.0"; + sha256 = "1vb9zsg2r5d9ad6ppbzzm18hq4d4ygc7g2z1w5nb866774zwlywb"; + revision = "1"; + editedCabalFile = "1fzkm7rxg3la10j65drhvqnzcv6c5rscq3cqz7f0395rbw0pakmy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89661,8 +89859,8 @@ self: { }: mkDerivation { pname = "groundhog-th"; - version = "0.9.0"; - sha256 = "1wwfgyak5kdhnn6i07y114q063ryg9w3sngh0c2fh2addh5xrqay"; + version = "0.9.0.1"; + sha256 = "0hrk86s5mfj33sx5im6pcym1br160vnp17yhi82b2x1imm26cmlk"; libraryHaskellDepends = [ aeson base bytestring containers groundhog template-haskell text time unordered-containers yaml @@ -89797,28 +89995,27 @@ self: { }) {}; "grpc-api-etcd" = callPackage - ({ mkDerivation, base, proto-lens, proto-lens-protoc }: + ({ mkDerivation, base, proto-lens, proto-lens-runtime }: mkDerivation { pname = "grpc-api-etcd"; - version = "0.1.0.1"; - sha256 = "0sr9nsk207ap1psf4mypzjbpbppxwmbbcv6z07dxpv1dwzs6dnyf"; - libraryHaskellDepends = [ base proto-lens proto-lens-protoc ]; + version = "0.2.0.0"; + sha256 = "1ymvgsrqhnym2wv5j8mbhh8i3r7y0jcz19k927qmffqk7sacfxg1"; + libraryHaskellDepends = [ base proto-lens proto-lens-runtime ]; description = "Generated messages and instances for etcd gRPC"; license = stdenv.lib.licenses.bsd3; }) {}; "grpc-etcd-client" = callPackage - ({ mkDerivation, base, bytestring, data-default-class - , grpc-api-etcd, http2-client, http2-client-grpc, lens, network - , proto-lens, proto-lens-protoc + ({ mkDerivation, base, bytestring, grpc-api-etcd, http2-client + , http2-client-grpc, lens, network, proto-lens, proto-lens-runtime }: mkDerivation { pname = "grpc-etcd-client"; - version = "0.1.1.2"; - sha256 = "1xrdasrg0m3cxlb227wmnl9vbakqiikrm3wi07wbnmbg6n5agzkr"; + version = "0.1.2.0"; + sha256 = "0ly24551b54cpzh05rmn9j6xl3qb3wi456yv45c69sv7i8jq63zf"; libraryHaskellDepends = [ - base bytestring data-default-class grpc-api-etcd http2-client - http2-client-grpc lens network proto-lens proto-lens-protoc + base bytestring grpc-api-etcd http2-client http2-client-grpc lens + network proto-lens proto-lens-runtime ]; description = "gRPC client for etcd"; license = stdenv.lib.licenses.bsd3; @@ -92895,6 +93092,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) utillinux;}; + "hakyll_4_12_4_0" = callPackage + ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring + , containers, cryptohash, data-default, deepseq, directory + , file-embed, filepath, fsnotify, http-conduit, http-types + , lrucache, mtl, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa + , resourcet, scientific, tagsoup, tasty, tasty-hunit + , tasty-quickcheck, text, time, time-locale-compat + , unordered-containers, utillinux, vector, wai, wai-app-static + , warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.12.4.0"; + sha256 = "0kflvb86maqn15h0dh2r2p415q9k351gl9mpb3vnbmfn0nhvg1x1"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptohash data-default deepseq directory file-embed filepath + fsnotify http-conduit http-types lrucache mtl network-uri + optparse-applicative pandoc pandoc-citeproc parsec process random + regex-tdfa resourcet scientific tagsoup text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base bytestring containers filepath QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers yaml + ]; + testToolDepends = [ utillinux ]; + description = "A static website compiler library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) utillinux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -98174,18 +98409,18 @@ self: { "haskoin-node" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra - , hashable, haskoin-core, hspec, monad-logger, mtl, network, nqe - , random, resourcet, rocksdb-haskell, rocksdb-query - , string-conversions, time, unique, unliftio + , haskoin-core, hspec, monad-logger, mtl, network, nqe, random + , resourcet, rocksdb-haskell, rocksdb-query, string-conversions + , time, unliftio }: mkDerivation { pname = "haskoin-node"; - version = "0.5.2"; - sha256 = "1wrkah2sbinkc5yp2b6mj6z0aps1pl7j1hncygmsa5pvg8iifjih"; + version = "0.6.1"; + sha256 = "06f1jmdgy5afkxcr06y1cp4jz21nby4snhnbpylj25d2y0dak8wy"; libraryHaskellDepends = [ - base bytestring cereal conduit conduit-extra hashable haskoin-core + base bytestring cereal conduit conduit-extra haskoin-core monad-logger mtl network nqe random resourcet rocksdb-haskell - rocksdb-query string-conversions time unique unliftio + rocksdb-query string-conversions time unliftio ]; testHaskellDepends = [ base bytestring cereal haskoin-core hspec monad-logger mtl network @@ -98249,8 +98484,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.1.3"; - sha256 = "1xlvh0q6jx37p4rnq4qspwnnq7hpvaqi9ib1mlgkdxj7ypxk26fr"; + version = "0.2.3"; + sha256 = "0ywfmqdwvw07gx4a413i0ffsgrq2gfjgpw8a6f78h6idiw69shkw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98264,7 +98499,7 @@ self: { rocksdb-haskell scotty string-conversions text unliftio ]; testHaskellDepends = [ - base haskoin-core haskoin-node hspec monad-logger nqe + base haskoin-core haskoin-node hspec monad-logger mtl nqe rocksdb-haskell unliftio ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -102043,18 +102278,6 @@ self: { }) {}; "hexml" = callPackage - ({ mkDerivation, base, bytestring, extra }: - mkDerivation { - pname = "hexml"; - version = "0.3.3"; - sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4"; - libraryHaskellDepends = [ base bytestring extra ]; - testHaskellDepends = [ base bytestring ]; - description = "XML subset DOM parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hexml_0_3_4" = callPackage ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; @@ -102064,7 +102287,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "XML subset DOM parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexml-lens" = callPackage @@ -105220,8 +105442,8 @@ self: { }: mkDerivation { pname = "hmatrix-svdlibc"; - version = "0.5.0"; - sha256 = "1spzpns2r7i82rqkq7s1ikz74m6d0z7fi3nbii7hjz6amskyzpz8"; + version = "0.5.0.1"; + sha256 = "0n89899f4n84d284aq2lx88zz1327a030dlzh17bh0ns2yjbm63g"; libraryHaskellDepends = [ base hmatrix vector ]; testHaskellDepends = [ base hmatrix hspec QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion hmatrix vector ]; @@ -108137,18 +108359,18 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, containers , criterion, hostname, hspec, hspec-core, HUnit, kazura-queue, mtl , network, protocol-buffers, protocol-buffers-descriptor - , QuickCheck, scientific, text, time, unagi-chan + , QuickCheck, scientific, stm, text, time, unagi-chan }: mkDerivation { pname = "hriemann"; - version = "0.3.3.1"; - sha256 = "0a2pljkqjvx88cssq24yq8h06md864fvvr77ka0nnmk3znyddn9f"; + version = "0.3.3.3"; + sha256 = "0xxdzbx5wqmz62k8jka2k896sdz49j2aqivmcic9fsrar5inalyp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring containers criterion hostname kazura-queue mtl network protocol-buffers - protocol-buffers-descriptor scientific text time unagi-chan + protocol-buffers-descriptor scientific stm text time unagi-chan ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -108882,10 +109104,8 @@ self: { }: mkDerivation { pname = "hs2ats"; - version = "0.3.0.3"; - sha256 = "0j8kka9n3in9ya1hndn0dpj8d1ha5ihxfrl995dwsa900z00i5yk"; - revision = "1"; - editedCabalFile = "0lx2z4zfphypmjx9m5v23lywfj2d16l6hs6ipd796g46jczc4piq"; + version = "0.3.0.4"; + sha256 = "1mqm4yblv22368v01xq59ppi4ifjpqlswfirm6n42ckb47xhmy09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113923,16 +114143,15 @@ self: { "http2-client-grpc" = callPackage ({ mkDerivation, async, base, binary, bytestring, case-insensitive , data-default-class, http2, http2-client, http2-grpc-types, lens - , proto-lens, proto-lens-protoc, text, tls + , proto-lens, text, tls }: mkDerivation { pname = "http2-client-grpc"; - version = "0.5.0.3"; - sha256 = "19vzrln75y64gkmzxcasmzxp8qsccg9jpr0z5k9s8w0g5vnfmp9x"; + version = "0.5.0.4"; + sha256 = "1277qp7gvwvqb12pz6j2nm08zdgx9nia4zak9d4pyw147dcf9qwv"; libraryHaskellDepends = [ async base binary bytestring case-insensitive data-default-class - http2 http2-client http2-grpc-types lens proto-lens - proto-lens-protoc text tls + http2 http2-client http2-grpc-types lens proto-lens text tls ]; testHaskellDepends = [ base ]; description = "Implement gRPC-over-HTTP2 clients"; @@ -113948,8 +114167,8 @@ self: { pname = "http2-grpc-types"; version = "0.3.0.0"; sha256 = "0r3gfc8alm535hqmyy39hd7nhpp3dmba52l4wf38bj7j3ckggpy5"; - revision = "1"; - editedCabalFile = "10gmgp63ll7zv8sbcw2klc0xi4qaiakbgsv46a5gv1pdgwh78w8b"; + revision = "2"; + editedCabalFile = "0b3dpd1krsaxxbg08vp9m2r2f2w4ab1dylb6bp945dfyr7fl6c1c"; libraryHaskellDepends = [ base binary bytestring case-insensitive proto-lens zlib ]; @@ -114902,14 +115121,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-ip_0_2_0_2" = callPackage + "hw-ip_0_2_1_0" = callPackage ({ mkDerivation, attoparsec, base, generic-lens, hedgehog, hspec , hw-bits, hw-hspec-hedgehog, text }: mkDerivation { pname = "hw-ip"; - version = "0.2.0.2"; - sha256 = "0c2nz9iq5x7mys90zy29ka4zkdggqngz77wjm51kv1jp7rsnpqn7"; + version = "0.2.1.0"; + sha256 = "09qfimmf8dsp1pf0vxjpf5v9ih8rk414jkh50inc83zygzp9if29"; libraryHaskellDepends = [ attoparsec base generic-lens hw-bits text ]; @@ -115152,29 +115371,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups - , transformers, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.6.2.14"; - sha256 = "18x7gxvn8p55j5iva4ag31kmdzcvlq76a56shsnh821xw3aw6ala"; - libraryHaskellDepends = [ - base bytestring mmap semigroups transformers vector - ]; - testHaskellDepends = [ - base bytestring directory exceptions hedgehog hspec - hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector - ]; - benchmarkHaskellDepends = [ - base bytestring criterion mmap semigroups transformers vector - ]; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_6_2_15" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups , transformers, vector @@ -115195,7 +115391,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -118567,17 +118762,20 @@ self: { }) {}; "indexation" = callPackage - ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus - , hashable, hashtables, mmorph, potoki, potoki-cereal, profunctors - , text, transformers, unordered-containers, vector + ({ mkDerivation, base, bytestring, cereal, cereal-vector + , contravariant, deepseq, deferred-folds, dense-int-set, focus + , foldl, hashable, list-t, mmorph, potoki, potoki-cereal + , profunctors, stm-containers, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "indexation"; - version = "0.5.0.1"; - sha256 = "036azy4bnz5xaf0m6dg18yfhi6sljiz9pmap2i8xs8gfbrrl3xsr"; + version = "0.6.2.1"; + sha256 = "016srnm3mqvfz1ki0bzxr88frav8zkj8l2nkknfrhx194cxwiahn"; libraryHaskellDepends = [ - base bytestring cereal deferred-folds focus hashable hashtables - mmorph potoki potoki-cereal profunctors text transformers + base bytestring cereal cereal-vector contravariant deepseq + deferred-folds dense-int-set focus foldl hashable list-t mmorph + potoki potoki-cereal profunctors stm-containers text transformers unordered-containers vector ]; description = "Tools for entity indexation"; @@ -118853,30 +119051,6 @@ self: { }) {}; "influxdb" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal - , cabal-doctest, clock, containers, doctest, foldl, http-client - , http-types, lens, network, optional-args, QuickCheck, scientific - , tagged, template-haskell, text, time, unordered-containers - , vector - }: - mkDerivation { - pname = "influxdb"; - version = "1.6.0.7"; - sha256 = "1fafcsrwfwxjzlz69qz9bq0pxc5iym12xnr6zv7j34yj6j96xzb2"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clock containers foldl http-client - http-types lens network optional-args scientific tagged text time - unordered-containers vector - ]; - testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - description = "Haskell client library for InfluxDB"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "influxdb_1_6_0_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, clock, containers, doctest, foldl, http-client , http-types, lens, network, optional-args, QuickCheck, scientific @@ -118898,7 +119072,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck template-haskell ]; description = "Haskell client library for InfluxDB"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "informative" = callPackage @@ -119527,24 +119700,6 @@ self: { }) {}; "integer-logarithms" = callPackage - ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck - , smallcheck, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck - }: - mkDerivation { - pname = "integer-logarithms"; - version = "1.0.2.1"; - sha256 = "1wj8kgjg5bn2yrs4zh9qfjv85cx6w998j9pi39yrbv305944mb9j"; - libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; - testHaskellDepends = [ - base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck - tasty-smallcheck - ]; - description = "Integer logarithms"; - license = stdenv.lib.licenses.mit; - }) {}; - - "integer-logarithms_1_0_2_2" = callPackage ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck , smallcheck, tasty, tasty-hunit, tasty-quickcheck , tasty-smallcheck @@ -119560,7 +119715,6 @@ self: { ]; description = "Integer logarithms"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-pure" = callPackage @@ -121378,6 +121532,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "itcli" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, mtl + , optparse-applicative, text, time, uuid, yaml + }: + mkDerivation { + pname = "itcli"; + version = "0.1.8.3"; + sha256 = "1ml6k0imkb6wy3fky2fd5q1gkbywm360jmlb6gw8mp8z7ci6ijbg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring directory filepath mtl optparse-applicative text + time uuid yaml + ]; + description = "Issue Tracker for the CLI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "itemfield" = callPackage ({ mkDerivation, base, brick, data-default, HUnit, microlens , microlens-th, QuickCheck, random, test-framework @@ -122126,8 +122298,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, time }: mkDerivation { pname = "japanese-calendar"; - version = "0.1.0.0"; - sha256 = "0i9699xammqi5q5rjn7cyzv41alm1c9hnq9njhf6mnxf0d08ch2y"; + version = "0.1.0.2"; + sha256 = "1dkfp2qj588nnd5r3ad37145n3mjm76h9pc2y7ga9s76cvi52xqy"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec QuickCheck time ]; description = "Data type of Japanese Calendar (Wareki)"; @@ -122515,6 +122687,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jinquantities" = callPackage + ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl + , parsec, process, quantities, regex-compat + }: + mkDerivation { + pname = "jinquantities"; + version = "0.1.1"; + sha256 = "1zrdbd2dkc4n1jycv20a1j8px6lkxdjvnv9l3w7b3z2rajj7rfh2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers mtl parsec ]; + executableHaskellDepends = [ + base containers mtl parsec quantities + ]; + testHaskellDepends = [ + base containers doctest Glob hlint hspec mtl parsec process + quantities regex-compat + ]; + description = "Unit conversion and manipulation library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jmacro" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , haskell-src-exts, haskell-src-meta, mtl, parseargs, parsec @@ -123518,8 +123712,8 @@ self: { pname = "json-rpc-client"; version = "0.2.5.0"; sha256 = "177lrw5m9dxdk6mcay0f92rwyih8q7znwb8m6da6r3zsn30gajak"; - revision = "6"; - editedCabalFile = "1x5vivxcnmf8igc5m3sh301nlag2kj6n7dgpiw58k0f0cdbh86i3"; + revision = "8"; + editedCabalFile = "04dqdn9gdw5xgkm4cnzsph57xcjc01rm1fdfwcfdzg71mbyf8f7y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129137,18 +129331,6 @@ self: { }) {}; "leancheck" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; - version = "0.7.3"; - sha256 = "0lvyf82qsiprvhk40870c6pz13z9fv2qml1cvvw3ryc7y8xh89v9"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - description = "Enumerative property-based testing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "leancheck_0_7_4" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; @@ -129158,7 +129340,6 @@ self: { testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leankit-api" = callPackage @@ -129212,22 +129393,6 @@ self: { }) {}; "learn-physics" = callPackage - ({ mkDerivation, base, gloss, gnuplot, hmatrix, vector-space }: - mkDerivation { - pname = "learn-physics"; - version = "0.6.2"; - sha256 = "0j69q7jyznjjizkyyn032dfc1g9r6fssxp4b183bapj1xp9n116j"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base gloss gnuplot hmatrix vector-space - ]; - executableHaskellDepends = [ base gloss gnuplot ]; - description = "Haskell code for learning physics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "learn-physics_0_6_3" = callPackage ({ mkDerivation, base, gloss, gnuplot, hmatrix, not-gloss , spatial-math, vector-space }: @@ -129245,7 +129410,6 @@ self: { ]; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -129693,10 +129857,8 @@ self: { ({ mkDerivation, base, ghc-prim, profunctors, tagged }: mkDerivation { pname = "lens-labels"; - version = "0.2.0.1"; - sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj"; - revision = "1"; - editedCabalFile = "0iyh7msip83dzj9gj5f18zchvjinhx40dmdb52vza0x1763qkilv"; + version = "0.2.0.2"; + sha256 = "1s23klkxckly91yfn194bbd3g8lq2x5ykp2mx6730wh2izzwiblw"; libraryHaskellDepends = [ base ghc-prim profunctors tagged ]; description = "Integration of lenses with OverloadedLabels"; license = stdenv.lib.licenses.bsd3; @@ -136260,14 +136422,14 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mameya"; - version = "0.1.0"; - sha256 = "15yxnr2b678gb358xy78zws4wgjcr3rqd8ia1d04924yfcm670pb"; + version = "0.2.1"; + sha256 = "05di6x3ahjfzs7lz69l4z54ikwz5vw94qdi4bc8mmr6jh67b1z3s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - description = "static site generator made to learn Haskell"; + description = "Static Website Generator in Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -138611,7 +138773,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_7_0_0" = callPackage + "megaparsec_7_0_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , criterion, deepseq, hspec, hspec-expectations, mtl , parser-combinators, QuickCheck, scientific, text, transformers @@ -138619,8 +138781,8 @@ self: { }: mkDerivation { pname = "megaparsec"; - version = "7.0.0"; - sha256 = "101kri8w4wf30xs9fnp938il13hxhy6gnnl4m1f0ws4d8q6qgmmz"; + version = "7.0.1"; + sha256 = "0b60gyd58n5ql7fnwmxvdz2n3h1nxmxjad52vh9b3ddzm1g3ifvb"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -139084,8 +139246,8 @@ self: { }: mkDerivation { pname = "merge-bash-history"; - version = "0.1.0.0"; - sha256 = "0v682qss97ffwm0v1kscqy02a8j7jfn66xr1p277jnfg3m6ng4rf"; + version = "0.1.0.1"; + sha256 = "1fi8qg5slkgksx24vz91bhi1ddnmavyjcm1i50la60l3c2y0m8rk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139093,7 +139255,7 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base ]; - description = "Initial project template from stack"; + description = "command line utility to merge bash_history"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -139465,6 +139627,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "miconix-test" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "miconix-test"; + version = "0.2"; + sha256 = "02p2m11chfva4i6293if0yf8rvdbxjf8wz38ckmksiicmzhss10y"; + revision = "2"; + editedCabalFile = "061f5whj0f9bmqwgnp14zi96ja5c5m28hr56qlcf07pv6rsk5fz6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + description = "a"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "micro-recursion-schemes" = callPackage ({ mkDerivation, base, cpphs, HUnit, template-haskell , th-abstraction @@ -140644,25 +140821,6 @@ self: { }) {}; "miso" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, http-api-data - , http-types, lucid, network-uri, servant, servant-lucid, text - , transformers, vector - }: - mkDerivation { - pname = "miso"; - version = "0.21.1.0"; - sha256 = "1yz909nmm0qjvm4kbq5r8a5r4881pcq0n2jzf29y9svcz8apw08l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers http-api-data http-types lucid - network-uri servant servant-lucid text transformers vector - ]; - description = "A tasty Haskell front-end framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "miso_0_21_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector @@ -140679,7 +140837,6 @@ self: { ]; description = "A tasty Haskell front-end framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "missing-foreign" = callPackage @@ -140903,6 +141060,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark_0_0_6_0" = callPackage + ({ mkDerivation, aeson, base, case-insensitive, containers + , criterion, data-default-class, deepseq, dlist, email-validate + , foldl, hashable, hspec, hspec-discover, hspec-megaparsec + , html-entity-map, lucid, megaparsec, microlens, microlens-th + , modern-uri, mtl, parser-combinators, QuickCheck, text + , text-metrics, unordered-containers, weigh, yaml + }: + mkDerivation { + pname = "mmark"; + version = "0.0.6.0"; + sha256 = "0ifz40fv5fdlj17cb4646amc4spy9dq7xn0bbscljskm7n7n1pxv"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base case-insensitive containers data-default-class deepseq + dlist email-validate foldl hashable html-entity-map lucid + megaparsec microlens microlens-th modern-uri mtl parser-combinators + text text-metrics unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base foldl hspec hspec-megaparsec lucid megaparsec modern-uri + QuickCheck text + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion text weigh ]; + description = "Strict markdown processor for writers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmark-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text @@ -140924,6 +141111,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark-cli_0_0_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid + , megaparsec, mmark, mmark-ext, optparse-applicative, stache, text + , unordered-containers + }: + mkDerivation { + pname = "mmark-cli"; + version = "0.0.4.0"; + sha256 = "0vw1pq3iz4bbz5fgbzi8lvpscc58izh6y210jfi12h2jyzajyf5k"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring directory gitrev lucid megaparsec mmark + mmark-ext optparse-applicative stache text unordered-containers + ]; + description = "Command line interface to the MMark markdown processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmark-ext" = callPackage ({ mkDerivation, base, foldl, ghc-syntax-highlighter, hspec , hspec-discover, lucid, microlens, mmark, modern-uri, skylighting @@ -140933,6 +141140,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.0"; sha256 = "1k9zw9fbfhlp5irbykycpw5qkjyhlcb8qrnbmsrn133hh1m3j0hs"; + revision = "2"; + editedCabalFile = "0xcjkzaah0npyw87mdsymq4bjwdf988fqmylzgr4kihks1a8d4xs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -143328,8 +143537,8 @@ self: { }: mkDerivation { pname = "morfette"; - version = "0.4.4"; - sha256 = "064wgdk0yrrjh8b7xnpmhk541fwqh24pg7hq1rh28vf2fbv6blcy"; + version = "0.4.7"; + sha256 = "1vxqg55zsj36pi1bsydm0v4fls4blya9jjfdv56jgdfjsjzzljyh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -146824,6 +147033,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "neat-interpolation_0_3_2_4" = callPackage + ({ mkDerivation, base, base-prelude, HTF, megaparsec + , template-haskell, text + }: + mkDerivation { + pname = "neat-interpolation"; + version = "0.3.2.4"; + sha256 = "0lhpjckwhzlvx4cdhrwprwb85vc7hc44ybvk5nswgn7z73cp0wyy"; + libraryHaskellDepends = [ + base base-prelude megaparsec template-haskell text + ]; + testHaskellDepends = [ base-prelude HTF ]; + description = "A quasiquoter for neat and simple multiline text interpolation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "needle" = callPackage ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec , parsec-extra, template-haskell, text, vector @@ -150066,15 +150292,15 @@ self: { "nqe" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra - , containers, exceptions, hspec, mtl, stm, stm-conduit, text - , unliftio + , containers, exceptions, hashable, hspec, mtl, stm, stm-conduit + , text, unique, unliftio }: mkDerivation { pname = "nqe"; - version = "0.4.1"; - sha256 = "1x6ila806i1b1smiby47c1sfj3m09xlxcqpg3ywdibh31znbhhqj"; + version = "0.5.0"; + sha256 = "0i5rp2nh4gr6isqvzkxmq31b7ycp2dhs885hn5ng6bc9q3nsjxly"; libraryHaskellDepends = [ - base conduit containers mtl stm unliftio + base conduit containers hashable mtl stm unique unliftio ]; testHaskellDepends = [ base bytestring conduit conduit-extra exceptions hspec stm @@ -151266,6 +151492,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unixODBC;}; + "odbc_0_2_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , formatting, hspec, optparse-applicative, parsec, QuickCheck + , semigroups, template-haskell, text, time, transformers, unixODBC + , unliftio-core, weigh + }: + mkDerivation { + pname = "odbc"; + version = "0.2.1"; + sha256 = "1s8l3i83jm022v0xqljfbf0qb28p5ps0cg6d9lzplywlqgwjh5nz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq formatting parsec + semigroups template-haskell text time transformers unliftio-core + ]; + librarySystemDepends = [ unixODBC ]; + executableHaskellDepends = [ + base bytestring optparse-applicative text + ]; + testHaskellDepends = [ + base bytestring hspec parsec QuickCheck text time + ]; + benchmarkHaskellDepends = [ async base text weigh ]; + description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) unixODBC;}; + "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers @@ -151845,19 +152100,20 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty - , product-profunctors, profunctors, QuickCheck, scientific - , semigroups, text, time, time-locale-compat, transformers, uuid - , void + , product-profunctors, profunctors, QuickCheck, semigroups, text + , time, time-locale-compat, transformers, uuid, void }: mkDerivation { pname = "opaleye"; - version = "0.6.7001.0"; - sha256 = "0r1hy1p8lcvhqh7p0199dipl7791sbppihl8v1k1vazbr2nkj0l9"; + 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 - profunctors scientific semigroups text time time-locale-compat - transformers uuid void + profunctors semigroups text time time-locale-compat transformers + uuid void ]; testHaskellDepends = [ aeson base containers contravariant dotenv hspec hspec-discover @@ -154260,7 +154516,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_2_3_2" = callPackage + "pandoc_2_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default @@ -154275,8 +154531,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.2.3.2"; - sha256 = "0dmk2vy0kfsi8xzpa8h0kypidf264d5rjvcqyd7jf34rjj47ikk2"; + version = "2.3"; + sha256 = "0wyf0rc8macczrql8v1802hdifzk5nbwxzv42kxfx55qnwdil1av"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -154345,6 +154601,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_14_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.14.4"; + sha256 = "00m81bwb0s0m7qm3b8xslwdyifdar2fzsnhjrxkqjlj8axdlb796"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath pandoc + pandoc-types syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath mtl pandoc + pandoc-types process temporary text yaml + ]; + doCheck = false; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -155512,8 +155803,8 @@ self: { }: mkDerivation { pname = "paripari"; - version = "0.2.1.0"; - sha256 = "002sr369102k2wwzy3adav52vvz7d0yyy07lqzqf8b7fw6ffjcy2"; + version = "0.4.0.0"; + sha256 = "10pg179pcrrwl321xw7q9wyfpfkaczavhlgrmv2nqd2yxwmkgqdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159295,33 +159586,45 @@ self: { }) {}; "pier" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary - , binary-orphans, bytestring, Cabal, containers, cryptohash-sha256 - , directory, hashable, http-client, http-client-tls, http-types - , optparse-applicative, process, shake, split, temporary, text - , transformers, unix, unordered-containers, yaml + ({ mkDerivation, aeson, base, binary, binary-orphans, Cabal + , containers, directory, hashable, optparse-applicative, pier-core + , shake, split, text, transformers, unordered-containers, yaml }: mkDerivation { pname = "pier"; - version = "0.1.0.0"; - sha256 = "19l8ghpik8j8igh0xa8kcmn6zs6r4xa8yks60n8v37d6ksr5k9m6"; - isLibrary = true; + version = "0.2.0.1"; + sha256 = "0j26bwm58lh0dddn0595hr6pq9f8plkvg670k3g0va1aqbd2i48k"; + isLibrary = false; isExecutable = true; - libraryHaskellDepends = [ - aeson base base64-bytestring binary binary-orphans bytestring Cabal - containers cryptohash-sha256 directory hashable http-client - http-client-tls http-types process shake temporary text - transformers unix unordered-containers yaml - ]; executableHaskellDepends = [ - base Cabal directory optparse-applicative shake split - unordered-containers + aeson base binary binary-orphans Cabal containers directory + hashable optparse-applicative pier-core shake split text + transformers unordered-containers yaml ]; description = "Yet another Haskell build system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pier-core" = callPackage + ({ mkDerivation, base, base64-bytestring, binary, bytestring, Cabal + , containers, cryptohash-sha256, directory, hashable, http-client + , http-client-tls, http-types, process, shake, temporary, text + , unix + }: + mkDerivation { + pname = "pier-core"; + version = "0.2.0.1"; + sha256 = "1kd6z5vw2v61kpgpf95a8hs4m97lnydsl2k0xqxq5bg59q281b64"; + libraryHaskellDepends = [ + base base64-bytestring binary bytestring Cabal containers + cryptohash-sha256 directory hashable http-client http-client-tls + http-types process shake temporary text unix + ]; + description = "A library for writing forwards-declared build systems in haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "piet" = callPackage ({ mkDerivation, array, base, containers, Imlib, mtl }: mkDerivation { @@ -163314,8 +163617,8 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.0.15"; - sha256 = "09220lqyl4rd7al03349r6wbp8hd85rjfbr6kq1swzn3yja2zhsz"; + version = "2.1.1"; + sha256 = "1qdja72zmrv5w7dpa2bzsf0phw6gaqvwzs8s3ilyw7v0h6hy3kgx"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -163332,6 +163635,8 @@ self: { pname = "potoki-cereal"; version = "0.3.0.1"; sha256 = "0dm5yvh8a8sgrqvgkl48zpn5c8ymz9h83nw44icnhqirg1hrkhvi"; + revision = "1"; + editedCabalFile = "1jp7vbxipvsg6shc03j0ms6apzmvb38nxpvwkbsk34vll4mzarj4"; libraryHaskellDepends = [ acquire attoparsec base base-prelude bytestring cereal potoki-core text @@ -163347,17 +163652,18 @@ self: { "potoki-core" = callPackage ({ mkDerivation, acquire, attoparsec, base, bytestring, criterion - , directory, foldl, hashable, ilist, primitive, profunctors, ptr - , QuickCheck, quickcheck-instances, random, rerebase, scanner - , split, stm, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, vector + , deepseq, directory, foldl, hashable, ilist, primitive + , profunctors, ptr, QuickCheck, quickcheck-instances, random + , rerebase, scanner, split, stm, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , vector }: mkDerivation { pname = "potoki-core"; - version = "2.2.16"; - sha256 = "0xjrbv087qyqqd3h3lam2jgrikp5lvsb716ndmqv0i1s4qlzxa6d"; + version = "2.3.1"; + sha256 = "083qp1fgn1xflmivzrd615lyy0blxn1lmb8lqkjaziqijys2n83i"; libraryHaskellDepends = [ - acquire attoparsec base bytestring directory foldl hashable + acquire attoparsec base bytestring deepseq directory foldl hashable primitive profunctors ptr scanner stm text time transformers unordered-containers vector ]; @@ -164285,14 +164591,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pretty-show_1_8_1" = callPackage + "pretty-show_1_8_2" = callPackage ({ mkDerivation, array, base, filepath, ghc-prim, happy , haskell-lexer, pretty, text }: mkDerivation { pname = "pretty-show"; - version = "1.8.1"; - sha256 = "0s8bj7ymbc9pz91kls2blrpip7pphcc683wd5ig8kywjmix1ibsg"; + version = "1.8.2"; + sha256 = "1fc431kr87hpk3rmdpbdiwsq0iyvh61hjwi4w0cp6zyasx8cg91a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -164735,8 +165041,8 @@ self: { }: mkDerivation { pname = "primitive-extras"; - version = "0.7.0.2"; - sha256 = "01xjis2y8gpa1f45g3nf9lminy3yhbsb10fzhk23z5n8205jh77d"; + version = "0.7.1"; + sha256 = "1xfvp63qi21iiz1905l61726vp2nnx3sffpphwf53j8yn193c33n"; libraryHaskellDepends = [ base bytestring cereal deferred-folds focus foldl list-t primitive profunctors vector @@ -166336,19 +166642,6 @@ self: { }) {}; "proto-lens-optparse" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.1.2"; - sha256 = "1hagdb7m3wqv6w8m0aaf8cfsj4lryqighj2ah5qpmi8hspy1mg55"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-optparse_0_1_1_3" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; @@ -166359,7 +166652,6 @@ self: { ]; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-protobuf-types_0_2_2_0" = callPackage @@ -166569,31 +166861,6 @@ self: { }) {}; "protobuf-simple" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, directory, filepath, hspec, mtl, parsec - , QuickCheck, quickcheck-instances, split, text - }: - mkDerivation { - pname = "protobuf-simple"; - version = "0.1.0.5"; - sha256 = "1w8nx700pyq0r909akyihcajsx5pgj76f2nfvwabib2fy4kv8ikb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 mtl text - ]; - executableHaskellDepends = [ - base containers directory filepath mtl parsec split text - ]; - testHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 filepath - hspec parsec QuickCheck quickcheck-instances split text - ]; - description = "Simple Protocol Buffers library (proto2)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "protobuf-simple_0_1_1_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, directory, filepath, hspec, mtl, parsec , QuickCheck, quickcheck-instances, split, text @@ -166616,7 +166883,6 @@ self: { ]; description = "Simple Protocol Buffers library (proto2)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers" = callPackage @@ -168903,10 +169169,8 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.14.1"; - sha256 = "0qk7nx855lrb9z1nkc74dshsij6p704rmggx0f9akwcpscsvhiim"; - revision = "1"; - editedCabalFile = "1jsqd19gwd5hizqlabk0haly9slri4m7bhj32vqvi0lk4mync94l"; + version = "0.4.14.2"; + sha256 = "11f9f7s6bag77a2kbhjwhhrcf1afbz18gnn3a4p0h2hav8b5lhcj"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups semirings tagged transformers @@ -168932,31 +169196,6 @@ self: { }) {}; "quickcheck-instances" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring - , case-insensitive, containers, hashable, old-time, QuickCheck - , scientific, tagged, text, time, transformers, transformers-compat - , unordered-containers, uuid-types, vector - }: - mkDerivation { - pname = "quickcheck-instances"; - version = "0.3.18"; - sha256 = "1bh1pzz5fdcqvzdcirqxna6fnjms02min5md716299g5niz46w55"; - revision = "2"; - editedCabalFile = "02mhzd7dkhmbd8ljm114j7ixp1lcllblz3zfkz0i7n976rac86w7"; - libraryHaskellDepends = [ - array base base-compat bytestring case-insensitive containers - hashable old-time QuickCheck scientific tagged text time - transformers transformers-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - base containers QuickCheck tagged uuid-types - ]; - description = "Common quickcheck instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "quickcheck-instances_0_3_19" = callPackage ({ mkDerivation, array, base, base-compat, bytestring , case-insensitive, containers, hashable, old-time, QuickCheck , scientific, tagged, text, time, transformers, transformers-compat @@ -168977,7 +169216,6 @@ self: { ]; description = "Common quickcheck instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-io" = callPackage @@ -170549,12 +170787,19 @@ self: { }) {}; "rank-product" = callPackage - ({ mkDerivation, base, random-fu }: + ({ mkDerivation, base, bytestring, cassava, containers, lens + , optparse-generic, random-fu, text, vector + }: mkDerivation { pname = "rank-product"; - version = "0.2.0.1"; - sha256 = "1dn03zlh7n8qk7dir2qdijyk207g9p4nbsc0zw4p3cvfpl4xzzvr"; - libraryHaskellDepends = [ base random-fu ]; + version = "0.2.2.0"; + sha256 = "1nrvcgf61fg243zfp7cab5hxyhjhh2mlk4ysd6igf64w8di25lir"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers random-fu text vector ]; + executableHaskellDepends = [ + base bytestring cassava containers lens optparse-generic vector + ]; description = "Find the rank product of a data set"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -172064,19 +172309,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.1.3"; - sha256 = "0sb9gfwq6kvldywmwxni8kgd9vhkpk8xxhidldrj5cwf8a2ipwbx"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base extra filepath ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_1_4" = callPackage ({ mkDerivation, base, extra, filepath }: mkDerivation { pname = "record-dot-preprocessor"; @@ -172087,7 +172319,6 @@ self: { executableHaskellDepends = [ base extra filepath ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage @@ -173798,6 +174029,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "registry" = callPackage + ({ mkDerivation, async, base, exceptions, hedgehog, hedgehog-corpus + , io-memoize, protolude, resourcet, tasty, tasty-discover + , tasty-hedgehog, tasty-th, text, transformers-base + }: + mkDerivation { + pname = "registry"; + version = "0.1.0.4"; + sha256 = "048ymaxiayd948wwyrds5x2nz2spzizc6pwiaw3n62ynp6izkv94"; + libraryHaskellDepends = [ + base exceptions protolude resourcet text transformers-base + ]; + testHaskellDepends = [ + async base exceptions hedgehog hedgehog-corpus io-memoize protolude + resourcet tasty tasty-discover tasty-hedgehog tasty-th text + transformers-base + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling \"components\""; + license = stdenv.lib.licenses.mit; + }) {}; + "regress" = callPackage ({ mkDerivation, ad, base, vector }: mkDerivation { @@ -175306,8 +175559,8 @@ self: { pname = "resolv"; version = "0.1.1.1"; sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; - revision = "1"; - editedCabalFile = "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma"; + revision = "2"; + editedCabalFile = "0fyi9wvwvvcasvxdq8fmbjjymap2sx4jyslplx85lv0n83wdrkcf"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -176232,6 +176485,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rfc1751" = callPackage + ({ mkDerivation, base, bytestring, cereal, hspec, QuickCheck + , vector + }: + mkDerivation { + pname = "rfc1751"; + version = "0.1.2"; + sha256 = "1jls5g6lch4mdspbyzx1kgysa21i2cid68qpvk9z7ggz4lbfhid3"; + libraryHaskellDepends = [ base bytestring cereal vector ]; + testHaskellDepends = [ + base bytestring cereal hspec QuickCheck vector + ]; + description = "RFC-1751 library for Haskell"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "rfc3339" = callPackage ({ mkDerivation, base, timerep }: mkDerivation { @@ -177067,8 +177336,8 @@ self: { }: mkDerivation { pname = "rocksdb-query"; - version = "0.1.1"; - sha256 = "17sgac07f6vc1ffp8ynlrjn1n0ww0dsdr43jha10d1n5564a2lyw"; + version = "0.1.4"; + sha256 = "1qk3l9plpid6i9xb1im3xkvsjvj3mk74wgxv9bpd3c3d8x83gwhb"; libraryHaskellDepends = [ base bytestring cereal conduit resourcet rocksdb-haskell unliftio ]; @@ -181727,8 +181996,8 @@ self: { }: mkDerivation { pname = "self-extract"; - version = "0.3.4"; - sha256 = "11v5d4sjbax5dncirmhgbvcj3a2ynnvlq34x4yamx0d9pm9b1idm"; + version = "0.4.0"; + sha256 = "1zv84rdf5nzszy4qhp74jdzam613z9p86sjh8ag6kb5fxaxk91dh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182889,17 +183158,18 @@ self: { }) {}; "servant-auth-token" = callPackage - ({ mkDerivation, aeson-injector, base, bytestring, containers - , http-api-data, mtl, pwstore-fast, servant, servant-auth-token-api - , servant-server, text, time, transformers, uuid, wai + ({ mkDerivation, aeson-injector, base, byteable, bytestring + , containers, http-api-data, mtl, pwstore-fast, servant + , servant-auth-token-api, servant-server, text, time, transformers + , uuid, wai }: mkDerivation { pname = "servant-auth-token"; - version = "0.5.3.0"; - sha256 = "04zg9a2brpca39gx0hk1s2mnccw8d5n3gxd082w31f3axji6rm3a"; + version = "0.5.6.0"; + sha256 = "1nbyzg13s3082mwmcd5q85a4i94ay7fac74x28ska01y2587p631"; libraryHaskellDepends = [ - aeson-injector base bytestring containers http-api-data mtl - pwstore-fast servant servant-auth-token-api servant-server text + aeson-injector base byteable bytestring containers http-api-data + mtl pwstore-fast servant servant-auth-token-api servant-server text time transformers uuid wai ]; description = "Servant based API and server for token based authorisation"; @@ -182916,8 +183186,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.5.3.1"; - sha256 = "0mndi1b0sgfik7yij3l65bcsqp820igbf09nnrk8dmznnama56y4"; + version = "0.5.4.0"; + sha256 = "1792zsnrm7s875bp72yi44kziaky7474z63pivmfba1jdhi33mj5"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -182935,8 +183205,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.5.2.0"; - sha256 = "1cb04lcqlb0iw729l97dm3xxxhwzinlsf4ipgda2dix8j29v7h5b"; + version = "0.5.3.0"; + sha256 = "0i9i89a9h9xq6r23p6xxyf7ywgr90p2dyw8862qz0pdj0qdbbi5v"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -182947,22 +183217,21 @@ self: { }) {}; "servant-auth-token-leveldb" = callPackage - ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra - , containers, exceptions, lens, leveldb-haskell, monad-control, mtl - , resourcet, safe, safecopy-store, servant-auth-token - , servant-auth-token-api, servant-server, store, text, time - , transformers, transformers-base, uuid, vector + ({ mkDerivation, aeson-injector, base, bytestring, cereal + , concurrent-extra, containers, exceptions, lens, leveldb-haskell + , mtl, resourcet, safe, safecopy, servant-auth-token + , servant-auth-token-api, servant-server, text, time, transformers + , unliftio-core, uuid, vector }: mkDerivation { pname = "servant-auth-token-leveldb"; - version = "0.5.3.0"; - sha256 = "0jj7px9w67d2kmcvap02ccmw6y4x9fz1mmwndhb4rjxyr1kkwkja"; + version = "0.6.0.0"; + sha256 = "0kqhcvs5ih4lj9i3jdpw8vyzpsim3j03lqfrdc0kqf06a0jyfbkp"; libraryHaskellDepends = [ - aeson-injector base bytestring concurrent-extra containers - exceptions lens leveldb-haskell monad-control mtl resourcet safe - safecopy-store servant-auth-token servant-auth-token-api - servant-server store text time transformers transformers-base uuid - vector + aeson-injector base bytestring cereal concurrent-extra containers + exceptions lens leveldb-haskell mtl resourcet safe safecopy + servant-auth-token servant-auth-token-api servant-server text time + transformers unliftio-core uuid vector ]; description = "Leveldb backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; @@ -182971,19 +183240,18 @@ self: { "servant-auth-token-persistent" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers - , monad-control, mtl, persistent, persistent-template + , exceptions, mtl, persistent, persistent-template , servant-auth-token, servant-auth-token-api, servant-server, text - , time, transformers, transformers-base, uuid + , time, transformers, unliftio-core, uuid }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.6.3.0"; - sha256 = "1rxcmccfj0rirjngqm3p5azrwlrcf8bfr3fm7m046b6w031cfh9y"; + version = "0.7.0.0"; + sha256 = "1mxpq33dbam0zyc7fnrn6zdqirbri8nih1xcyzczpgs946j97zff"; libraryHaskellDepends = [ - aeson-injector base bytestring containers monad-control mtl - persistent persistent-template servant-auth-token - servant-auth-token-api servant-server text time transformers - transformers-base uuid + aeson-injector base bytestring containers exceptions mtl persistent + persistent-template servant-auth-token servant-auth-token-api + servant-server text time transformers unliftio-core uuid ]; description = "Persistent backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; @@ -184984,6 +185252,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "set-of" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "set-of"; + version = "0.1.0.1"; + sha256 = "13liv3nh6c8hbkjr119x6zvibkrkah0zslk283d2zl6qw7w7sngm"; + libraryHaskellDepends = [ base containers ]; + description = "Sets of fixed size, with typelits"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "set-with" = callPackage ({ mkDerivation, base, containers, invariant, QuickCheck , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck @@ -186380,8 +186659,8 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.3.8"; - sha256 = "0sji1lw1ma8js9kylixn694108nv74g8qpbfd198fwqvcqx5jhwh"; + version = "0.3.11"; + sha256 = "041hqvlfi28ynfcln80dwm1i5g4pjl7ydx0bys35lw92fl39zxb9"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob text unordered-containers @@ -187086,6 +187365,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-cmd" = callPackage + ({ mkDerivation, base, directory, filepath, process }: + mkDerivation { + pname = "simple-cmd"; + version = "0.1.0.0"; + sha256 = "1d9jaar1in01rwg6if6x9p2hacsdd6k6ygkrza9sbklnr4872msl"; + libraryHaskellDepends = [ base directory filepath process ]; + description = "Simple String-based process commands"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -188933,6 +189223,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slotmap" = callPackage + ({ mkDerivation, base, hspec, primitive, vector }: + mkDerivation { + pname = "slotmap"; + version = "0.1.0.0"; + sha256 = "00zc8n1divwak4r0q4ffnij2qxa3902ly7zbipn0zzjmvx5n1rh0"; + libraryHaskellDepends = [ base primitive vector ]; + testHaskellDepends = [ base hspec primitive vector ]; + description = "Pure Haskell slotmap implementation over ST or IO"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "slug" = callPackage ({ mkDerivation, aeson, base, exceptions, hspec, http-api-data , path-pieces, persistent, QuickCheck, text @@ -191650,23 +191952,6 @@ self: { }) {}; "sox" = callPackage - ({ mkDerivation, base, containers, explicit-exception - , extensible-exceptions, process, sample-frame, semigroups - , transformers, unix, utility-ht - }: - mkDerivation { - pname = "sox"; - version = "0.2.3"; - sha256 = "145dmcj9vj58wrndidarnr7bbkybvzyda88awrxw4p3iqy8s2xb0"; - libraryHaskellDepends = [ - base containers explicit-exception extensible-exceptions process - sample-frame semigroups transformers unix utility-ht - ]; - description = "Play, write, read, convert audio signals using Sox"; - license = "GPL"; - }) {}; - - "sox_0_2_3_1" = callPackage ({ mkDerivation, base, containers, explicit-exception , extensible-exceptions, process, sample-frame, semigroups , transformers, unix, utility-ht @@ -191681,30 +191966,9 @@ self: { ]; description = "Play, write, read, convert audio signals using Sox"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soxlib" = callPackage - ({ mkDerivation, base, bytestring, containers, explicit-exception - , extensible-exceptions, sample-frame, sox, storablevector - , transformers, utility-ht - }: - mkDerivation { - pname = "soxlib"; - version = "0.0.3"; - sha256 = "12ydbn7l8zfnmbxx4jv551vlfs7cflss5vhgaljwxbzan2z5bd8q"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers explicit-exception extensible-exceptions - sample-frame storablevector transformers utility-ht - ]; - libraryPkgconfigDepends = [ sox ]; - description = "Write, read, convert audio signals using libsox"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) sox;}; - - "soxlib_0_0_3_1" = callPackage ({ mkDerivation, base, bytestring, explicit-exception , extensible-exceptions, sample-frame, sox, storablevector , transformers, utility-ht @@ -191722,7 +191986,6 @@ self: { libraryPkgconfigDepends = [ sox ]; description = "Write, read, convert audio signals using libsox"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) sox;}; "soyuz" = callPackage @@ -192742,22 +193005,6 @@ self: { }) {}; "spreadsheet" = callPackage - ({ mkDerivation, base, explicit-exception, transformers, utility-ht - }: - mkDerivation { - pname = "spreadsheet"; - version = "0.1.3.7"; - sha256 = "180vv2bka5b97gl1g6vdsri2yrfyy6ivdq4jw98qiw50pz66c2l4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base explicit-exception transformers utility-ht - ]; - description = "Read and write spreadsheets from and to CSV files in a lazy way"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "spreadsheet_0_1_3_8" = callPackage ({ mkDerivation, base, explicit-exception, transformers, utility-ht }: mkDerivation { @@ -192771,7 +193018,6 @@ self: { ]; description = "Read and write spreadsheets from and to CSV files in a lazy way"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sprinkles" = callPackage @@ -193672,7 +193918,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stache_2_0_0" = callPackage + "stache_2_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, directory, file-embed, filepath, hspec, hspec-discover , hspec-megaparsec, megaparsec, mtl, template-haskell, text @@ -193680,8 +193926,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "2.0.0"; - sha256 = "11j8rvl9dqda73hwd4p7rwmf36w6xc86ls53v9ip6ag2052j1cll"; + version = "2.0.1"; + sha256 = "0awyh8zjvly18s4gnqy4970fj1hr4zpb38lisfy6px42m38g17vk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -193966,6 +194212,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stack-tag" = callPackage + ({ mkDerivation, async, base, containers, directory, hasktags, mtl + , optparse-applicative, process, text + }: + mkDerivation { + pname = "stack-tag"; + version = "0.2.0"; + sha256 = "08610hacra5sq22addh4fsqz4pwg98576lvwvvi4q8bly4ai23zb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base containers directory hasktags mtl process text + ]; + executableHaskellDepends = [ + async base containers directory hasktags mtl optparse-applicative + process text + ]; + description = "Create etags for Haskell projects based on Stack snapshots"; + license = stdenv.lib.licenses.mit; + }) {}; + "stack-type" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -196624,7 +196891,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "streamly_0_5_0" = callPackage + "streamly_0_5_1" = callPackage ({ mkDerivation, atomic-primops, base, clock, containers, deepseq , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue , monad-control, mtl, QuickCheck, random, transformers @@ -196632,8 +196899,8 @@ self: { }: mkDerivation { pname = "streamly"; - version = "0.5.0"; - sha256 = "1kzgrwnr2w6w4yjmx4qm325d0hf4wy21gb7a1cv0db4jkha3672s"; + version = "0.5.1"; + sha256 = "04hc87jwcfpbwydm75ic3rz87m76s39aysi14m514nib87xprbji"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199860,25 +200127,6 @@ self: { }) {}; "system-fileio" = callPackage - ({ mkDerivation, base, bytestring, chell, system-filepath - , temporary, text, time, transformers, unix - }: - mkDerivation { - pname = "system-fileio"; - version = "0.3.16.3"; - sha256 = "1484hcl27s2qcby8ws5djj11q9bz68bspcifz9h5gii2ndy70x9i"; - libraryHaskellDepends = [ - base bytestring system-filepath text time unix - ]; - testHaskellDepends = [ - base bytestring chell system-filepath temporary text time - transformers unix - ]; - description = "Consistent filesystem interaction across GHC versions (deprecated)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "system-fileio_0_3_16_4" = callPackage ({ mkDerivation, base, bytestring, chell, system-filepath , temporary, text, time, transformers, unix }: @@ -199895,7 +200143,6 @@ self: { ]; description = "Consistent filesystem interaction across GHC versions (deprecated)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "system-filepath" = callPackage @@ -200499,31 +200746,6 @@ self: { }) {}; "tagchup" = callPackage - ({ mkDerivation, base, bytestring, containers, data-accessor - , explicit-exception, non-empty, old-time, transformers, utility-ht - , xml-basic - }: - mkDerivation { - pname = "tagchup"; - version = "0.4.1"; - sha256 = "1h14xvbn5idc37zkxlkf1g9zr54l4kn4889mnfcbxg56fdfrfb0j"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers data-accessor explicit-exception - non-empty transformers utility-ht xml-basic - ]; - testHaskellDepends = [ base xml-basic ]; - benchmarkHaskellDepends = [ - base bytestring containers data-accessor explicit-exception - old-time transformers utility-ht xml-basic - ]; - description = "alternative package for processing of tag soups"; - license = "GPL"; - }) {}; - - "tagchup_0_4_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, non-empty, old-time, transformers, utility-ht , xml-basic @@ -200546,7 +200768,6 @@ self: { ]; description = "alternative package for processing of tag soups"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagged" = callPackage @@ -203000,6 +203221,18 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "tensors" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, singletons, vector }: + mkDerivation { + pname = "tensors"; + version = "0.1.0"; + sha256 = "1kwj1ii70cazw64yhhhkcby4kqjm21zzncdr4av0majr07kcbaz5"; + libraryHaskellDepends = [ base singletons vector ]; + testHaskellDepends = [ base hspec QuickCheck singletons vector ]; + description = "Tensor in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "term-rewriting" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, containers, HUnit , mtl, multiset, parsec, QuickCheck, union-find-array @@ -203397,23 +203630,6 @@ self: { }) {}; "test-framework-quickcheck2" = callPackage - ({ mkDerivation, base, extensible-exceptions, QuickCheck, random - , test-framework - }: - mkDerivation { - pname = "test-framework-quickcheck2"; - version = "0.3.0.4"; - sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp"; - revision = "1"; - editedCabalFile = "147ngmfdkskyg7mwsp5w73a4dbx3rp5s38bci3z03kn1m093lxff"; - libraryHaskellDepends = [ - base extensible-exceptions QuickCheck random test-framework - ]; - description = "QuickCheck-2 support for the test-framework package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "test-framework-quickcheck2_0_3_0_5" = callPackage ({ mkDerivation, base, extensible-exceptions, QuickCheck, random , test-framework }: @@ -203426,7 +203642,6 @@ self: { ]; description = "QuickCheck-2 support for the test-framework package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework-sandbox" = callPackage @@ -203894,28 +204109,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.11.0.1"; - sha256 = "11dc09hfnyfsz20ch2c867w0zdgjkzq41506lm61i3dk87ngdisf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - description = "Conversion between formats used to represent mathematics"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "texmath_0_11_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -203935,7 +204128,6 @@ self: { ]; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -211426,6 +211618,8 @@ self: { pname = "type-level-sets"; version = "0.8.7.0"; sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7"; + revision = "1"; + editedCabalFile = "0x03wqriksvdcvhlg3nxpnjgr5w22qkhny6aic6npjgnwjsamvxr"; libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; license = stdenv.lib.licenses.bsd3; @@ -212154,6 +212348,28 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "tzdata_0_1_20180501_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, HUnit + , test-framework, test-framework-hunit, test-framework-th, unix + , vector + }: + mkDerivation { + pname = "tzdata"; + version = "0.1.20180501.0"; + sha256 = "0nnzvkm6r7cq4g14zjxzgxx63sy8pxkg2whfgq6knpzhgran9n45"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers deepseq vector + ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + test-framework-th unix + ]; + description = "Time zone database (as files and as a module)"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "u2f" = callPackage ({ mkDerivation, aeson, asn1-encoding, asn1-types, base , base64-bytestring, binary, bytestring, cryptohash, cryptonite @@ -212644,6 +212860,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unbound-generics_0_4_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, contravariant + , criterion, deepseq, exceptions, mtl, profunctors, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell + , transformers, transformers-compat + }: + mkDerivation { + pname = "unbound-generics"; + version = "0.4.0"; + sha256 = "04amv54wrabzdmlig1mxi51ikq1lmfcm504184y0nm0xjahfssmx"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers contravariant deepseq exceptions mtl + profunctors template-haskell transformers transformers-compat + ]; + testHaskellDepends = [ + base mtl QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Support for programming with names and binders using GHC Generics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unbounded-delays" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -212916,20 +213155,6 @@ self: { }) {}; "unicode" = callPackage - ({ mkDerivation, base, containers, semigroups, utility-ht }: - mkDerivation { - pname = "unicode"; - version = "0.0.1"; - sha256 = "10cv8kk3c028bylkjz8jx0xhmkzrjbmhm1hhbdsyvszl9mfykga9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers semigroups ]; - testHaskellDepends = [ base containers utility-ht ]; - description = "Construct and transform unicode characters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode_0_0_1_1" = callPackage ({ mkDerivation, base, containers, semigroups, utility-ht }: mkDerivation { pname = "unicode"; @@ -212941,7 +213166,6 @@ self: { testHaskellDepends = [ base containers utility-ht ]; description = "Construct and transform unicode characters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-names" = callPackage @@ -213843,26 +214067,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, deepseq, directory, filepath, hspec - , process, stm, time, transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.7.1"; - sha256 = "1rif0r52qw2g8kxnbxpcdsmy925py47f8gspfvkbp16nrpxk7k63"; - libraryHaskellDepends = [ - async base deepseq directory filepath process stm time transformers - unix unliftio-core - ]; - testHaskellDepends = [ - async base deepseq directory filepath hspec process stm time - transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "unliftio_0_2_8_0" = callPackage ({ mkDerivation, async, base, deepseq, directory, filepath, hspec , process, stm, time, transformers, unix, unliftio-core }: @@ -213880,7 +214084,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -216511,6 +216714,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-algorithms_0_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, mwc-random + , primitive, QuickCheck, vector + }: + mkDerivation { + pname = "vector-algorithms"; + version = "0.8.0.0"; + sha256 = "1czili52fsjfz2d19c4v6p1qw8jya4gcqsfan1njiydrzplw18np"; + libraryHaskellDepends = [ base bytestring primitive vector ]; + testHaskellDepends = [ + base bytestring containers QuickCheck vector + ]; + benchmarkHaskellDepends = [ base mwc-random vector ]; + description = "Efficient algorithms for vector arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vector-binary" = callPackage ({ mkDerivation, base, binary, vector }: mkDerivation { @@ -217213,24 +217434,6 @@ self: { }) {}; "viewprof" = callPackage - ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens - , scientific, text, vector, vector-algorithms, vty - }: - mkDerivation { - pname = "viewprof"; - version = "0.0.0.22"; - sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base brick containers directory ghc-prof lens scientific text - vector vector-algorithms vty - ]; - description = "Text-based interactive GHC .prof viewer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "viewprof_0_0_0_23" = callPackage ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: @@ -217246,7 +217449,6 @@ self: { ]; description = "Text-based interactive GHC .prof viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "views" = callPackage @@ -217745,22 +217947,24 @@ self: { }) {}; "voicebase" = callPackage - ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client - , http-client-openssl, json-autotype, lens, mime-types, options - , text, wreq + ({ mkDerivation, aeson, base, bytestring, filepath, HsOpenSSL + , http-client, http-client-openssl, json-autotype, lens, mime-types + , optparse-applicative, text, wreq }: mkDerivation { pname = "voicebase"; - version = "0.1.1.2"; - sha256 = "1kw988gbx9vvrfybz3k1qxm3hyqxrfi0dyy5iwmq191y7x2scbj6"; + version = "0.1.1.4"; + sha256 = "17yrdrvvd3kyd6qnkfhqdwjxc5ripmzwa056rvn38ny3cxcfkd78"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl json-autotype lens mime-types text wreq ]; - executableHaskellDepends = [ base bytestring mime-types options ]; - testHaskellDepends = [ base ]; + executableHaskellDepends = [ + aeson base bytestring filepath mime-types optparse-applicative text + ]; + testHaskellDepends = [ aeson base ]; description = "Upload audio files to voicebase to get a transcription"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -219838,40 +220042,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, doctest - , gauge, ghc-prim, hashable, hspec, http-client, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.23"; - sha256 = "12v9qhi4hyp0sb90yddsax16jj7x47nmqwn53sv7b5nszcxgzam0"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory doctest ghc-prim hashable - hspec http-client http-date http-types http2 HUnit iproute - lifted-base network process QuickCheck silently simple-sendfile stm - streaming-commons text time transformers unix unix-compat vault wai - word8 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network unix unix-compat - ]; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_25" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, doctest , gauge, ghc-prim, hashable, hspec, http-client, http-date @@ -219903,7 +220073,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -219931,6 +220100,8 @@ self: { pname = "warp-grpc"; version = "0.1.0.3"; sha256 = "1x40jskp4c2dj4w3pfrw4f3ys9c64nlas2068s7zl05qayw21srf"; + revision = "1"; + editedCabalFile = "18mnn9wdhx8kv3y8nagkn7z7qmcyxnrcvigjyy378sfipcgjmdwc"; libraryHaskellDepends = [ async base binary bytestring case-insensitive http-types http2-grpc-types proto-lens wai warp warp-tls @@ -221692,8 +221863,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, utf8-string }: mkDerivation { pname = "wilton-ffi"; - version = "0.3.0.2"; - sha256 = "1qnsdj9676ifg9z67qdzblsszrzvhihwaww4s03jpy2324q42qhk"; + version = "0.3.0.3"; + sha256 = "1kpr1rg3nbvjvj29pa4b8ls52x0j6ixidnh6nm2jw3c2gplhmr5d"; libraryHaskellDepends = [ aeson base bytestring utf8-string ]; description = "Haskell modules support for Wilton JavaScript runtime"; license = stdenv.lib.licenses.mit; @@ -221888,6 +222059,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "with" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "with"; + version = "0.1.0"; + sha256 = "0jgm6w1xisyww81ak9rrrqmhgaiwdgk5rgvzax72rknzg9rb6701"; + description = "Simple open product type"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "with-index" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -223471,6 +223652,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509_1_7_4" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, containers, cryptonite, hourglass, memory, mtl, pem + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "x509"; + version = "1.7.4"; + sha256 = "1vm1ir0q7nxcyq65bmw7hbwlmf3frya077v9jikcrh8igg18m717"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring containers + cryptonite hourglass memory mtl pem + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass mtl tasty + tasty-quickcheck + ]; + description = "X509 reader and writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-store" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, mtl, pem, tasty @@ -224169,22 +224372,6 @@ self: { }) {}; "xml-basic" = callPackage - ({ mkDerivation, base, containers, data-accessor - , explicit-exception, semigroups, utility-ht - }: - mkDerivation { - pname = "xml-basic"; - version = "0.1.3"; - sha256 = "0ma3bjjsvijknmdnywfk5ch9v5pymxbmkwgzzq58iiv26hkd3n4q"; - libraryHaskellDepends = [ - base containers data-accessor explicit-exception semigroups - utility-ht - ]; - description = "Basics for XML/HTML representation and processing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xml-basic_0_1_3_1" = callPackage ({ mkDerivation, base, containers, data-accessor , explicit-exception, semigroups, utility-ht }: @@ -224198,7 +224385,6 @@ self: { ]; description = "Basics for XML/HTML representation and processing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-catalog" = callPackage @@ -224265,6 +224451,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit_1_8_0_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , bytestring, conduit, conduit-extra, containers + , data-default-class, deepseq, doctest, hspec, HUnit, resourcet + , text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.8.0.1"; + sha256 = "177gmyigxql1pn3ncz0r8annwv5cbxnihbgrrg1dhm4gmc9jy2wq"; + libraryHaskellDepends = [ + attoparsec base blaze-html blaze-markup bytestring conduit + conduit-extra containers data-default-class deepseq resourcet text + transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit containers doctest hspec HUnit + resourcet text transformers xml-types + ]; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -225922,7 +226132,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yaml_0_10_1_1" = callPackage + "yaml_0_10_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific @@ -225931,8 +226141,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.10.1.1"; - sha256 = "1rbmflr1yfcg147v544laq9vybn4kidjlc7v96ddaamx8sg32192"; + version = "0.10.2.0"; + sha256 = "0yklc3fz18h9gawp00ff2qhmymh2g25dsf08si935rjd1wadhf23"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -227876,6 +228086,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-paginator_1_1_0_1" = callPackage + ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces + , persistent, safe, text, transformers, uri-encode, yesod-core + , yesod-test + }: + mkDerivation { + pname = "yesod-paginator"; + version = "1.1.0.1"; + sha256 = "140b4cikshl5f229awnp5jcbnyln0bmzlqjfcwxzxssxwnviy93f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-markup path-pieces persistent safe text transformers + uri-encode yesod-core + ]; + testHaskellDepends = [ base doctest hspec yesod-core yesod-test ]; + description = "A pagination approach for yesod"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-paypal-rest" = callPackage ({ mkDerivation, base, paypal-rest-client, time, yesod-core }: mkDerivation { @@ -229695,13 +229926,14 @@ self: { ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, boxes, bytestring, containers, directory, filepath , formatting, Glob, hspec, hspec-core, HUnit, language-javascript - , mtl, optparse-applicative, process, purescript, safe, text - , transformers, transformers-base, transformers-compat, utf8-string + , mtl, optparse-applicative, process, purescript, QuickCheck, safe + , text, transformers, transformers-base, transformers-compat + , utf8-string }: mkDerivation { pname = "zephyr"; - version = "0.1.4"; - sha256 = "0zsqn8rbrzdh1l2m44nqhcdx3y3lbxdvik4scs5lb0sz5a0rdx5q"; + version = "0.2.0"; + sha256 = "0n0z7s71gjlpra4ghfd51rcz5yqddzzwfdpjnhlxciakrabc5m3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229719,8 +229951,8 @@ self: { testHaskellDepends = [ aeson ansi-terminal base base-compat bytestring containers directory filepath hspec hspec-core HUnit language-javascript mtl - optparse-applicative process purescript text transformers - transformers-base transformers-compat utf8-string + optparse-applicative process purescript QuickCheck text + transformers transformers-base transformers-compat utf8-string ]; description = "Zephyr tree shaking for PureScript Language"; license = stdenv.lib.licenses.mpl20; @@ -230692,20 +230924,20 @@ self: { "ztar" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, deepseq - , directory, extra, filepath, path, path-io, process, QuickCheck - , tasty, tasty-quickcheck, text, unix-compat, zip, zlib + , directory, filepath, path, path-io, process, QuickCheck, tasty + , tasty-quickcheck, text, unix-compat, zip, zlib }: mkDerivation { pname = "ztar"; - version = "0.2.0"; - sha256 = "1y6kkfwx3aw2fi46r7dg4q84mbhl54f2x4vpvwvzd9alz1nvv90i"; + version = "1.0.0"; + sha256 = "03a1amca24xpcjsx795pr1dqd78i8ickjqclbr5xcv74zzkhixp2"; libraryHaskellDepends = [ base bytestring deepseq directory filepath path process text unix-compat zip zlib ]; testHaskellDepends = [ - base bytestring bytestring-arbitrary extra path path-io QuickCheck - tasty tasty-quickcheck + base bytestring bytestring-arbitrary filepath path path-io + QuickCheck tasty tasty-quickcheck ]; description = "Creating and extracting arbitrary archives"; license = stdenv.lib.licenses.bsd3; From c5467e8f731a2db9d28c81de23758407ef58c303 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 18 Sep 2018 06:52:28 -0400 Subject: [PATCH 061/218] cabal-install: use newer version of Cabal library --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0fc9a1b168e5..f78fbd9fc709 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -33,7 +33,7 @@ self: super: { unbuildable = throw "package depends on meta package 'unbuildable'"; # Use the latest version of the Cabal library. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_0_1; }); # The test suite depends on old versions of tasty and QuickCheck. hackage-security = dontCheck super.hackage-security; From 72e2ab2c7241f0d26c8a547e1c5ca4f7a61e885e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Sep 2018 16:03:05 +0200 Subject: [PATCH 062/218] cabal2nix: update yaml override to the latest version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f78fbd9fc709..1f551a87b75a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1075,7 +1075,7 @@ self: super: { # The tool needs a newer hpack version than the one mandated by LTS-12.x. cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_31_0; - yaml = self.yaml_0_10_1_1; + yaml = self.yaml_0_10_2_0; }); # Break out of "aeson <1.3, temporary <1.3". From c18a0becf20afa61fcf49d3126e200a9eb826384 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Sep 2018 02:30:53 +0200 Subject: [PATCH 063/218] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.11.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/439b9af37fd8bde15e6e18a19fc6d27eb174d27a. --- .../haskell-modules/hackage-packages.nix | 242 +++++++++++++++--- 1 file changed, 209 insertions(+), 33 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dc245e85bc5d..1f6cb3e22200 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -31896,24 +31896,31 @@ self: { }) {}; "axel" = callPackage - ({ mkDerivation, base, directory, filepath, lens, lens-aeson - , monad-control, mtl, parsec, process, regex-pcre, split, strict - , text, typed-process, vector, yaml + ({ mkDerivation, base, bytestring, directory, filepath + , haskell-src-exts, hedgehog, lens, lens-aeson, mtl + , optparse-applicative, parsec, process, regex-pcre, split, strict + , tasty, tasty-discover, tasty-golden, tasty-hedgehog, tasty-hspec + , template-haskell, text, transformers, typed-process, vector, yaml }: mkDerivation { pname = "axel"; - version = "0.0.4"; - sha256 = "0gg1q7nfwsdh0wr5mqyrjcrfga4i87j8q2f4n9nvpq6hmwnphpc3"; - revision = "1"; - editedCabalFile = "0ff8pi6x26wv6bp2hx92h3cs9iln1yj6230am1c2ygjhr16wfwna"; + version = "0.0.5"; + sha256 = "0xkkb78wjggv5vnrzxgfxfirsfzazdbhjsb8bg9xsl9jgafbz6fq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base directory filepath lens lens-aeson monad-control mtl parsec - process regex-pcre split strict text typed-process vector yaml + base bytestring directory filepath haskell-src-exts lens lens-aeson + mtl optparse-applicative parsec process regex-pcre strict text + transformers typed-process vector yaml ]; - executableHaskellDepends = [ base directory ]; + executableHaskellDepends = [ base mtl optparse-applicative ]; + testHaskellDepends = [ + base bytestring filepath hedgehog lens mtl split tasty + tasty-discover tasty-golden tasty-hedgehog tasty-hspec + template-haskell transformers + ]; + testToolDepends = [ tasty-discover ]; description = "The Axel programming language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -33625,8 +33632,8 @@ self: { }: mkDerivation { pname = "beam-sqlite"; - version = "0.3.2.2"; - sha256 = "1k33bbh6zhhm7h88q9rwigrj5fisfgbwza6mfrhbygdpzck473hp"; + version = "0.3.2.3"; + sha256 = "01pz1i4k9pqya569kp7xic0g1lilwrjf0yvijq7bwgpara20y7ji"; libraryHaskellDepends = [ aeson attoparsec base beam-core beam-migrate bytestring dlist free hashable mtl network-uri scientific sqlite-simple text time unix @@ -63536,6 +63543,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributed-closure_0_4_1" = callPackage + ({ mkDerivation, async, base, binary, bytestring, constraints + , hspec, QuickCheck, syb, template-haskell + }: + mkDerivation { + pname = "distributed-closure"; + version = "0.4.1"; + sha256 = "1rkw5r5r3jlrkckjkqv290qx890a8sipx1c7n2syk1f6bshgwkny"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring constraints syb template-haskell + ]; + executableHaskellDepends = [ async base binary bytestring ]; + testHaskellDepends = [ base binary hspec QuickCheck ]; + description = "Serializable closures for distributed programming"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "distributed-fork" = callPackage ({ mkDerivation, async, base, binary, bytestring, constraints , distributed-closure, exceptions, stm, tasty, tasty-hunit @@ -68138,6 +68165,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eliminators_0_5" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.5"; + sha256 = "0d1d2pp8r2gai25q898v30gb5r82pjzi9smqndn27p1bk9xlqzzr"; + libraryHaskellDepends = [ + base extra singleton-nats singletons template-haskell + th-abstraction th-desugar + ]; + testHaskellDepends = [ base hspec singleton-nats singletons ]; + testToolDepends = [ hspec-discover ]; + description = "Dependently typed elimination functions using singletons"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -72154,6 +72200,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_6_11" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.6.11"; + sha256 = "0qqjhlvf9m9wph5c6xwvv2fb8l7cvwkc98f1r27nl4bjrxqag8sh"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ base directory filepath QuickCheck unix ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -107707,7 +107770,7 @@ self: { description = "Binding for the PAPI library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {papi = null;}; + }) {inherit (pkgs) papi;}; "hpaste" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup @@ -142383,17 +142446,15 @@ self: { }: mkDerivation { pname = "monad-persist"; - version = "0.0.2.0"; - sha256 = "17jq41r7bmycnzz028pii14cm0qjvclj01z78aj6aj1h4mlwlbc1"; - revision = "1"; - editedCabalFile = "0sghbyfd7jpwi80hivzbh2z77zl9kpzlvablkfx2w0q70hnbbrvd"; + version = "0.0.3.0"; + sha256 = "1d97lx9frzwydc82b7srw4r6dr3865wrnvyz27xmcvzxfzbyymi8"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl persistent text transformers transformers-base ]; testHaskellDepends = [ base hspec monad-control monad-logger persistent persistent-sqlite - persistent-template text + persistent-template text transformers ]; description = "An mtl-style typeclass and transformer for persistent"; license = stdenv.lib.licenses.isc; @@ -151492,7 +151553,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) unixODBC;}; - "odbc_0_2_1" = callPackage + "odbc_0_2_2" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , formatting, hspec, optparse-applicative, parsec, QuickCheck , semigroups, template-haskell, text, time, transformers, unixODBC @@ -151500,8 +151561,8 @@ self: { }: mkDerivation { pname = "odbc"; - version = "0.2.1"; - sha256 = "1s8l3i83jm022v0xqljfbf0qb28p5ps0cg6d9lzplywlqgwjh5nz"; + version = "0.2.2"; + sha256 = "0dkkkrv43kl3643i0j4hgj1mcsk1jhrl086dygd6hqb9hd4156k5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163617,8 +163678,10 @@ self: { ({ mkDerivation, potoki-core }: mkDerivation { pname = "potoki"; - version = "2.1.1"; - sha256 = "1qdja72zmrv5w7dpa2bzsf0phw6gaqvwzs8s3ilyw7v0h6hy3kgx"; + version = "2.1.2"; + sha256 = "1f4yf50zawxm6z2lidwrgcvc71f71aichqjihycibkrhp0s34ppj"; + revision = "1"; + editedCabalFile = "1qg6s7ppmz505r63k13qvm2ig6lknypji4jlkzpacricmkr3lymm"; libraryHaskellDepends = [ potoki-core ]; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; @@ -163655,17 +163718,17 @@ self: { , deepseq, directory, foldl, hashable, ilist, primitive , profunctors, ptr, QuickCheck, quickcheck-instances, random , rerebase, scanner, split, stm, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , vector + , tasty-quickcheck, text, text-builder, time, transformers + , unordered-containers, vector }: mkDerivation { pname = "potoki-core"; - version = "2.3.1"; - sha256 = "083qp1fgn1xflmivzrd615lyy0blxn1lmb8lqkjaziqijys2n83i"; + version = "2.3.2"; + sha256 = "1438wvf81zx208l1sqxcly4rvvgw14vwhlmrh4zbkkn7pgxqlnky"; libraryHaskellDepends = [ acquire attoparsec base bytestring deepseq directory foldl hashable - primitive profunctors ptr scanner stm text time transformers - unordered-containers vector + primitive profunctors ptr scanner stm text text-builder time + transformers unordered-containers vector ]; testHaskellDepends = [ acquire attoparsec foldl ilist QuickCheck quickcheck-instances @@ -175559,8 +175622,8 @@ self: { pname = "resolv"; version = "0.1.1.1"; sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; - revision = "2"; - editedCabalFile = "0fyi9wvwvvcasvxdq8fmbjjymap2sx4jyslplx85lv0n83wdrkcf"; + revision = "3"; + editedCabalFile = "0r1i7zrnynqxd3nzq4cz9648s3dmj29w63mcip57620d0fimyghm"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -181180,6 +181243,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scythe" = callPackage + ({ mkDerivation, alex, array, base, bytestring, mtl, text }: + mkDerivation { + pname = "scythe"; + version = "0.1.0.0"; + sha256 = "00g6i3vihfrbrj98hpkrv4gqna7a4vyl6kwbzsj9ymx8jvv0jdaq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base bytestring mtl text ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ base bytestring ]; + description = "Fast CSV lexing on ByteString"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scyther-proof" = callPackage ({ mkDerivation, alex, array, base, cmdargs, containers, directory , filepath, json, mtl, parsec, pretty, process, safe, tagsoup, time @@ -188306,6 +188384,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-nats_0_4_2" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "singleton-nats"; + version = "0.4.2"; + sha256 = "1wcwks2acnql5ihkjn2543hgdnlw049z8av8x5dp5r552fq6k0cg"; + libraryHaskellDepends = [ base singletons ]; + description = "Unary natural numbers relying on the singletons infrastructure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-typelits" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -188337,6 +188427,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singletons_2_5" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath + , ghc-boot-th, mtl, pretty, process, syb, tasty, tasty-golden + , template-haskell, text, th-desugar, transformers + }: + mkDerivation { + pname = "singletons"; + version = "2.5"; + sha256 = "0bk1ad4lk4vc5hw2j4r4nzs655k43v21d2s66hjvp679zxkvzz44"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl pretty syb template-haskell text + th-desugar transformers + ]; + testHaskellDepends = [ base filepath process tasty tasty-golden ]; + description = "A framework for generating singleton types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singnal" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201033,6 +201143,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagsoup_0_14_7" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , process, QuickCheck, text, time + }: + mkDerivation { + pname = "tagsoup"; + version = "0.14.7"; + sha256 = "09gcy5fd5nsk1b7zdrf7yb329fyr8hq5apd6w3cyh3nxd60z504r"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring deepseq directory process QuickCheck time + ]; + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagsoup-ht" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, old-time, tagsoup, transformers, utility-ht @@ -201405,6 +201532,8 @@ self: { pname = "tar"; version = "0.5.1.0"; sha256 = "0s2brvaxg5fki2jdkccmnpssiy6a3wjh24p6a3dkkdvjcixnk7f8"; + revision = "1"; + editedCabalFile = "1lydbwsmccf2av0g61j07bx7r5mzbcfgwvmh0qwg3a91857x264x"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -205295,6 +205424,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-desugar_1_9" = callPackage + ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb + , template-haskell, th-expand-syns, th-lift, th-orphans + }: + mkDerivation { + pname = "th-desugar"; + version = "1.9"; + sha256 = "1vxg0jvc239ngmv53yx564b7wkgd0b10xvx5phxvnnpm9n2pljpi"; + libraryHaskellDepends = [ + base containers mtl syb template-haskell th-expand-syns th-lift + th-orphans + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-expand-syns + th-lift th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-dict-discovery" = callPackage ({ mkDerivation, base, constraints, template-haskell }: mkDerivation { @@ -205850,6 +206000,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "these_0_7_5" = callPackage + ({ mkDerivation, aeson, base, bifunctors, binary, containers + , data-default-class, deepseq, hashable, keys, mtl, profunctors + , QuickCheck, quickcheck-instances, semigroupoids, tasty + , tasty-quickcheck, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "these"; + version = "0.7.5"; + sha256 = "1yrmxkpka0b6hzb7h2j603rjvyzhldrsq8h7336jr7b0ml929b6v"; + libraryHaskellDepends = [ + aeson base bifunctors binary containers data-default-class deepseq + hashable keys mtl profunctors QuickCheck semigroupoids transformers + transformers-compat unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + aeson base bifunctors binary containers hashable QuickCheck + quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "these-skinny" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -219337,8 +219513,8 @@ self: { }: mkDerivation { pname = "wai-middleware-rollbar"; - version = "0.10.0"; - sha256 = "1905cgmcgmsy0v2c84q33aharlklffqxhr6bwr1zvi138c9bivd6"; + version = "0.11.0"; + sha256 = "1nsnkf9wk61lj092z56knwfrdjyazql16y2kj5h0iamnf4gmxa7w"; libraryHaskellDepends = [ aeson base bytestring hostname http-client http-conduit http-types rollbar-hs text time uuid wai From 6e4c666a671a5df1d9a385280fcc133700e2b841 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 Sep 2018 10:49:23 +0200 Subject: [PATCH 064/218] git-annex: update sha256 hash for new version 6.20180913 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f551a87b75a..5d751992fa71 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -86,7 +86,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0a7h21cwfvprj5xfyivjzg2hbs71xp85l9v6kyp58mlqvwy3zffl"; + sha256 = "1y56dlhx3azny5hzixn9x4kmzzpmakzyvw45qk8x4ffsc7jqq5bs"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 9219580c823e8aa724b7426cddd7222d78856bf9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 14:04:48 -0500 Subject: [PATCH 065/218] i7z: simplify a bit --- pkgs/os-specific/linux/i7z/default.nix | 27 ++++++-------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 3bf9fbd74d38..c6e06bf85272 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -16,39 +16,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildPhase = '' - runHook preBuild - - make - ${lib.optionalString withGui '' + postBuild = lib.optionalString withGui '' cd GUI qmake make clean make cd .. - ''} - - runHook postBuild ''; - installPhase = '' - runHook preInstall + makeFlags = [ "prefix=${placeholder "out"}" ]; - mkdir -p $out/{bin,sbin} - make install prefix=$out - ${lib.optionalString withGui '' - install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui - ''} - mv $out/sbin/* $out/bin/ - rmdir $out/sbin - - runHook postInstall + postInstall = lib.optionalString withGui '' + install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui ''; meta = with lib; { description = "A better i7 (and now i3, i5) reporting tool for Linux"; - homepage = https://github.com/ajaiantilal/i7z; - repositories.git = https://github.com/ajaiantilal/i7z.git; + homepage = https://github.com/DimitryAndric/i7z; + repositories.git = https://github.com/DimitryAndric/i7z.git; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; # broken on ARM From 6108d6ada849d29b9129148943dd1c1feedd4d02 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 14:18:34 -0500 Subject: [PATCH 066/218] i7z: use qt5 for gui (when enabled), various fixes from debian --- pkgs/os-specific/linux/i7z/default.nix | 22 +++++++++++++++++++--- pkgs/os-specific/linux/i7z/qt5.patch | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/i7z/qt5.patch diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index c6e06bf85272..ac5f9fc5ba30 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, ncurses -, withGui ? false, qt4 ? null }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, ncurses +, withGui ? false, qtbase }: stdenv.mkDerivation rec { name = "i7z-${version}"; @@ -12,7 +12,23 @@ stdenv.mkDerivation rec { sha256 = "0l8wz0ffb27nkwchc606js652spk8masy3kjmzh7ygipwsary5ds"; }; - buildInputs = [ ncurses ] ++ lib.optional withGui qt4; + buildInputs = [ ncurses ] ++ lib.optional withGui qtbase; + + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/fix-insecure-tempfile.patch"; + sha256 = "0ifg06xjw14y4fnzzgkhqm4sv9mcdzgi8m2wffq9z8b1r0znya3s"; + }) + (fetchpatch { + url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/nehalem.patch"; + sha256 = "1ys6sgm01jkqb6d4y7qc3h89dzph8jjjcfya5c5jcm7dkxlzjq8a"; + }) + (fetchpatch { + url = "https://salsa.debian.org/debian/i7z/raw/ad1359764ee7a860a02e0c972f40339058fa9369/debian/patches/hyphen-used-as-minus-sign.patch"; + sha256 = "1ji2qvdyq0594cpqz0dlsfggvw3rm63sygh0jxvwjgxpnhykhg1p"; + }) + ./qt5.patch + ]; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/i7z/qt5.patch b/pkgs/os-specific/linux/i7z/qt5.patch new file mode 100644 index 000000000000..9e9b162d9e85 --- /dev/null +++ b/pkgs/os-specific/linux/i7z/qt5.patch @@ -0,0 +1,13 @@ +diff -Naur a/GUI/i7z_GUI.pro b/GUI/i7z_GUI.pro +--- a/GUI/i7z_GUI.pro 2013-10-12 21:59:19.000000000 +0100 ++++ b/GUI/i7z_GUI.pro 2016-11-05 13:54:30.118655672 +0000 +@@ -3,7 +3,8 @@ + ###################################################################### + + TEMPLATE = app +-TARGET = ++TARGET = i7z_GUI ++QT += widgets + DEPENDPATH += . + INCLUDEPATH += . + CONFIG += debug diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b33088174734..57633b0ae6d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13900,7 +13900,7 @@ with pkgs; hwdata = callPackage ../os-specific/linux/hwdata { }; - i7z = callPackage ../os-specific/linux/i7z { }; + i7z = qt5.callPackage ../os-specific/linux/i7z { }; pcm = callPackage ../os-specific/linux/pcm { }; From 34a94e3b75ed59ee83c22394d5976933bd3c48ab Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Sep 2018 15:23:56 -0400 Subject: [PATCH 067/218] lightdm: ensure run-directory is /run/lightdm (#46907) --- .../display-managers/lightdm/default.nix | 1 + .../display-managers/lightdm/run-dir.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/applications/display-managers/lightdm/run-dir.patch diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index bec07ac2d506..da7189f9196f 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ] ++ optional withQt4 qt4 ++ optional withQt5 qtbase; + patches = [ ./run-dir.patch ]; preConfigure = "NOCONFIGURE=1 ./autogen.sh"; diff --git a/pkgs/applications/display-managers/lightdm/run-dir.patch b/pkgs/applications/display-managers/lightdm/run-dir.patch new file mode 100644 index 000000000000..eb8e5a0f4d7e --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/run-dir.patch @@ -0,0 +1,13 @@ +diff --git a/data/lightdm.conf b/data/lightdm.conf +index 16b80f7..b3af435 100644 +--- a/data/lightdm.conf ++++ b/data/lightdm.conf +@@ -28,7 +28,7 @@ + #guest-account-script=guest-account + #logind-check-graphical=false + #log-directory=/var/log/lightdm +-#run-directory=/var/run/lightdm ++run-directory=/run/lightdm + #cache-directory=/var/cache/lightdm + #sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions + #remote-sessions-directory=/usr/share/lightdm/remote-sessions From 76e22c76b0327808765fc4f4191af35e52d68cc7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 14:24:06 -0500 Subject: [PATCH 068/218] undervolt: 2.8 -> 2.9 --- pkgs/os-specific/linux/undervolt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index e9c033acd990..a97cca4dfa76 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.2.8"; + version = "0.2.9"; pname = "undervolt"; src = fetchFromGitHub { owner = "georgewhewell"; repo = "undervolt"; rev = "${version}"; - sha256 = "0crkqc5zq0gpyg031hfwdxymfc2gc1h8b6m0axzlh7gvnxlf5hra"; + sha256 = "1d934lp8yczrfslmwff6fxzd4arja2vg00s5kwdr949bxpa6w59c"; }; meta = with stdenv.lib; { From dee2dab7c6a84c7615e81d20aec5e12ed3b0ae1b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 16 Sep 2018 18:36:21 +0200 Subject: [PATCH 069/218] ibus-engines.typing-booster: init at 2.1.1 This package providesa completion input method for faster typing. See https://mike-fabian.github.io/ibus-typing-booster Detailed instructions how to activate this IBus engine on your desktop can be found in the upstream docs: https://mike-fabian.github.io/ibus-typing-booster/documentation.html A simple VM with the Gnome3 desktop and activated `ibus' looks like this: ```nix { emojipicker = { pkgs, ... }: { services.xserver = { enable = true; desktopManager.gnome3.enable = true; desktopManager.xterm.enable = false; }; users.extraUsers.vm = { password = "vm"; isNormalUser = true; }; i18n.inputMethod.ibus.engines = [ pkgs.ibus-engines.typing-booster ]; i18n.inputMethod.enabled = "ibus"; virtualisation.memorySize = 2048; }; } ``` Fixes #38721 --- doc/package-notes.xml | 60 +++++++++++++++++++ .../ibus-typing-booster/default.nix | 41 +++++++++++++ .../ibus-typing-booster/hunspell-dirs.patch | 31 ++++++++++ .../ibus-typing-booster/wrapper.nix | 30 ++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 5 files changed, 168 insertions(+) create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 1f088e8aaa0e..05e820bcabe5 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -814,4 +814,64 @@ citrix_receiver.override { +
+ ibus-engines.typing-booster + + This package is an ibus-based completion method to speed up typing. + +
+ Activating the engine + + + IBus needs to be configured accordingly to activate typing-booster. The configuration + depends on the desktop manager in use. For detailed instructions, please refer to the + upstream docs. + + + On NixOS you need to explicitly enable ibus with given engines + before customizing your desktop to use typing-booster. This can be achieved + using the ibus module: +{ pkgs, ... }: { + i18n.inputMethod = { + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ typing-booster ]; + }; +} + +
+ +
+ Using custom hunspell dictionaries + + + The IBus engine is based on hunspell to support completion in many languages. + By default the dictionaries de-de, en-us, es-es, + it-it, sv-se and sv-fi + are in use. To add another dictionary, the package can be overridden like this: +ibus-engines.typing-booster.override { + langs = [ "de-at" "en-gb" ]; +} + + + Note: each language passed to langs must be an attribute name in + pkgs.hunspellDicts. + +
+ +
+ Built-in emoji picker + + + The ibus-engines.typing-booster package contains a program + named emoji-picker. To display all emojis correctly, + a special font such as noto-fonts-emoji is needed: + + + On NixOS it can be installed using the following expression: +{ pkgs, ... }: { + fonts.fonts = with pkgs; [ noto-fonts-emoji ]; +} + +
+
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix new file mode 100644 index 000000000000..c5aaa032b40e --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib +, wrapGAppsHook, gobjectIntrospection +}: + +let + + python = python3.withPackages (ps: with ps; [ + pygobject3 + dbus-python + ]); + +in + +stdenv.mkDerivation rec { + name = "ibus-typing-booster-${version}"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "mike-fabian"; + repo = "ibus-typing-booster"; + rev = version; + sha256 = "01kpxplk9nh56f32fkq3nnsqykbzpi7pcxbfp38dq0prgrhw9a6b"; + }; + + patches = [ ./hunspell-dirs.patch ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook gobjectIntrospection ]; + buildInputs = [ python ibus gtk3 m17n_lib ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${m17n_lib}/lib") + ''; + + meta = with stdenv.lib; { + homepage = https://mike-fabian.github.io/ibus-typing-booster/; + license = licenses.gpl3Plus; + description = "A typing booster engine for the IBus platform"; + maintainers = with maintainers; [ ma27 ]; + isIbusEngine = true; + }; +} diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch new file mode 100644 index 000000000000..7b624b379a26 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/hunspell-dirs.patch @@ -0,0 +1,31 @@ +diff --git a/engine/itb_util.py b/engine/itb_util.py +index ded236a..633525a 100755 +--- a/engine/itb_util.py ++++ b/engine/itb_util.py +@@ -1876,14 +1876,18 @@ def find_hunspell_dictionary(language): + If no dictionary can be found for the requested language, + the return value is ('', ''). + ''' +- dirnames = [ +- '/usr/share/hunspell', +- '/usr/share/myspell', +- '/usr/share/myspell/dicts', +- '/usr/local/share/hunspell', # On FreeBSD the dictionaries are here +- '/usr/local/share/myspell', +- '/usr/local/share/myspell/dicts', +- ] ++ ++ if "NIX_HUNSPELL_DIRS" in os.environ: ++ dirnames = os.environ["NIX_HUNSPELL_DIRS"].split(":") ++ else: # fallback to the original behavior ++ dirnames = [ ++ '/usr/share/hunspell', ++ '/usr/share/myspell', ++ '/usr/share/myspell/dicts', ++ '/usr/local/share/hunspell', # On FreeBSD the dictionaries are here ++ '/usr/local/share/myspell', ++ '/usr/local/share/myspell/dicts', ++ ] + dic_path = '' + aff_path = '' + for language in expand_languages([language]): diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix new file mode 100644 index 000000000000..e6505f3cc468 --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix @@ -0,0 +1,30 @@ +{ typing-booster, symlinkJoin, hunspellDicts, lib, makeWrapper +, langs ? [ "de-de" "en-us" "es-es" "it-it" "sv-se" "sv-fi" ] +}: + +let + + hunspellDirs = with lib; makeSearchPath ":" (flatten (flip map langs (lang: [ + "${hunspellDicts.${lang}}/share/hunspell" + "${hunspellDicts.${lang}}/share/myspell" + "${hunspellDicts.${lang}}/share/myspell/dicts" + ]))); + +in + +symlinkJoin { + name = "${typing-booster.name}-with-hunspell"; + paths = [ typing-booster ]; + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + for i in bin/emoji-picker libexec/ibus-{setup,engine}-typing-booster; do + wrapProgram "$out/$i" \ + --prefix NIX_HUNSPELL_DIRS : ${hunspellDirs} + done + + sed -i -e "s,${typing-booster},$out," $out/share/ibus/component/typing-booster.xml + ''; + + inherit (typing-booster) meta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9722e945594e..708eef1e49ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1906,6 +1906,12 @@ with pkgs; }; uniemoji = callPackage ../tools/inputmethods/ibus-engines/ibus-uniemoji { }; + + typing-booster-unwrapped = callPackage ../tools/inputmethods/ibus-engines/ibus-typing-booster { }; + + typing-booster = callPackage ../tools/inputmethods/ibus-engines/ibus-typing-booster/wrapper.nix { + typing-booster = ibus-engines.typing-booster-unwrapped; + }; }; ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { From a0c5dd8a09215e47a67122005a0525febdee8d72 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 19 Sep 2018 22:18:29 +0200 Subject: [PATCH 070/218] arelle: fix build, use current python3 (#46862) It was pinned to python34, build failed in dependency python34Packages.pytest. Use python3(6) instead. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b33088174734..525b2eeb951a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15468,7 +15468,7 @@ with pkgs; inherit (vamp) vampSDK; }; - inherit (python34Packages) arelle; + inherit (python3Packages) arelle; ario = callPackage ../applications/audio/ario { }; From f3a0c8a3aafb30d6a57e92b4b0b0245510d5a844 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Wed, 19 Sep 2018 23:50:22 +0200 Subject: [PATCH 071/218] pythonPackages.nilearn: disable still failing tests (#46918) A previous attempt to fix tests failing on some machines (#46850) was unsuccessful, they still failed on Hydra sometimes while succeeding locally. Revert #46850 and disable these tests instead. --- pkgs/development/python-modules/nilearn/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 14bb15184b59..32ec4b74509d 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -14,18 +14,12 @@ buildPythonPackage rec { # disable some failing tests checkPhase = '' nosetests nilearn/tests \ - -e test_cache_mixin_with_expand_user -e test_clean_confounds -e test_detrend + -e test_cache_mixin_with_expand_user -e test_clean_confounds -e test_detrend \ + -e test_clean_detrending -e test_high_variance_confounds ''; checkInputs = [ nose ]; - # These tests fail on some builder machines, probably due to lower - # arithmetic precision. Reduce required precision from 13 to 8 decimals. - postPatch = '' - substituteInPlace nilearn/tests/test_signal.py \ - --replace 'decimal=13' 'decimal=8' - ''; - propagatedBuildInputs = [ matplotlib nibabel From d6b9252d67b9989ec1a81b62288e504ff9fc0b76 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 16:55:50 -0500 Subject: [PATCH 072/218] editline: 1.15.3 -> 1.16.0 (#46897) https://github.com/troglobit/editline/releases/tag/1.16.0 --- pkgs/development/libraries/editline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index d9b5a2b64d63..dc44c7d8705f 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "editline-${version}"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; rev = version; - sha256 = "0dm5fgq0acpprr938idwml64nclg9l6c6avirsd8r6f40qicbgma"; + sha256 = "0a751dp34mk9hwv59ss447csknpm5i5cgd607m3fqf24rszyhbf2"; }; nativeBuildInputs = [ autoreconfHook ]; From 6e9cc8871f2c4e7a88d4c81d2d0e75fb03811d65 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 17:10:47 -0500 Subject: [PATCH 073/218] brotli: 1.0.5 -> 1.0.6 (#46903) --- pkgs/tools/compression/brotli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index a63721466dbc..db5d1f216054 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "brotli-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "0ssj7mnhpdpk7qnwr49qfd4gxhkmvbli5mhs274pz55cx1xp7xja"; + sha256 = "1hng7v7n6asli9v8gnshrqjnia5cvrwzgnx7irmk7r98nnjzlqda"; }; nativeBuildInputs = [ cmake ]; From 869f615ff4fa83eea51934065cf6e8613e76a37c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Sep 2018 00:17:45 +0200 Subject: [PATCH 074/218] nix: 2.1.1 -> 2.1.2 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++---- pkgs/tools/package-management/nix/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index cb182a08a830..adde237c07c9 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/h180y3n5k1ypxgm1pcvj243qix5j45zz-nix-2.1.1"; - i686-linux = "/nix/store/v2y4k4v9ml07jmfq739wyflapg3b7b5k-nix-2.1.1"; - aarch64-linux = "/nix/store/v485craglq7xm5996ci8qy5dyc17dab0-nix-2.1.1"; - x86_64-darwin = "/nix/store/lc3ymlix73kaad5srjdgaxp9ngr1sg6g-nix-2.1.1"; + x86_64-linux = "/nix/store/mxg4bbblxfns96yrz0nalxyiyjl7gj98-nix-2.1.2"; + i686-linux = "/nix/store/bgjgmbwirx63mwwychpikd7yc4k4lbjv-nix-2.1.2"; + aarch64-linux = "/nix/store/yi18azn4nwrcwvaiag04jnxc1qs38fy5-nix-2.1.2"; + x86_64-darwin = "/nix/store/fpivmcck2qpw5plrp599iraw2x9jp18k-nix-2.1.2"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 7d78fef39742..ea0cdf9bd0f1 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -148,10 +148,10 @@ in rec { }) // { perl-bindings = nix1; }; nixStable = (common rec { - name = "nix-2.1.1"; + name = "nix-2.1.2"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b"; + sha256 = "68e55382dac9e66f84ead69b3c786a4ea85d4a6611a7a740aa0b78fcc85db3ec"; }; }) // { perl-bindings = perl-bindings { nix = nixStable; From 4a77150d8b27e99e8890b97d4b8935ba394596a5 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Thu, 20 Sep 2018 01:25:38 +0300 Subject: [PATCH 075/218] qbittorrent: 4.1.2 -> 4.1.3 (#46917) --- .../networking/p2p/qbittorrent/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index b69906f8eb79..673ece2cb72c 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig +{ stdenv, fetchFromGitHub, pkgconfig , boost, libtorrentRasterbar, qtbase, qttools, qtsvg , debugSupport ? false # Debugging , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -10,23 +10,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05"; + sha256 = "1hpcn1x4z3vdjscw035d18vqhfs7c6yv002akgmbgdf9jl3vfrsl"; }; - patches = [ - (fetchpatch { - name = "fix-desktop-file-regression.patch"; - url = "https://github.com/qbittorrent/qBittorrent/commit/078325a3eb85c286b9a3454192ed2deadeda604c.patch"; - sha256 = "1xhpd4ncy2m9zxsllizkry2013ij0ii9p8b8jbb35sazw5p50c96"; - }) - ]; - # NOTE: 2018-05-31: CMake is working but it is not officially supported nativeBuildInputs = [ pkgconfig ]; From 254218bffb0acb6f7d19de4b3b9199a890c971a8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 19 Sep 2018 17:28:05 -0500 Subject: [PATCH 076/218] pahole: (??) -> v1.12, cleanup (#46913) (roughly 2015-09-15 -> 2018-08-16) --- .../development/tools/misc/pahole/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 38de21872b9f..3864ad945835 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchgit, cmake, elfutils, zlib }: -stdenv.mkDerivation { - name = "pahole-head"; +stdenv.mkDerivation rec { + name = "pahole-${version}"; + version = "1.12"; src = fetchgit { url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git; - sha256 = "05f8a14ea6c200c20e9c6738593b38e4ced73a9cef86499ccd7af910eb9b74b3"; - rev = "1decb1bc4a412a0902b7b25190d755a875022d03"; + sha256 = "1a8xfwqdc2j3ydh9bk2pkvsaf3lrkbxj66vj991c7knc31ix8kpw"; + rev = "v${version}"; }; - buildInputs = [ cmake elfutils zlib ]; - postInstall = '' - for p in $out/bin/*; do - rpath=`patchelf --print-rpath $p || true`:$out - patchelf --set-rpath "$rpath" $p || true - done - ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ elfutils zlib ]; + + # Put libraries in "lib" subdirectory, not top level of $out + cmakeFlags = [ "-D__LIB=lib" ]; meta = with stdenv.lib; { homepage = https://git.kernel.org/cgit/devel/pahole/pahole.git/; From bbb30c320e119cd2660066105e5c2d7219a590fd Mon Sep 17 00:00:00 2001 From: "Leo R. Lundgren" Date: Thu, 20 Sep 2018 02:08:45 +0200 Subject: [PATCH 077/218] open-vm-tools: 10.1.10 -> 10.3.0 --- pkgs/applications/virtualization/open-vm-tools/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e42c1d5dd1e4..49df39040db3 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "open-vm-tools-${version}"; - version = "10.1.10"; + version = "10.3.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "13ifpi53rc2463ka8xw9zx407d1fz119x8sb9k48g5mwxm6c85fm"; + sha256 = "0arx4yd8c5qszfgw8rqyi65j37r46dxibmzqqxb096isxhxjymw6"; }; sourceRoot = "${src.name}/open-vm-tools"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 814c5e9d6073..3671c53f2eeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14471,7 +14471,7 @@ with pkgs; nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { - inherit (gnome2) gtk gtkmm; + inherit (gnome3) gtk gtkmm; }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; From 42f486703d09168dc907442eafb3ac8c2c818e65 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 20 Sep 2018 10:08:52 +0800 Subject: [PATCH 078/218] overmind: 2.0.0.beta1 -> 1.2.1 Newer version has some weird failure cases related to PATH --- pkgs/applications/misc/overmind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index ac985a5e4d2d..d7f601b50cd8 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "overmind-${version}"; - version = "2.0.0.beta1"; + version = "1.2.1"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "DarthSim"; repo = "overmind"; rev = "v${version}"; - sha256 = "15fch3qszdm8bj1m9hxky9zgk6f5gpbswwfslg84qdjf4iwr5drq"; + sha256 = "11ws9rsy8ladjp1y3b6vva9sjmw4s24xc1w18lyhfz63xc908nfw"; }; meta = with stdenv.lib; { From 03d8620098e392e0753ceb8f36146882e1c51af5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 19 Sep 2018 22:41:10 -0700 Subject: [PATCH 079/218] wireguard-tools: 0.0.20180904 -> 0.0.20180918 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wireguard-tools/versions --- pkgs/tools/networking/wireguard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index f93596b8e8fb..4f71d6bc2e4f 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "wireguard-tools-${version}"; - version = "0.0.20180904"; + version = "0.0.20180918"; src = fetchzip { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "0slf6lchzhb2san1hsqnny1sdmxq8rzqwz355f33zsgaj6qh1gmk"; + sha256 = "0ax6wvapzmn52l7js6n416852npgapa9875yl2ixs271y8m9kv40"; }; sourceRoot = "source/src/tools"; From be4db7a6a9baba3a90e1a8b0014ea1c9968c6124 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 19 Sep 2018 23:24:42 -0700 Subject: [PATCH 080/218] wesnoth: 1.14.4 -> 1.14.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/wesnoth/versions --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 4df457b68f5a..9d86afa97ec3 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.14.4"; + version = "1.14.5"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1hw1ap8xxpdwyx1sf8fm1g75p6724y3hwb4kpvyqbsq7bwfwsb9i"; + sha256 = "1kgpj2f22nnx4mwd1zis3s5ny2983aasgqsmz7wnqaq7n6a7ac85"; }; nativeBuildInputs = [ cmake pkgconfig ]; From d82d6a7daef2301de0eb43538e869af7314c3e28 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 14 Sep 2018 10:19:55 +0200 Subject: [PATCH 081/218] vimPlugins: shougo -> Shougo --- pkgs/misc/vim-plugins/generated.nix | 32 +++++++++++++------------- pkgs/misc/vim-plugins/vim-plugin-names | 32 +++++++++++++------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e1a8d0ae1f93..4fb293c6f992 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -226,7 +226,7 @@ context_filetype-vim = buildVimPluginFrom2Nix { name = "context_filetype-vim-2018-08-30"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "context_filetype.vim"; rev = "5392e3f0f3ff82b7149818a5700680f4bbcfea45"; sha256 = "0xnqn96qnlvpvqc4sx8vmnryfqgcxrgczlmadgkms18gd3ib6i0z"; @@ -336,7 +336,7 @@ denite-nvim = buildVimPluginFrom2Nix { name = "denite-nvim-2018-09-15"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "denite.nvim"; rev = "8685cfbb7f0a4bea173a6b08a72a33ef70780334"; sha256 = "0zc15802hda59x42k0962fmawjq021y7ys10h4ypnwy50cn1vjzj"; @@ -419,7 +419,7 @@ deoplete-nvim = buildVimPluginFrom2Nix { name = "deoplete-nvim-2018-09-12"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "deoplete.nvim"; rev = "93f6e3bce8229557b952dcad792786b1cc228991"; sha256 = "033iskhyz91158ifmpzpv1gi4rfx368c6knakj65spcrlfci58y9"; @@ -439,7 +439,7 @@ echodoc-vim = buildVimPluginFrom2Nix { name = "echodoc-vim-2018-09-09"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "echodoc.vim"; rev = "781b1622029cd89350e6383da8ead834fb0cedd2"; sha256 = "018xrql2prik0v9g0099k883r5gdgnip36vidnzmkr0b0h5bgw6a"; @@ -851,7 +851,7 @@ neco-syntax = buildVimPluginFrom2Nix { name = "neco-syntax-2017-10-01"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "neco-syntax"; rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; @@ -861,7 +861,7 @@ neco-vim = buildVimPluginFrom2Nix { name = "neco-vim-2017-10-01"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "neco-vim"; rev = "f5397c5e800d65a58c56d8f1b1b92686b05f4ca9"; sha256 = "0yb7ja6qgrazszk4i01cwjj00j9vd43zs2r11b08iy8n10jnzr73"; @@ -871,7 +871,7 @@ neocomplete-vim = buildVimPluginFrom2Nix { name = "neocomplete-vim-2018-03-28"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "neocomplete.vim"; rev = "4be617947f3fcf2d725fab20b0e12f8b46c9e2f3"; sha256 = "00ns46gy726w74nmnzhqnyh10jnpr04453v3rclswxgcvgma82b8"; @@ -891,7 +891,7 @@ neoinclude-vim = buildVimPluginFrom2Nix { name = "neoinclude-vim-2018-05-21"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "neoinclude.vim"; rev = "2fa77b9211d3f10c29559b715b6863da67ae7d3a"; sha256 = "0pdahb2z9q4dk67xkwvaqrlpai86slhncfb4gn88x40dlnd7rkbg"; @@ -911,7 +911,7 @@ neomru-vim = buildVimPluginFrom2Nix { name = "neomru-vim-2017-10-01"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "neomru.vim"; rev = "97540f54fa20b94daf306f0c1f3cce983bbf7a1d"; sha256 = "15d5hmh5v3hnjnfb5736n45rh5nyq41vqjp1cz4ls2rxmmfi3xa7"; @@ -921,7 +921,7 @@ neosnippet-snippets = buildVimPluginFrom2Nix { name = "neosnippet-snippets-2018-09-12"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "neosnippet-snippets"; rev = "e61e966339bbab2abba6ba92bccd8825463b2d0d"; sha256 = "0yis1r2ypxym421gwlsm8zszsg490xw5q0h111k077x19qa5j4fs"; @@ -931,7 +931,7 @@ neosnippet-vim = buildVimPluginFrom2Nix { name = "neosnippet-vim-2018-07-30"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "neosnippet.vim"; rev = "70700ddef65f8f0639b336d04a0d2dbdc4eb0830"; sha256 = "0szhmdqqgpfy6shwiw7wnsd06cz8c7v5zmpaa3hzs32gyrx49rza"; @@ -941,7 +941,7 @@ neoyank-vim = buildVimPluginFrom2Nix { name = "neoyank-vim-2018-03-26"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "neoyank.vim"; rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; @@ -1311,7 +1311,7 @@ tabpagebuffer-vim = buildVimPluginFrom2Nix { name = "tabpagebuffer-vim-2014-09-30"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "tabpagebuffer.vim"; rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; @@ -1451,7 +1451,7 @@ unite-vim = buildVimPluginFrom2Nix { name = "unite-vim-2018-08-06"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "unite.vim"; rev = "7ed231f2dbceb82b3ed81dc5ef999c94c2528586"; sha256 = "0p2xfsyflds74lrpk14nb388nh2rc3hmqg3i9kgzxqns4i6w5s8v"; @@ -3122,7 +3122,7 @@ vimproc-vim = buildVimPluginFrom2Nix { name = "vimproc-vim-2018-01-07"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "vimproc.vim"; rev = "2300224d366642f4f8d6f88861535d4ccbe20143"; sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia"; @@ -3132,7 +3132,7 @@ vimshell-vim = buildVimPluginFrom2Nix { name = "vimshell-vim-2018-06-02"; src = fetchFromGitHub { - owner = "shougo"; + owner = "Shougo"; repo = "vimshell.vim"; rev = "03bf7673a5098918a533000d67dca97546695237"; sha256 = "1ckxjap9kz8skbjchg561sqyd5y5qwacg8mabmniy78qa7i3qdzi"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 595d0f9ae6a0..fbce248724c2 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -220,23 +220,23 @@ scrooloose/nerdtree scrooloose/syntastic sebastianmarkow/deoplete-rust sheerun/vim-polyglot -shougo/context_filetype.vim -shougo/denite.nvim +Shougo/context_filetype.vim +Shougo/denite.nvim Shougo/deol.nvim -shougo/deoplete.nvim -shougo/echodoc.vim -shougo/neco-syntax -shougo/neco-vim -shougo/neocomplete.vim -shougo/neoinclude.vim -shougo/neomru.vim -shougo/neosnippet-snippets -shougo/neosnippet.vim -shougo/neoyank.vim -shougo/tabpagebuffer.vim -shougo/unite.vim -shougo/vimproc.vim -shougo/vimshell.vim +Shougo/deoplete.nvim +Shougo/echodoc.vim +Shougo/neco-syntax +Shougo/neco-vim +Shougo/neocomplete.vim +Shougo/neoinclude.vim +Shougo/neomru.vim +Shougo/neosnippet-snippets +Shougo/neosnippet.vim +Shougo/neoyank.vim +Shougo/tabpagebuffer.vim +Shougo/unite.vim +Shougo/vimproc.vim +Shougo/vimshell.vim shumphrey/fugitive-gitlab.vim SirVer/ultisnips sjl/gundo.vim From 3f47dfff3bd88735d502990b6ad196bd0ea354cd Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 16 Sep 2018 13:06:58 +0200 Subject: [PATCH 082/218] vimPlugins: Add vim-plug, update plugins --- pkgs/misc/vim-plugins/generated.nix | 148 +++++++++++++------------ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 80 insertions(+), 69 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4fb293c6f992..18ca6f1de30a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -53,12 +53,12 @@ }; ale = buildVimPluginFrom2Nix { - name = "ale-2018-09-14"; + name = "ale-2018-09-19"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "f1f2a222281c9e489c3ca6a4f72329c08d4646a6"; - sha256 = "0dv0icsg9cmaib9waipj3kz29hczs17kzxbrv46a4y7cb4vcb0jd"; + rev = "169a6e26b2ca63ab0f2f5bb3d2176ff0a2f68bc3"; + sha256 = "09pc3a9wkql7j9rc3yfgwns94s7rrldichxwhq37ily139596wkm"; }; }; @@ -163,12 +163,12 @@ }; clang_complete = buildVimPluginFrom2Nix { - name = "clang_complete-2018-01-18"; + name = "clang_complete-2018-09-19"; src = fetchFromGitHub { owner = "Rip-Rip"; repo = "clang_complete"; - rev = "0918788ea0b9dc4c753ffd162c95f890ae57a275"; - sha256 = "19hf7xrx1lsvn5rhwmc0qc1qzpb365j1d0jzvihd99p0zkgzgj1p"; + rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f"; + sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc"; }; }; @@ -193,12 +193,12 @@ }; command-t = buildVimPluginFrom2Nix { - name = "command-t-2017-11-17"; + name = "command-t-2018-09-19"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "7147ba92c9c1eef8269fd47d47ba636ce7f365a6"; - sha256 = "171z1jjjv1l15rh3i2hc400vjf4zns8sjvda0vcjkx2717ax658r"; + rev = "7364a410bc4f0d7febc183678cd565066dfd1e73"; + sha256 = "1a14ddq6jkfklicdgkpbizzlrx2r4isxarbav5q86w86rwkx3jfi"; fetchSubmodules = true; }; }; @@ -376,12 +376,12 @@ }; deoplete-jedi = buildVimPluginFrom2Nix { - name = "deoplete-jedi-2018-09-15"; + name = "deoplete-jedi-2018-09-18"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-jedi"; - rev = "e397e76e88e8f3c4342ac5284b7dd12561426041"; - sha256 = "1zslxqs0zcs9vj47g3jr6h6f1lqyswpjc15a1z06zak166ppsxkw"; + rev = "d49b166458784585dc0cbfb0d7643bc02eba3dd8"; + sha256 = "1dza6bzij0f8bfs7k9j954f8xccjjcrc7wrcgrm1qw0d2jbm4bgq"; fetchSubmodules = true; }; }; @@ -719,12 +719,12 @@ }; lightline-vim = buildVimPluginFrom2Nix { - name = "lightline-vim-2018-09-16"; + name = "lightline-vim-2018-09-17"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "0b026a2b894844b58f8a632290ea1cdab201ed50"; - sha256 = "0hpw22sv41drn376y4vv5krbjdahga6vxiqrrgky5x1d8bj1fz4m"; + rev = "47765c787ddc981c2eab6105ade84067d164893c"; + sha256 = "1r5xpss99jfkvc5dngg877dhmirwnrwppql7ysbab50wfx4hv5c6"; }; }; @@ -899,12 +899,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-09-16"; + name = "neomake-2018-09-17"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "1b5c098e152124267034ce175676594995e4af72"; - sha256 = "19860x030hscv75sqsjjdkpkndcssn20f9iqy955ssh6v3qmjg2m"; + rev = "5c0e5c5de14a03c438a370a5ef79a3165a2e705f"; + sha256 = "0ffkpidgc9lki5h4x8w3yvf5vj6rdip6n0wd89dax81bk7579pcb"; }; }; @@ -959,12 +959,12 @@ }; nerdtree = buildVimPluginFrom2Nix { - name = "nerdtree-2018-09-15"; + name = "nerdtree-2018-09-17"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "cd1f2c803ec485074af070a2fe942a029775e5bd"; - sha256 = "07rna5sqjq934xx8nqsv0b0z6rmzprdxfa76kq5gm3bhc807c7pv"; + rev = "599238ad99642e8767c4be6adda75bd84afdfd42"; + sha256 = "1yjx254lmwil42hild0nprxpb26rw84872cnxrzaqfljwsyq7wwv"; }; }; @@ -979,12 +979,12 @@ }; nim-vim = buildVimPluginFrom2Nix { - name = "nim-vim-2018-08-16"; + name = "nim-vim-2018-09-19"; src = fetchFromGitHub { owner = "zah"; repo = "nim.vim"; - rev = "7d1211cc1588d8970e44435c612405f41ab5a36b"; - sha256 = "1s28sk7d73vckh37xhld99i8kkx2dxcvsiv8ixlkhgg1pdcchd6d"; + rev = "b0c4c6c7318866e5d74715885cb379aab70d2763"; + sha256 = "18wdyw8kchfi0zglzvcnakzm9w8h22a1qjcqnk9j64siwcj6bzcy"; }; }; @@ -1189,12 +1189,12 @@ }; rust-vim = buildVimPluginFrom2Nix { - name = "rust-vim-2018-09-15"; + name = "rust-vim-2018-09-16"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "83620e6c674e1ceb801f1b322fb30d028ee59685"; - sha256 = "0bvyay7r76r3zg00ziinlycw29316r8n81dxsd5qcgxmxfd3ssd1"; + rev = "5e4672c8ba490d2663c34d89616729b36b294594"; + sha256 = "189vjd2v271h4634i1fxi9g1sfxkgsb087454na67jrz1pwd8xvw"; }; }; @@ -1439,12 +1439,12 @@ }; undotree = buildVimPluginFrom2Nix { - name = "undotree-2018-09-07"; + name = "undotree-2018-09-17"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "364c73dae83bbaa552fa901dbcb082be22f846f4"; - sha256 = "1swjgdgbr63a5xp9nlmcpa5f31r1jc9n4wqz4sgmhrcdc4xxq8ah"; + rev = "c15a0409d9d5a7eacf18d3061a8a37d114532765"; + sha256 = "0iaj69cc7ysylql43ybprsls9liprmg46ak9mmbh1vjgny2c1nf0"; }; }; @@ -1679,12 +1679,12 @@ }; vim-airline = buildVimPluginFrom2Nix { - name = "vim-airline-2018-09-16"; + name = "vim-airline-2018-09-18"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "bcd37fc1152912fd456606152cebc8d5fc8db865"; - sha256 = "0cmfj4pvwqyq2nzsy4zhkwhyrifg2sx0z5plw0dvyi2jnfns7afi"; + rev = "251ed064e84dc684a944edbe37d3c559af3e02bf"; + sha256 = "1nmcir24f9mlnnfnkbcn3ww5dhn96k6nh0kdpjz1hdh4wd659vhm"; }; }; @@ -1899,12 +1899,12 @@ }; vim-dispatch = buildVimPluginFrom2Nix { - name = "vim-dispatch-2018-09-13"; + name = "vim-dispatch-2018-09-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "fe48d002ce5d473b2057641666d643c66ede6230"; - sha256 = "1yxssbss89c1sp6vq0mb7cz65cw0lbqfs2ng7hfr92fag68agi2p"; + rev = "72a08f297e71f25e569f66a825ce2878b038e045"; + sha256 = "1d0swdrgp3xls4ac854xsqpjipbml9a8yqxcg888xnm8jsqfhqn1"; }; }; @@ -2039,12 +2039,12 @@ }; vim-fugitive = buildVimPluginFrom2Nix { - name = "vim-fugitive-2018-09-15"; + name = "vim-fugitive-2018-09-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "fb5531997342be62efbbb98bda4b90ee88b2ac00"; - sha256 = "092fpxmvl7mq1bh8g87ld1mn19qh9dc9r16ngilhg8zx3fvpvi67"; + rev = "9fec8aadc54372cbea6ac3c9cf6909054140b573"; + sha256 = "0pkfhbaka6gsabmz74v5dpwd72rwjrrq9wchcda86rmb6nxqsgmg"; }; }; @@ -2099,12 +2099,12 @@ }; vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2018-09-13"; + name = "vim-go-2018-09-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "8df48b2c2c8aa02dd5ab00b6e9f35b0b9808d798"; - sha256 = "1ymkmnwvbm5b09d930p7k3cmk7dg1rn68qny9n7jhs7hwxdc309a"; + rev = "1656f2ff1bb8c4865b2e9870c2be3468974c6ea9"; + sha256 = "1k6gyzh3sm5ndmh6r8k07q8gmr6190qfvk8cxcj1i37hr6ari0zd"; }; }; @@ -2279,12 +2279,12 @@ }; vim-javacomplete2 = buildVimPluginFrom2Nix { - name = "vim-javacomplete2-2018-08-20"; + name = "vim-javacomplete2-2018-09-18"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "2567a4f3ba2b1b902fd85ca24726aba3bf61aaa5"; - sha256 = "17mlip2mxv9sj2pxmj3clb7ax6m545pa5ynbr80vxww99537gxpr"; + rev = "3436162781c215f638af5ad8e83df9000edfa203"; + sha256 = "1ak1czp7dnz376bvalpnr0n8y1s0x4cpwrhb596phfa2567c4f41"; }; }; @@ -2490,12 +2490,12 @@ }; vim-obsession = buildVimPluginFrom2Nix { - name = "vim-obsession-2018-08-27"; + name = "vim-obsession-2018-09-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "523b2c60eb956aba6014e18be75aa7bde5280c33"; - sha256 = "18hgsrlk4319mpr36sj78a43fvr85lzisxblkik36gvyby9qr3h3"; + rev = "95a576210dc4408a4804a0a62a9eae90d701026b"; + sha256 = "04wrwlvdlakn9vrg48y80pcz2jy6kb1zigmjych15s51ay56cswd"; }; }; @@ -2609,6 +2609,16 @@ }; }; + vim-plug = buildVimPluginFrom2Nix { + name = "vim-plug-2018-09-12"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-plug"; + rev = "b6050d6f03f3e2792589535249e3c997d3e94461"; + sha256 = "11x10l75q6k4z67yyk5ll25fqpgb2ma88vplrakw3k41g79xn9d9"; + }; + }; + vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { name = "vim-plugin-AnsiEsc-2018-05-10"; src = fetchFromGitHub { @@ -2640,12 +2650,12 @@ }; vim-projectionist = buildVimPluginFrom2Nix { - name = "vim-projectionist-2018-09-09"; + name = "vim-projectionist-2018-09-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "ee68be42d26a8879b871c051e85ce0dfae7364f0"; - sha256 = "1x1v6q6gqw1f5h0rshj8q7x5cip78x2p6xdj05dglqdq1wz4w28i"; + rev = "2f7ccf211326e06b89b5a677b2eee3ddb4b644a2"; + sha256 = "13v9j32p16ak237gwvhk69s6q6maxpg41xd66dqvkj0d7hb21i0v"; }; }; @@ -2760,12 +2770,12 @@ }; vim-sensible = buildVimPluginFrom2Nix { - name = "vim-sensible-2018-07-16"; + name = "vim-sensible-2018-09-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "c82c6d4978be28adcf85dc1e61fa428e801bd525"; - sha256 = "0w87wic0qx20h36k075lvmj53glxkcyv8hkrx5aw4xqxvbq5fk6q"; + rev = "679e53d61558466933fbffc87fab8735eeb8fea8"; + sha256 = "1sq836sy6kn9z092mnwjxs9p3ijka82gm0nhfvlym348yv1s03wn"; }; }; @@ -2820,12 +2830,12 @@ }; vim-snippets = buildVimPluginFrom2Nix { - name = "vim-snippets-2018-09-14"; + name = "vim-snippets-2018-09-18"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "2af1ffe88d3de3fbe40a6e74fb626b18a6548cbd"; - sha256 = "1rkmj800lyp1gqbb00qyscw6fwc1mjz0bc4drd6b6pc2x952m2fi"; + rev = "39219ca29234a7e28e56379308f59e7190358092"; + sha256 = "1hnvpkqipa82qqhn68fr1qi71dj4khjgjqzhj85w6chdii1bf6qp"; }; }; @@ -3140,22 +3150,22 @@ }; vimtex = buildVimPluginFrom2Nix { - name = "vimtex-2018-09-15"; + name = "vimtex-2018-09-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "46e2e4f73f89e4116b85a8d6726af44776e3a4f8"; - sha256 = "05cgw7b3l63lb3dbb07kzb2h9akf5gxa6kl7hzvrsf8khva20nic"; + rev = "fb09eed5336b6540f8350f2792fded0956362d7b"; + sha256 = "0g3pw5qw6y9vpdmdnw4x478m5c34g2wll01gdy76yf8r5vysyv41"; }; }; vimwiki = buildVimPluginFrom2Nix { - name = "vimwiki-2018-09-03"; + name = "vimwiki-2018-09-17"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "f55ec31675e372e2f59d51322b445ea91191ec2b"; - sha256 = "1qjczzj35nwhv1lrl9cf1bdpisr5vlwhf444apzj9c9pcjymc00z"; + rev = "f882cf01528e471d78d10df28ce407bc1cc23bc9"; + sha256 = "1c6vkz3y168akh0c6a8api4g0nwsh90gkd6l0pyqpr03glwyqg61"; }; }; @@ -3220,12 +3230,12 @@ }; youcompleteme = buildVimPluginFrom2Nix { - name = "youcompleteme-2018-09-09"; + name = "youcompleteme-2018-09-20"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "487b8ab2b4d5bcaece29a17a26818a62616e21b5"; - sha256 = "1r0sdcllnqgi376hbj1f31irppqw1qqx7rna1jvj5qvi5d81s2nr"; + rev = "a020cbc0fc4b535f81d9f8db33150b92df68694a"; + sha256 = "1i9hqmns7hyc15cz565g8xzlf6ryk03xwg714sfbcmkai9vl61w3"; fetchSubmodules = true; }; }; @@ -3261,12 +3271,12 @@ }; zig-vim = buildVimPluginFrom2Nix { - name = "zig-vim-2018-09-13"; + name = "zig-vim-2018-09-17"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "057fdd7cd36e12dff0f65092d8e0861f36efdfe2"; - sha256 = "1i5x4mnfdjqkk71v8calwbm1y85blyrrpg4hqljf58csc7vhq2v9"; + rev = "9986edc96f220bb9208473a5ad61339c1567df23"; + sha256 = "03grs1ha5r4cfh8hczfawj7x7xwb6j716rl52gbkhbxhlk72w5kq"; }; }; } \ No newline at end of file diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index fbce248724c2..bbb05143c3c2 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -109,6 +109,7 @@ junegunn/limelight.vim junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo +junegunn/vim-plug justincampbell/vim-eighties justinmk/vim-dirvish KabbAmine/zeavim.vim From 516a83c0e825843b5984adcabf710ef240343f31 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 16 Sep 2018 18:26:45 +0200 Subject: [PATCH 083/218] vimPlugins: Add vim-plug addon implementation --- pkgs/misc/vim-plugins/vim-utils.nix | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index bae1645563f0..9255bbe12635 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -172,6 +172,7 @@ let packages ? null, vam ? null, pathogen ? null, + plug ? null, customRC ? "" }: @@ -194,6 +195,18 @@ let execute pathogen#infect('${pluginsEnv}/{}') ''); + /* vim-plug is an extremely popular vim plugin manager. + */ + plugImpl = lib.optionalString (plug != null) + '' + source ${vimPlugins.vim-plug.rtp}/plug.vim + call plug#begin('/dev/null') + + '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + '' + + call plug#end() + ''; + /* vim-addon-manager = VAM @@ -302,6 +315,7 @@ let ${vamImpl} ${pathogenImpl} + ${plugImpl} ${vundleImpl} ${neobundleImpl} ${nativeImpl} @@ -427,7 +441,8 @@ rec { packages ? {}, givenKnownPlugins ? null, vam ? null, - pathogen ? null, ... + pathogen ? null, + plug ? null, ... }: let # This is probably overcomplicated, but I don't understand this well enough to know what's necessary. @@ -439,7 +454,7 @@ rec { vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; }; names = (lib.optionals (pathogen != null) pathogenNames) ++ (lib.optionals (vam != null) vamNames); - nonNativePlugins = map (name: knownPlugins.${name}) names; + nonNativePlugins = map (name: knownPlugins.${name}) names ++ (lib.optionals (plug != null) plug.plugins); nativePluginsConfigs = lib.attrsets.attrValues packages; nativePlugins = lib.concatMap ({start?[], opt?[]}: start++opt) nativePluginsConfigs; in @@ -457,6 +472,11 @@ rec { vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ]; }; + test_vim_with_vim_addon_nix_using_plug = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-plug"; + vimrcConfig.plug.plugins = with vimPlugins; [ vim-addon-nix ]; + }; + test_vim_with_vim_addon_nix = vim_configurable.customize { name = "vim-with-vim-addon-nix"; vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-addon-nix ]; From c1d8b1e26610819a3ab4b98190b52c7c8ff9ced6 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Thu, 20 Sep 2018 09:05:33 +0200 Subject: [PATCH 084/218] doc: Add section about vim-plug --- doc/languages-frameworks/vim.section.md | 50 ++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index f0a6559c3d51..9c7d21a5a02e 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -59,7 +59,7 @@ vim_configurable.customize { } ``` -For Neovim the syntax is +For Neovim the syntax is: ``` neovim.override { @@ -96,6 +96,54 @@ The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.n After that you can install your special grafted `myVim` or `myNeovim` packages. +## Managing plugins with vim-plug + +To use vim-plug to manage your Vim plugins the following example can be used: + +``` +vim_configurable.customize { + vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { + # loaded on launch + plug.plugins = [ youcompleteme fugitive phpCompletion elm-vim ]; + }; +} +``` + +For Neovim the syntax is: + +``` +neovim.override { + configure = { + customRC = '' + # here your custom configuration goes! + ''; + plug.plugins = with pkgs.vimPlugins; [ + vim-go + ]; + }; +} +``` + +The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable: + +``` +{ + packageOverrides = pkgs: with pkgs; { + myVim = vim_configurable.customize { + name = "vim-with-plugins"; + # add here code from the example section + }; + myNeovim = neovim.override { + configure = { + # add here code from the example section + }; + }; + }; +} +``` + +After that you can install your special grafted `myVim` or `myNeovim` packages. + ## Managing plugins with VAM ### Handling dependencies of Vim plugins From 1552f2ef68c1ad86525aa26e676ccf6e77fea017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 20 Sep 2018 08:20:11 +0100 Subject: [PATCH 085/218] doc/vim: remove some vim-plug redundancy --- doc/languages-frameworks/vim.section.md | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 9c7d21a5a02e..1b235dbb52f6 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -15,6 +15,7 @@ At the moment we support three different methods for managing plugins: - Vim packages (*recommend*) - VAM (=vim-addon-manager) - Pathogen +- vim-plug ## Custom configuration @@ -98,7 +99,8 @@ After that you can install your special grafted `myVim` or `myNeovim` packages. ## Managing plugins with vim-plug -To use vim-plug to manage your Vim plugins the following example can be used: +To use [vim-plug](https://github.com/junegunn/vim-plug) to manage your Vim +plugins the following example can be used: ``` vim_configurable.customize { @@ -124,26 +126,6 @@ neovim.override { } ``` -The resulting package can be added to `packageOverrides` in `~/.nixpkgs/config.nix` to make it installable: - -``` -{ - packageOverrides = pkgs: with pkgs; { - myVim = vim_configurable.customize { - name = "vim-with-plugins"; - # add here code from the example section - }; - myNeovim = neovim.override { - configure = { - # add here code from the example section - }; - }; - }; -} -``` - -After that you can install your special grafted `myVim` or `myNeovim` packages. - ## Managing plugins with VAM ### Handling dependencies of Vim plugins From bd46155a8d9bd1f93e9151ec56d85ccb43d1d811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 20 Sep 2018 08:26:03 +0100 Subject: [PATCH 086/218] vimUtils: replace vim-addon-nix with vim-nix vim-addon-nix throws weird errors on startup --- pkgs/misc/vim-plugins/vim-utils.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 9255bbe12635..7595ae02164d 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -462,23 +462,23 @@ rec { # test cases: - test_vim_with_vim_addon_nix_using_vam = vim_configurable.customize { + test_vim_with_vim_nix_using_vam = vim_configurable.customize { name = "vim-with-vim-addon-nix-using-vam"; - vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }]; + vimrcConfig.vam.pluginDictionaries = [{name = "vim-nix"; }]; }; - test_vim_with_vim_addon_nix_using_pathogen = vim_configurable.customize { + test_vim_with_vim_nix_using_pathogen = vim_configurable.customize { name = "vim-with-vim-addon-nix-using-pathogen"; - vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ]; + vimrcConfig.pathogen.pluginNames = [ "vim-nix" ]; }; - test_vim_with_vim_addon_nix_using_plug = vim_configurable.customize { + test_vim_with_vim_nix_using_plug = vim_configurable.customize { name = "vim-with-vim-addon-nix-using-plug"; - vimrcConfig.plug.plugins = with vimPlugins; [ vim-addon-nix ]; + vimrcConfig.plug.plugins = with vimPlugins; [ vim-nix ]; }; - test_vim_with_vim_addon_nix = vim_configurable.customize { + test_vim_with_vim_nix = vim_configurable.customize { name = "vim-with-vim-addon-nix"; - vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-addon-nix ]; + vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; }; } From 6fdec2b3a4c643169005ebcd2e905239b5bc27fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 20 Sep 2018 08:42:00 +0100 Subject: [PATCH 087/218] vimPlugins: update.py also needs nix-prefetch-git --- pkgs/misc/vim-plugins/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index c9ccd2364725..3f5e255ae21c 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p python3 nix -i python3 +#!nix-shell -p nix-prefetch-git -p python3 nix -i python3 # format: # $ nix run nixpkgs.python3Packages.black -c black update.py From 0e1f3ef01afcbb4cf66ebb766bd096033eacc633 Mon Sep 17 00:00:00 2001 From: Sam Parkinson Date: Thu, 20 Sep 2018 13:51:04 +1000 Subject: [PATCH 088/218] vim-tsx: init at 2017-03-16 fixes #46728 --- pkgs/misc/vim-plugins/generated.nix | 10 ++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 18ca6f1de30a..ad181c7bf953 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3009,6 +3009,16 @@ }; }; + vim-tsx = buildVimPluginFrom2Nix { + name = "vim-tsx-2017-03-16"; + src = fetchFromGitHub { + owner = "ianks"; + repo = "vim-tsx"; + rev = "77c89c42e189fefd3c9a632b37b7e3b3b9edf918"; + sha256 = "0wmd6gql57bxp868sq2dchp9sc3jbisr4vaz4y0lczhmk0prds6n"; + }; + }; + vim-unimpaired = buildVimPluginFrom2Nix { name = "vim-unimpaired-2018-07-26"; src = fetchFromGitHub { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bbb05143c3c2..5f664c39e3c5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -79,6 +79,7 @@ heavenshell/vim-jsdoc hecal3/vim-leader-guide honza/vim-snippets hsanson/vim-android +ianks/vim-tsx idris-hackers/idris-vim inkarkat/vim-SyntaxRange int3/vim-extradite From 2eed7b735055c7b2d6fabd81dbb5871e2438c1b3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Sep 2018 03:00:18 -0500 Subject: [PATCH 089/218] compton{,-git}: bump to v2, set COMPTON_VERSION so '--version' has sane output (#46685) Previously they both would claim to be 'git--' :). --- .../window-managers/compton/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index e5faf084a42d..138451656667 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -42,10 +42,12 @@ let }; }); - stableSource = { + stableSource = rec { pname = "compton"; version = "0.1_beta2.5"; + COMPTON_VERSION = version; + src = fetchFromGitHub { owner = "chjj"; repo = "compton"; @@ -58,15 +60,17 @@ let }; }; - gitSource = { + gitSource = rec { pname = "compton-git"; - version = "2018-08-14"; + version = "2"; + + COMPTON_VERSION = "v${version}"; src = fetchFromGitHub { owner = "yshui"; repo = "compton"; - rev = "cac8094ce12cd40706fb48f9ab35354d9ee7c48f"; - sha256 = "0qif3nx8vszlr06bixasna13pzfaikp86xax9miwnba50517y7v5"; + rev = COMPTON_VERSION; + sha256 = "1b6jgkkjbmgm7d7qjs94h722kgbqjagcxznkh2r84hcmcl8pibjq"; }; meta = { From 2e9e44300586c6b16c99d512b61b50e96e04b6f0 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 20 Sep 2018 09:43:56 +0100 Subject: [PATCH 090/218] glxinfo: 8.3.0 -> 8.4.0 --- pkgs/tools/graphics/glxinfo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index a3a9a4d8eda4..7e4d95045a79 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "glxinfo-${version}"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; - sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; + url = "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-${version}.tar.bz2"; + sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81"; }; buildInputs = [ libX11 libGL ]; From ff22306255bfe0d309485e59ce336cd28f84c884 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Tue, 11 Sep 2018 17:49:42 -0700 Subject: [PATCH 091/218] factorio: download using token, not password Downloads were broken by upstream devs' addition of CAPTCHA to the login form. We now need only a slightly modified fetchurl to retrieve the binary distribution. --- pkgs/games/factorio/default.nix | 104 ++++++++++++++++++++++---------- pkgs/games/factorio/fetch.nix | 33 ---------- pkgs/games/factorio/fetch.sh | 55 ----------------- 3 files changed, 73 insertions(+), 119 deletions(-) delete mode 100644 pkgs/games/factorio/fetch.nix delete mode 100644 pkgs/games/factorio/fetch.sh diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index bb019e570260..4b568a2aaf58 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -3,7 +3,7 @@ , factorio-utils , releaseType , mods ? [] -, username ? "" , password ? "" +, username ? "", token ? "" # get/reset token at https://factorio.com/profile , experimental ? false }: @@ -13,59 +13,101 @@ assert releaseType == "alpha" let - # NB If you nix-prefetch-url any of these, be sure to add a --name arg, - # where the ultimate "_" (before the version) is changed to a "-". + helpMsg = '' + + ===FETCH FAILED=== + Please ensure you have set the username and token with config.nix, or + /etc/nix/nixpkgs-config.nix if on NixOS. + + Your token can be seen at https://factorio.com/profile (after logging in). It is + not as sensitive as your password, but should still be safeguarded. There is a + link on that page to revoke/invalidate the token, if you believe it has been + leaked or wish to take precautions. + + Example: + { + packageOverrides = pkgs: { + factorio = pkgs.factorio.override { + username = "FactorioPlayer1654"; + token = "d5ad5a8971267c895c0da598688761"; + }; + }; + } + + Alternatively, instead of providing the username+token, you may manually + download the release through https://factorio.com/download , then add it to + the store using e.g.: + + releaseType=alpha + version=0.16.51 + nix-prefetch-url file://$HOME/Downloads/factorio_\''${releaseType}_x64_\''${version}.tar.xz --name factorio_\''${releaseType}_x64-\''${version}.tar.xz + + Note the ultimate "_" is replaced with "-" in the --name arg! + ''; + branch = if experimental then "experimental" else "stable"; + binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { - stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; fetcher = authenticatedFetch; }; - experimental = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; fetcher = authenticatedFetch; }; + stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; }; + experimental = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; withAuth = true; }; }; headless = { - stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; }; + stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; }; experimental = bdist { sha256 = "00691kr85p58qpxf3889p20nrgsvsyspx3c8yd11dkg46wly06z1"; version = "0.16.50"; }; }; demo = { stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; }; - experimental = bdist { }; }; }; i686-linux = let bdist = bdistForArch { inUrl = "linux32"; inTar = "i386"; }; in { alpha = { - stable = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; nameMut = asGz; }; - experimental = bdist { }; - }; - headless = { - stable = bdist { }; - experimental = bdist { }; - }; - demo = { - stable = bdist { }; - experimental = bdist { }; + stable = bdist { sha256 = "0nnfkxxqnywx1z05xnndgh71gp4izmwdk026nnjih74m2k5j086l"; version = "0.14.23"; withAuth = true; nameMut = asGz; }; }; }; }; - actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio: unsupported platform"); - bdistForArch = arch: { sha256 ? null - , version ? "0.16.51" - , fetcher ? fetchurl + actual = binDists.${stdenv.hostPlatform.system}.${releaseType}.${branch} or (throw "Factorio ${releaseType}-${branch} binaries for ${stdenv.hostPlatform.system} are not available for download."); + + bdistForArch = arch: { version + , sha256 + , withAuth ? false , nameMut ? x: x }: - if sha256 == null then - throw "Factorio ${releaseType}-${arch.inTar} binaries are not (and were never?) available to download" - else { + let + url = "https://factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; + name = nameMut "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz"; + in { inherit version arch; - src = fetcher { - inherit sha256; - url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; - name = nameMut "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz"; - }; + src = + if withAuth then + (stdenv.lib.overrideDerivation + (fetchurl { + inherit name url sha256; + curlOpts = [ + "--get" + "--data-urlencode" "username@username" + "--data-urlencode" "token@token" + ]; + }) + (_: { # This preHook hides the credentials from /proc + preHook = '' + echo -n "${username}" >username + echo -n "${token}" >token + ''; + failureHook = '' + cat < password -# Might as well hide the username as well. -echo -n "$username" > username - -# Get a CSRF token. -csrf=$($curl $loginUrl | xidel - -e '//input[@id="csrf_token"]/@value') - -# Log in. We don't especially care about the result, but let's check if login failed. -$curl --data-urlencode csrf_token="$csrf" \ - --data-urlencode username_or_email@username \ - --data-urlencode password@password \ - -d action=Login \ - $loginUrl -D headers > /dev/null - -if grep -q 'Location: https://' headers; then - # Now download. We need --insecure for this, but the sha256 should cover us. - $curl --insecure --location --fail $url > $out || { echo "Login succeeded, but subsequent fetch failed."; exit 1; } - set +x -else - set +x - echo 'Login failed' - echo 'Please set username and password with config.nix,' - echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.' - echo - echo 'Example:' - echo '{' - echo ' packageOverrides = pkgs: rec {' - echo ' factorio = pkgs.factorio.override {' - echo ' username = "";' - echo ' password = "";' - echo ' };' - echo ' };' - echo '}' - - exit 1 -fi From 8ed49d7ec872c5f1f64a03c7b7a809fa4af295c6 Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Thu, 20 Sep 2018 02:23:53 -0700 Subject: [PATCH 092/218] factorio: experimental=true includes stable builds, when newer --- pkgs/games/factorio/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 4b568a2aaf58..bd05c3728100 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -4,7 +4,7 @@ , releaseType , mods ? [] , username ? "", token ? "" # get/reset token at https://factorio.com/profile -, experimental ? false +, experimental ? false # true means to always use the latest branch }: assert releaseType == "alpha" @@ -47,15 +47,17 @@ let branch = if experimental then "experimental" else "stable"; + # NB `experimental` directs us to take the latest build, regardless of its branch; + # hence the (stable, experimental) pairs may sometimes refer to the same distributable. binDists = { x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; }; - experimental = bdist { sha256 = "1qwfivl5wf0ii8c4prdl4yili23qimsh2cj874r37q3ygpjk3bd3"; version = "0.16.50"; withAuth = true; }; + experimental = bdist { sha256 = "0b4hbpdcrh5hgip9q5dkmw22p66lcdhnr0kmb0w5dw6yi7fnxxh0"; version = "0.16.51"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; }; - experimental = bdist { sha256 = "00691kr85p58qpxf3889p20nrgsvsyspx3c8yd11dkg46wly06z1"; version = "0.16.50"; }; + experimental = bdist { sha256 = "0zrnpg2js0ysvx9y50h3gajldk16mv02dvrwnkazh5kzr1d9zc3c"; version = "0.16.51"; }; }; demo = { stable = bdist { sha256 = "0zf61z8937yd8pyrjrqdjgd0rjl7snwrm3xw86vv7s7p835san6a"; version = "0.16.51"; }; From e03b99c309565afe2fb090a1f5986e2c5fc95a5e Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 20 Sep 2018 10:46:42 +0100 Subject: [PATCH 093/218] glxinfo: add es2gears, es2_info --- pkgs/tools/graphics/glxinfo/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 7e4d95045a79..6a2a3a5a46e8 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { configurePhase = "true"; buildPhase = " - cd src/xdemos - $CC glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11 - $CC glxgears.c -o glxgears -lGL -lX11 -lm + $CC src/xdemos/{glxinfo.c,glinfo_common.c} -o glxinfo -lGL -lX11 + $CC src/xdemos/glxgears.c -o glxgears -lGL -lX11 -lm + $CC src/egl/opengles2/es2_info.c -o es2_info -lEGL -lGLESv2 -lX11 + $CC src/egl/opengles2/es2gears.c src/egl/eglut/{eglut.c,eglut_x11.c} -o es2gears -Isrc/egl/eglut -lEGL -lGLESv2 -lX11 -lm "; installPhase = " - mkdir -p $out/bin - cp glxinfo glxgears $out/bin/ + install -Dm 555 -t $out/bin glx{info,gears} es2{_info,gears} "; meta = with stdenv.lib; { From 8cd90e40be87dca6b85e409efabd5557c51b4ebf Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Thu, 20 Sep 2018 12:27:24 +0200 Subject: [PATCH 094/218] gitlab: add missing meta.platforms --- pkgs/applications/version-management/gitlab/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 90d16d846608..64e0ef2b59d0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -109,5 +109,6 @@ stdenv.mkDerivation rec { description = "Web-based Git-repository manager"; homepage = https://gitlab.com; license = licenses.mit; + platforms = platforms.linux; }; } From c8598daad4dee3d15e312608b56ce50532830c90 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Thu, 20 Sep 2018 11:45:16 +0100 Subject: [PATCH 095/218] haskellPackages.sbv: fix location of z3 executable A lot of the functionality of the z3 library depends on it being able to find the z3 executable on $PATH. Hard-coding it here means it will never be unable to find it and z3 doesn't need to pollute $PATH. --- pkgs/development/haskell-modules/configuration-nix.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d016bd6ce8d6..a516b7645104 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -511,4 +511,10 @@ self: super: builtins.intersectAttrs super { # Doctests hang only when compiling with nix. # https://github.com/cdepillabout/termonad/issues/15 termonad = dontCheck super.termonad; + + # Expects z3 to be on path so we replace it with a hard + sbv = overrideCabal super.sbv (drv: { + postPatch = '' + sed -i -e 's|"z3"|"${pkgs.z3}/bin/z3"|' Data/SBV/Provers/Z3.hs''; + }); } From 8b58a7187c9f3c8f1997f328c27c536effccdac3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 20 Sep 2018 12:47:46 +0200 Subject: [PATCH 096/218] nixos/yabar: fix module & test (#46954) The `pkgs.yabar` package is relatively old (2016-04) and contains several issues fixed on master. `yabar-unstable` containsa recent master build with several fixes and a lot of new features (I use `yabar-unstable` for some time now and had no issues with it). In the upstream bugtracker some bugs could be fixed on ArchLinux by simply installing `yabar-git` (an AUR package which builds a recent master). To stabilize the module, the option `programs.yabar.package` now defaults to `pkgs.yabar-unstable` and yields a warning with several linked issues that are known on `pkgs.yabar`. The test has been refactored as well to ensure that `yabar` actually starts (and avoid non-deterministic random success) and takes a screenshot of a very minimalistic configuration on IceWM. Fixes #46899 --- nixos/modules/programs/yabar.nix | 17 +++++++++++++++-- nixos/tests/yabar.nix | 16 ++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/nixos/modules/programs/yabar.nix b/nixos/modules/programs/yabar.nix index a01083c3ace9..db085211366e 100644 --- a/nixos/modules/programs/yabar.nix +++ b/nixos/modules/programs/yabar.nix @@ -44,10 +44,23 @@ in enable = mkEnableOption "yabar"; package = mkOption { - default = pkgs.yabar; - example = literalExample "pkgs.yabar-unstable"; + default = pkgs.yabar-unstable; + example = literalExample "pkgs.yabar"; type = types.package; + # `yabar-stable` segfaults under certain conditions. + apply = x: if x == pkgs.yabar-unstable then x else flip warn x '' + It's not recommended to use `yabar' with `programs.yabar', the (old) stable release + tends to segfault under certain circumstances: + + * https://github.com/geommer/yabar/issues/86 + * https://github.com/geommer/yabar/issues/68 + * https://github.com/geommer/yabar/issues/143 + + Most of them don't occur on master anymore, until a new release is published, it's recommended + to use `yabar-unstable'. + ''; + description = '' The package which contains the `yabar` binary. diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix index 06fe5bc2b278..bbc0cf4c7dd7 100644 --- a/nixos/tests/yabar.nix +++ b/nixos/tests/yabar.nix @@ -8,18 +8,26 @@ with lib; maintainers = [ ma27 ]; }; - nodes.yabar = { + machine = { imports = [ ./common/x11.nix ./common/user-account.nix ]; services.xserver.displayManager.auto.user = "bob"; programs.yabar.enable = true; + programs.yabar.bars = { + top.indicators.date.exec = "YABAR_DATE"; + }; }; testScript = '' - $yabar->start; - $yabar->waitForX; + $machine->start; + $machine->waitForX; - $yabar->waitForUnit("yabar.service", "bob"); + # confirm proper startup + $machine->waitForUnit("yabar.service", "bob"); + $machine->sleep(10); + $machine->waitForUnit("yabar.service", "bob"); + + $machine->screenshot("top_bar"); ''; }) From 05659962cd8c04a9e8bf05b298b735f5747bf12c Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Thu, 20 Sep 2018 13:20:12 +0200 Subject: [PATCH 097/218] nixos/tests/networking.virtual: prevent non-deterministic failure (#46949) The test failed non-deterministically on Hydra because interfaces sometimes weren't yet fully cleaned up when the result was checked. --- nixos/tests/networking.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 02bd4bd98079..87a8c4c0e196 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -467,7 +467,7 @@ let # Wait for networking to come up $machine->start; - $machine->waitForUnit("network.target"); + $machine->waitForUnit("network-online.target"); # Test interfaces set up my $list = $machine->succeed("ip tuntap list | sort"); @@ -479,7 +479,9 @@ let # Test interfaces clean up $machine->succeed("systemctl stop network-addresses-tap0"); + $machine->sleep(10); $machine->succeed("systemctl stop network-addresses-tun0"); + $machine->sleep(10); my $residue = $machine->succeed("ip tuntap list"); $residue eq "" or die( "Some virtual interface has not been properly cleaned:\n", From 069cfb58991e81e72ae32de384bb456861dd46b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 05:23:48 -0700 Subject: [PATCH 098/218] rdma-core: 19 -> 20 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rdma-core/versions --- pkgs/os-specific/linux/rdma-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index de7164b2af03..b66cb78a702b 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -3,7 +3,7 @@ } : let - version = "19"; + version = "20"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0c01f9yn9sk7wslyrclsi2jvrn4d36bdw4qjbl0vmcv4858wf4bb"; + sha256 = "1zz9r1zq9ql806sbyi7nrslx1d96hgd9zvdlzbv4j31m6kfmsyri"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; From 8eba6994e22c58adfeaac48041558d71c1fd4155 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 06:18:52 -0700 Subject: [PATCH 099/218] pulseeffects: 4.3.4 -> 4.3.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pulseeffects/versions --- pkgs/applications/audio/pulseeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 46d4f971420a..b055a520be04 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0gyyqxfmmp6hbwc10i48sxrgdxansm3vsbwgc6rh89clxwcnfiml"; + sha256 = "01jxkz4s3m8cqsn6wcbrw7bzr7sr7hqsp9950018riilpni7k4bd"; }; nativeBuildInputs = [ From 3afe74864c80363db262d74a7461c00acc57fa54 Mon Sep 17 00:00:00 2001 From: Thomas Kerber Date: Thu, 20 Sep 2018 14:41:12 +0100 Subject: [PATCH 100/218] vim-utils: fix broken vim-plug implementation. --- pkgs/misc/vim-plugins/vim-utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 7595ae02164d..7122e2a42306 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -198,14 +198,14 @@ let /* vim-plug is an extremely popular vim plugin manager. */ plugImpl = lib.optionalString (plug != null) - '' + ('' source ${vimPlugins.vim-plug.rtp}/plug.vim call plug#begin('/dev/null') '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + '' call plug#end() - ''; + ''); /* vim-addon-manager = VAM From 7ead7a4a67f4c2d8b42720f0e9f090470989634c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Sep 2018 09:47:21 -0400 Subject: [PATCH 101/218] linux: 4.4.156 -> 4.4.157 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index c25da926b267..3106dc981055 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.156"; + version = "4.4.157"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1aj87ncc8afx4dr42rf2kr5ai2k5w5arcp8z336i2wlnrbcdhhh4"; + sha256 = "0kb23pq0q7nkrri4bir5x6285wbi17fn5mpbm9awzjablq5bq400"; }; } // (args.argsOverride or {})) From 5509a39e9ad489aeea37945e399aba8f6cb721e2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Sep 2018 09:47:58 -0400 Subject: [PATCH 102/218] linux: 4.9.127 -> 4.9.128 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index db46ea80e609..6e5d310075e2 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.127"; + version = "4.9.128"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03yxdzmlikyvbkfaha871h9n7y58lyzyxgybsx09ln4pxnnswxwl"; + sha256 = "04kgdci8xndml2fwbam59pjwwxqd4kf7y3qgkk4asshs9546zdxx"; }; } // (args.argsOverride or {})) From 28fee11e1c42b93cd5e4aac303bddc9da1bb0fe6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Sep 2018 09:51:08 -0400 Subject: [PATCH 103/218] linux: 4.14.70 -> 4.14.71 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index bc52e3ddf875..fcec5fd0df41 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.70"; + version = "4.14.71"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0b733s4m9r9606xmxv5jfr5x14c4ik665awln2smd23z8wrdipy5"; + sha256 = "12blj3zzvzs2nz8rp1g5ykibfvm355442c31l4ijr4mxphylg93n"; }; } // (args.argsOverride or {})) From 7d30b3d10c8dbc9d024525a84742fca6d44f24bf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 20 Sep 2018 09:51:32 -0400 Subject: [PATCH 104/218] linux: 4.18.8 -> 4.18.9 --- pkgs/os-specific/linux/kernel/linux-4.18.nix | 4 ++-- pkgs/top-level/all-packages.nix | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix index 91232ab0bbee..48fc823ee084 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.18.8"; + version = "4.18.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "152lz1yim77kpighdcyy1csxs0xf8m2zkwwcz847fqdbd6ninmgi"; + sha256 = "0yli3qr9rygqk5zc4w70xb49b8jbgd09cdz4ji5a00krwm8m76ac"; }; } // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23537a11e54f..4b02c8d9cb21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14085,18 +14085,6 @@ with pkgs; # when adding a new linux version # kernelPatches.cpu-cgroup-v2."4.11" kernelPatches.modinst_arg_list_too_long - - # https://github.com/NixOS/nixpkgs/issues/45165 - # TODO: remove this patch once it is merged upstream and released. - (rec { - name = "hid-core-fix-grouping-by-application"; - patch = fetchpatch { - name = name + ".patch"; - # https://patchwork.kernel.org/patch/10587369/ - url = https://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git/patch/?id=0d6c3011409135ea84e2a231b013a22017ff999a; - sha256 = "0bdrv0aqjh0rdjlaaaqpdgrnd9452fa4ggaa1nq2kmik3q00cq4m"; - }; - }) ]; }; From b914cf8083ac65eecef41a59e93367fd41ea8cb3 Mon Sep 17 00:00:00 2001 From: AesaKamar Date: Thu, 20 Sep 2018 10:18:38 -0400 Subject: [PATCH 105/218] scalafmt 1.4.0 -> 1.5.1 --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index d50b1435b733..40ed7f44d8c3 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "1.4.0"; + version = "1.5.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "12hsix3b7qnyr9x2v7i6jgqljdqxpfj4bfvhjdl99ijr793g3lnp"; + outputHash = "15xfys9wdlx3rrqb2ab6qcfngkf6sa8v8q8shh10kk8jrc30g6dk"; }; in stdenv.mkDerivation rec { From 8908bc4e194e3d3d6d4e320b3777dbfe86337de2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Sep 2018 09:27:30 -0500 Subject: [PATCH 106/218] range-v3: 0.3.6 -> 0.3.7 --- pkgs/development/libraries/range-v3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index cd981f8947aa..cdb5297a6d87 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; rev = version; - sha256 = "050h9pa57kd57l73njxpjb331snybddl29x2vpy5ycygvqiw8kcp"; + sha256 = "1zhsz1i4jy97idydg7ay3wazp7v2353vckkli5w9g51jka43h5x2"; }; nativeBuildInputs = [ cmake ]; From da78d3e829de37545b8ddb6da81eb638a0828637 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 08:34:23 -0700 Subject: [PATCH 107/218] links2: 2.16 -> 2.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/links2/versions --- pkgs/applications/networking/browsers/links2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index ff165f99ae9b..bccc3fa2f4c0 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.16"; + version = "2.17"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42"; + sha256 = "0dh2gbzcw8kxy81z4ggsynibnqs56b83vy8qgz7illsag1irff6q"; }; buildInputs = with stdenv.lib; From a32d7e0c74465e685c997624b12d1582fda05fd9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 20 Sep 2018 11:40:36 -0400 Subject: [PATCH 108/218] dockerTools.buildImage: support impure dates Because dates are an impurity, by default buildImage will use a static date of one second past the UNIX Epoch. This can be a bit frustrating when listing docker images in the CLI: $ docker image list REPOSITORY TAG IMAGE ID CREATED SIZE hello latest 08c791c7846e 48 years ago 25.2MB If you want to trade the purity for a better user experience, you can set created to now. pkgs.dockerTools.buildImage { name = "hello"; tag = "latest"; created = "now"; contents = pkgs.hello; config.Cmd = [ "/bin/hello" ]; } and now the Docker CLI will display a reasonable date and sort the images as expected: $ docker image list REPOSITORY TAG IMAGE ID CREATED SIZE hello latest de2bf4786de6 About a minute ago 25.2MB --- doc/functions.xml | 39 +++++++++++++++++++++++++++ pkgs/build-support/docker/default.nix | 19 ++++++++----- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/doc/functions.xml b/doc/functions.xml index 3cfc6884bd26..31b40fb084a3 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -638,6 +638,45 @@ buildImage { pkgs.cacert to contents. + + + Impurely Defining a Docker Layer's Creation Date + + Because dates are an impurity, by default + buildImage will use a static date of one + second past the UNIX Epoch. This can be a bit frustrating when + listing docker images in the CLI: + + + + If you want to trade the purity for a better user experience, + you can set created to + now. + + + + and now the Docker CLI will display a reasonable date and + sort the images as expected: + + +
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 93b715659eb0..0cee1dd2916f 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -450,11 +450,18 @@ rec { baseName = baseNameOf name; # Create a JSON blob of the configuration. Set the date to unix zero. - baseJson = writeText "${baseName}-config.json" (builtins.toJSON { - inherit created config; - architecture = "amd64"; - os = "linux"; - }); + baseJson = let + pure = writeText "${baseName}-config.json" (builtins.toJSON { + inherit created config; + architecture = "amd64"; + os = "linux"; + }); + impure = runCommand "${baseName}-config.json" + { buildInputs = [ jq ]; } + '' + jq ".created = \"$(TZ=utc date --iso-8601="seconds")\"" ${pure} > $out + ''; + in if created == "now" then impure else pure; layer = if runAsRoot == null @@ -577,7 +584,7 @@ rec { currentID=$layerID while [[ -n "$currentID" ]]; do layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1) - imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"${created}\"}] + .") + imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .") imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .") From 7d20233dc3320360c47a811e7f7e6c3b5acc9da1 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Thu, 20 Sep 2018 18:22:20 +0200 Subject: [PATCH 109/218] mopidy-iris: 3.25.1 -> 3.26.0 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 482e3652ec09..ab9bfa26d0ab 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.25.1"; + version = "3.26.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "148ksv87lw3l3dwncmlq8qzv6xik29axdgaljdcp0g4pd98a7dlk"; + sha256 = "0yd52dlm0qh3ycqxhxhiw52111wa87b7wlxbwdj5p9an5yqnkkvy"; }; propagatedBuildInputs = [ From 0c631248c198ee020cc98f659b0eedfb36a6f010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 20 Sep 2018 13:37:33 -0300 Subject: [PATCH 110/218] tint2: 16.4 -> 16.6.1 (#46994) --- pkgs/applications/misc/tint2/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 31ccdb3c7f53..c70503cbff2f 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "16.4"; + version = "16.6.1"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "1h9l45zimai2hqfcf2y98g4i03imhmvm3mlsld9x99i650kxr5jm"; + sha256 = "1h5bn4vi7gffwi4mpwpn0s6vxvl44rn3m9b23w8q9zyz9v24flz7"; }; enableParallelBuilding = true; @@ -24,20 +24,18 @@ stdenv.mkDerivation rec { libXdmcp libstartup_notification hicolor-icon-theme ]; postPatch = '' - substituteInPlace CMakeLists.txt --replace /etc $out/etc for f in ./src/launcher/apps-common.c \ - ./src/launcher/icon-theme-common.c \ - ./themes/*tint2rc + ./src/launcher/icon-theme-common.c do substituteInPlace $f --replace /usr/share/ /run/current-system/sw/share/ done ''; - meta = { + meta = with stdenv.lib; { homepage = https://gitlab.com/o9000/tint2; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; }; } From a454984adb8e6b709f4881774999ebe53d9ed7c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 08:54:00 -0700 Subject: [PATCH 111/218] mediainfo: 18.08 -> 18.08.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/mediainfo/versions --- pkgs/applications/misc/mediainfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index d222ad1e53e0..69e33fbfc184 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "18.08"; + version = "18.08.1"; name = "mediainfo-${version}"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0l4bhrgwfn3da6cr0jz5vs17sk7k0bc26nk7hymv04xifns5999n"; + sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From afa5e20b050822068673480c6f98e783632d10c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 08:06:10 -0700 Subject: [PATCH 112/218] ncmpc: 0.30 -> 0.31 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ncmpc/versions --- pkgs/applications/audio/ncmpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index ffd5b9a58582..08d300598232 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ncmpc-${version}"; - version = "0.30"; + version = "0.31"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "0s2bynm5szrk8bjhg200mvsm2ny0wz9s10nx7r69y9y4jsxr8624"; + sha256 = "09h1m9rkk89729i2d5zsfdc6rxajvikgsi3h99rwz2192gm457rj"; }; buildInputs = [ glib ncurses mpd_clientlib ]; From 3222fe17569eac373cb9f3ed62a2befb91d29bbc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 04:50:12 -0700 Subject: [PATCH 113/218] smcroute: 2.4.1 -> 2.4.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/smcroute/versions --- pkgs/servers/smcroute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 241ed17d2a11..75fff3715edc 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "smcroute-${version}"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "0wh7c15lglcgiap9pplqpd5abnxhfx3vh0nqjzvfnl82hwhnld1z"; + sha256 = "197bi3il0c1vldw35ijx3zqyfj738nvfvr7yr4cwrbv40p3ascaq"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 31ea743d1387b4af820c593007ab3fb51cc6ca71 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 08:42:53 -0700 Subject: [PATCH 114/218] metabase: 0.30.1 -> 0.30.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/metabase/versions --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index ac6dd44a8441..2e1cba52ee54 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "metabase-${version}"; - version = "0.30.1"; + version = "0.30.3"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "13035yhbhsr4xg48hanbf8qchwyk6j59c90qkbjr914xcyvj6scc"; + sha256 = "1w8886xkg88r8dla4l9kpxw2rwwjx23y1dk5rgfgh1vcw8da8cn4"; }; nativeBuildInputs = [ makeWrapper ]; From ae093d7d9b2d6030af8624fdc57177796dfb02a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 08:37:00 -0700 Subject: [PATCH 115/218] libre: 0.5.8 -> 0.5.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libre/versions --- pkgs/development/libraries/libre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index c996c5c25f94..50b485c4822c 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.5.8"; + version = "0.5.9"; name = "libre-${version}"; src = fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "0w0f8j43j0nzgvkmv3ayzrssppgjmsh6z8mpa5iqsz8nv99dc3qr"; + sha256 = "04lnnlhifzyhv231abgnzvfzq21xhsal3lnimncp1q3pmrfa0aw8"; }; buildInputs = [ zlib openssl ]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ] From aedc651903e3b20514c2fda056ff0bc9124b4d5d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 20 Sep 2018 13:02:22 -0400 Subject: [PATCH 116/218] dockerTools.buildImage: test that created=now makes an unstable date --- nixos/tests/docker-tools.nix | 7 +++++++ pkgs/build-support/docker/examples.nix | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index db4eacc37287..5a7590cbf364 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -20,7 +20,10 @@ import ./make-test.nix ({ pkgs, ... }: { '' $docker->waitForUnit("sockets.target"); + # Ensure Docker images use a stable date by default $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); + $docker->succeed("[ '1970-01-01T00:00:01Z' = \"\$(docker inspect ${pkgs.dockerTools.examples.bash.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]"); + $docker->succeed("docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version"); $docker->succeed("docker rmi ${pkgs.dockerTools.examples.bash.imageName}"); @@ -51,5 +54,9 @@ import ./make-test.nix ({ pkgs, ... }: { $docker->succeed("docker run --rm runasrootextracommands cat extraCommands"); $docker->succeed("docker run --rm runasrootextracommands cat runAsRoot"); $docker->succeed("docker rmi '${pkgs.dockerTools.examples.runAsRootExtraCommands.imageName}'"); + + # Ensure Docker images can use an unstable date + $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bash}'"); + $docker->succeed("[ '1970-01-01T00:00:01Z' != \"\$(docker inspect ${pkgs.dockerTools.examples.unstableDate.imageName} | ${pkgs.jq}/bin/jq -r .[].Created)\" ]"); ''; }) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index ec2667310cdd..822e0dbb31f2 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -141,4 +141,13 @@ rec { runAsRoot = ''echo "(runAsRoot)" > runAsRoot''; extraCommands = ''echo "(extraCommand)" > extraCommands''; }; + + # 9. Ensure that setting created to now results in a date which + # isn't the epoch + 1 + unstableDate = pkgs.dockerTools.buildImage { + name = "unstable-date"; + tag = "latest"; + contents = [ pkgs.coreutils ]; + created = "now"; + }; } From 273501303cb1844f512c9b4ac428f14a2c69a040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 20 Sep 2018 14:11:26 -0300 Subject: [PATCH 117/218] numix-icon-theme-circle: 18-08-17 -> 18.09.19 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 68b967e715d4..ebda6d4428c1 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { - version = "18.08.17"; + version = "18.09.19"; package-name = "numix-icon-theme-circle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "1nxgm5vf2rzbg8qh48iy0vdj12ffahlp9qhj8h0k1li03s3nf15h"; + sha256 = "1a1ack4kpngnb3c281pssmp3snn2idcn2c5cv3l38a0dl5g5w8nq"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; From 06daa1bb7a87c4540693dbe2b0cf4754292c42bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 20 Sep 2018 14:16:53 -0300 Subject: [PATCH 118/218] numix-icon-theme-square: 18-08-17 -> 18.09.19 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index ec6972c4cac7..03c1ba0f827a 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "18.08.17"; + version = "18.09.19"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "0pn5m73zd240bk2kilcgv57xn7grhbcj5ay4w1jzzn1f4ifaa0w8"; + sha256 = "0q5p901qj3gyzgpy5kk9q5sqb13ka5cfg6wvazlfch1k3kaqksz1"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; From aec67d299c24d0bfff6f5ae04b5c462f3d3138d9 Mon Sep 17 00:00:00 2001 From: John Children <32305209+johnchildren@users.noreply.github.com> Date: Thu, 20 Sep 2018 18:45:54 +0100 Subject: [PATCH 119/218] doc/stdenv: libaries -> libraries (#47011) This commit corrects a minor typo in the stdenv portion of the documentation for the nix language. --- doc/stdenv.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 7a0f8f270bad..cc0c13c54471 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -2129,7 +2129,7 @@ someVar=$(stripHash $name) The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency. For example, the C compiler wrapper's setup hook feeds itself flags for each - dependency that contains relevant libaries and headers. This is done by + dependency that contains relevant libraries and headers. This is done by defining a bash function, and appending its name to one of envBuildBuildHooks`, envBuildHostHooks`, envBuildTargetHooks`, envHostHostHooks`, From 3d3b66606cdd5360a436b3aad1692f7f6b4fd968 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 11:44:41 -0700 Subject: [PATCH 120/218] ioping: 1.0 -> 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/ioping/versions --- pkgs/tools/system/ioping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 92235fde8f35..22dd9289bfd4 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "ioping-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "koct9i"; repo = "ioping"; rev = "v${version}"; - sha256 = "0yn7wgd6sd39zmr5l97zd6sq1ah7l49k1h7dhgx0nv96fa4r2y9h"; + sha256 = "0cv2496jplka55yqdcf3ln78r8yggy4lgmgf06l6fbljjrdx7pgq"; }; makeFlags = "PREFIX=$(out)"; From ce03af969e584a199d7305c737ea1f6df5bf9d67 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Sep 2018 19:18:28 +0000 Subject: [PATCH 121/218] =?UTF-8?q?ocaml=20=E2=89=A4=204.05:=20mark=20as?= =?UTF-8?q?=20broken=20on=20Aarch64=20(#47010)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index d2295d2d79b0..1ed6d2c6db22 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (args // rec { ''; platforms = with platforms; linux ++ darwin; - broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast major_version "4.06"; + broken = stdenv.isAarch64 && !stdenv.lib.versionAtLeast version "4.06"; }; }) From e40d850fd13cdb8daab7745bc15631e737c1b1a0 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Thu, 20 Sep 2018 21:29:37 +0200 Subject: [PATCH 122/218] nixos/tests/gdk-pixbuf: fix test on i686 (#46916) Test didn't run because it tried to create a VM with 4096M RAM but qemu-system-i386 has a hard 2047M memory limit. - reduce memory to 2047M on i686. - increase timeout 300s -> 1800s because the tests are much slower on i686 and timed out. --- nixos/tests/gdk-pixbuf.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix index b20f61b5ffe2..005c5111da2b 100644 --- a/nixos/tests/gdk-pixbuf.nix +++ b/nixos/tests/gdk-pixbuf.nix @@ -10,10 +10,12 @@ import ./make-test.nix ({ pkgs, ... }: { environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ]; - virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE + # Tests allocate a lot of memory trying to exploit a CVE + # but qemu-system-i386 has a 2047M memory limit + virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096; }; testScript = '' - $machine->succeed("gnome-desktop-testing-runner"); + $machine->succeed("gnome-desktop-testing-runner -t 1800"); # increase timeout to 1800s ''; }) From 08815b9af892fcd8dd28a3fdf8eaa921f0797063 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Sep 2018 04:19:56 -0500 Subject: [PATCH 123/218] perlPackages.Mojolicious: 7.88 -> 8.0 Signed-off-by: Austin Seipp --- pkgs/top-level/perl-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 714dba45aa2f..1497146c7322 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9989,16 +9989,20 @@ let license = stdenv.lib.licenses.asl20; }; }; + Mojolicious = buildPerlPackage rec { - name = "Mojolicious-7.88"; + name = "Mojolicious-8.0"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz"; - sha256 = "4c4c9c05131fcd175cd6370e15d2586baec1a3ec882cb6971e1f5f52b5e0d785"; + sha256 = "b266fd32f12cca2504be012e785f34eb09c0a132df52be183ff5d494e87f0b98"; }; + buildInputs = [ ExtUtilsMakeMaker ]; + propagatedBuildInputs = [ IOSocketIP JSONPP PodSimple TimeLocal ]; meta = { - homepage = https://mojolicious.org/; + homepage = https://mojolicious.org; description = "Real-time web framework"; - license = with stdenv.lib.licenses; [ artistic2 ]; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.thoughtpolice ]; }; }; From 0214f9e25e832b4d9d6bbcbf74d75b087b9ee7bc Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 20 Sep 2018 04:20:16 -0500 Subject: [PATCH 124/218] perlPackages.MojoIOLoopForkCall: 0.19 -> 0.20 Signed-off-by: Austin Seipp --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 1497146c7322..f2d2da0cc6ff 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10007,10 +10007,10 @@ let }; MojoIOLoopForkCall = buildPerlModule rec { - name = "Mojo-IOLoop-ForkCall-0.19"; + name = "Mojo-IOLoop-ForkCall-0.20"; src = fetchurl { url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz"; - sha256 = "a436b71c7d1450f79b9810f4f46e24f5ffe1e1428da473d4315673e08e4dec62"; + sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b"; }; propagatedBuildInputs = [ IOPipely Mojolicious ]; meta = { From f6bc086b212b5aa11c47d5bb57082aa89baeb15e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 20 Sep 2018 22:14:30 +0200 Subject: [PATCH 125/218] dolphinEmuMaster: mark broken on darwin The default version isn't enabled on darwin either, however it did work at some point. /tmp/nix-build-dolphin-emu-2018-08-17.drv-0/source/Source/Core/Core/NetPlayServer.cpp:1180:26: error: unknown type name 'lzo_uint32_t'; did you mean 'lzo_uint32'? std::vector wrkmem(LZO1X_1_MEM_COMPRESS); /cc ZHF #45961 --- pkgs/misc/emulators/dolphin-emu/master.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 140e199908ce..05b75312646d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -78,6 +78,7 @@ in stdenv.mkDerivation rec { branch = "master"; # x86_32 is an unsupported platform. # Enable generic build if you really want a JIT-less binary. + broken = stdenv.isDarwin; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } From 709a828e713b028a3dc5e9de9ed1711a405d010b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 20 Sep 2018 22:19:56 +0200 Subject: [PATCH 126/218] dico: mark linux only. Never built successfully. Undefined symbols for architecture x86_64: "_rpl_strerror", referenced from: _default_print_diag in libgrecs.a(diag.o) _grecs_symtab_strerror in libgrecs.a(symtab.o) _parse_inet in libgrecs.a(sockaddr.o) ld: symbol(s) not found for architecture x86_64 /cc ZHF #45961 --- pkgs/servers/dico/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index 4fa28a61829f..76a3f51caa2e 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/dico/; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; longDescription = '' GNU Dico is a flexible modular implementation of DICT server From 33f818198b5f22afe22e95672e3aff5d03280e5a Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 20 Sep 2018 22:22:53 +0200 Subject: [PATCH 127/218] docker-proxy: mark linux only Unlike docker (cli only) this probably won't work on darwin. github.com/docker/libnetwork/networkdb can't load package: package github.com/docker/libnetwork/ns: build constraints exclude all Go files in /private/tmp/nix-build-docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.drv-0/go/src/github.com/docker/libnetwork/ns /cc ZHF #45961 --- pkgs/applications/virtualization/docker/proxy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index 651631b478fc..8b7021f7dbb8 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -24,6 +24,6 @@ buildGoPackage rec { license = licenses.asl20; homepage = https://github.com/docker/libnetwork; maintainers = with maintainers; [vdemeester]; - platforms = docker.meta.platforms; + platforms = platforms.linux; }; } From c2056d25ddd9d9526d4bcf69a8f248a95f0c37ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 13:24:59 -0700 Subject: [PATCH 128/218] gpodder: 3.10.3 -> 3.10.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gpodder/versions --- pkgs/applications/audio/gpodder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 1ada45e62925..ccd20a6b7b2b 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.3"; + version = "3.10.5"; format = "other"; src = fetchFromGitHub { owner = "gpodder"; repo = "gpodder"; rev = version; - sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l"; + sha256 = "00lvma40d62h4haybabh15x1y7rnmd84whbjgjv773igwagkn9vw"; }; postPatch = with stdenv.lib; '' From dd33a9dc0b993b6ac8875a74cfe48b9133cb9fe9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 14:31:57 -0700 Subject: [PATCH 129/218] firejail: 0.9.54 -> 0.9.56 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/firejail/versions --- pkgs/os-specific/linux/firejail/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 9f2374e75a88..568e474f444a 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.54"; + version="0.9.56"; name="${baseName}-${version}"; - hash="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff"; - url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.54.tar.xz"; - sha256="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff"; + hash="0b9ig0a91i19sfm94a6yl510pm4dlidmani3fsnb7vh0qy3l9121"; + url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.56.tar.xz"; + sha256="0b9ig0a91i19sfm94a6yl510pm4dlidmani3fsnb7vh0qy3l9121"; }; buildInputs = [ which From 6587910e4f02e754ecbabcd8d9778a824b0f2c86 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 14:46:26 -0700 Subject: [PATCH 130/218] eudev: 3.2.5 -> 3.2.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/eudev/versions --- pkgs/os-specific/linux/eudev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index 0ca85c7e50bc..771f012c2c21 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="eudev"; - version = "3.2.5"; + version = "3.2.6"; name="${baseName}-${version}"; url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; - sha256 = "1bwh72brp4dvr2dm6ng0lflic6abl87h8zk209im5lna0m0x1hj9"; + sha256 = "1qdpnvsv3qqwy6jl4i4b1dn212y6nvawpaladb7plfping9p2n46"; }; nativeBuildInputs = [ pkgconfig ]; From 1c40a3eb05e434ddcafb40c48c5d7c2bc5645648 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Thu, 20 Sep 2018 23:54:11 +0200 Subject: [PATCH 131/218] circleci-cli: 0.1.0 -> 0.1.2307 (#46983) * circleci-cli: 0.1.0 -> 0.1.2307 We are also building from source now, instead of using a pre-packaged version. This means we need Go. Also did minor refactors. * circleci-cli: removed unneeded dependencies --- .../tools/misc/circleci-cli/default.nix | 32 ++++++++----------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 62c7cf3d8774..cc062eca932e 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,28 +1,22 @@ -{ stdenv, fetchFromGitHub, docker, makeWrapper }: +{ stdenv, fetchFromGitHub, buildGoPackage }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let + owner = "CircleCI-Public"; pname = "circleci-cli"; - version = "0.1.0"; + version = "0.1.2307"; +in +buildGoPackage rec { + name = "${pname}-${version}"; + inherit version; - src = fetchFromGitHub { - owner = "circleci"; - repo = "local-cli"; + src = fetchFromGitHub { + inherit owner; + repo = pname; rev = "v${version}"; - sha256 = "1bv1ck5zvyl6pyvbfglizg8ybna4yg2nz441kiv5rmp4g27n6db2"; + sha256 = "0z71jnq42idvhgpgn3mdpbajmgn4b41rpifv5qxn3h1pgi08f75s"; }; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p "$out/bin/" - cp "$src/circleci.sh" "$out/bin/circleci" - ''; - - postFixup = '' - wrapProgram $out/bin/circleci \ - --prefix "PATH" : "${docker}/bin" - ''; + goPackagePath = "github.com/${owner}/${pname}"; meta = with stdenv.lib; { # Box blurb edited from the AUR package circleci-cli From 74cd060c86982edf574fbac54a51c5305d2aeda1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 14:55:54 -0700 Subject: [PATCH 132/218] praat: 6.0.42 -> 6.0.43 (#46974) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/praat/versions --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index d322553fdaad..5db5035c8352 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "6.0.42"; + version = "6.0.43"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1llcj1cq4k60lnr6jkdshd4l9nkg9yc2xmaqiinqryxrb58jmpcv"; + sha256 = "1l13bvnl7sv8v6s5z63201bhzavnj6bnqcj446akippsam13z4sf"; }; configurePhase = '' From 9c02914b426d4770ddbe24c5551f5a42659bc50f Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Fri, 21 Sep 2018 00:18:13 +0200 Subject: [PATCH 133/218] pythonPackages.circus: fix build, add meta (#47066) --- .../python-modules/circus/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/development/python-modules/circus/default.nix index 0a82238b703e..a4f96ccaf68e 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/development/python-modules/circus/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi , iowait, psutil, pyzmq, tornado, mock }: buildPythonPackage rec { @@ -10,7 +10,22 @@ buildPythonPackage rec { sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b"; }; + postPatch = '' + # relax version restrictions to fix build + substituteInPlace setup.py \ + --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" \ + --replace "tornado>=3.0,<5.0" "tornado>=3.0" + ''; + + checkInputs = [ mock ]; + doCheck = false; # weird error - propagatedBuildInputs = [ iowait psutil pyzmq tornado mock ]; + propagatedBuildInputs = [ iowait psutil pyzmq tornado ]; + + meta = with stdenv.lib; { + description = "A process and socket manager"; + homepage = "https://github.circus.com/circus-tent/circus"; + license = licenses.asl20; + }; } From 2c5ae2ae61170db868279998a88876b2abb28f72 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Fri, 21 Sep 2018 00:19:01 +0200 Subject: [PATCH 134/218] liquidwar: fix build (#47064) - add missing dependencies readline and libtool that used to be propagated by guile but aren't anymore - build with guile 2.0 instead of 1.8 --- pkgs/games/liquidwar/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 53556b8cd914..1ff1f96b5a23 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -2,7 +2,7 @@ , gmp, libGLU_combined, libjpeg, libpng , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf -, curl, sqlite +, curl, sqlite, libtool, readline , libogg, libvorbis, libcaca, csound, cunit } : stdenv.mkDerivation rec { @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { curl sqlite libogg libvorbis csound libXrender libcaca cunit + libtool readline ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef4ccb202aa1..5a0b0956d759 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20030,7 +20030,7 @@ with pkgs; }; liquidwar = callPackage ../games/liquidwar { - guile = guile_1_8; + guile = guile_2_0; }; liquidwar5 = callPackage ../games/liquidwar/5.nix { From fab901ddd3d034c53901c640d9787c0794d1bcad Mon Sep 17 00:00:00 2001 From: roconnor Date: Thu, 20 Sep 2018 18:35:39 -0400 Subject: [PATCH 135/218] bitcoin: 0.16.2 -> 0.16.3 (#46891) --- pkgs/applications/altcoins/bitcoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 24bc3875dd5e..878cb6064e8c 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.2"; + version = "0.16.3"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "1n07qykx5hc0ph8fwn7hfrbsrjv19fdzvs5h0nysq4wfgn5wa40r"; + sha256 = "060223dzzk2izfzhxwlzzd0fhbgglvbgps2nyc4zz767vybysvl3"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; From 4d3575973553ee1997ad1d7690af446cfba79dc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 15:49:51 -0700 Subject: [PATCH 136/218] feh: 2.27.1 -> 2.28 (#47055) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/feh/versions --- pkgs/applications/graphics/feh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index f10916bcd631..bbc533d37e84 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.27.1"; + version = "2.28"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "10zk76l491s22qrv86rax6cvpgwyl3qq0izl2pbk0k1z1kw3ihvf"; + sha256 = "1nfka7w6pzj2bbwx8vydr2wwm7z8mrbqiy1xrq97c1g5bxy2vlhk"; }; outputs = [ "out" "man" "doc" ]; From 46f6a69e49550c405e9ab7914d5ac235cfcfe663 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 15:57:18 -0700 Subject: [PATCH 137/218] you-get: 0.4.1128 -> 0.4.1148 (#46928) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/you-get/versions --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 5254d1091680..6a56d23f7490 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1128"; + version = "0.4.1148"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0i0wspmgblxwvvbm3q8zz4l450fs3bccqxxfm0ysfgprgcy8fp3l"; + sha256 = "1ypgqaxf5qn5b3c2n4hcsiixyvvpvmpx5gny523cd5igb7h0yja5"; }; meta = with stdenv.lib; { From 85f60cbeb0a6ff14248f291a21047459cd6f6890 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 16:03:24 -0700 Subject: [PATCH 138/218] libwebsockets: 3.0.0 -> 3.0.1 (#47020) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwebsockets/versions --- pkgs/development/libraries/libwebsockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 9cd0aabcf097..8c0db4a7396f 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libwebsockets-${version}"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - sha256 = "0cz4f05qd9b2bm27h5pkwym2cl7ff73lgirzwjppwf9b18if58yv"; + sha256 = "1x3qrz2hqsrv2lg0y9irdx37c8r9j9vf9mwzgw61znzvk6hc9ymq"; }; buildInputs = [ cmake openssl zlib libuv ]; From 5e7b7b805aed412fad6939ad6829f3ff77f64a38 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 21 Sep 2018 01:17:41 +0200 Subject: [PATCH 139/218] nixos/tests/ferm: disable dhcpcd The test failed in one run on Hydra, logs look like dhcpcd changed ipv6 routing at just the wrong time. Disable dhcpcd. It's not needed, the test uses static IPs anyway. --- nixos/tests/ferm.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index 24b74df85ad1..b8e8663e3ad2 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : { with pkgs.lib; { networking = { + dhcpcd.enable = false; interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ]; interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ]; }; @@ -20,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { with pkgs.lib; { networking = { + dhcpcd.enable = false; interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ]; interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; @@ -51,7 +53,7 @@ import ./make-test.nix ({ pkgs, ...} : { '' startAll; - $client->waitForUnit("network.target"); + $client->waitForUnit("network-online.target"); $server->waitForUnit("ferm.service"); $server->waitForUnit("nginx.service"); $server->waitUntilSucceeds("ss -ntl | grep -q 80"); From 73dbb11a0da27ece505639a5b2d11aba18ec8b27 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 16:41:18 -0700 Subject: [PATCH 140/218] debootstrap: 1.0.108 -> 1.0.109 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/debootstrap/versions --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 4e8eb0411d1a..bb4302d8aaec 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.108"; + version = "1.0.109"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1zfp6i6mskgx3b186sbd1443031h9z01yfqgynhl848faknv4h9f"; + sha256 = "117xgrv6mpszyndmsvkn4ynh57b2s40qc68bpmfmxggw58j42klw"; }; buildInputs = [ dpkg gettext gawk perl wget ]; From 39d85a2e0fc46005d82f561b2f84ea44f0a74375 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 16:43:32 -0700 Subject: [PATCH 141/218] double-conversion: 3.0.0 -> 3.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/double-conversion/versions --- pkgs/development/libraries/double-conversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 7a33559cbc79..96375fcd5beb 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "double-conversion-${version}"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; rev = "v${version}"; - sha256 = "05m78wlwrg310mxh1cl3d8d0ishzfvzh84x64xmvng252m0vc8yz"; + sha256 = "123rb2p4snqagrybw66vnapchqdwn2rfpr1wcq0ya9gwbyl7xccx"; }; nativeBuildInputs = [ cmake ]; From ce6debe9006544ab39ee25e7106d9726c37b928e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 17:11:15 -0700 Subject: [PATCH 142/218] elisa: 0.2.1 -> 0.2.80 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/elisa/versions --- pkgs/applications/audio/elisa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 90ea4c58ea4a..2d35ebb41aee 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { name = "elisa-${version}"; - version = "0.2.1"; + version = "0.2.80"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "0b3rx3gh6adlrbmgj75dicqv6qzzn4fyfxbf1nwh3zd2hi0ca89w"; + sha256 = "0wc2kkp28gp1rfgg14a769lalwd44yz7jxkrzanh91v5j2kkln07"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; From 7736337916538aab67a00739c53b8434da773a3b Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 20 Sep 2018 20:23:04 -0400 Subject: [PATCH 143/218] Clarfy the binary reproducibility problems of created=now with dockerTools.buildImage. --- doc/functions.xml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/functions.xml b/doc/functions.xml index 31b40fb084a3..0c0d82b0342c 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -642,10 +642,12 @@ buildImage { Impurely Defining a Docker Layer's Creation Date - Because dates are an impurity, by default - buildImage will use a static date of one - second past the UNIX Epoch. This can be a bit frustrating when - listing docker images in the CLI: + By default buildImage will use a static + date of one second past the UNIX Epoch. This allows + buildImage to produce binary reproducible + images. When listing images with docker list + images, the newly created images will be listed like + this: - If you want to trade the purity for a better user experience, - you can set created to - now. + You can break binary reproducibility but have a sorted, + meaningful CREATED column by setting + created to now. and now the Docker CLI will display a reasonable date and sort the images as expected: - - + however, the produced images will not be binary reproducible. +
From dc47fdabc691a8a240d60fdc4a450587984b49fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 17:28:49 -0700 Subject: [PATCH 144/218] dmidecode: 3.1 -> 3.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/dmidecode/versions --- pkgs/os-specific/linux/dmidecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 0216e48d58f5..49163cc8b790 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dmidecode-3.1"; + name = "dmidecode-3.2"; src = fetchurl { url = "mirror://savannah/dmidecode/${name}.tar.xz"; - sha256 = "1h0sg0lxa15nzf8s7884p6q7p6md9idm0c79wyqmk32l4ndwwrnp"; + sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; }; makeFlags = "prefix=$(out)"; From ffb7ad6caa85eb1a8b1fd58bb3f5067be8ef2af5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 17:35:26 -0700 Subject: [PATCH 145/218] cgal: 4.12 -> 4.12.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/cgal/versions --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 23a539491d0e..0de1e35440b9 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.12"; + version = "4.12.1"; name = "cgal-" + version; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "0n4yvg2rkrlb1bwhykrg4iyqg4whxadcs441k10xx0r75i6220mn"; + sha256 = "0b8wwfnvbayxi18jahfdplkjqr59ynq6phk0kz62gqp8vmwia9d9"; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; From f5fb4283d4c690cfe7938368773f7db729b65398 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 17:39:37 -0700 Subject: [PATCH 146/218] afflib: 3.7.16 -> 3.7.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/afflib/versions --- pkgs/development/libraries/afflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index a1c466605228..5ccb7f95ee19 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "3.7.16"; + version = "3.7.17"; name = "afflib-${version}"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; rev = "v${version}"; - sha256 = "0piwkmg7jn64h57cjf5cybyvyqxj2k752g9vrf4ycds7nhvvbnb6"; + sha256 = "11q20n6p5nvwmd9wwk0addlfxpxagf47ly89scn3jvc7k484ksan"; }; nativeBuildInputs = [ autoreconfHook ]; From dcf5c4910e1e82973eed4801f09949920999e019 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 17:48:47 -0700 Subject: [PATCH 147/218] apr: 1.6.3 -> 1.6.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apr/versions --- pkgs/development/libraries/apr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 705f61445b59..8c31c89947cd 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apr-1.6.3"; + name = "apr-1.6.5"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "0wiik6amxn6lkc55fv9yz5i3kbxnqbp36alrzabx1avsdp8hc7qk"; + sha256 = "01d1n1ql66bxsjx0wyzazmkqdqdmr0is6a7lwyy5kzy4z7yajz56"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; From 8cf1f60fa3c15fd249ffaa9c55dce626e114f636 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 17:53:28 -0700 Subject: [PATCH 148/218] ammonite: 1.2.0 -> 1.2.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/ammonite/versions --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 0e98d63fdd3e..7544958cb314 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.2.0"; + version = "1.2.1"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "08kh4j9jsg3c3ks9q5f01i13d1ak701vjviy5wb3y6xsajg62nfj"; + sha256 = "096xychdq1pmyjfv4cv4pvm29dk539rxpq3iaz9rpznp01af4mjf"; }; propagatedBuildInputs = [ jre ] ; From fa693e95f4f9c890d4aa56b5133466b648066f95 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 17:55:55 -0700 Subject: [PATCH 149/218] burp: 2.1.32 -> 2.2.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/burp/versions --- pkgs/tools/backup/burp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 4133478dbf98..3ef6be79531b 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.1.32"; + version = "2.2.4"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5"; + sha256 = "0y63z1vcm5h7s0q5lv94gpdqnfgi2qb0g0h81idai5p0yqw09v8h"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 45c637d8a018ac670c784a9ffc89ed3013e8d6a9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 20 Sep 2018 21:48:06 -0400 Subject: [PATCH 150/218] haskellPackages.x509-system: Override based on the host, not target platform There were many reverts back and forth, but it ultimately appears that I am the source of this mistake. I clarified the comment so as not to confuse myself or anyone else. --- pkgs/development/haskell-modules/configuration-nix.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d363d2e87b69..cf53f9e2b510 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -126,9 +126,9 @@ self: super: builtins.intersectAttrs super { # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; - # Prevents needing to add security_tool as a build tool to all of x509-system's - # dependencies. - x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc + # Prevents needing to add `security_tool` as a run-time dependency for + # everything using x509-system to give access to the `security` executable. + x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc then let inherit (pkgs.darwin) security_tool; in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { postPatch = (drv.postPatch or "") + '' From e8693206ee703c4df26540bce84844113e443e99 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 20 Sep 2018 23:46:31 -0500 Subject: [PATCH 151/218] utmps: init at 0.0.1.3 Haven't tried using it, but packging it is first step! :) --- pkgs/development/libraries/utmps/default.nix | 32 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/utmps/default.nix diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix new file mode 100644 index 000000000000..859d152072fb --- /dev/null +++ b/pkgs/development/libraries/utmps/default.nix @@ -0,0 +1,32 @@ +{ stdenv, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "utmps"; + version = "0.0.1.3"; + sha256 = "0dwskdclac4afmh7f7zn6jdiydgaf59a65q43r6b813mghczjvvd"; + + description = "A secure utmpx and wtmp implementation"; + + configureFlags = [ + "--libdir=\${lib}/lib" + "--dynlibdir=\${lib}/lib" + "--bindir=\${bin}/bin" + "--includedir=\${dev}/include" + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + "--with-dynlib=${skalibs.lib}/lib" + ]; + + postInstall = '' + # remove all execline executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + rm libutmps.* + + mv doc $doc/share/doc/utmps/html + mv examples $doc/share/doc/utmps/examples + ''; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a0b0956d759..7a9a456d33d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12075,6 +12075,7 @@ with pkgs; s6-rc = callPackage ../tools/system/s6-rc { }; nsss = callPackage ../development/libraries/nsss { }; + utmps = callPackage ../development/libraries/utmps { }; }; From 8ffd65b12e7eeb74ddec11efd9fc3b49bbd568ea Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Fri, 21 Sep 2018 09:22:03 +0200 Subject: [PATCH 152/218] nixos/tests/atd: wait for atd to start The test failed non-deterministically when an at command was issued before the atd daemon was running. --- nixos/tests/atd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index 9f367d4c1d2a..25db72799241 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -16,6 +16,7 @@ import ./make-test.nix ({ pkgs, ... }: testScript = '' startAll; + $machine->waitForUnit('atd.service'); # wait for atd to start $machine->fail("test -f ~root/at-1"); $machine->fail("test -f ~alice/at-1"); From ba33eac477850892610148394ef38b8ea0d07da0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 21 Sep 2018 03:23:26 -0500 Subject: [PATCH 153/218] bat: install man page (#47099) --- pkgs/tools/misc/bat/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 01e720e5b877..ec2062805ab1 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -20,6 +20,10 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; + postInstall = '' + install -m 444 -Dt $out/share/man/man1 doc/bat.1 + ''; + meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = https://github.com/sharkdp/bat; From a709d11dd14c74faebe42c1d08215d8ecfe60922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 21 Sep 2018 09:41:17 +0100 Subject: [PATCH 154/218] gogs: 0.11.53 -> 0.11.66 (#47073) --- pkgs/applications/version-management/gogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 25f7be37e1ee..56e411368961 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.11.53"; + version = "0.11.66"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "1icm4bawyic4ivzyspqc6qjv882gil8j923zrbylw3i4ifhlcdhd"; + sha256 = "1b9ilk4xlsllsj5pzmxwsz4a1zvgd06a8mi9ni9hbvmfl3w8xf28"; }; patches = [ ./static-root-path.patch ]; From 7a6091d5c9b10ded05dfee01d3ff828b74712f14 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 21 Sep 2018 17:43:24 +0900 Subject: [PATCH 155/218] rubocop: 0.58.1 -> 0.59.1 --- pkgs/development/tools/rubocop/Gemfile.lock | 6 +++--- pkgs/development/tools/rubocop/gemset.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 6215bed77cf0..9c6f2fc32d21 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -9,7 +9,7 @@ GEM powerpack (0.1.2) rainbow (3.0.0) rake (12.3.1) - rubocop (0.58.1) + rubocop (0.59.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) parser (>= 2.5, != 2.5.1.1) @@ -17,7 +17,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) unicode-display_width (1.4.0) PLATFORMS @@ -28,4 +28,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.16.1 + 1.16.4 diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix index 7478cd568bd6..862f655b49da 100644 --- a/pkgs/development/tools/rubocop/gemset.nix +++ b/pkgs/development/tools/rubocop/gemset.nix @@ -60,18 +60,18 @@ dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s2qlrdx2f7653kmzwm58c8izyvgyjrzjrz76l2b005f2816kji6"; + sha256 = "0hz4slfisbq8nqs83mvvh6yv5hb7z7zx9fxvv9cka6b9ldvr2i2b"; type = "gem"; }; - version = "0.58.1"; + version = "0.59.1"; }; ruby-progressbar = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; + sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; unicode-display_width = { source = { From 9a859fb7f9fc7c81b78122e1c47765aa61e7aa28 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Fri, 21 Sep 2018 02:13:49 -0700 Subject: [PATCH 156/218] libratbag: init at v0.9.903 Add package libratbag and service module ratbagd Libratbag contains ratbagd daemon and ratbagctl cli to configure buttons, dpi, leds, etc. of gaming mice. Add mvnetbiz to maintainers. --- maintainers/maintainer-list.nix | 5 +++ nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/ratbagd.nix | 32 +++++++++++++++++ pkgs/os-specific/linux/libratbag/default.nix | 36 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 76 insertions(+) create mode 100644 nixos/modules/services/hardware/ratbagd.nix create mode 100644 pkgs/os-specific/linux/libratbag/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ecec7bbaf7e3..5b6ada894a70 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2808,6 +2808,11 @@ github = "muflax"; name = "Stefan Dorn"; }; + mvnetbiz = { + email = "mvnetbiz@gmail.com"; + github = "mvnetbiz"; + name = "Matt Votava"; + }; myrl = { email = "myrl.0xf@gmail.com"; github = "myrl"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3f3123798f59..84ce52909c02 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -275,6 +275,7 @@ ./services/hardware/nvidia-optimus.nix ./services/hardware/pcscd.nix ./services/hardware/pommed.nix + ./services/hardware/ratbagd.nix ./services/hardware/sane.nix ./services/hardware/sane_extra_backends/brscan4.nix ./services/hardware/tcsd.nix diff --git a/nixos/modules/services/hardware/ratbagd.nix b/nixos/modules/services/hardware/ratbagd.nix new file mode 100644 index 000000000000..103e1d2315ae --- /dev/null +++ b/nixos/modules/services/hardware/ratbagd.nix @@ -0,0 +1,32 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.ratbagd; +in +{ + ###### interface + + options = { + services.ratbagd = { + enable = mkOption { + default = false; + description = '' + Whether to enable ratbagd for configuring gaming mice. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + # Give users access to the "ratbagctl" tool + environment.systemPackages = [ pkgs.libratbag ]; + + services.dbus.packages = [ pkgs.libratbag ]; + + systemd.packages = [ pkgs.libratbag ]; + }; +} diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix new file mode 100644 index 000000000000..271dc156695a --- /dev/null +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }: + +stdenv.mkDerivation rec { + name = "libratbag-${version}"; + version = "0.9.903"; + + src = fetchFromGitHub { + owner = "libratbag"; + repo = "libratbag"; + rev = "v${version}"; + sha256 = "0cr5skrb7a5mgj7dkm647ib8336hb88bf11blaf6xldafi8b0jlj"; + }; + + + # todo: python should be in buildInputs, but right now meson propagates + # its own python. see: https://github.com/NixOS/nixpkgs/pull/46020 + nativeBuildInputs = [ + (python3.withPackages (ps: with ps; [ evdev pygobject3 ])) + meson ninja pkgconfig gitMinimal swig check valgrind + ]; + + buildInputs = [ glib systemd udev libevdev ]; + + mesonFlags = [ + "-Dsystemd-unit-dir=./lib/systemd/system/" + ]; + + meta = with stdenv.lib; { + description = "Configuration library for gaming mice"; + homepage = https://github.com/libratbag/libratbag; + license = licenses.mit; + maintainers = with maintainers; [ mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd7dca53c84c..5540098efb93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15022,6 +15022,8 @@ with pkgs; libertinus = callPackage ../data/fonts/libertinus { }; + libratbag = callPackage ../os-specific/linux/libratbag { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; From 78f1715149940165c8b48d372903617c175b5bd1 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Fri, 21 Sep 2018 02:15:38 -0700 Subject: [PATCH 157/218] piper: init at 0.2.902 Add package piper. Piper is a gtk frontend application for ratbagctl to configure gaming mice. --- pkgs/os-specific/linux/piper/default.nix | 33 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/piper/default.nix diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix new file mode 100644 index 000000000000..3e774faaffe2 --- /dev/null +++ b/pkgs/os-specific/linux/piper/default.nix @@ -0,0 +1,33 @@ +{ stdenv, meson, ninja, pkgconfig, gettext, fetchFromGitHub, python3 +, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "piper-${version}"; + version = "0.2.902"; + + format = "other"; + + src = fetchFromGitHub { + owner = "libratbag"; + repo = "piper"; + rev = version; + sha256 = "1ny0vf8ym9v040cb5h084k5wwn929fnhq9infbdq8f8vvy61magb"; + }; + + nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib ]; + buildInputs = [ gtk3 glib gnome3.defaultIconTheme python3 ]; + propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ]; + + postPatch = '' + chmod +x meson_install.sh # patchShebangs requires executable file + patchShebangs meson_install.sh + ''; + + meta = with stdenv.lib; { + description = "GTK frontend for ratbagd mouse config daemon"; + homepage = https://github.com/libratbag/piper; + license = licenses.gpl2; + maintainers = with maintainers; [ mvnetbiz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5540098efb93..b40b804015ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17746,6 +17746,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul {}; + piper = callPackage ../os-specific/linux/piper { }; + plank = callPackage ../applications/misc/plank { }; planner = callPackage ../applications/office/planner { }; From f0e0c6d72e4e6460b45924ca2c0262f5be82492d Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Fri, 21 Sep 2018 11:57:04 +0200 Subject: [PATCH 158/218] mopidy-iris: 3.26.0 -> 3.26.1 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index ab9bfa26d0ab..88aa47169985 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.26.0"; + version = "3.26.1"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0yd52dlm0qh3ycqxhxhiw52111wa87b7wlxbwdj5p9an5yqnkkvy"; + sha256 = "0qa55mmkrig5jymhm0mrr9jvxzfb2j70b971big3ady038cqd6f5"; }; propagatedBuildInputs = [ From de764e65f0d655c6cdd9fca23abd101290a2a6b6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 21 Sep 2018 13:07:07 +0300 Subject: [PATCH 159/218] acl2: 8.0 -> 8.0.post.2018.09.20; fixes build with fresher SBCL --- pkgs/development/interpreters/acl2/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 14b9a78af46e..a0da6e0ee7f8 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -4,15 +4,20 @@ let hashes = { "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; + "8.0.post.2018.09.20" = "1dj1dkkj6drk23h7cckyhcfplyzqlbz288wpxm77zr0gazxz8mw6"; +}; +revs = { + "8.0" = "8.0"; + "8.0.post.2018.09.20" = "531089336bb1734ff82c7b3b3fc05917451db770"; }; in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "8.0"; + version = "8.0.post.2018.09.20"; src = fetchFromGitHub { owner = "acl2-devel"; repo = "acl2-devel"; - rev = "${version}"; + rev = revs."${version}"; sha256 = hashes."${version}"; }; From 41457058da7a51f44d0c4ce89740bb7bef40c40c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 17:36:53 -0700 Subject: [PATCH 160/218] chrony: 3.3 -> 3.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/chrony/versions --- pkgs/tools/networking/chrony/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index bf1ef0600bcc..9cca93040dd7 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "3.3"; + version = "3.4"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "0a1ilzr88xhzx1ql3xhn36a4rvl79hvp0dvgm3az4cjhhzav47qd"; + sha256 = "17vb1sy79lsjif23v66mgn39lbgmxy59mf7mi9ffb9qh4ryf8xxg"; }; postPatch = '' From 69b2c0dcf1c7895817f613171de7a71a02e31adc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Sep 2018 05:42:53 -0500 Subject: [PATCH 161/218] utmps: add top-level attribute, as was the style at the time --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a9a456d33d0..ad0625a66091 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12365,6 +12365,8 @@ with pkgs; uthash = callPackage ../development/libraries/uthash { }; + utmps = skawarePackages.utmps; + ucommon = ucommon_openssl; ucommon_openssl = callPackage ../development/libraries/ucommon { From 96c66faa49862560125d1d4fbefe3144c69d4c62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 15:04:42 -0700 Subject: [PATCH 162/218] earlyoom: 0.11 -> 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/earlyoom/versions --- pkgs/os-specific/linux/earlyoom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 52333c109ee0..0c2f1a872fd9 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "earlyoom-${VERSION}"; # This environment variable is read by make to set the build version. - VERSION = "0.11"; + VERSION = "1.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${VERSION}"; - sha256 = "1k3xslb70fzk80wlka32l0k2v45qn1xgwyjkjiz85gv6v4mv92vl"; + sha256 = "1hczn59mmx287hnlhcmpxrf3jy3arllif165dq7b2ha6w3ywngww"; }; installPhase = '' From 4eb077bed72e3ad0fe5ba5150931d45fa1296429 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 20 Sep 2018 12:01:26 -0700 Subject: [PATCH 163/218] kotlin: 1.2.61 -> 1.2.70 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kotlin/versions --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 757773eed52d..718628d8ad41 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.2.61"; + version = "1.2.70"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1gsvilsbgwdvyvxjnlvs0rhrgm6x9dapziwgwgg9kbi9a0w4avdy"; + sha256 = "0d44rzngpfhgh1qc99b97dczdyrmypbwzrmr00qmcy2ya2il0fm2"; }; propagatedBuildInputs = [ jre ] ; From acbe6b2374502d3a032ff197a3d2e5f4d5d3a520 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Fri, 21 Sep 2018 14:34:09 +0200 Subject: [PATCH 164/218] Revert "burp: 2.1.32 -> 2.2.4" 2.2.4 is not considered a stable version and is actually old. This reverts commit fa693e95f4f9c890d4aa56b5133466b648066f95. --- pkgs/tools/backup/burp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 3ef6be79531b..4133478dbf98 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "burp-${version}"; - version = "2.2.4"; + version = "2.1.32"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; rev = version; - sha256 = "0y63z1vcm5h7s0q5lv94gpdqnfgi2qb0g0h81idai5p0yqw09v8h"; + sha256 = "1izs5vavffvj6z478s5x1shg71p2v5bnnrsam1avs21ylxbfnxi5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 7ff90cd103c2fca386ed085afb0559380996d239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 21 Sep 2018 14:37:39 +0200 Subject: [PATCH 165/218] pyre: 0.0.11 -> 0.0.14 --- pkgs/development/tools/pyre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pyre/default.nix b/pkgs/development/tools/pyre/default.nix index c466d39eb4e1..99e53610c01c 100644 --- a/pkgs/development/tools/pyre/default.nix +++ b/pkgs/development/tools/pyre/default.nix @@ -3,7 +3,7 @@ let # Manually set version - the setup script requires # hg and git + keeping the .git directory around. - pyre-version = "0.0.11"; + pyre-version = "0.0.14"; versionFile = writeScript "version.ml" '' cat > "./version.ml" < Date: Fri, 21 Sep 2018 15:54:48 +0200 Subject: [PATCH 166/218] lua: remove lua4 and lua5_0 Both versions are not maintained anymore upstream and have open security issues, e.g. https://nvd.nist.gov/vuln/detail/CVE-2014-5461. The same holds for lua5_1 but that seems to be in use in some places. Re #47122 Re #47123 --- .../interpreters/lua-4/default.nix | 32 ------------------- pkgs/development/interpreters/lua-5/5.0.3.nix | 32 ------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 66 deletions(-) delete mode 100644 pkgs/development/interpreters/lua-4/default.nix delete mode 100644 pkgs/development/interpreters/lua-5/5.0.3.nix diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix deleted file mode 100644 index be49d2dd9215..000000000000 --- a/pkgs/development/interpreters/lua-4/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "lua-4.0.1"; - - src = fetchurl { - url = https://www.lua.org/ftp/lua-4.0.1.tar.gz; - sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z"; - }; - - configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config"; - buildFlags = "all so sobin"; - installFlags = "INSTALL_ROOT=$$out"; - - hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; - - meta = { - homepage = http://www.lua.org; - description = "Powerful, fast, lightweight, embeddable scripting language"; - longDescription = '' - Lua combines simple procedural syntax with powerful data - description constructs based on associative arrays and extensible - semantics. Lua is dynamically typed, runs by interpreting bytecode - for a register-based virtual machine, and has automatic memory - management with incremental garbage collection, making it ideal - for configuration, scripting, and rapid prototyping. - ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - branch = "4"; - }; -} diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix deleted file mode 100644 index d343ec6c63b1..000000000000 --- a/pkgs/development/interpreters/lua-5/5.0.3.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "lua-5.0.3"; - - src = fetchurl { - url = https://www.lua.org/ftp/lua-5.0.3.tar.gz; - sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671"; - }; - - hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector"; - - configurePhase = "sed -i -e 's/MYCFLAGS=.*/MYCFLAGS=-O3 -fomit-frame-pointer -fPIC/' config"; - buildFlags = "all so sobin"; - installFlags = "INSTALL_ROOT=$$out"; - installTargets = "install soinstall"; - - meta = { - homepage = http://www.lua.org; - description = "Powerful, fast, lightweight, embeddable scripting language"; - longDescription = '' - Lua combines simple procedural syntax with powerful data - description constructs based on associative arrays and extensible - semantics. Lua is dynamically typed, runs by interpreting bytecode - for a register-based virtual machine, and has automatic memory - management with incremental garbage collection, making it ideal - for configuration, scripting, and rapid prototyping. - ''; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad0625a66091..c6448a0b4bd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7501,8 +7501,6 @@ with pkgs; ### LUA MODULES - lua4 = callPackage ../development/interpreters/lua-4 { }; - lua5_0 = callPackage ../development/interpreters/lua-5/5.0.3.nix { }; lua5_1 = callPackage ../development/interpreters/lua-5/5.1.nix { }; lua5_2 = callPackage ../development/interpreters/lua-5/5.2.nix { }; lua5_2_compat = callPackage ../development/interpreters/lua-5/5.2.nix { From 7ac0ecc12be54adf4d0ee146ae5c5a74957e7ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 21 Sep 2018 12:41:21 -0300 Subject: [PATCH 167/218] rage: add dependency on mesa_noglu.dev (#47132) --- pkgs/desktops/enlightenment/rage.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 5de225220733..e7dfb5ca3989 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, wrapGAppsHook }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { meson ninja (pkgconfig.override { vanilla = true; }) + mesa_noglu.dev wrapGAppsHook ]; From cb212f78e08ca74334ad7c5e93839d844281870b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 21 Sep 2018 08:56:11 -0700 Subject: [PATCH 168/218] nwipe: 0.24 -> 0.25 (#46996) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nwipe/versions --- pkgs/tools/security/nwipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix index 214ffccc7aea..a27ed7bad1a5 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/tools/security/nwipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: stdenv.mkDerivation rec { - version = "0.24"; + version = "0.25"; name = "nwipe-${version}"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; rev = "v${version}"; - sha256 = "0zminjngz98b4jl1ii6ssa7pkmf4xw6mmk8apxz3xr68cps12ls0"; + sha256 = "1hx041arw82k814g9r8dqsfi736mj5nlzp2zpi8n2qfqfc1q8nir"; }; nativeBuildInputs = [ automake autoconf pkgconfig ]; buildInputs = [ ncurses parted ]; From 2ed26f583805fd62d3b2a6188a39a6833142d3a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 21 Sep 2018 08:56:47 -0700 Subject: [PATCH 169/218] shotcut: 18.08.14 -> 18.09.16 (#46963) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shotcut/versions --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index dea7e7f86a94..a92cb5eb1e14 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.08.14"; + version = "18.09.16"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "074df9vc0rdb4byalaarq522vkfq5mrhxs4dgbyqls3ryd3hj1ds"; + sha256 = "0mv28v9c45gvf1jizb7zwmhcckpy7mznpai1zncc5gb5p7kqf56y"; }; enableParallelBuilding = true; From 907a9fa83db9948d79541ba39bf1b24ff35bc16e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 21 Sep 2018 08:57:55 -0700 Subject: [PATCH 170/218] smarty3: 3.1.32 -> 3.1.33 (#46947) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/smarty3/versions --- pkgs/development/libraries/smarty3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index 2fce5b3368f7..66bfd601a62d 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, ... }: stdenv.mkDerivation rec { name = "smarty3-${version}"; - version = "3.1.32"; + version = "3.1.33"; src = fetchFromGitHub { owner = "smarty-php"; repo = "smarty"; rev = "v${version}"; - sha256 = "1rfa5pzr23db1bivpivljgmgpn99m6ksgli64kmii5cmpvxi00y2"; + sha256 = "12kll8nv4b90nlx3y0213lsncqw2ydshjx4g6dv7jah6j1pv29ix"; }; installPhase = '' From 60b6d5f8a8c5c2f2e50e446dbe0e07575b535e82 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 21 Sep 2018 19:09:29 +0300 Subject: [PATCH 171/218] acl2: 8.1.post.2018.09.20 -> 8.1; turns out there is a release --- pkgs/development/interpreters/acl2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index a0da6e0ee7f8..cc88b32119e7 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -4,15 +4,15 @@ let hashes = { "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; - "8.0.post.2018.09.20" = "1dj1dkkj6drk23h7cckyhcfplyzqlbz288wpxm77zr0gazxz8mw6"; + "8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd"; }; revs = { "8.0" = "8.0"; - "8.0.post.2018.09.20" = "531089336bb1734ff82c7b3b3fc05917451db770"; + "8.1" = "8.1"; }; in stdenv.mkDerivation rec { name = "acl2-${version}"; - version = "8.0.post.2018.09.20"; + version = "8.1"; src = fetchFromGitHub { owner = "acl2-devel"; From e372ab46265a3dd083e5abee646741b6b5e35caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 21 Sep 2018 13:25:51 -0300 Subject: [PATCH 172/218] ephoto: add dependency on mesa_noglu.dev (#47136) --- pkgs/desktops/enlightenment/ephoto.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index 6a49852909e6..ad4620d4f450 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }: stdenv.mkDerivation rec { name = "ephoto-${version}"; @@ -9,9 +9,16 @@ stdenv.mkDerivation rec { sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb"; }; - nativeBuildInputs = [ (pkgconfig.override { vanilla = true; }) makeWrapper ]; + nativeBuildInputs = [ + (pkgconfig.override { vanilla = true; }) + mesa_noglu.dev # otherwise pkg-config does not find gbm + makeWrapper + ]; - buildInputs = [ efl pcre ]; + buildInputs = [ + efl + pcre + ]; meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; From e2ed4f3d2267b0268cff1b27611140448486ae39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 21 Sep 2018 13:30:12 -0300 Subject: [PATCH 173/218] numix-cursor-theme: 20160110 -> 1.1 (#47016) --- .../data/icons/numix-cursor-theme/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index edeb61c6d3e1..8e5a317082ea 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, inkscape, xcursorgen }: stdenv.mkDerivation rec { - version = "20160110"; - + version = "1.1"; package-name = "numix-cursor-theme"; - name = "${package-name}-${version}"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "e92186d9df47c04d4e0a778eb6941ef58590b179"; - sha256 = "1sr4pisgrn3632phsiny2fyr2ib6l51fnjdsanmh9ampagl4ly7g"; + rev = "v${version}"; + sha256 = "0p8h48wsy3z5dz9vdnp01fpn6q8ky0h74l5qgixlip557bsa1spi"; }; - dontBuild = true; + nativeBuildInputs = [ inkscape xcursorgen ]; + + buildPhase = '' + patchShebangs . + HOME=$TMP ./build.sh + ''; installPhase = '' install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix{,-Light} $out/share/icons/ + cp -dr --no-preserve='ownership' Numix-Cursor{,-Light} $out/share/icons/ ''; meta = with stdenv.lib; { From 452a81c991d34fc5e6c56b7fdbcdff97c693b51f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 21 Sep 2018 12:32:17 -0400 Subject: [PATCH 174/218] libusb1: Build everywhere, since MinGW works --- pkgs/development/libraries/libusb1/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 69afd9d4c691..7ec714f02237 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.libusb.info; description = "User-space USB library"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; } From 45de1594d74a4b7bf1191b985aec44f38b57e288 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 21 Sep 2018 09:33:16 -0700 Subject: [PATCH 175/218] clipgrab: 3.6.9 -> 3.7.0 (#47082) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/clipgrab/versions --- pkgs/applications/video/clipgrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 96e0bb04031b..c54a9358b609 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "clipgrab-${version}"; - version = "3.6.9"; + version = "3.7.0"; src = fetchurl { - sha256 = "16r0h286vqw1bns29sx5x2919pj3y8gxf1k7dpf9xrz0vm2zrc3v"; + sha256 = "0rx12218yy6h27z3xsmmxfsw8ldlsf4y862adkz6ybrygppsaib4"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${name}.tar.gz"; }; From da84efcd12dd3029e42b3bd0a384fe8634913cda Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 21 Sep 2018 17:56:35 +0200 Subject: [PATCH 176/218] libretro.mame: 2017-03-02 -> 2018-09-13 Fixes build of the MAME libretro core. Closes #47137. Signed-off-by: Christoph Hrdinka --- pkgs/misc/emulators/retroarch/cores.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 371ace848fb7..2eef6009ac26 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -234,8 +234,8 @@ in with stdenv.lib.licenses; core = "mame"; src = fetchRetro { repo = "mame"; - rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e"; - sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1"; + rev = "9f9e6b6c9bde4d50c72e9a5c80496a1fec6b8aa9"; + sha256 = "0lfj8bjchkcvyb5x0x29cg10fkfklxndk80947k4qfysclijxpkv"; }; description = "Port of MAME to libretro"; license = gpl2Plus; From b97242238d7efb029c76eb8d4fe4b1228a5b49a8 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 21 Sep 2018 12:55:12 -0400 Subject: [PATCH 177/218] fetchzip: Use unzip from buildPackages Additionally, the manual path manipulation becomes no longer needed. --- pkgs/build-support/fetchzip/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 4a5381d71f20..f1b9b9290d4c 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -14,7 +14,7 @@ , name ? "source" , ... } @ args: -lib.overrideDerivation (fetchurl ({ +(fetchurl ({ inherit name; recursiveHash = true; @@ -23,8 +23,6 @@ lib.overrideDerivation (fetchurl ({ postFetch = '' - export PATH=${unzip}/bin:$PATH - unpackDir="$TMPDIR/unpack" mkdir "$unpackDir" cd "$unpackDir" @@ -48,6 +46,7 @@ lib.overrideDerivation (fetchurl ({ mv "$unpackDir" "$out" '') #*/ + extraPostFetch; -} // removeAttrs args [ "stripRoot" "extraPostFetch" ])) -# Hackety-hack: we actually need unzip hooks, too -(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) +} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { + # Hackety-hack: we actually need unzip hooks, too + nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; +}) From 73862bf8121ddc7aa41bbec3e26bcb6244f18713 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 21 Sep 2018 19:08:25 +0200 Subject: [PATCH 178/218] haskellPackages.mandrill: fix build for ghc843 --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5d751992fa71..64a82ed42a87 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1130,4 +1130,10 @@ self: super: { safe-money-serialise = super.safe-money-serialise.override { safe-money = self.safe-money_0_7; }; safe-money-xmlbf = super.safe-money-xmlbf.override { safe-money = self.safe-money_0_7; }; + # https://github.com/adinapoli/mandrill/pull/52 + mandrill = appendPatch super.mandrill (pkgs.fetchpatch { + url = https://github.com/adinapoli/mandrill/commit/30356d9dfc025a5f35a156b17685241fc3882c55.patch; + sha256 = "1qair09xs6vln3vsjz7sy4hhv037146zak4mq3iv6kdhmp606hqv"; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 203b0ac9824ff1863adee4ec90450f9c8ffc62d3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 21 Sep 2018 12:42:36 -0500 Subject: [PATCH 179/218] s-tui: 0.7.5 -> 0.8.2 (#47133) --- pkgs/tools/system/s-tui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 935b49f95db3..35a26eb7daee 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "s-tui"; - version = "0.7.5"; + version = "0.8.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "01w5jh0p66jk4h3cmif4glq42zv44zhziczxjwazkd034rp8dnv9"; + sha256 = "18bn0bpnrljx11gj95m2x5hlsnb8jkivlm6b1xx035ldgj1svgzh"; }; propagatedBuildInputs = with pythonPackages; [ From d7b8f68c05da04f6b3931d590b2d97e537963b76 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Fri, 21 Sep 2018 20:08:02 +0200 Subject: [PATCH 180/218] pythonPackages.dependency-injector: 3.13.1 -> 3.13.2 (#47139) --- .../python-modules/dependency-injector/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 6eec8ab91cd2..05f1c965f401 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ stdenv, buildPythonPackage, fetchPypi, six, unittest2 }: buildPythonPackage rec { pname = "dependency-injector"; - version = "3.13.1"; + version = "3.13.2"; src = fetchPypi { inherit pname version; - sha256 = "0bmcgdfjavgxdzkb904q968ig1x44arvpj2m4rpm5nc9vhhgq43q"; + sha256 = "0kgb40qspibr1x8ksv0whrr7v0jy20dnqzmc591hm2y4kwzl5hdw"; }; - # TODO: Enable tests after upstream merges https://github.com/ets-labs/python-dependency-injector/pull/204 - doCheck = false; - propagatedBuildInputs = [ six ]; + checkInputs = [ unittest2 ]; + + checkPhase = '' + unit2 discover tests/unit + ''; meta = with stdenv.lib; { description = "Dependency injection microframework for Python"; From 3ac97c054f9fc35d0872a6e05dbfe839a07ec73d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 21 Sep 2018 11:45:07 -0700 Subject: [PATCH 181/218] lgogdownloader: 3.3 -> 3.4 (#47039) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lgogdownloader/versions --- pkgs/games/lgogdownloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index ba273cfb6b97..4d4b46054c28 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lgogdownloader-${version}"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "056idwwxjcp2zjqk5h7l3py1h45sax4vbsm93bz9shnfx1s1h3gc"; + sha256 = "155vnz4w2v5d3yihwzq8yi406g19kc7banzlarhlcp3j11riwd24"; }; nativeBuildInputs = [ cmake pkgconfig help2man ]; From a526719184e6dbfff9992bdac52ce3d65ec09fa7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 21 Sep 2018 21:43:23 +0200 Subject: [PATCH 182/218] signal-desktop: 1.16.1 -> 1.16.2 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 040f5912db4b..8bacf73a80f1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.16.1"; + version = "1.16.2"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1qlibn6k5zbjw9bni2l20qx58jcpwrl99awdmgha1fzmpjkn6bl5"; + sha256 = "1j1785sc8pmrhi8yhlv4brxn7zrd33skgkkvzfl60nqkh2nybh3y"; }; phases = [ "unpackPhase" "installPhase" ]; From eb3bb7c7f631af80acd81aaf9fc78dcb9a0c9a92 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 21 Sep 2018 12:46:57 -0700 Subject: [PATCH 183/218] Revert "burp: 2.1.32 -> 2.2.4" From 4a68689bb4956364b95f49a94dfd64284e8abc16 Mon Sep 17 00:00:00 2001 From: Valentin Heidelberger <31535155+va1entin@users.noreply.github.com> Date: Fri, 21 Sep 2018 23:29:29 +0200 Subject: [PATCH 184/218] youtube-dl: 2018.09.10 -> 2018.09.18 (#47151) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d688e5fe6625..7e79614c04ca 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.09.10"; + version = "2018.09.18"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "12gd84i5drc2z4wzah7r2vj8fkj9yilm7q8dm7q9n95abrdb7sh8"; + sha256 = "0mlsdmddmyy3xaqy366k48xds14g17l81al3kglndjkbrrji63sb"; }; nativeBuildInputs = [ makeWrapper ]; From f0c0e2acc6082503dcb866206cac6843da8d4da8 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 21 Sep 2018 22:41:06 +0000 Subject: [PATCH 185/218] htslib: 1.7 -> 1.9 --- pkgs/development/libraries/science/biology/htslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index 48548bd72652..2ee9144b316d 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "htslib"; - version = "1.7"; + version = "1.9"; src = fetchurl { url = "https://github.com/samtools/htslib/releases/download/${version}/${name}.tar.bz2"; - sha256 = "be3d4e25c256acdd41bebb8a7ad55e89bb18e2fc7fc336124b1e2c82ae8886c6"; + sha256 = "16ljv43sc3fxmv63w7b2ff8m1s7h89xhazwmbm1bicz8axq8fjz0"; }; # perl is only used during the check phase. From cefd38b721e7dda1a841a12cd2eaec4825276202 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 21 Sep 2018 22:41:24 +0000 Subject: [PATCH 186/218] samtools: 1.8 -> 1.9 --- pkgs/applications/science/biology/samtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 87e708526ef7..c4b4bb522c40 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "samtools"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "https://github.com/samtools/samtools/releases/download/${version}/${name}.tar.bz2"; - sha256 = "05myg7bs90i68qbqab9cdg9rqj2xh39azibrx82ipzc5kcfvqhn9"; + sha256 = "10ilqbmm7ri8z431sn90lvbjwizd0hhkf9rcqw8j823hf26nhgq8"; }; nativeBuildInputs = [ perl ]; From 7545b7dcf3d5857d40bf3e9171074d46514d0f0e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 21 Sep 2018 22:41:51 +0000 Subject: [PATCH 187/218] platypus: 2017-03-07 -> 2018-07-22 --- pkgs/applications/science/biology/platypus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index 2947515652e2..323ca90f0a2a 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -4,13 +4,13 @@ let python = python27.withPackages (ps: with ps; [ cython ]); in stdenv.mkDerivation rec { name = "platypus-unstable-${version}"; - version = "2017-03-07"; + version = "2018-07-22"; src = fetchFromGitHub { owner = "andyrimmer"; repo = "Platypus"; - rev = "cbbd914"; - sha256 = "0xgj3pl7n4c12j5pp5qyjfk4rsvb5inwzrpcbhdf3br5f3mmdsb9"; + rev = "3e72641c69800da0cd4906b090298e654d316ee1"; + sha256 = "0nah6r54b8xm778gqyb8b7rsd76z8ji4g73sm6rvpw5s96iib1vw"; }; buildInputs = [ htslib python zlib makeWrapper ]; From e78cf6ecbacd4035243d1d75de4a62e407dcf324 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 21 Sep 2018 22:48:56 +0000 Subject: [PATCH 188/218] python.pkgs.pysam: 0.13.0 -> 0.15.1 --- pkgs/development/python-modules/pysam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 9d6cbacc9589..3138c114e697 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysam"; - version = "0.13.0"; + version = "0.15.1"; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "v${version}"; - sha256 = "1lwbcl38w1x0gciw5psjp87msmv9zzkgiqikg9b83dqaw2y5az1i"; + sha256 = "1vj367w6xbn9bpmksm162l1aipf7cj97h1q83y7jcpm33ihwpf7x"; }; buildInputs = [ bzip2 curl cython lzma zlib ]; From 4c9898108d74ab52cbe0d64166a4a16f25afa15f Mon Sep 17 00:00:00 2001 From: jeschli Date: Fri, 21 Sep 2018 18:22:47 +0200 Subject: [PATCH 189/218] pev: init at unstable-2018-07-22 --- maintainers/maintainer-list.nix | 5 ++++ .../tools/analysis/pev/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/analysis/pev/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 566414bf4439..c180ffffd859 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1847,6 +1847,11 @@ github = "jerith666"; name = "Matt McHenry"; }; + jeschli = { + email = "jeschli@gmail.com"; + github = "jeschli"; + name = "Markus Hihn"; + }; jethro = { email = "jethrokuan95@gmail.com"; github = "jethrokuan"; diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix new file mode 100644 index 000000000000..8e8f438b5e1a --- /dev/null +++ b/pkgs/development/tools/analysis/pev/default.nix @@ -0,0 +1,24 @@ +{ stdenv, openssl, fetchFromGitHub }: +stdenv.mkDerivation { + name = "pev-unstable-2018-07-22"; + buildInputs = [ openssl ]; + src = fetchFromGitHub { + owner = "merces"; + repo = "pev"; + rev = "aa4ef7f"; + sha256 = "00a3g486343lhqcsf4vrdy5xif6v3cgcf2y8yp5b96x15c0wid36"; + fetchSubmodules = true; + }; + + makeFlags = [ "prefix=$(out)" ]; + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "pev is a full-featured, open source, multiplatform command line toolkit to work with PE (Portable Executables) binaries."; + homepage = "http://pev.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.jeschli ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6448a0b4bd6..4502d61b5760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1487,6 +1487,8 @@ with pkgs; pbzx = callPackage ../tools/compression/pbzx { }; + pev = callPackage ../development/tools/analysis/pev { }; + photon = callPackage ../tools/networking/photon { }; playerctl = callPackage ../tools/audio/playerctl { }; From 7a036a5cbe4b9948ed72b7d16e44ee79172fecc4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Sep 2018 02:31:17 +0200 Subject: [PATCH 190/218] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.11.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/c75652c02be6a65822e661fda072ea610bd7ad13. --- .../haskell-modules/hackage-packages.nix | 625 +++++++++++++++--- 1 file changed, 525 insertions(+), 100 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1f6cb3e22200..6db88796b64c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -11333,8 +11333,8 @@ self: { }: mkDerivation { pname = "Lattices"; - version = "0.0.2"; - sha256 = "0c04nhcsqqja84bnha065k914rplffy7pawxijdnf9zvan3xpswf"; + version = "0.0.3"; + sha256 = "08v41np4v4v7dcv5959vvrg0l60xqk5wzi6y1gnm9q1i641r129k"; libraryHaskellDepends = [ array base HaskellForMaths ]; testHaskellDepends = [ array base HaskellForMaths HUnit test-framework @@ -28119,6 +28119,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {arbb_dev = null;}; + "arbor-postgres" = callPackage + ({ mkDerivation, base, bytestring, generic-lens, lens, network-uri + , optparse-applicative, postgresql-simple, text + }: + mkDerivation { + pname = "arbor-postgres"; + version = "0.0.2"; + sha256 = "04fly3bwzkv30j79rzm5mk5af3j28z6grnixl2ll3nnqmbwkwr2n"; + libraryHaskellDepends = [ + base bytestring generic-lens lens network-uri optparse-applicative + postgresql-simple text + ]; + description = "Convenience types and functions for postgresql-simple"; + license = stdenv.lib.licenses.mit; + }) {}; + "arbtt" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , bytestring-progress, conduit, containers, deepseq, directory @@ -31906,6 +31922,8 @@ self: { pname = "axel"; version = "0.0.5"; sha256 = "0xkkb78wjggv5vnrzxgfxfirsfzazdbhjsb8bg9xsl9jgafbz6fq"; + revision = "1"; + editedCabalFile = "0cyygds6277zbm01b8x7sx700c83z20hdimlnk4wzhm1v2zya3a4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -39079,6 +39097,77 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "broadcast-chan_0_2_0" = callPackage + ({ mkDerivation, async, base, criterion, deepseq, stm + , unliftio-core + }: + mkDerivation { + pname = "broadcast-chan"; + version = "0.2.0"; + sha256 = "1hpc7hi7xbzc03391byxgyinknsdgsd0dgsvs7m7g3jdpdckw5g7"; + libraryHaskellDepends = [ base unliftio-core ]; + benchmarkHaskellDepends = [ async base criterion deepseq stm ]; + description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "broadcast-chan-conduit" = callPackage + ({ mkDerivation, base, broadcast-chan, broadcast-chan-tests + , conduit, containers, resourcet, transformers, unliftio-core + }: + mkDerivation { + pname = "broadcast-chan-conduit"; + version = "0.2.0"; + sha256 = "020g2lrhp27dp5hyq23dhypxlmlymf6alw9jc5nwp4xv3992kfzx"; + libraryHaskellDepends = [ + base broadcast-chan conduit resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + base broadcast-chan-tests conduit containers + ]; + description = "Conduit-based parallel streaming code for broadcast-chan"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "broadcast-chan-pipes" = callPackage + ({ mkDerivation, base, broadcast-chan, broadcast-chan-tests + , containers, foldl, pipes, pipes-safe + }: + mkDerivation { + pname = "broadcast-chan-pipes"; + version = "0.2.0"; + sha256 = "04p9h3wzx4qv00yl1hfrxyhl5rylhxn1psfvkppdz5in2h88a7f7"; + libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ]; + testHaskellDepends = [ + base broadcast-chan-tests containers foldl pipes pipes-safe + ]; + description = "Pipes-based parallel streaming code for broadcast-chan"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "broadcast-chan-tests" = callPackage + ({ mkDerivation, async, base, broadcast-chan, clock, containers + , foldl, monad-loops, optparse-applicative, paramtree, random, stm + , tagged, tasty, tasty-golden, tasty-hunit, tasty-travis, temporary + , text + }: + mkDerivation { + pname = "broadcast-chan-tests"; + version = "0.2.0"; + sha256 = "1np0w4pv36hnifrklgybazhnwh4pfm73d7mx51p1flp9czaj0zz6"; + libraryHaskellDepends = [ + async base broadcast-chan clock containers optparse-applicative + paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis + temporary text + ]; + testHaskellDepends = [ + base broadcast-chan containers foldl monad-loops random + ]; + description = "Helpers for generating tests for broadcast-chan"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "broccoli" = callPackage ({ mkDerivation, base, containers, stm, time }: mkDerivation { @@ -39295,8 +39384,8 @@ self: { }: mkDerivation { pname = "btree"; - version = "0.3"; - sha256 = "058pry7g9sbmd0crd1gdpsj9ynvyfcyyvlna1wb49my9m5qmxp79"; + version = "0.3.1"; + sha256 = "071ghhjzg7c6m87nh2q53kqbff9hx782h6c1z5s9pwl2b7r8cc7g"; libraryHaskellDepends = [ base ghc-prim primitive ]; testHaskellDepends = [ base containers hashable MonadRandom primitive smallcheck tasty @@ -50116,21 +50205,22 @@ self: { "concraft" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring, cmdargs , comonad, containers, crf-chain1-constrained, crf-chain2-tiers - , data-lens, lazy-io, monad-codec, monad-ox, sgd, tagset-positional - , temporary, text, text-binary, transformers, vector, vector-binary - , zlib + , data-lens, data-memocombinators, lazy-io, monad-codec, monad-ox + , parallel, pedestrian-dag, sgd, tagset-positional, temporary, text + , text-binary, transformers, vector, vector-binary, zlib }: mkDerivation { pname = "concraft"; - version = "0.9.4"; - sha256 = "17q7mhf0n9pnxhvwk3yy61ljfifz8nhld1xhhnn13fldq34663q3"; + version = "0.11.0"; + sha256 = "07da6r8rw4vphr7q5i0lfap80vlbq1jm9lsbjp6khc7n59l5b2j7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base binary bytestring cmdargs comonad containers - crf-chain1-constrained crf-chain2-tiers data-lens lazy-io - monad-codec monad-ox sgd tagset-positional temporary text - text-binary transformers vector vector-binary zlib + crf-chain1-constrained crf-chain2-tiers data-lens + data-memocombinators lazy-io monad-codec monad-ox parallel + pedestrian-dag sgd tagset-positional temporary text text-binary + transformers vector vector-binary zlib ]; description = "Morphological disambiguation based on constrained CRFs"; license = stdenv.lib.licenses.bsd3; @@ -50161,21 +50251,28 @@ self: { "concraft-pl" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, concraft - , containers, lazy-io, mtl, network, process, sgd, split - , tagset-positional, text, transformers + , containers, crf-chain1-constrained, crf-chain2-tiers, dhall + , filepath, http-types, lazy-io, lens, mtl, network, pedestrian-dag + , process, scotty, sgd, split, tagset-positional, text + , transformers, vector, wreq }: mkDerivation { pname = "concraft-pl"; - version = "0.7.4"; - sha256 = "0yhq3vdg7l0ibhv0pxj70jm5lrfjk3k0xd1p6ap6im4rh3xxvgw3"; + version = "2.0.2"; + sha256 = "0vl49khchpsyxlwxa55xpah8gnjqgfx0vb9jrjzdbfaj293g77sm"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring concraft containers lazy-io mtl - network process sgd split tagset-positional text transformers + aeson base binary bytestring concraft containers + crf-chain1-constrained crf-chain2-tiers dhall http-types lazy-io + lens mtl network pedestrian-dag process scotty sgd split + tagset-positional text transformers vector wreq + ]; + executableHaskellDepends = [ + base bytestring cmdargs concraft containers crf-chain1-constrained + dhall filepath pedestrian-dag sgd tagset-positional text ]; - executableHaskellDepends = [ cmdargs ]; description = "Morphological tagger for Polish"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -54065,16 +54162,18 @@ self: { "crf-chain1-constrained" = callPackage ({ mkDerivation, array, base, binary, containers, data-lens - , logfloat, monad-codec, parallel, random, sgd, vector - , vector-binary, vector-th-unbox + , data-memocombinators, logfloat, monad-codec, parallel + , pedestrian-dag, random, sgd, vector, vector-binary + , vector-th-unbox }: mkDerivation { pname = "crf-chain1-constrained"; - version = "0.3.2"; - sha256 = "02xf9q96rlmmfcdz45bpbsdi0ki7mdrdwzg2zph7b55jwsnb4fja"; + version = "0.4.0"; + sha256 = "1mqprywxh51hvbchw1pvg66bsdf24rx6ywk06z98sx88rlvc4a2q"; libraryHaskellDepends = [ - array base binary containers data-lens logfloat monad-codec - parallel random sgd vector vector-binary vector-th-unbox + array base binary containers data-lens data-memocombinators + logfloat monad-codec parallel pedestrian-dag random sgd vector + vector-binary vector-th-unbox ]; description = "First-order, constrained, linear-chain conditional random fields"; license = stdenv.lib.licenses.bsd3; @@ -54101,16 +54200,17 @@ self: { "crf-chain2-tiers" = callPackage ({ mkDerivation, array, base, binary, comonad, containers - , data-lens, logfloat, monad-codec, parallel, sgd, vector - , vector-binary, vector-th-unbox + , data-lens, data-memocombinators, logfloat, monad-codec, parallel + , pedestrian-dag, sgd, vector, vector-binary, vector-th-unbox }: mkDerivation { pname = "crf-chain2-tiers"; - version = "0.2.4"; - sha256 = "0sxa5rsla676x47a1l8cvypccyl8vi7y68fnbnrk7r20ahw6vxi1"; + version = "0.3.0"; + sha256 = "1iv86nscnrvy2yskpx4xilzqbz7y2gv9kzvlgz2h44svhshnypar"; libraryHaskellDepends = [ - array base binary comonad containers data-lens logfloat monad-codec - parallel sgd vector vector-binary vector-th-unbox + array base binary comonad containers data-lens data-memocombinators + logfloat monad-codec parallel pedestrian-dag sgd vector + vector-binary vector-th-unbox ]; description = "Second-order, tiered, constrained, linear conditional random fields"; license = stdenv.lib.licenses.bsd3; @@ -55401,6 +55501,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "css-syntax_0_1_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, directory, hspec + , QuickCheck, scientific, text + }: + mkDerivation { + pname = "css-syntax"; + version = "0.1.0.0"; + sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh"; + libraryHaskellDepends = [ base scientific text ]; + testHaskellDepends = [ + base directory hspec QuickCheck scientific text + ]; + benchmarkHaskellDepends = [ + base criterion deepseq directory scientific text + ]; + description = "High-performance CSS tokenizer and serializer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "css-text" = callPackage ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: mkDerivation { @@ -81510,21 +81630,21 @@ self: { }) {}; "geojson" = callPackage - ({ mkDerivation, aeson, base, bytestring, hlint, lens, scientific - , semigroups, tasty, tasty-hspec, tasty-quickcheck, text - , transformers, validation, vector + ({ mkDerivation, aeson, base, bytestring, deepseq, hlint, lens + , scientific, semigroups, tasty, tasty-hspec, tasty-quickcheck + , text, transformers, validation, vector }: mkDerivation { pname = "geojson"; - version = "1.3.3"; - sha256 = "17ra6kb2bgz9ydhqhgp00wmpd3dqxqgc89wifnn3qqk0rqwsqilz"; + version = "2.0.0"; + sha256 = "0pbdd34z09l7z4alqs92x6aw0s74rcv6hs5nr7gqrhc0wzrsmi5q"; libraryHaskellDepends = [ - aeson base lens scientific semigroups text transformers validation - vector + aeson base deepseq lens scientific semigroups text transformers + validation vector ]; testHaskellDepends = [ aeson base bytestring hlint tasty tasty-hspec tasty-quickcheck text - validation + validation vector ]; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; @@ -83599,6 +83719,29 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gtk_3_0_25" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk + , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject + , gi-pango, gtk3, haskell-gi, haskell-gi-base + , haskell-gi-overloading, text, transformers + }: + mkDerivation { + pname = "gi-gtk"; + version = "3.0.25"; + sha256 = "0l6xnh85agjagdmjy72akvxviwkzyngh7rii5idrsd62bb27abx1"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf + gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gtk3 ]; + doHaddock = false; + description = "Gtk bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {gtk3 = pkgs.gnome3.gtk;}; + "gi-gtk-declarative" = callPackage ({ mkDerivation, base, gi-gobject, gi-gtk, haskell-gi , haskell-gi-base, haskell-gi-overloading, mtl, text @@ -83651,6 +83794,24 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {}; + "gi-gtk-hs_0_3_6_2" = callPackage + ({ mkDerivation, base, base-compat, containers, gi-gdk + , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl + , text, transformers + }: + mkDerivation { + pname = "gi-gtk-hs"; + version = "0.3.6.2"; + sha256 = "04gksr27nqzx77c8kv2c94ysf1pz3nwhvnxvbz8h7cn4hzvzhb8z"; + libraryHaskellDepends = [ + base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject + gi-gtk haskell-gi-base mtl text transformers + ]; + description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gi-gtkosxapplication" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-gobject, gi-gtk, gtk-mac-integration-gtk3, haskell-gi @@ -86462,8 +86623,8 @@ self: { }: mkDerivation { pname = "goatee"; - version = "0.3.1.2"; - sha256 = "1lz14w17yn92icdiz8i4435m4qli158infxq02ry6pap94kk78d9"; + version = "0.3.1.3"; + sha256 = "16nsgb1gf7mn35pchigrankl8q7p6cvgsxzbb3ab93jqm8kjxmyn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers mtl parsec template-haskell @@ -86480,8 +86641,8 @@ self: { }: mkDerivation { pname = "goatee-gtk"; - version = "0.3.1.2"; - sha256 = "19qgkrv22jffvy27ykqyhgqw2qak4888r1d3x1lfs48r3bisli2h"; + version = "0.3.1.3"; + sha256 = "0sp819fzgflsfj1glgdmw2qhb97rzdy6nargdmwvaxfay925p8aw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -92102,8 +92263,8 @@ self: { pname = "hackage-security"; version = "0.5.3.0"; sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "2"; - editedCabalFile = "0hwv588hwzlhzck7lhlhmnz4vv05mmfxmx1vmk0b9gwvlv7wfjc3"; + revision = "3"; + editedCabalFile = "07h13j203wafvimfhswpjl2a43iaavy9579hm16z5m565m7f8hwy"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -95189,8 +95350,8 @@ self: { pname = "hasbolt"; version = "0.1.3.0"; sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx"; - revision = "2"; - editedCabalFile = "1isygckkasffk06bd6023imr51c7l9cdvk4vf2vgv9x10v8kpp37"; + revision = "3"; + editedCabalFile = "0j9njdb6x5ibx113bprsq2i0jmrigdli23pjabxam9q07979c9ac"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default hex network text transformers @@ -96397,6 +96558,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_21_2" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.21.2"; + sha256 = "075x1jxm1r038ajy0raxrm2m3d1j7lc91cq9ik26fvp1vd6p13xg"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading_0_0" = callPackage ({ mkDerivation }: mkDerivation { @@ -97123,6 +97297,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-exts_1_20_3" = callPackage + ({ mkDerivation, array, base, containers, directory, filepath + , ghc-prim, happy, mtl, pretty, pretty-show, smallcheck, tasty + , tasty-golden, tasty-smallcheck + }: + mkDerivation { + pname = "haskell-src-exts"; + version = "1.20.3"; + sha256 = "1a74s4zarxdvhnflkxy13pawbfcdhyrb6gkdx0si8spv66knhgj3"; + libraryHaskellDepends = [ array base ghc-prim pretty ]; + libraryToolDepends = [ happy ]; + testHaskellDepends = [ + base containers directory filepath mtl pretty-show smallcheck tasty + tasty-golden tasty-smallcheck + ]; + doCheck = false; + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-exts-observe" = callPackage ({ mkDerivation, base, haskell-src-exts, Hoed }: mkDerivation { @@ -98782,20 +98977,23 @@ self: { }) {}; "hasktags" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json - , microlens-platform, utf8-string + ({ mkDerivation, base, bytestring, containers, directory, filepath + , HUnit, json, microlens-platform, optparse-applicative + , utf8-string }: mkDerivation { pname = "hasktags"; - version = "0.70.1"; - sha256 = "01ngdfaiwlzwai34wmhi7wysk6raxb465v0imyn7j3ibk374af5v"; + version = "0.71.2"; + sha256 = "1s2k9qrgy1jily96img2pmn7g35mwnnfiw6si3aw32jfhg5zsh1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory filepath json microlens-platform utf8-string ]; - executableHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ + base containers directory filepath optparse-applicative + ]; testHaskellDepends = [ base bytestring directory filepath HUnit json microlens-platform utf8-string @@ -104691,6 +104889,8 @@ self: { pname = "hledger"; version = "1.10"; sha256 = "1ly4sp0lhb3w5nrd77xd84bcyvm000fwwjipm7gq8bjhabw20i7n"; + revision = "1"; + editedCabalFile = "1kj1by80j7f6rzwfccwl2cp53bb3lyivh8a8xnawdyxab1pkyz34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104864,6 +105064,8 @@ self: { pname = "hledger-lib"; version = "1.10"; sha256 = "1kj3376gaaq39rwfyhfg7npdsy7z561184wia4rc8ijzf0isz2p1"; + revision = "1"; + editedCabalFile = "1b6hj4w1qfh1q8c3ikx5sn8z70cfdmqi4iy3a3l64q4x1j4jgyic"; libraryHaskellDepends = [ ansi-terminal array base base-compat-batteries blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq @@ -104894,6 +105096,8 @@ self: { pname = "hledger-ui"; version = "1.10.1"; sha256 = "1h4hhsyajpiydvs1p6f4z1s3kblyfn4lvnwwbar6lj4z5jfizm67"; + revision = "1"; + editedCabalFile = "1xvppxdkrk64mpqb64r016xshxqq25zzflbysmldgiqm1ibngy1g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -104939,6 +105143,8 @@ self: { pname = "hledger-web"; version = "1.10"; sha256 = "1hfl9kr3h9lcmy512s3yiv3rp31md7kw5n1145khj2j3l8qd3py9"; + revision = "1"; + editedCabalFile = "0zzgc6mjia06fwvjwpzzczh0p9k0a6bi2lib6zq5k1briq4gqblm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115456,6 +115662,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_6_2_17" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, exceptions + , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups + , transformers, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.2.17"; + sha256 = "184ymryvfj3s6bc3igahfyd8k9cqf59vmpb9g3afh8xpicpmmiv6"; + libraryHaskellDepends = [ + base bytestring mmap semigroups transformers vector + ]; + testHaskellDepends = [ + base bytestring directory exceptions hedgehog hspec + hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap semigroups transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -125049,8 +125279,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.2.0"; - sha256 = "0h6v9jsdc6r1zqz4wgvqr3y0ghqprjbfhlgmwh6q2cjixm3mxw1x"; + version = "0.5.0.0"; + sha256 = "1wvsk4lnkjpi38z7f9w8dafsw0cc1cgi8q2fsrqc0f7xv1qgzjb3"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions exceptions http-client http-types katip retry scientific semigroups @@ -127601,6 +127831,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c_0_8_2" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.8.2"; + sha256 = "05ff3ywh2lpxgd00nv6y3jnqpdl6bg0f2yn3csd043rv4srd6adp"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath pretty + process syb + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -128246,6 +128495,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-ocaml" = callPackage + ({ mkDerivation, alex, array, base, containers, data-default + , extensible-effects, happy, interpolate, lens, megaparsec, mtl + , prettyprinter, string-qq, tasty, tasty-hunit, zlib + }: + mkDerivation { + pname = "language-ocaml"; + version = "0.1.31"; + sha256 = "1vkqy5hdyqq5c22cccyvj1ci5srimpd5w8qwrwrrq9d5yai061w6"; + libraryHaskellDepends = [ + array base containers data-default extensible-effects interpolate + lens megaparsec mtl prettyprinter string-qq tasty tasty-hunit + ]; + libraryPkgconfigDepends = [ zlib ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base interpolate megaparsec prettyprinter string-qq tasty + tasty-hunit + ]; + description = "Language tools for manipulating OCaml programs in Haskell"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) zlib;}; + "language-openscad" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -136139,6 +136411,37 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "magicbane_0_4_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, bytestring + , conduit, conduit-combinators, data-has, ekg-core, ekg-wai, envy + , errors, exceptions, fast-logger, http-api-data, http-client + , http-client-tls, http-conduit, http-link-header, http-types + , lifted-base, monad-control, monad-logger, monad-metrics + , mono-traversable, mtl, network-uri, raw-strings-qq, refined, rio + , rio-orphans, servant-server, split, string-conversions, text + , transformers, transformers-base, unliftio, unliftio-core + , unordered-containers, wai, wai-cli, wai-middleware-metrics + }: + mkDerivation { + pname = "magicbane"; + version = "0.4.0"; + sha256 = "0n2yn3jbklibb21pm2ifiy9035d3xmrh8cgywnpawm51p5q3klwl"; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base bytestring conduit + conduit-combinators data-has ekg-core ekg-wai envy errors + exceptions fast-logger http-api-data http-client http-client-tls + http-conduit http-link-header http-types lifted-base monad-control + monad-logger monad-metrics mono-traversable mtl network-uri + raw-strings-qq refined rio rio-orphans servant-server split + string-conversions text transformers transformers-base unliftio + unliftio-core unordered-containers wai wai-cli + wai-middleware-metrics + ]; + description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "magico" = callPackage ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { @@ -137195,6 +137498,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "markdown_0_1_17_4" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , bytestring, call-stack, conduit, conduit-extra, containers + , data-default, directory, filepath, hspec, text, transformers + , xml-conduit, xml-types, xss-sanitize + }: + mkDerivation { + pname = "markdown"; + version = "0.1.17.4"; + sha256 = "1m7xf3r7wvpzdj2zic90w5b6adnjb6mjq9mycbnzcjibpr1fgqy2"; + libraryHaskellDepends = [ + attoparsec base blaze-html blaze-markup conduit conduit-extra + containers data-default text transformers xml-conduit xml-types + xss-sanitize + ]; + testHaskellDepends = [ + base blaze-html bytestring call-stack conduit conduit-extra + containers directory filepath hspec text transformers + ]; + description = "Convert Markdown to HTML, with XSS protection"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "markdown-kate" = callPackage ({ mkDerivation, attoparsec, attoparsec-conduit, base, blaze-html , conduit, containers, data-default, highlighting-kate, hspec @@ -143683,7 +144010,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "morte_1_7_0" = callPackage + "morte_1_7_1" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, formatting, http-client , http-client-tls, microlens, microlens-mtl, mtl @@ -143693,8 +144020,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.7.0"; - sha256 = "1q2na2xw70jr71v1ysscqf3v3f2hvn4f0lxkh4dgsdy8986b41cl"; + version = "1.7.1"; + sha256 = "1ff9h3zzcz59q07v0yx93v537z6swy65j88z9cn6mgfjrxjmqx2b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -148300,8 +148627,8 @@ self: { }: mkDerivation { pname = "network-messagepack-rpc"; - version = "0.1.0.0"; - sha256 = "0yqisywmhl0y6f88ifpkv8dlldg5s2c2h8z8cv6mhhqj4qdzp1h3"; + version = "0.1.1.0"; + sha256 = "13q3dr0l5a5yd693hb2h5nw86kxcw7vbm41dw3lbky7jr8hh2r0h"; libraryHaskellDepends = [ base bytestring data-msgpack safe-exceptions text unordered-containers @@ -148317,8 +148644,8 @@ self: { }: mkDerivation { pname = "network-messagepack-rpc-websocket"; - version = "0.1.0.0"; - sha256 = "1q7ckch5z08wxrdsv62z07ivdihqvmcwfg2pgcbf66dhgc9bq4f6"; + version = "0.1.1.0"; + sha256 = "05cd6cqyydjwymnk8rscqngvz3knyibl674rcbjpz28him6gbc7d"; libraryHaskellDepends = [ base network-messagepack-rpc text websockets wss-client ]; @@ -154716,14 +155043,14 @@ self: { "pandoc-crossref" = callPackage ({ mkDerivation, base, containers, data-accessor , data-accessor-template, data-accessor-transformers, data-default - , deepseq, directory, filepath, hspec, mtl, open-browser + , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb , template-haskell, temporary, text, utility-ht }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.2.1"; - sha256 = "0rxinqgfri1zlq1di4dx949migm3j76lvb10hvmpa4rxz0fkq0l6"; + version = "0.3.3.0"; + sha256 = "0gnchg8z07g95wrsj9ywd308gy3h6ihrg7p50rw1dsszrdbfldiw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -154736,7 +155063,7 @@ self: { executableHaskellDepends = [ base containers data-accessor data-accessor-template data-accessor-transformers data-default deepseq directory filepath - mtl open-browser optparse-applicative pandoc pandoc-types + gitrev mtl open-browser optparse-applicative pandoc pandoc-types roman-numerals syb template-haskell temporary text utility-ht ]; testHaskellDepends = [ @@ -155731,8 +156058,8 @@ self: { }: mkDerivation { pname = "paramtree"; - version = "0.1.1"; - sha256 = "1k6bcx0h4prg7a85knhaw4z7vh9gilc9m1y66r9qrhj2fqi0ilj3"; + version = "0.1.1.1"; + sha256 = "0ls9wzmz5lk7gyl8lx9cjs49zpwhrv955fs5q6ypv7bpbvjbchs1"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base bytestring tasty tasty-golden tasty-hunit temporary @@ -157640,6 +157967,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pedestrian-dag" = callPackage + ({ mkDerivation, array, base, binary, containers }: + mkDerivation { + pname = "pedestrian-dag"; + version = "0.2.0"; + sha256 = "075m58nmls893vis3l55dix8mrciwl2r8kz1s18mgwhxvadm4gdp"; + libraryHaskellDepends = [ array base binary containers ]; + description = "A pedestrian implementation of directed acyclic graphs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "peg" = callPackage ({ mkDerivation, base, containers, filepath, haskeline, logict, mtl , parsec @@ -161244,6 +161582,55 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "planet-mitchell" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, ansi-terminal + , approximate, array, async, atomic-primops, base, base-orphans + , base16-bytestring, bits, bytestring, bytestring-lexing + , case-insensitive, cborg, comonad, compact, constraints + , containers, contravariant, contravariant-extras, deepseq + , distributive, dlist, double-conversion, Earley, envparse, erf + , exceptions, extra, fgl, filepath, foldl, free, gauge + , generic-aeson, half, hashable, heaps, hedgehog + , integer-logarithms, lens, lens-aeson, list-transformer, logict + , managed, megaparsec, mmorph, monad-ste, mtl, multiset, mwc-random + , network, network-info, network-uri, nf, optparse-applicative + , parallel, parser-combinators, pointed, prettyprinter + , prettyprinter-ansi-terminal, primitive, profunctors, psqueues + , reactive-banana, reflection, regex-applicative, scientific + , semigroupoids, semigroups, semilattices, serialise, split, stm + , stm-chans, stm-containers, tagged, text, text-short, time + , transformers, transformers-base, transformers-compat + , typed-process, unagi-chan, unix, unliftio, unordered-containers + , utf8-string, uuid, uuid-types, vault, vector, vector-builder + , weigh, writer-cps-mtl + }: + mkDerivation { + pname = "planet-mitchell"; + version = "0.0.0"; + sha256 = "1grz5vbcz169bw9w4b85w7g59hfsif99qg11x0nwm5jb9a6chkhp"; + libraryHaskellDepends = [ + aeson aeson-pretty aeson-qq ansi-terminal approximate array async + atomic-primops base base-orphans base16-bytestring bits bytestring + bytestring-lexing case-insensitive cborg comonad compact + constraints containers contravariant contravariant-extras deepseq + distributive dlist double-conversion Earley envparse erf exceptions + extra fgl filepath foldl free gauge generic-aeson half hashable + heaps hedgehog integer-logarithms lens lens-aeson list-transformer + logict managed megaparsec mmorph monad-ste mtl multiset mwc-random + network network-info network-uri nf optparse-applicative parallel + parser-combinators pointed prettyprinter + prettyprinter-ansi-terminal primitive profunctors psqueues + reactive-banana reflection regex-applicative scientific + semigroupoids semigroups semilattices serialise split stm stm-chans + stm-containers tagged text text-short time transformers + transformers-base transformers-compat typed-process unagi-chan unix + unliftio unordered-containers utf8-string uuid uuid-types vault + vector vector-builder weigh writer-cps-mtl + ]; + description = "Planet Mitchell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plankton" = callPackage ({ mkDerivation, adjunctions, base, protolude }: mkDerivation { @@ -163690,19 +164077,17 @@ self: { "potoki-cereal" = callPackage ({ mkDerivation, acquire, attoparsec, base, base-prelude - , bytestring, cereal, directory, potoki, potoki-core, QuickCheck - , quickcheck-instances, rerebase, tasty, tasty-hunit + , bytestring, cereal, directory, potoki, potoki-core, profunctors + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit , tasty-quickcheck, text }: mkDerivation { pname = "potoki-cereal"; - version = "0.3.0.1"; - sha256 = "0dm5yvh8a8sgrqvgkl48zpn5c8ymz9h83nw44icnhqirg1hrkhvi"; - revision = "1"; - editedCabalFile = "1jp7vbxipvsg6shc03j0ms6apzmvb38nxpvwkbsk34vll4mzarj4"; + version = "0.3.1"; + sha256 = "1y6sgfafhnbgaifspli90ww4aj4r69vhkgl9v1jvspgrk67nzssj"; libraryHaskellDepends = [ acquire attoparsec base base-prelude bytestring cereal potoki-core - text + profunctors text ]; testHaskellDepends = [ directory potoki QuickCheck quickcheck-instances rerebase tasty @@ -169232,8 +169617,8 @@ self: { }: mkDerivation { pname = "quickcheck-classes"; - version = "0.4.14.2"; - sha256 = "11f9f7s6bag77a2kbhjwhhrcf1afbz18gnn3a4p0h2hav8b5lhcj"; + version = "0.4.14.3"; + sha256 = "1vzn20bci14hlkbdrgjqzb16yyqg332rb1aspsdh19grj0cvr4l8"; libraryHaskellDepends = [ aeson base bifunctors containers primitive QuickCheck semigroupoids semigroups semirings tagged transformers @@ -174099,8 +174484,8 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.0.4"; - sha256 = "048ymaxiayd948wwyrds5x2nz2spzizc6pwiaw3n62ynp6izkv94"; + version = "0.1.0.5"; + sha256 = "0yqv58ra2h7cmnwvbpbdxma69qr1n44gw8mckrr0sq38rah9dxg3"; libraryHaskellDepends = [ base exceptions protolude resourcet text transformers-base ]; @@ -180026,24 +180411,24 @@ self: { "sbv" = callPackage ({ mkDerivation, array, async, base, bytestring, containers - , crackNum, data-binary-ieee754, deepseq, directory, doctest - , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty - , process, QuickCheck, random, syb, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, time, z3 + , crackNum, deepseq, directory, doctest, filepath, generic-deriving + , ghc, Glob, hlint, mtl, pretty, process, QuickCheck, random + , reinterpret-cast, syb, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, time, z3 }: mkDerivation { pname = "sbv"; - version = "7.10"; - sha256 = "0bq3h0aidjdh7a9gp97mxfpng4x36mxyb4bgmj4pyjqdnbdgr05p"; + version = "7.11"; + sha256 = "16kbhpfpzqxhc1zbxpjyvq89bnmhgm20v48np53dhqbpwjnphvva"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async base containers crackNum data-binary-ieee754 deepseq - directory filepath generic-deriving ghc mtl pretty process - QuickCheck random syb template-haskell time + array async base containers crackNum deepseq directory filepath + generic-deriving ghc mtl pretty process QuickCheck random + reinterpret-cast syb template-haskell time ]; testHaskellDepends = [ - base bytestring containers data-binary-ieee754 directory doctest - filepath Glob hlint mtl QuickCheck random syb tasty tasty-golden + base bytestring containers directory doctest filepath Glob hlint + mtl QuickCheck random reinterpret-cast syb tasty tasty-golden tasty-hunit tasty-quickcheck template-haskell ]; testSystemDepends = [ z3 ]; @@ -181247,8 +181632,8 @@ self: { ({ mkDerivation, alex, array, base, bytestring, mtl, text }: mkDerivation { pname = "scythe"; - version = "0.1.0.0"; - sha256 = "00g6i3vihfrbrj98hpkrv4gqna7a4vyl6kwbzsj9ymx8jvv0jdaq"; + version = "0.2.0.0"; + sha256 = "0lh3f5xj6jc1jlg049vf63gvkw93nv8xd6b4b6jpk4nyv9fw2sqn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring mtl text ]; @@ -185680,8 +186065,8 @@ self: { }: mkDerivation { pname = "sgd"; - version = "0.3.7"; - sha256 = "1z4w81mbk2syrxacfrjb690ik6lcsh1fb7m3d65zlz37y3pk5q04"; + version = "0.4.0.1"; + sha256 = "05ngij0zigjxplw76qaczpd4dmdmqj23h8bfls5cd5s5sbxv5irb"; libraryHaskellDepends = [ base binary bytestring containers deepseq filepath lazy-io logfloat monad-par mtl primitive random temporary vector @@ -201106,8 +201491,8 @@ self: { }: mkDerivation { pname = "tagset-positional"; - version = "0.3.0"; - sha256 = "0x1mwwlwhka12bzshy0j0w7iq9ka6kn1jgsifi26jmg7zf79zydf"; + version = "0.3.1"; + sha256 = "1fhc0qzfqs2jw8lr8j7vsx72dv15vsvnvqvbim5jqjmq43f8h1zv"; libraryHaskellDepends = [ base binary containers parsec text text-binary ]; @@ -214037,7 +214422,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_3_0" = callPackage + "universum_1_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -214045,8 +214430,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.3.0"; - sha256 = "17ggcbkfympmj0y99ycdvck2iliqscz4hp1wz6qgl0gmb3ywx0gp"; + version = "1.4.0"; + sha256 = "1qhpz4wlvhrdjb1pvs0lgm0pghrciqasb3378zw32lqh3pv2pnrk"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -217503,6 +217888,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_5_0" = callPackage + ({ mkDerivation, base, base-prelude, checkers, deepseq, hashable + , megaparsec, microlens, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.5.0"; + sha256 = "1g6db0ah78yk1m5wyxp0az7bzlbxsfkychqjcj423wzx90z7ww4w"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base base-prelude checkers megaparsec microlens QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vfr-waypoints" = callPackage ({ mkDerivation, base, containers, dimensional, fuzzy , geodetic-types, lens, monoid-subclasses, optparse-applicative @@ -222373,6 +222777,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wkt-geom" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, geojson + , hspec, lens, QuickCheck, scientific, trifecta, utf8-string + , vector + }: + mkDerivation { + pname = "wkt-geom"; + version = "0.0.1"; + sha256 = "069jwfycqjg5dz4w80ywwjn3pky5kzg7wlwd7qk9y8lwca0bv4ij"; + libraryHaskellDepends = [ + base binary bytestring geojson scientific trifecta utf8-string + vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base binary bytestring geojson hspec lens QuickCheck + scientific trifecta vector + ]; + description = "A parser of WKT, WKB and eWKB"; + license = stdenv.lib.licenses.asl20; + }) {}; + "wl-pprint" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -227382,8 +227807,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.5.1.0"; - sha256 = "18mm1394rs93cchzglwdhzh5sc025bglgrqi4c0hi5hhw893k38z"; + version = "0.5.2.0"; + sha256 = "0pf1bplly18rjhagzkqacbpi5wq78kisg0vz217yml5z0xwy1rkj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ From 2ffcbeda133775bc19b80623be29746ce75d7411 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 22 Sep 2018 13:20:45 +0200 Subject: [PATCH 191/218] ghc: add release version for 8.6.1 --- pkgs/development/compilers/ghc/8.6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 36ef9d0cc73d..d4f2f931c31c 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -78,12 +78,12 @@ let in stdenv.mkDerivation (rec { - version = "8.6.0.20180810"; + version = "8.6.1"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.6.1-beta1/ghc-${version}-src.tar.xz"; - sha256 = "0b3nyjs4lsh67lfw7wh7r7kkf4g2xiypdxd77aycmwd3pdxj09yw"; + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "0dkh7idgrqr567fq94a0f5x3w0r4cm2ydn51nb5wfisw3rnw499c"; }; enableParallelBuilding = true; From 230fd497383bee3d46d2a68da2481e3ece7620e8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 22 Sep 2018 19:46:21 +0800 Subject: [PATCH 192/218] weechat: Add version and meta to `buildEnv` package Currently the output from `nix search` and similar tools are lacking important meta data --- pkgs/applications/networking/irc/weechat/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index a9de275559db..bf5d06423142 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -145,9 +145,10 @@ in if configure == null then weechat else unwrapped = weechat; }; in buildEnv { - name = "weechat-bin-env"; + name = "weechat-bin-env-${weechat.version}"; paths = [ (mkWeechat "weechat") (mkWeechat "weechat-headless") ]; + meta = weechat.meta; } From 9e87b56dd1e20b1d0f5fce34694f4e1362afd3fb Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Sat, 22 Sep 2018 14:17:34 +0200 Subject: [PATCH 193/218] zathura: 0.4.0 -> 0.4.1 (#47140) This fixes the synctex-related build failure with texlive 2018 (currently on 18.09). --- pkgs/applications/misc/zathura/core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 001d70775d6d..56701cffb8cf 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -11,11 +11,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "zathura-core-${version}"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; - sha256 = "1j0yah09adv3bsjhhbqra5lambal32svk8fxmf89wwmcqrcr4qma"; + sha256 = "1znr3psqda06xklzj8mn452w908llapcg1rj468jwpg0wzv6pxfn"; }; nativeBuildInputs = [ From 1357f6492cdafcd0077f4357da6a33df287ef7fd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 22 Sep 2018 15:24:54 +0200 Subject: [PATCH 194/218] androidStudioPackages.{dev,canary}: 3.3.0.9 -> 3.3.0.10 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2385cd31cfaa..7b99e06446b3 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0mriakxxchc0wbqkl236pp4fsqbq3gb2qrkdg5hx9zz763dc59gp"; }; latestVersion = { # canary & dev - version = "3.3.0.9"; # "Android Studio 3.3 Canary 10" - build = "182.4996246"; - sha256Hash = "0g6hhfhlfj9szw48z22n869n6d0rw5fhljazj63dmw6i4v6rd92g"; + version = "3.3.0.10"; # "Android Studio 3.3 Canary 11" + build = "182.5012296"; + sha256Hash = "0gqwf904y2pvp10l96gr055gjl1zf9pkb7840abqhl26liliwdm4"; }; in rec { # Old alias From 8f5a37829d181d9dd3611c44178b8b41aede9161 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 22 Sep 2018 21:40:52 +0800 Subject: [PATCH 195/218] subsurface: 4.8.1 -> 4.8.2 --- pkgs/applications/misc/subsurface/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 1b998c48580e..50bb1df2eef2 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -4,14 +4,14 @@ }: let - version = "4.8.1"; + version = "4.8.2"; libdc = stdenv.mkDerivation rec { name = "libdivecomputer-ssrf-${version}"; src = fetchurl { url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz"; - sha256 = "1x6z08gfp9jldv7vcsdasjcarns43qns9cm8s9w27n0c2lvchjvy"; + sha256 = "167qan59raibmilkc574gdqxfjg2f5ww2frn86xzk2kn4qg8190w"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz"; - sha256 = "0758sw05gjy8sckvaqc0hmbh2kibmzapgp0hlk8rsp1vsldq4vd2"; + sha256 = "1fzrq6rqb6pzs36wxar2453cl509dqpcy9w7nq4gw7b1v2331wfy"; }; buildInputs = [ From 3d8f6b61885bce149e2b2482ae3710f0ca48adca Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Sat, 22 Sep 2018 22:07:34 +0800 Subject: [PATCH 196/218] abduco: refactor (compile on darwin) (#47124) --- pkgs/tools/misc/abduco/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index cdfb57fc5f0e..4fc254b76b40 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.unix; }; + CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + src = fetchurl { url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; sha256 = "1x1m58ckwsprljgmdy93mvgjyg9x3cqrzdf3mysp0mx97zhhj2f9"; From 4eebe205fe8287e0d2385ad15798d8b0146394dc Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Sat, 22 Sep 2018 22:18:47 +0800 Subject: [PATCH 197/218] dvtm: refactor (fix on darwin) (#47103) --- pkgs/tools/misc/dvtm/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix index f25d134ca790..58c602113ddb 100644 --- a/pkgs/tools/misc/dvtm/default.nix +++ b/pkgs/tools/misc/dvtm/default.nix @@ -9,6 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g"; }; + patches = [ + # https://github.com/martanne/dvtm/pull/69 + # Use self-pipe instead of signal blocking fixes issues on darwin. + (fetchurl { + url = "https://github.com/martanne/dvtm/commit/1f1ed664d64603f3f1ce1388571227dc723901b2.patch"; + sha256 = "1cby8x3ckvhzqa8yxlfrwzgm8wk7yz84kr9psdjr7xwpnca1cqrd"; + }) + ]; + + CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + postPatch = stdenv.lib.optionalString (customConfig != null) '' cp ${builtins.toFile "config.h" customConfig} ./config.h ''; @@ -28,7 +39,7 @@ stdenv.mkDerivation rec { description = "Dynamic virtual terminal manager"; homepage = http://www.brain-dump.org/projects/dvtm; license = licenses.mit; - platforms = platforms.linux; maintainers = [ maintainers.vrthra ]; + platforms = platforms.unix; }; } From c7706995244390ef76b5fdee72619b5f10fbd64f Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Sat, 22 Sep 2018 18:07:00 +0200 Subject: [PATCH 198/218] devpi-client: 3.1.0 -> 4.1.0, fix tests (#47142) --- pkgs/development/tools/devpi-client/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 26d96a641263..e70971b670c2 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -9,28 +9,28 @@ pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "devpi-client"; - version = "3.1.0"; + version = "4.1.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0w47x3lkafcg9ijlaxllmq4886nsc91w49ck1cd7vn2gafkwjkgr"; + sha256 = "0f5jkvxx9fl8v5vwbwmplqhjsdfgiib7j3zvn0zxd8krvi2s38fq"; }; checkInputs = with pythonPackages; [ - pytest webtest mock + pytest pytestflakes webtest mock devpi-server tox sphinx wheel git mercurial detox setuptools ]; checkPhase = '' export PATH=$PATH:$out/bin + export HOME=$TMPDIR # fix tests failing in sandbox due to "/homeless-shelter" # setuptools do not get propagated into the tox call (cannot import setuptools) rm testing/test_test.py # test_pypi_index_attributes tries to connect to upstream pypi - # test_download_release_error is fixed in the next release - py.test -k 'not test_pypi_index_attributes and not test_download_release_error' testing + py.test -k 'not test_pypi_index_attributes' testing ''; LC_ALL = "en_US.UTF-8"; From 1a5788010e65fc7a337ea2cc15be44ae32a4828f Mon Sep 17 00:00:00 2001 From: rbasso Date: Sat, 22 Sep 2018 13:09:41 -0300 Subject: [PATCH 199/218] exercism: 3.0.6 -> 3.0.9 (#47170) --- pkgs/applications/misc/exercism/default.nix | 4 +- pkgs/applications/misc/exercism/deps.nix | 76 ++++++++++----------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 4c5e9e5230a6..946f3695f166 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "exercism-${version}"; - version = "3.0.6"; + version = "3.0.9"; goPackagePath = "github.com/exercism/cli"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "0xr5bqzm0md1vllnr384k92k7w1nxzw9lhqgm23zkxx5a4vqzy56"; + sha256 = "0nr3dzipylicrbplh25dw0w84qklr0xcyq442i9aswzibqrb2vc6"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/exercism/deps.nix b/pkgs/applications/misc/exercism/deps.nix index ad93aa4e4373..10a6baa2241b 100644 --- a/pkgs/applications/misc/exercism/deps.nix +++ b/pkgs/applications/misc/exercism/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/blang/semver"; - rev = "3c1074078d32d767e08ab2c8564867292da86926"; - sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx"; + rev = "2ee87856327ba09384cabd113bc6b5d174e9ec0f"; + sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; }; } { @@ -23,8 +23,8 @@ fetch = { type = "git"; url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + rev = "629574ca2a5df945712d3079857300b5e4da0236"; + sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; + rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; + sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; }; } { @@ -59,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + rev = "be5ece7dd465ab0765a9682137865547526d1dfb"; + sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8"; }; } { @@ -68,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; - sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; + rev = "d0303fe809921458f417bcf828397a65db30a7e4"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-buffruneio"; - rev = "e2f66f8164ca709d4c21e815860afd2024e9b894"; - sha256 = "16h7fybbai45p5gn2la6z37a8h1ws6r3pg3nwqiw6gbbgjqicrbv"; + rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; + sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; - sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; + rev = "5ccdfb18c776b740aecaf085c4d9a2779199c279"; + sha256 = "1jl44j58y62rhnwkzw3mvcj725gdyzs45pq4ga81qqxwqxs3czsq"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "787d034dfe70e44075ccc060d346146ef53270ad"; - sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; + rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; + sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; }; } { @@ -113,8 +113,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"; + sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050"; }; } { @@ -122,8 +122,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1"; - sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; + rev = "b26b538f693051ac6518e65672de3144ce3fbedc"; + sha256 = "0pm3qlw35xygz9zz7hizlmin76wrfac8vsxvsd9i0zpnijbkmjv6"; }; } { @@ -131,8 +131,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; + rev = "0efa5202c04663c757d84f90f5219c1250baf94f"; + sha256 = "1sfd72zvw9lrzfc8haswhqf93bzm20q4yhbynm6n5fnnc56zn4gs"; }; } { @@ -140,8 +140,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "3ebe029320b2676d667ae88da602a5f854788a8a"; - sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp"; + rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"; + sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2"; }; } { @@ -149,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793"; - sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh"; + rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4"; + sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; }; } { @@ -158,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; + sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; }; } { @@ -167,8 +167,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd"; - sha256 = "0vx7mz18p480p7fh0w5jv6mfdbsswrlac1sz4i705q7q7ygz59lm"; + rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f"; + sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k"; }; } { @@ -176,8 +176,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "bd9dbc187b6e1dacfdd2722a87e83093c2d7bd6e"; - sha256 = "0zj8s3q2fznmap1nfr8pv4hz8xqixmkyhr6slq4baf8rvcb4mvbj"; + rev = "d8f5ea21b9295e315e612b4bcf4bedea93454d4d"; + sha256 = "1gy2y20glqqqcmmrcx2wrvk4h74h8im1nxvzi91i1mxjk7p185mv"; }; } { @@ -185,8 +185,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "0605a8320aceb4207a5fb3521281e17ec2075476"; - sha256 = "1pak7q9ivwxh5bnjk00pkrs9ri9vmbyccvza56fl6138w397h49j"; + rev = "3bd178b88a8180be2df394a1fbb81313916f0e7b"; + sha256 = "137pp3gz8ll08q0q434dn6472bbkv81h72qqqm9idhf7cc6f51w9"; }; } { @@ -194,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b"; + sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44"; }; } ] \ No newline at end of file From d1b97bcbe8dffdf53e1a81e0839cf42d397e9c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Fri, 21 Sep 2018 00:51:03 +0200 Subject: [PATCH 200/218] dune: 1.1.1 -> 1.2.1 --- pkgs/development/tools/ocaml/dune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/default.nix b/pkgs/development/tools/ocaml/dune/default.nix index a9ed66a8efe1..857d6ff1b7c2 100644 --- a/pkgs/development/tools/ocaml/dune/default.nix +++ b/pkgs/development/tools/ocaml/dune/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "dune-${version}"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; rev = "${version}"; - sha256 = "0v2pnxpmqsvrvidpwxvbsypzhqfdnjs5crjp9y61qi8nyj8d75zw"; + sha256 = "14m5zg1b6d0y03c5qsmqmwiwz2h0iys02rlgn6kzm519ck679bkq"; }; buildInputs = with ocamlPackages; [ ocaml findlib ]; From aefb40b671d76964623005cf11a4b251c1267c14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Sep 2018 09:25:44 -0700 Subject: [PATCH 201/218] hylafaxplus: 5.6.0 -> 5.6.1 (#47045) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/hylafaxplus/versions --- pkgs/servers/hylafaxplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 410d24974268..dc53ee36f702 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -30,8 +30,8 @@ let name = "hylafaxplus-${version}"; - version = "5.6.0"; - sha256 = "128514kw9kb5cvznm87z7gis1mpyx4bcqrxx4xa7cbfj1v3v81fr"; + version = "5.6.1"; + sha256 = "100jcnkf44g659fh732a3ic2ik6l619cv0zhhp37n2kaydv876s1"; configSite = substituteAll { name = "hylafaxplus-config.site"; From 3b0d3036044f9d6e46e0b9b13eecd11d5728b34d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 22 Sep 2018 18:35:51 +0200 Subject: [PATCH 202/218] gnuradio-rds: 2016-08-27 -> 1.0.0 --- pkgs/applications/misc/gnuradio/rds.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnuradio/rds.nix b/pkgs/applications/misc/gnuradio/rds.nix index 44ed89d9002d..b617791dc2e1 100644 --- a/pkgs/applications/misc/gnuradio/rds.nix +++ b/pkgs/applications/misc/gnuradio/rds.nix @@ -6,12 +6,12 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { name = "gnuradio-rds-${version}"; - version = "2016-08-27"; + version = "1.0.0"; src = fetchFromGitHub { owner = "bastibl"; repo = "gr-rds"; - rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc"; + rev = "$v{version}"; sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; }; From a8087e3bd70ddc13bcd491f117d5b5473c2f4c14 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sat, 22 Sep 2018 18:49:35 +0200 Subject: [PATCH 203/218] gitlab-runner: 11.2.0 -> 11.3.0 (#47167) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 0b6d0cd28efd..203e140b369e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "11.2.0"; + version = "11.3.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1dphrws6118l0ryvgny0z5h9fsdbwckm4x21bh8hwb6bxdbqr0yn"; + sha256 = "1xl48lrycwy4d7h83ydp9gj27d9mhbpa4xrd1bn7i3ad9lrn7xjz"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "162lzbi7z9afp470w0qkcja728jyb48s7krzinmvg45fb3fb0lfn"; + sha256 = "0afjg4hv9iy80anl5h7cnjdxzk4zrkj2zn3f4qsl9rf7354ik1zj"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1y4fb5jbks6xab7zim10s112h11bq04hh3lddmhm4f2nyqcmlrqh"; + sha256 = "0p992mm8zz30nx0q076g0waqvfknn05wyyr1n1sxglbh9nmym157"; }; patches = [ ./fix-shell-path.patch ]; From 1491d4f268421d64667dd136e4064a0550fc1bff Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 22 Sep 2018 15:02:54 +0000 Subject: [PATCH 204/218] yed: 3.18.1 -> 3.18.1.1 --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index a7cc7229d5b1..9100efc86394 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.18.1"; + version = "3.18.1.1"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "6aefd87cd925b4a4c86871a3772de243b4e520a86f82158189ae8c19a9a5ecf8"; + sha256 = "0jl0c18jkmy21ka5xgki8dqq2v8cy63qvmx3x01wrhiplmczn97y"; }; nativeBuildInputs = [ unzip makeWrapper ]; From 6adb944cb66c36a89dd9bffff21d4e81e96d85f3 Mon Sep 17 00:00:00 2001 From: Christian Kauhaus Date: Sat, 22 Sep 2018 19:09:33 +0200 Subject: [PATCH 205/218] lua: 5.2.3 -> 5.2.4 (#47126) Lua 5.2.4 is the EOL point release of the 5.2 series. --- pkgs/development/interpreters/lua-5/5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index 6d8de7bae27e..a8badf647c0c 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { name = "lua-${version}"; luaversion = "5.2"; - version = "${luaversion}.3"; + version = "${luaversion}.4"; src = fetchurl { url = "https://www.lua.org/ftp/${name}.tar.gz"; - sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk"; + sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"; }; buildInputs = [ readline ]; From 7a5483e8b469a43eec06f2d864139f093d1ac4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Rauscher?= Date: Sat, 22 Sep 2018 17:21:26 +0000 Subject: [PATCH 206/218] mopidy-iris: 3.26.1 -> 3.26.2 (#47161) --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 88aa47169985..be44112d82a8 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.26.1"; + version = "3.26.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0qa55mmkrig5jymhm0mrr9jvxzfb2j70b971big3ady038cqd6f5"; + sha256 = "04jg5k8znkn0iirfnsndm74f8mypj8zwj76j489l0m263k1kn715"; }; propagatedBuildInputs = [ From 5b3c8485d60475ce8b316eab6b56afa47e11dea6 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sat, 22 Sep 2018 18:23:31 +0100 Subject: [PATCH 207/218] sddm: link whole sddm directory, not just themes (#47174) --- nixos/modules/services/x11/display-managers/sddm.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 1635c0f9acc5..2a9826177737 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -263,7 +263,9 @@ in }; environment.etc."sddm.conf".source = cfgFile; - environment.pathsToLink = [ "/share/sddm/themes" ]; + environment.pathsToLink = [ + "/share/sddm" + ]; users.groups.sddm.gid = config.ids.gids.sddm; From ef04436f7bfd3a1173730540a244cd60bac99274 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 22 Sep 2018 10:44:33 -0700 Subject: [PATCH 208/218] latte-dock: 0.8.0 -> 0.8.1 (#47027) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/latte-dock/versions --- pkgs/applications/misc/latte-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index c22c014bf5f5..6d22be32afaf 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.8.0"; + version = "0.8.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; - sha256 = "1zg9r162r66vcvj5rzgy61mda89sk5yfy96g5p1aahbim0rgbdbs"; + sha256 = "1f480ahrsxrksiiyspg7kb1hnz4vcjbs3w039cjkq2vp4wvjd74q"; name = "${name}.tar.xz"; }; From 3063794c881391233b34a64dfc9f4c3317db1e9c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 22 Sep 2018 19:56:48 +0200 Subject: [PATCH 209/218] gnuradio-nacl: 2015-11-05 -> 2017-04-10 --- pkgs/applications/misc/gnuradio/nacl.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gnuradio/nacl.nix b/pkgs/applications/misc/gnuradio/nacl.nix index 28836958e98c..2f4b0e4e3eb6 100644 --- a/pkgs/applications/misc/gnuradio/nacl.nix +++ b/pkgs/applications/misc/gnuradio/nacl.nix @@ -7,13 +7,13 @@ assert pythonSupport -> python != null && swig != null; stdenv.mkDerivation rec { name = "gnuradio-nacl-${version}"; - version = "2015-11-05"; + version = "2017-04-10"; src = fetchFromGitHub { owner = "stwunsch"; repo = "gr-nacl"; - rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95"; - sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35"; + rev = "15276bb0fcabf5fe4de4e58df3d579b5be0e9765"; + sha256 = "018np0qlk61l7mlv3xxx5cj1rax8f1vqrsrch3higsl25yydbv7v"; }; nativeBuildInputs = [ pkgconfig ]; From f2ba1a4284c30af9071c7f5efbaa709beb8c18a0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 22 Sep 2018 20:12:23 +0200 Subject: [PATCH 210/218] tor-browser-bundle-bin: 8.0 -> 8.0.1 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index d9ff1b5c54d8..90287c05b5e4 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -103,7 +103,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "8.0"; + version = "8.0.1"; lang = "en-US"; @@ -113,7 +113,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "139cizh33x3nzr0f4b2q3cchrv9l01n3c2v0v0mghq30hap55p79"; + sha256 = "05k914066pk11qxbwr77g6v20cfc8h9mh9yc3bpsfy35p8sypv8c"; }; "i686-linux" = fetchurl { @@ -121,7 +121,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "1vw5wh193vs5x3wizz34m2nyzlxpn24727hdxqpiqwlhwhj7y3nx"; + sha256 = "1w2apsiimy6d5vpql37j5bmf8y8xhx4irryd5ad3vqqsr0x5wla7"; }; }; in From 0b82fbc3af2149f4db6da4150b35393569f6366f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 22 Sep 2018 20:22:57 +0200 Subject: [PATCH 211/218] php: Refactor so we can upgrade PHP per platform (#47162) This way we don't need to disable flags etc by platform and can still backport new versions to stable for linux even if there's a bug or something in the darwin build. --- pkgs/development/interpreters/php/default.nix | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index adffe647c365..5af569a5e7c8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -37,10 +37,7 @@ let , opensslSupport ? config.php.openssl or true , mbstringSupport ? config.php.mbstring or true , gdSupport ? config.php.gd or true - # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826 - # We need to disable the intl support on darwin. Whenever the upstream bug is - # fixed we should revert this to just just "config.php.intl or true". - , intlSupport ? (config.php.intl or true) && (!stdenv.isDarwin) + , intlSupport ? config.php.intl or true , exifSupport ? config.php.exif or true , xslSupport ? config.php.xsl or false , mcryptSupport ? config.php.mcrypt or true @@ -225,13 +222,35 @@ let }; in { - php71 = generic { - version = "7.1.22"; - sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8"; - }; + # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826 + # We can't update the darwin versions because they simply don't compile at + # all due to a bug in the intl extensions. + # + # The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10. - php72 = generic { - version = "7.2.10"; - sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1"; - }; + php71 = generic ( + if stdenv.isDarwin then + { + version = "7.1.20"; + sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs"; + } + else + { + version = "7.1.22"; + sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8"; + } + ); + + php72 = generic ( + if stdenv.isDarwin then + { + version = "7.2.8"; + sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z"; + } + else + { + version = "7.2.10"; + sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1"; + } + ); } From 13e738f1e89869f158035ac6c0b0c118ae5eaf04 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Sat, 22 Sep 2018 20:49:23 +0200 Subject: [PATCH 212/218] nixos/release.nix: run test for pgjwt (#47181) --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index d26aacb669aa..14983edb0ce7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -381,7 +381,7 @@ in rec { tests.pgmanage = callTest tests/pgmanage.nix {}; tests.postgis = callTest tests/postgis.nix {}; tests.powerdns = callTest tests/powerdns.nix {}; - #tests.pgjwt = callTest tests/pgjwt.nix {}; + tests.pgjwt = callTest tests/pgjwt.nix {}; tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {}; tests.printing = callTest tests/printing.nix {}; tests.prometheus = callTest tests/prometheus.nix {}; From 6e6e0a987bde5bdc0c7aa653b7446937135a53fc Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Sat, 22 Sep 2018 21:31:46 +0200 Subject: [PATCH 213/218] nixos/tests/codimd: fix non-deterministic failure (#47179) Test failed non-deterministically due to an obvious copy/paste error. Fix it and increase wait time to 10s (2s may not be enough on Hydra). --- nixos/tests/codimd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/codimd.nix b/nixos/tests/codimd.nix index 8f98d9f3fa72..9dedac96844a 100644 --- a/nixos/tests/codimd.nix +++ b/nixos/tests/codimd.nix @@ -40,7 +40,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: subtest "CodiMD sqlite", sub { $codimdSqlite->waitForUnit("codimd.service"); $codimdSqlite->waitForOpenPort(3000); - $codimdPostgres->succeed("sleep 2"); # avoid 503 during startup + $codimdSqlite->sleep(10); # avoid 503 during startup $codimdSqlite->succeed("curl -sSf http://localhost:3000/new"); }; @@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: $codimdPostgres->waitForUnit("codimd.service"); $codimdPostgres->waitForOpenPort(5432); $codimdPostgres->waitForOpenPort(3000); - $codimdPostgres->succeed("sleep 2"); # avoid 503 during startup + $codimdPostgres->sleep(10); # avoid 503 during startup $codimdPostgres->succeed("curl -sSf http://localhost:3000/new"); }; ''; From a8413d816aadfa7b376dabc84777a21eca3dd210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Sep 2018 21:27:35 +0100 Subject: [PATCH 214/218] luaPackages.luadbi: 0.5 -> 0.6 (#47156) Switch to maintained fork that is compatible with lua5.2/lua5.3. This package was tested with prosody. --- pkgs/top-level/lua-packages.nix | 37 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 7933ca46b98a..8d141d7e7c64 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -380,35 +380,36 @@ let luadbi = buildLuaPackage rec { name = "luadbi-${version}"; - version = "0.5"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/luadbi/luadbi.${version}.tar.gz"; - sha256 = "07ikxgxgfpimnwf7zrqwcwma83ss3wm2nzjxpwv2a1c0vmc684a9"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "mwild1"; + repo = "luadbi"; + rev = "v${version}"; + sha256 = "1cpl84pl75wqd9zph3w4srd5lxij359p8xmmf7xpdbxz67695vah"; }; - sourceRoot = "."; - buildInputs = [ mysql.connector-c postgresql sqlite ]; + MYSQL_INC="-I${mysql.connector-c}/include/mysql"; - preConfigure = '' - substituteInPlace Makefile --replace CC=gcc CC=cc - '' + stdenv.lib.optionalString stdenv.isDarwin '' + buildInputs = [ mysql postgresql sqlite ]; + + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile \ --replace '-shared' '-bundle -undefined dynamic_lookup -all_load' ''; - NIX_CFLAGS_COMPILE = [ - "-I${mysql.connector-c}/include/mysql" - "-L${mysql.connector-c}/lib/mysql" - "-I${postgresql}/include/server" + installFlags = [ + "LUA_CDIR=$(out)/lib/lua/${lua.luaversion}" + "LUA_LDIR=$(out)/share/lua/${lua.luaversion}" ]; - installPhase = '' - mkdir -p $out/lib/lua/${lua.luaversion} - install -p DBI.lua *.so $out/lib/lua/${lua.luaversion} - ''; + installTargets = [ + "install_lua" "install_mysql" "install_psql" "install_sqlite3" + ]; meta = with stdenv.lib; { - homepage = "https://code.google.com/archive/p/luadbi/"; + homepage = https://github.com/mwild1/luadbi; + license = licenses.mit; platforms = stdenv.lib.platforms.unix; }; }; From 52a1179b6c20e923beddde1dd1e0034aa19176d2 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 22 Sep 2018 23:13:10 +0200 Subject: [PATCH 215/218] ffmpeg: don't use gcc on darwin (#47189) This isn't necessary and causes build failures for certain versions. CC libavfilter/libmpcodecs/vf_eq2.o CC libavfilter/libmpcodecs/vf_fil.o CC libavfilter/libmpcodecs/vf_fspp.o libavfilter/libmpcodecs/vf_fspp.c:939:18: error: unknown token in expression movq %mm2, 0*8+(%rsp) /cc ZHF #45961 --- pkgs/top-level/all-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18ad8892e55f..fd91049b52f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9333,23 +9333,18 @@ with pkgs; ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; - stdenv = gccStdenv; }; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - stdenv = gccStdenv; }; ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; - stdenv = gccStdenv; }; # Aliases From 845ae983f6033338d89927d65fbfd7f28d91b16e Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sun, 23 Sep 2018 00:15:28 +0200 Subject: [PATCH 216/218] nixos/iso-image: fix 32bit UEFI boot UEFI iso image for i686 didn't boot because the default boot file was incorrectly named bootx32.efi. The correct name is bootia32.efi. --- nixos/modules/installer/cd-dvd/iso-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 98712f0759a9..96fdb997b2c0 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -233,7 +233,7 @@ let " # Make our own efi program, we can't rely on "grub-install" since it seems to # probe for devices, even with --skip-fs-probe. - ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootx32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \ + ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \ $MODULES cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ From c20caa6a6f63f8805cac04fb0ec1db7e645780a4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 22 Sep 2018 17:31:07 -0500 Subject: [PATCH 217/218] gnomecast: 1.4.0 -> 1.4.1 (#47191) --- pkgs/applications/video/gnomecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index a2faaf39f082..74ae6faec902 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -3,11 +3,11 @@ with python3Packages; buildPythonApplication rec { pname = "gnomecast"; - version = "1.4.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "17hxqpisw6j6caw6bzp0wd0p3idqy6a78wwwk8kms6hpxasirwyk"; + sha256 = "0mn03gqbwmhch0055bzgdwkzsl304qdyqwrgyiq0k5c5d2gyala5"; }; nativeBuildInputs = [ wrapGAppsHook ]; From bd13ef5944a01f02006bcd4caafaaeba6a52d323 Mon Sep 17 00:00:00 2001 From: Charles Duffy Date: Sat, 22 Sep 2018 18:22:07 -0500 Subject: [PATCH 218/218] Introduce desync, an alternate implementation of casync (#47195) desync isn't as feature-rich as casync, but has a focus on production usability and implementation quality which may make it a more appropriate tool. --- maintainers/maintainer-list.nix | 5 + .../networking/sync/desync/default.nix | 27 ++++ .../networking/sync/desync/deps.nix | 129 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 163 insertions(+) create mode 100644 pkgs/applications/networking/sync/desync/default.nix create mode 100644 pkgs/applications/networking/sync/desync/deps.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 216d6dac74ea..c3b327893826 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -678,6 +678,11 @@ github = "Chaddai"; name = "Chaddaï Fouché"; }; + chaduffy = { + email = "charles@dyfis.net"; + github = "charles-dyfis-net"; + name = "Charles Duffy"; + }; changlinli = { email = "mail@changlinli.com"; github = "changlinli"; diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix new file mode 100644 index 000000000000..e8cca04203b1 --- /dev/null +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "desync-${version}"; + version = "0.3.0"; + rev = "v${version}"; + + goPackagePath = "github.com/folbricht/desync"; + + src = fetchFromGitHub { + inherit rev; + owner = "folbricht"; + repo = "desync"; + sha256 = "1h2i6ai7q1mg2ysd3cnas96rb8g0bpp1v3hh7ip9nrfxhlplyyda"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Content-addressed binary distribution system"; + longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness"; + homepage = https://github.com/folbricht/desync; + license = licenses.bsd3; + platforms = platforms.unix; # windows temporarily broken in 0.3.0 release + maintainers = [ maintainers.chaduffy ]; + }; +} diff --git a/pkgs/applications/networking/sync/desync/deps.nix b/pkgs/applications/networking/sync/desync/deps.nix new file mode 100644 index 000000000000..2342fb76f0c9 --- /dev/null +++ b/pkgs/applications/networking/sync/desync/deps.nix @@ -0,0 +1,129 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/datadog/zstd"; + fetch = { + type = "git"; + url = "https://github.com/datadog/zstd"; + rev = "940731c8fc259059120b0e617a69d54dcd7c3eee"; + sha256 = "04nmljnk54xm2k4ydhdiidazk3765jk8h4hvcsymkrsggrfyrjfx"; + }; + } + { + goPackagePath = "github.com/dchest/siphash"; + fetch = { + type = "git"; + url = "https://github.com/dchest/siphash"; + rev = "34f201214d993633bb24f418ba11736ab8b55aa7"; + sha256 = "08s076y7vmjqnq7jz0762hkm896r6r31v8b31a3gy0n8rfa01k8k"; + }; + } + { + goPackagePath = "github.com/folbricht/tempfile"; + fetch = { + type = "git"; + url = "https://github.com/folbricht/tempfile"; + rev = "ee190cb5934293f187a9d43ee34de7d5cf9ceb83"; + sha256 = "0vz08qvbniqxc24vhmcbq5ncnz97ncp4jbxgcf0hziazxfp114z3"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "fa25069db393aecc09b71267d0489b357781c860"; + sha256 = "0fs1c48hni5gc1fyz65d138jpmqm1sqpb7vw5vhx0j6lmj1nf45z"; + }; + } + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "1d35017e97018335f348413b3aeed67468d80f7b"; + sha256 = "11rggvkd6lc5lcpsfvc9iip4z9cingzpkpshaskv2cirbxdynyi8"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "1455def202f6e05b95cc7bfc7e8ae67ae5141eba"; + sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q"; + }; + } + { + goPackagePath = "github.com/minio/minio-go"; + fetch = { + type = "git"; + url = "https://github.com/minio/minio-go"; + rev = "f01ef22c977052d716c74724874f932a16f047bb"; + sha256 = "0pn1likcwnzb2j4hi4r1ib3xlp31h2vgwyc7xnm1iv7f8l4gk2hc"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "c059e472caf75dbe73903f6521a20abac245b17f"; + sha256 = "07xg8ym776j2w0k8445ii82lx8yz358cp1z96r739y13i1anqdzi"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "08de04f133f27844173471167014e1a753655ac8"; + sha256 = "090q4xmjbllwl3rpj1hzp0iw3qw1yvp6r3kf5cgw44ai57z96271"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "0e37d006457bf46f9e6692014ba72ef82c33022c"; + sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2f5d2388922f370f4355f327fcf4cfe9f5583908"; + sha256 = "03s92ygxfrd2c1m4697sd6iksgbar6c007w1yf3h6wmd79vr5dxs"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d47a0f3392421c5624713c9a19fe781f651f8a50"; + sha256 = "01dqcv7vnynwhlmb28fn50svjb9kfj04nk7frvf7mh4jd3qnrsnv"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "905a57155faa8230500121607930ebb9dd8e139c"; + sha256 = "1qlvvb44j9ss3mkb5035i20xsd6sm0n05sqpqbi8gjw64g086zcb"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd91049b52f8..6478ccb7741d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1184,6 +1184,8 @@ with pkgs; deja-dup = callPackage ../applications/backup/deja-dup { }; + desync = callPackage ../applications/networking/sync/desync { }; + devmem2 = callPackage ../os-specific/linux/devmem2 { }; dbus-broker = callPackage ../os-specific/linux/dbus-broker { };