From 3a192fb519d7f04389c4eda2fcf2dfde31445ce3 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 19 Aug 2019 15:25:28 -0500 Subject: [PATCH 01/68] boost171: init at 1.71.0 --- pkgs/development/libraries/boost/1.71.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/1.71.nix diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix new file mode 100644 index 000000000000..d70b8bd5a7fb --- /dev/null +++ b/pkgs/development/libraries/boost/1.71.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.71.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_71_0.html + sha256 = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac28faca9922..66d11d7679a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10287,7 +10287,8 @@ in boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost167; boost170 = callPackage ../development/libraries/boost/1.70.nix { }; - boost17x = boost170; + boost171 = callPackage ../development/libraries/boost/1.71.nix { }; + boost17x = boost171; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; From bf3de125a3f24d34e9414d6dfdba7dfc1174fdca Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 19 Aug 2019 15:28:12 -0500 Subject: [PATCH 02/68] boost171: grab from bintray, not on sf.net ("yet"?) --- pkgs/development/libraries/boost/1.71.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix index d70b8bd5a7fb..3a585c2bc9b1 100644 --- a/pkgs/development/libraries/boost/1.71.nix +++ b/pkgs/development/libraries/boost/1.71.nix @@ -4,7 +4,8 @@ callPackage ./generic.nix (args // rec { version = "1.71.0"; src = fetchurl { - url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"; + #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"; + url = "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"; # SHA256 from http://www.boost.org/users/history/version_1_71_0.html sha256 = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"; }; From b53840212774c9ae7f7bdacabe3792db05561c8c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 3 Sep 2019 18:20:22 -0500 Subject: [PATCH 03/68] boost171: use 'urls' attribute per suggestion (thanks!) Co-Authored-By: Jon --- pkgs/development/libraries/boost/1.71.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/1.71.nix b/pkgs/development/libraries/boost/1.71.nix index 3a585c2bc9b1..f66bd4cd6fb1 100644 --- a/pkgs/development/libraries/boost/1.71.nix +++ b/pkgs/development/libraries/boost/1.71.nix @@ -5,7 +5,10 @@ callPackage ./generic.nix (args // rec { src = fetchurl { #url = "mirror://sourceforge/boost/boost_1_71_0.tar.bz2"; - url = "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2"; + urls = [ + "mirror://sourceforge/boost/boost_1_71_0.tar.bz2" + "https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2" + ]; # SHA256 from http://www.boost.org/users/history/version_1_71_0.html sha256 = "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee"; }; From d75c296dc2b4c45f197a66a4a64245d921226d0f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 10 Nov 2019 18:24:57 +0100 Subject: [PATCH 04/68] roundcube: 1.3.10 -> 1.4.0 https://roundcube.net/news/2019/11/09/roundcube-1.4.0-released * `curl` cmd in the test can fail as roundcube returns a http/401 if unauthorized (and we're explicitly requesting the login form). By checking if the `persistent_login` plugin is loaded, the assertion is still valid) * Use `$argv[0]` to determine install path in the installer script. I'm not exactly sure why, but it seems as `__DIR__` now resolves symlinks which breaks the installer if roundcube is in a `buildEnv` with third-party plugins. --- nixos/tests/roundcube.nix | 2 +- ...Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch | 2 +- pkgs/servers/roundcube/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/roundcube.nix b/nixos/tests/roundcube.nix index 4f2560ce8c2f..3206144ce806 100644 --- a/nixos/tests/roundcube.nix +++ b/nixos/tests/roundcube.nix @@ -25,6 +25,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { roundcube.wait_for_unit("postgresql.service") roundcube.wait_for_unit("phpfpm-roundcube.service") roundcube.wait_for_unit("nginx.service") - roundcube.succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'") + roundcube.succeed("curl -sSL http://roundcube/ | grep 'Keep me logged in'") ''; }) diff --git a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch index 96710d6162d7..27ebd59a48d9 100644 --- a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch +++ b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch @@ -18,7 +18,7 @@ index 08e3bb5..b2ad498 100755 */ -define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' ); -+define('INSTALL_PATH', __DIR__ . '/../' ); ++define('INSTALL_PATH', dirname(dirname($argv[0])).'/'); require_once INSTALL_PATH . 'program/include/clisetup.php'; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 93499d87e0b6..5953a28a2832 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.3.10"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1gx8dgrr3p6fksv3pm381a080i9r6snwcmfd1q112mqg19ai3zk9"; + sha256 = "0b7gc342z0smn7q6cnznj9ncal0515ki4kkq1hlmqmyn0nna5lkb"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From ce26b3eaf000f4be9803d299bdb4d27af18d6ed5 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 11 Nov 2019 16:18:23 -0500 Subject: [PATCH 05/68] nixos/slim: remove The SLIM project is abandoned and their last release was in 2013. Because of this it poses a security risk to systems, no one is working on it or picked up maintenance. It also lacks compatibility with systemd and logind sessions. For users, there liikely isn't anything like slim that's as lightweight in terms of dependencies. --- nixos/lib/testing-python.nix | 1 - nixos/lib/testing.nix | 1 - nixos/modules/hardware/video/nvidia.nix | 2 +- .../services/x11/desktop-managers/plasma5.nix | 1 - .../services/x11/display-managers/default.nix | 12 +- .../services/x11/display-managers/slim.nix | 160 +-------------- nixos/modules/services/x11/xserver.nix | 1 - nixos/release-combined.nix | 1 - nixos/tests/all-tests.nix | 1 - nixos/tests/slim.nix | 66 ------- .../display-managers/slim/default.nix | 55 ------ .../display-managers/slim/no-logfile.patch | 80 -------- .../display-managers/slim/run-once.patch | 12 -- .../display-managers/slim/runtime-paths.patch | 70 ------- .../display-managers/slim/sort-sessions.patch | 40 ---- .../display-managers/slim/themes.nix | 183 ------------------ pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 6 - 18 files changed, 18 insertions(+), 676 deletions(-) delete mode 100644 nixos/tests/slim.nix delete mode 100644 pkgs/applications/display-managers/slim/default.nix delete mode 100644 pkgs/applications/display-managers/slim/no-logfile.patch delete mode 100644 pkgs/applications/display-managers/slim/run-once.patch delete mode 100644 pkgs/applications/display-managers/slim/runtime-paths.patch delete mode 100644 pkgs/applications/display-managers/slim/sort-sessions.patch delete mode 100644 pkgs/applications/display-managers/slim/themes.nix diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 21f6172e9671..22a6e7a6cc03 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -258,7 +258,6 @@ in rec { inherit require; virtualisation.memorySize = 1024; services.xserver.enable = true; - services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.auto.enable = true; services.xserver.windowManager.default = "icewm"; services.xserver.windowManager.icewm.enable = true; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 767068771036..a5f060a8d8e3 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -248,7 +248,6 @@ in rec { inherit require; virtualisation.memorySize = 1024; services.xserver.enable = true; - services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.auto.enable = true; services.xserver.windowManager.default = "icewm"; services.xserver.windowManager.icewm.enable = true; diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 3ab2afc97407..1e18e927ec6e 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -75,7 +75,7 @@ in Note that this configuration will only be successful when a display manager for which the - option is supported is used; notably, SLiM is not supported. + option is supported is used. ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index b6fb7218da6f..b48ca3fad939 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -232,7 +232,6 @@ in security.pam.services.kdm.enableKwallet = true; security.pam.services.lightdm.enableKwallet = true; security.pam.services.sddm.enableKwallet = true; - security.pam.services.slim.enableKwallet = true; xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index bf6b048654b3..b66856fd4d44 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -1,9 +1,9 @@ # This module declares the options to define a *display manager*, the -# program responsible for handling X logins (such as xdm, gdb, or -# SLiM). The display manager allows the user to select a *session -# type*. When the user logs in, the display manager starts the +# program responsible for handling X logins (such as LightDM, GDM, or SDDM). +# The display manager allows the user to select a *session +# type*. When the user logs in, the display manager starts the # *session script* ("xsession" below) to launch the selected session -# type. The session type defines two things: the *desktop manager* +# type. The session type defines two things: the *desktop manager* # (e.g., KDE, Gnome or a plain xterm), and optionally the *window # manager* (e.g. kwin or twm). @@ -196,7 +196,6 @@ let fi '') cfg.displayManager.extraSessionFilePackages} - ${concatMapStrings (pkg: '' if test -d ${pkg}/share/wayland-sessions; then mkdir -p "$out/share/wayland-sessions" @@ -322,7 +321,7 @@ in execCmd = mkOption { type = types.str; example = literalExample '' - "''${pkgs.slim}/bin/slim" + "''${pkgs.lightdm}/bin/lightdm" ''; description = "Command to start the display manager."; }; @@ -330,7 +329,6 @@ in environment = mkOption { type = types.attrsOf types.unspecified; default = {}; - example = { SLIM_CFGFILE = "/etc/slim.conf"; }; description = "Additional environment variables needed by the display manager."; }; diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 124660a43f07..4b0948a5b7a5 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -2,155 +2,15 @@ with lib; -let - - dmcfg = config.services.xserver.displayManager; - - cfg = dmcfg.slim; - - slimConfig = pkgs.writeText "slim.cfg" - '' - xauth_path ${dmcfg.xauthBin} - default_xserver ${dmcfg.xserverBin} - xserver_arguments ${toString dmcfg.xserverArgs} - sessiondir ${dmcfg.session.desktops}/share/xsessions - login_cmd exec ${pkgs.runtimeShell} ${dmcfg.session.wrapper} "%session" - halt_cmd ${config.systemd.package}/sbin/shutdown -h now - reboot_cmd ${config.systemd.package}/sbin/shutdown -r now - logfile /dev/stderr - ${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)} - ${optionalString (cfg.defaultUser != null) ("focus_password yes")} - ${optionalString cfg.autoLogin "auto_login yes"} - ${optionalString (cfg.consoleCmd != null) "console_cmd ${cfg.consoleCmd}"} - ${cfg.extraConfig} - ''; - - # Unpack the SLiM theme, or use the default. - slimThemesDir = - let - unpackedTheme = pkgs.runCommand "slim-theme" { preferLocalBuild = true; } - '' - mkdir -p $out - cd $out - unpackFile ${cfg.theme} - ln -s * default - ''; - in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme; - -in - { - - ###### interface - - options = { - - services.xserver.displayManager.slim = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable SLiM as the display manager. - ''; - }; - - theme = mkOption { - type = types.nullOr types.path; - default = pkgs.fetchurl { - url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz"; - sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8"; - }; - defaultText = ''pkgs.fetchurl { - url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz"; - sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8"; - }''; - example = literalExample '' - pkgs.fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz"; - sha256 = "0ndr419i5myzcylvxb89m9grl2xyq6fbnyc3lkd711mzlmnnfxdy"; - } - ''; - description = '' - The theme for the SLiM login manager. If not specified, SLiM's - default theme is used. See for a - collection of themes. TODO: berlios shut down. - ''; - }; - - defaultUser = mkOption { - type = types.nullOr types.str; - default = null; - example = "login"; - description = '' - The default user to load. If you put a username here you - get it automatically loaded into the username field, and - the focus is placed on the password. - ''; - }; - - autoLogin = mkOption { - type = types.bool; - default = false; - description = '' - Automatically log in as the default user. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration options for SLiM login manager. Do not - add options that can be configured directly. - ''; - }; - - consoleCmd = mkOption { - type = types.nullOr types.str; - default = '' - ${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ${pkgs.shadow}/bin/login - ''; - defaultText = '' - ''${pkgs.xterm}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e ''${pkgs.shadow}/bin/login - ''; - description = '' - The command to run when "console" is given as the username. - ''; - }; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - services.xserver.displayManager.job = - { environment = - { SLIM_CFGFILE = slimConfig; - SLIM_THEMESDIR = slimThemesDir; - }; - execCmd = "exec ${pkgs.slim}/bin/slim"; - }; - - services.xserver.displayManager.sessionCommands = - '' - # Export the config/themes for slimlock. - export SLIM_THEMESDIR=${slimThemesDir} - ''; - - # Allow null passwords so that the user can login as root on the - # installation CD. - security.pam.services.slim = { allowNullPassword = true; startSession = true; }; - - # Allow slimlock to work. - security.pam.services.slimlock = {}; - - environment.systemPackages = [ pkgs.slim ]; - - }; - + # added 2019-11-11 + imports = [ + (mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] '' + The SLIM project is abandoned and their last release was in 2013. + Because of this it poses a security risk to your system. + Other issues include it not fully supporting systemd and logind sessions. + Please use a different display manager such as LightDM, SDDM, or GDM. + You can also use the startx module which uses Xinitrc. + '') + ]; } diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index a8406544a72f..70f01dbdbf59 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -557,7 +557,6 @@ in default = !( dmconf.auto.enable || dmconf.gdm.enable || dmconf.sddm.enable - || dmconf.slim.enable || dmconf.xpra.enable ); in mkIf (default) true; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9e2109d88b5f..1bcab5cab098 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -133,7 +133,6 @@ in rec { (all nixos.tests.proxy) (all nixos.tests.sddm.default) (all nixos.tests.simple) - (all nixos.tests.slim) (all nixos.tests.switchTest) (all nixos.tests.udisks2) (all nixos.tests.xfce) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9db505a27d41..2f480f9ea3e5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -247,7 +247,6 @@ in shiori = handleTest ./shiori.nix {}; signal-desktop = handleTest ./signal-desktop.nix {}; simple = handleTest ./simple.nix {}; - slim = handleTest ./slim.nix {}; slurm = handleTest ./slurm.nix {}; smokeping = handleTest ./smokeping.nix {}; snapper = handleTest ./snapper.nix {}; diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix deleted file mode 100644 index 42c87dfa039d..000000000000 --- a/nixos/tests/slim.nix +++ /dev/null @@ -1,66 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "slim"; - - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aszlig ]; - }; - - machine = { pkgs, ... }: { - imports = [ ./common/user-account.nix ]; - services.xserver.enable = true; - services.xserver.windowManager.default = "icewm"; - services.xserver.windowManager.icewm.enable = true; - services.xserver.desktopManager.default = "none"; - services.xserver.displayManager.slim = { - enable = true; - - # Use a custom theme in order to get best OCR results - theme = pkgs.runCommand "slim-theme-ocr" { - nativeBuildInputs = [ pkgs.imagemagick ]; - } '' - mkdir "$out" - convert -size 1x1 xc:white "$out/background.jpg" - convert -size 200x100 xc:white "$out/panel.jpg" - cat > "$out/slim.theme" <waitForText(qr/Username:/); - $machine->sendChars("${user.name}\n"); - $machine->waitForText(qr/Password:/); - $machine->sendChars("${user.password}\n"); - - $machine->waitForFile('${user.home}/.Xauthority'); - $machine->succeed('xauth merge ${user.home}/.Xauthority'); - $machine->waitForWindow('^IceWM '); - - # Make sure SLiM doesn't create a log file - $machine->fail('test -e /var/log/slim.log'); - ''; -}) diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix deleted file mode 100644 index e504c09e43e6..000000000000 --- a/pkgs/applications/display-managers/slim/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng -, fontconfig, freetype, pam, dbus, makeWrapper }: - -stdenv.mkDerivation rec { - name = "slim-1.3.6"; - - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/${name}.tar.gz"; - sha256 = "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1"; - }; - - patches = - [ # Allow the paths of the configuration file and theme directory to - # be set at runtime. - ./runtime-paths.patch - - # Exit after the user's session has finished. This works around - # slim's broken PAM session handling (see - # http://developer.berlios.de/bugs/?func=detailbug&bug_id=19102&group_id=2663). - ./run-once.patch - - # Ensure that sessions appear in sort order, rather than in - # directory order. - ./sort-sessions.patch - - # Allow to set logfile to a special "/dev/stderr" in order to continue - # logging to stderr and thus to the journal. - ./no-logfile.patch - ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - url = "https://raw.githubusercontent.com/gentoo/musl/8eddda8072add075ebf56cf6d288bc1450d6b5f8/x11-misc/slim/files/slim-1.3.6-add-missing-libgen_h.patch"; - sha256 = "0f82672s2r2cmdqfn2mbg3di76mbla9n0ik20p2gv4igi6p866xm"; - }); - - preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib"; - - cmakeFlags = [ "-DUSE_PAM=1" ]; - - NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype -std=c++11"; - - enableParallelBuilding = true; - - buildInputs = - [ cmake pkgconfig libjpeg libpng fontconfig freetype - pam dbus - xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper - ]; - - NIX_CFLAGS_LINK = "-lXmu"; - - meta = { - homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/applications/display-managers/slim/no-logfile.patch b/pkgs/applications/display-managers/slim/no-logfile.patch deleted file mode 100644 index f2f5f1549930..000000000000 --- a/pkgs/applications/display-managers/slim/no-logfile.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/log.cpp b/log.cpp -index b44677a..7c89dda 100644 ---- a/log.cpp -+++ b/log.cpp -@@ -1,23 +1,31 @@ - #include "log.h" - #include -+#include - - bool - LogUnit::openLog(const char * filename) - { -- if (logFile.is_open()) { -+ if (isFile && logFile.is_open()) { - cerr << APPNAME - << ": opening a new Log file, while another is already open" - << endl; -- logFile.close(); -+ closeLog(); - } -- logFile.open(filename, ios_base::app); - -- return !(logFile.fail()); -+ if (strcmp(filename, "/dev/stderr") == 0) { -+ isFile = false; -+ return true; -+ } else { -+ logFile.open(filename, ios_base::app); -+ isFile = true; -+ return !(logFile.fail()); -+ } - } - - void - LogUnit::closeLog() - { -+ if (!isFile) return; - if (logFile.is_open()) - logFile.close(); - } -diff --git a/log.h b/log.h -index b7810be..ad548a2 100644 ---- a/log.h -+++ b/log.h -@@ -9,11 +9,14 @@ - #endif - #include "const.h" - #include -+#include - - using namespace std; - - static class LogUnit { - ofstream logFile; -+ bool isFile; -+ inline ostream &getStream() { return isFile ? logFile : cerr; } - public: - bool openLog(const char * filename); - void closeLog(); -@@ -22,17 +25,17 @@ public: - - template - LogUnit & operator<<(const Type & text) { -- logFile << text; logFile.flush(); -+ getStream() << text; getStream().flush(); - return *this; - } - - LogUnit & operator<<(ostream & (*fp)(ostream&)) { -- logFile << fp; logFile.flush(); -+ getStream() << fp; getStream().flush(); - return *this; - } - - LogUnit & operator<<(ios_base & (*fp)(ios_base&)) { -- logFile << fp; logFile.flush(); -+ getStream() << fp; getStream().flush(); - return *this; - } - } logStream; diff --git a/pkgs/applications/display-managers/slim/run-once.patch b/pkgs/applications/display-managers/slim/run-once.patch deleted file mode 100644 index 78f1454a883e..000000000000 --- a/pkgs/applications/display-managers/slim/run-once.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp ---- slim-1.3.6-orig/app.cpp 2013-10-15 11:02:55.629263422 +0200 -+++ slim-1.3.6/app.cpp 2013-10-15 13:00:10.141210784 +0200 -@@ -816,7 +822,7 @@ - StopServer(); - RemoveLock(); - while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */ -- Run(); -+ exit(OK_EXIT); - } - - void App::KillAllClients(Bool top) { diff --git a/pkgs/applications/display-managers/slim/runtime-paths.patch b/pkgs/applications/display-managers/slim/runtime-paths.patch deleted file mode 100644 index 5a8e07bfbf07..000000000000 --- a/pkgs/applications/display-managers/slim/runtime-paths.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -ru slim-1.3.6-orig/app.cpp slim-1.3.6/app.cpp ---- slim-1.3.6-orig/app.cpp 2013-10-02 00:38:05.000000000 +0200 -+++ slim-1.3.6/app.cpp 2014-03-30 19:01:04.115414201 +0200 -@@ -200,7 +200,9 @@ - - /* Read configuration and theme */ - cfg = new Cfg; -- cfg->readConf(CFGFILE); -+ char *cfgfile = getenv("SLIM_CFGFILE"); -+ if (!cfgfile) cfgfile = CFGFILE; -+ cfg->readConf(cfgfile); - string themebase = ""; - string themefile = ""; - string themedir = ""; -@@ -208,7 +210,9 @@ - if (testing) { - themeName = testtheme; - } else { -- themebase = string(THEMESDIR) + "/"; -+ char *themesdir = getenv("SLIM_THEMESDIR"); -+ if (!themesdir) themesdir = THEMESDIR; -+ themebase = string(themesdir) + "/"; - themeName = cfg->getOption("current_theme"); - string::size_type pos; - if ((pos = themeName.find(",")) != string::npos) { -diff -ru slim-1.3.6-orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt ---- slim-1.3.6-orig/CMakeLists.txt 2013-10-02 00:38:05.000000000 +0200 -+++ slim-1.3.6/CMakeLists.txt 2014-03-30 19:16:48.445069729 +0200 -@@ -23,7 +23,7 @@ - - set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") - set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim") --set(SYSCONFDIR "/etc") -+set(SYSCONFDIR "$ENV{out}/etc") - set(LIBDIR "/lib") - set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") - -@@ -40,7 +40,7 @@ - set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPACKAGE=\"slim\"") - set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DVERSION=\"${SLIM_VERSION}\"") - set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"") --set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"") -+set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"/etc\"") - - # Flags - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2") -Only in slim-1.3.6: CMakeLists.txt~ -diff -ru slim-1.3.6-orig/slimlock.cpp slim-1.3.6/slimlock.cpp ---- slim-1.3.6-orig/slimlock.cpp 2013-10-02 00:38:05.000000000 +0200 -+++ slim-1.3.6/slimlock.cpp 2014-03-30 19:01:04.115414201 +0200 -@@ -106,13 +106,17 @@ - unsigned int cfg_passwd_timeout; - // Read user's current theme - cfg = new Cfg; -- cfg->readConf(CFGFILE); -+ char *cfgfile = getenv("SLIM_CFGFILE"); -+ if (!cfgfile) cfgfile = CFGFILE; -+ cfg->readConf(cfgfile); - cfg->readConf(SLIMLOCKCFG); - string themebase = ""; - string themefile = ""; - string themedir = ""; - themeName = ""; -- themebase = string(THEMESDIR) + "/"; -+ char *themesdir = getenv("SLIM_THEMESDIR"); -+ if (!themesdir) themesdir = THEMESDIR; -+ themebase = string(themesdir) + "/"; - themeName = cfg->getOption("current_theme"); - string::size_type pos; - if ((pos = themeName.find(",")) != string::npos) { diff --git a/pkgs/applications/display-managers/slim/sort-sessions.patch b/pkgs/applications/display-managers/slim/sort-sessions.patch deleted file mode 100644 index cab5610f44fb..000000000000 --- a/pkgs/applications/display-managers/slim/sort-sessions.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ru -x '*~' slim-1.3.6-orig/cfg.cpp slim-1.3.6/cfg.cpp ---- slim-1.3.6-orig/cfg.cpp 2013-10-02 00:38:05.000000000 +0200 -+++ slim-1.3.6/cfg.cpp 2016-01-30 10:35:51.108766802 +0100 -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -293,6 +294,8 @@ - - sessions.clear(); - -+ typedef pair session_t; -+ - if( !strSessionDir.empty() ) { - DIR *pDir = opendir(strSessionDir.c_str()); - -@@ -325,7 +328,7 @@ - } - } - desktop_file.close(); -- pair session(session_name,session_exec); -+ session_t session(session_name,session_exec); - sessions.push_back(session); - cout << session_exec << " - " << session_name << endl; - } -@@ -341,6 +344,10 @@ - pair session("",""); - sessions.push_back(session); - } -+ -+ std::sort(sessions.begin(), sessions.end(), [](session_t& a, session_t& b) -> bool{ -+ return a.first < b.first; -+ }); - } - - pair Cfg::nextSession() { diff --git a/pkgs/applications/display-managers/slim/themes.nix b/pkgs/applications/display-managers/slim/themes.nix deleted file mode 100644 index b1be24f3e1d6..000000000000 --- a/pkgs/applications/display-managers/slim/themes.nix +++ /dev/null @@ -1,183 +0,0 @@ -{ stdenv, fetchurl, slim }: - -# Inspired on aspell buildDict expression - -let - buildTheme = - {fullName, src, version ? "testing"}: - - stdenv. mkDerivation rec { - name = "${fullName}-${version}"; - - inherit src; - - buildInputs = [ slim ]; - - dontBuild = true; - - installPhase = '' - install -dm755 $out/share/slim/themes/${name} - install -m644 * $out/share/slim/themes/${name} - ''; - - meta = { - description = "Slim theme for ${fullName}"; - platforms = stdenv.lib.platforms.linux; - }; - }; - -in { - - archlinuxSimple = buildTheme { - fullName = "archlinux-simple"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-archlinux-simple.tar.gz"; - sha256 = "7d60d6782fa86302646fe67253467c04692d247f89bdbe87178f690f32b270db"; - }; - }; - - capernoited = buildTheme { - fullName = "capernoited"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-capernoited.tar.gz"; - sha256 = "fb9163c6a2656d60f088dc4f2173aa7556a6794495122acfa7d3be7182f16b41"; - }; - }; - - debianMoreblue = buildTheme { - fullName = "debian-moreblue"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-debian-moreblue.tar.bz2"; - sha256 = "5b76929827d4a4d604ddca4f42668cca3309b6f7bd659901021c6f49d6d2c481"; - }; - }; - - fingerprint = buildTheme { - fullName = "fingerprint"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-fingerprint.tar.gz"; - sha256 = "48b703f84ce7b814cda0824f65cafebf695cd71a14166b481bb44616097d3144"; - }; - }; - - flat = buildTheme { - fullName = "flat"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-flat.tar.gz"; - sha256 = "0092d531540f9da8ef07ad173e527c4ef9c088d04962d142be3c11f0c5c0c5e9"; - }; - }; - - flower2 = buildTheme { - fullName = "flower2"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-flower2.tar.gz"; - sha256 = "840faf6459ffd6c2c363160c85cb98000717f9a425102976336f5d8f68ed95ee"; - }; - }; - - gentooSimple = buildTheme { - fullName = "gentoo-simple"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-gentoo-simple.tar.bz2"; - sha256 = "27c8614cc930ca200acf81f1192febc102501744939d5cbe997141e37c96d8c2"; - }; - }; - - lake = buildTheme { - fullName = "lake"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-lake.tar.gz"; - sha256 = "f7d662e37068a6c64cbf910adf3c192f1b50724baa427a8c9487cb9f7ed95851"; - }; - }; - - lunar = buildTheme { - fullName = "lunar-0.4"; - version = ""; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-lunar-0.4.tar.bz2"; - sha256 = "1543eb45e4d664377e0dd4f7f954aba005823034ba9692624398b3d58be87d76"; - }; - }; - - mindlock = buildTheme { - fullName = "mindlock"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-mindlock.tar.gz"; - sha256 = "99a6e6acd55bf55ece18a3f644299517b71c1adc49efd87ce2d7e654fb67033c"; - }; - }; - - parallelDimensions = buildTheme { - fullName = "parallel-dimensions"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-parallel-dimensions.tar.gz"; - sha256 = "2b17c3e6d3967a6a0744e20e6e05c9d3938f4ef04c62d49ddbd416bc4743046f"; - }; - }; - - previous = buildTheme { - fullName = "previous"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-previous.tar.gz"; - sha256 = "1f2a69f8fc0dc8ed8eb86a4c1d1087ba7be486973fb81efab52a63c661d726f8"; - }; - }; - - rainbow = buildTheme { - fullName = "rainbow"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-rainbow.tar.gz"; - sha256 = "d83e3afdb05be50cff7da037bb31208b2c152539d1a009740b13857f5f910072"; - }; - }; - - rear-window = buildTheme { - fullName = "rear-window"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-rear-window.tar.gz"; - sha256 = "0b123706ccb67e94f626c183530ec5732b209bab155bc661d6a3f5cd5ee39511"; - }; - }; - - scotlandRoad = buildTheme { - fullName = "scotland-road"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-scotland-road.tar.gz"; - sha256 = "fd60a434496ed39b968ffa1e5457b36cd12f64a4e2ecedffc675f97ca3f3bba1"; - }; - }; - - subway = buildTheme { - fullName = "subway"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-subway.tar.gz"; - sha256 = "0205568e3e157973b113a83b26d8829ce9962a85ef7eb8a33d3ae2f3f9292253"; - }; - }; - - wave = buildTheme { - fullName = "wave"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-wave.tar.gz"; - sha256 = "be75676da5bf8670daa48379bb9cc1be0b9a5faa09adbea967dfd7125320b959"; - }; - }; - - zenwalk = buildTheme { - fullName = "zenwalk"; - src = fetchurl { - url = "mirror://sourceforge/slim.berlios/slim-zenwalk.tar.gz"; - sha256 = "f0f41d17ea505b0aa96a036e978fabaf673a51d3f81a919cb0d43364d4bc7a57"; - }; - }; - - nixosSlim = buildTheme { - fullName = "nixos-slim"; - src = fetchurl { - url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz"; - sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8"; - }; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 262304cdbf0c..99d412da8c17 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -351,6 +351,8 @@ mapAliases ({ slurm-llnl-full = slurm-full; # renamed July 2017 slurm-full = slurm; # added 2018-05-1 smbclient = samba; # added 2018-04-25 + slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 + slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 spaceOrbit = space-orbit; # addewd 2016-05-23 speech_tools = speech-tools; # added 2018-04-25 speedtest_cli = speedtest-cli; # added 2015-02-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37ee1237d581..36599a6722a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21068,16 +21068,10 @@ in skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; - slim = callPackage ../applications/display-managers/slim { - libpng = libpng12; - }; - smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; }; - slimThemes = recurseIntoAttrs (callPackage ../applications/display-managers/slim/themes.nix {}); - smartdeblur = callPackage ../applications/graphics/smartdeblur { }; snapper = callPackage ../tools/misc/snapper { }; From 3d256326ab875111765e26e421995f1a07143201 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 11 Nov 2019 16:22:36 -0500 Subject: [PATCH 06/68] nixos/doc: remove refs to slim --- nixos/doc/manual/configuration/x-windows.xml | 2 +- nixos/doc/manual/development/option-declarations.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index f6f659b02afa..9206f43ea392 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -39,7 +39,7 @@ can select an alternative one by picking one of the following lines: = true; - = true; + = true; diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index eee81bf64263..56ebf4816306 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -99,7 +99,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a module file - per display manager backend (slim, sddm, gdm ...). + per display manager backend (sddm, gdm ...). @@ -146,7 +146,7 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming"> />), and to extend it in each backend module (, + linkend='ex-option-declaration-eot-backend-gdm' />, ). @@ -167,11 +167,11 @@ services.xserver.displayManager.enable = mkOption { }; - - Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module + + Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>gdm</literal> module services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "slim" ]); + type = with types; nullOr (enum [ "gdm" ]); }; From 9c7db09e485529608dec9471067700d34ebdad0a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 11 Nov 2019 16:41:26 -0500 Subject: [PATCH 07/68] rl-2003: add note about slim --- nixos/doc/manual/release-notes/rl-2003.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 72766f16eb9f..52cf5ee13911 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -131,6 +131,13 @@ networking.interfaces.<name>.… options. + + + The SLIM Display Manager has been removed, as it has been unmaintained since 2013. + Consider migrating to a different display manager such as LightDM (current default in NixOS), + SDDM, GDM, or using the startx module which uses Xinitrc. + + From cc780aa7f42d5a9afba1b2b750f88a4628b2336c Mon Sep 17 00:00:00 2001 From: tekeri <47343275+tekeri@users.noreply.github.com> Date: Fri, 26 Apr 2019 16:38:16 +0900 Subject: [PATCH 08/68] perlPackages.CryptECB: init at 2.21 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 06fe3aa2cfe9..360517e53b6a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3370,6 +3370,19 @@ let NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp"; }; + CryptECB = buildPerlPackage { + pname = "Crypt-ECB"; + version = "2.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AP/APPEL/Crypt-ECB-2.21.tar.gz"; + sha256 = "890f8b3040220ea705ee5ca4f9bd23435a1779bc3ffa75533736e6c9c21d1015"; + }; + meta = with stdenv.lib; { + description = "Use block ciphers using ECB mode"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CryptEksblowfish = buildPerlModule { pname = "Crypt-Eksblowfish"; version = "0.009"; From 72d6831f21bb3ad073e9e21470070f2607658f25 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 14 Nov 2019 04:20:00 -0500 Subject: [PATCH 09/68] nodejs-13_x: 13.0.1 -> 13.1.0 Changelog: https://github.com/nodejs/node/releases/tag/v13.1.0 --- pkgs/development/web/nodejs/v13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index 37d42e0ee771..df7e7ed92669 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,8 +5,8 @@ let in buildNodejs { inherit enableNpm; - version = "13.0.1"; - sha256 = "1n9w1kvdzdg2j0a41wdkqcl893209lc018sd49xpy1cnr169h6vr"; + version = "13.1.0"; + sha256 = "0s6b2k7i89j9mxwyz271fvm6bf8jcz2v5kzmn0v5icrkpmn0ab6l"; patches = stdenv.lib.optionals stdenv.isDarwin [ ./disable-libatomic-darwin-13_x.patch ]; } From c5939e67cddccbed848588ba7d50c5b05041f0e3 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 14 Nov 2019 20:09:55 +0100 Subject: [PATCH 10/68] gitea: 1.9.5 -> 1.9.6 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 6a7a42bacc11..4ee67a6a1ef3 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "07isawbasshkgij2mh7pmp6h3ns758ysflngr18z0k2m38ny9h31"; + sha256 = "0ql6hrrc339hrik4yk26bjn5x167c5q4s10kjld5fsgmn2k1nhdb"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' From 2bf8cccc0d8855c98538741c27978d2be434fbf7 Mon Sep 17 00:00:00 2001 From: Milan Svoboda Date: Thu, 7 Nov 2019 20:46:42 +0100 Subject: [PATCH 11/68] grip-search: init at 0.8 --- pkgs/tools/text/grip-search/default.nix | 31 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/text/grip-search/default.nix diff --git a/pkgs/tools/text/grip-search/default.nix b/pkgs/tools/text/grip-search/default.nix new file mode 100644 index 000000000000..921691a40afd --- /dev/null +++ b/pkgs/tools/text/grip-search/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, boost, pkgconfig, cmake, catch2 }: + +stdenv.mkDerivation rec { + pname = "grip-search"; + version = "0.8"; + + src = fetchFromGitHub { + owner = "sc0ty"; + repo = "grip"; + rev = "v${version}"; + sha256 = "0bkqarylgzhis6fpj48qbifcd6a26cgnq8784hgnm707rq9kb0rx"; + }; + + nativeBuildInputs = [ pkgconfig cmake catch2 ]; + + doCheck = true; + + buildInputs = [ boost ]; + + patchPhase = '' + substituteInPlace src/general/config.h --replace "CUSTOM-BUILD" "${version}" + ''; + + meta = with stdenv.lib; { + description = "Fast, indexed regexp search over large file trees"; + homepage = "https://github.com/sc0ty/grip"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ tex ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e2cfd9d0e84..e15086eb1f43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17529,6 +17529,8 @@ in grepm = callPackage ../applications/search/grepm { }; + grip-search = callPackage ../tools/text/grip-search { }; + grip = callPackage ../applications/misc/grip { inherit (gnome2) libgnome libgnomeui vte; }; From 6b9390f253894b0bf71e5b888cde99e0140e9a26 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Thu, 14 Nov 2019 22:25:40 +0100 Subject: [PATCH 12/68] dragon-drop: 1.1.0 -> 1.1.1 Fixes segfault which would make the program unusable. --- pkgs/tools/X11/dragon-drop/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index f15d099016a5..54ece6a9a163 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -2,21 +2,20 @@ stdenv.mkDerivation rec { pname = "dragon-drop"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "mwh"; repo = "dragon"; rev = "v${version}"; - sha256 = "0iwlrcqvbjshpwvg0gsqdqcjv48q1ary59pm74zzjnr8v9470smr"; + sha256 = "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk ]; installPhase = '' - mkdir -p $out/bin - mv dragon $out/bin + install -D dragon -t $out/bin ''; meta = with stdenv.lib; { From d11137ef90a5ab19ac1245f4277709ab06061a37 Mon Sep 17 00:00:00 2001 From: Guillaume Desforges Date: Tue, 12 Nov 2019 19:11:54 +0100 Subject: [PATCH 13/68] python2Packages.geopy: Freeze in seperate file --- pkgs/development/python-modules/geopy/2.nix | 28 +++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/geopy/2.nix diff --git a/pkgs/development/python-modules/geopy/2.nix b/pkgs/development/python-modules/geopy/2.nix new file mode 100644 index 000000000000..49876872724b --- /dev/null +++ b/pkgs/development/python-modules/geopy/2.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy27 +, geographiclib +}: + +buildPythonPackage rec { + pname = "geopy"; + version = "1.20.0"; + + disabled = !isPy27; # only Python 2.7 + doCheck = false; # Needs network access + + propagatedBuildInputs = [ geographiclib ]; + + src = fetchPypi { + inherit pname version; + sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/geopy/geopy"; + description = "Python Geocoding Toolbox"; + license = licenses.mit; + maintainers = with maintainers; [GuillaumeDesforges]; + }; +} From d119e10f7420bd900e22a37ee4e577f7964f8ec4 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 14 Nov 2019 15:45:06 -0600 Subject: [PATCH 14/68] signal-desktop: 1.27.4 -> 1.28.0 --- .../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 564e5e17b0a0..e39f01a92c04 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -59,7 +59,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.27.4"; # Please backport all updates to the stable channel. + version = "1.28.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1aza1s70xzx9qkv7b5mpfi4zgdn5dq3rl03lx3jixij3x3pxg5sj"; + sha256 = "14cd635fax99l5jk70jy0mjnvw01b0gbv666szc4ajamm36l2bkr"; }; phases = [ "unpackPhase" "installPhase" ]; From 6d12f065e91246f42de6feda9ad01da79643a751 Mon Sep 17 00:00:00 2001 From: Guillaume Desforges Date: Tue, 12 Nov 2019 19:12:56 +0100 Subject: [PATCH 15/68] python3Packages.geopy: 1.20 -> unstable-2019-11-10 * Update geopy to unstable version from GitHub for Python 3+ * Add GuillaumeDesforges as maintainer --- maintainers/maintainer-list.nix | 6 ++++ .../python-modules/geopy/default.nix | 33 +++++++++---------- pkgs/top-level/python-packages.nix | 4 ++- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5948944aa23f..586706d53e70 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2615,6 +2615,12 @@ githubId = 9705357; name = "Guillaume Bouchard"; }; + GuillaumeDesforges = { + email = "aceus02@gmail.com"; + github = "GuillaumeDesforges"; + githubId = 1882000; + name = "Guillaume Desforges"; + }; guillaumekoenig = { email = "guillaume.edward.koenig@gmail.com"; github = "guillaumekoenig"; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 3a9e8b86c917..817c1e38418e 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -1,31 +1,30 @@ { stdenv , buildPythonPackage -, fetchPypi -, isPy27 -, mock -, tox -, pylint +, fetchFromGitHub +, isPy3k +, geographiclib }: buildPythonPackage rec { - pname = "geopy"; - version = "1.20.0"; - disabled = !isPy27; + pname = "geopy-unstable"; + version = "2019-11-10"; - src = fetchPypi { - inherit pname version; - sha256 = "9419bc90ee6231590c4ae7acf1cf126cefbd0736942da7a6a1436946e80830e2"; + disabled = !isPy3k; # only Python 3 + doCheck = false; # Needs network access + + propagatedBuildInputs = [ geographiclib ]; + + src = fetchFromGitHub { + owner = "geopy"; + repo = "geopy"; + rev = "531b7de6126838a3e69370227aa7f2086ba52b89"; + sha256 = "07l1pblzg3hb3dbvd9rq8x78ly5dv0zxbc5hwskqil0bhv5v1p39"; }; - doCheck = false; # too much - - buildInputs = [ mock tox pylint ]; - meta = with stdenv.lib; { homepage = "https://github.com/geopy/geopy"; description = "Python Geocoding Toolbox"; license = licenses.mit; - broken = true; + maintainers = with maintainers; [GuillaumeDesforges]; }; - } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9df5646d8eb..a815cfa141ba 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4877,7 +4877,9 @@ in { geographiclib = callPackage ../development/python-modules/geographiclib { }; - geopy = callPackage ../development/python-modules/geopy { }; + geopy = if isPy3k + then callPackage ../development/python-modules/geopy { } + else callPackage ../development/python-modules/geopy/2.nix { }; django-haystack = callPackage ../development/python-modules/django-haystack { }; From 4f8e9b2d134ec24ef2fe6a8a84d399853ab57897 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 14 Nov 2019 16:20:24 -0600 Subject: [PATCH 16/68] Add myself to maintainers list. --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 44260ac1f25a..9795f18fde60 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2070,6 +2070,12 @@ email = "mpcervin@uncg.edu"; name = "Mabry Cervin"; }; + equirosa = { + email = "eduardo@eduardoquiros.com"; + github = "equirosa"; + githubId = 39096810; + name = "Eduardo Quiros"; + }; eqyiel = { email = "ruben@maher.fyi"; github = "eqyiel"; From 470942f29e68cbcc1df118e3d10e3970d1dd5875 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Thu, 14 Nov 2019 16:22:39 -0600 Subject: [PATCH 17/68] Add self (equirosa) to signal-desktop maintaners. --- .../networking/instant-messengers/signal-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index e39f01a92c04..aee540b7886a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -114,7 +114,7 @@ in stdenv.mkDerivation rec { ''; homepage = https://signal.org/; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ixmatus primeos ]; + maintainers = with lib.maintainers; [ ixmatus primeos equirosa ]; platforms = [ "x86_64-linux" ]; }; } From a6924d3fb77d78050f006ef60e0da8b09f533187 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 14 Nov 2019 18:00:00 -0500 Subject: [PATCH 18/68] terraform: 0.12.14 -> 0.12.15 Changelog: https://github.com/hashicorp/terraform/releases/tag/v0.12.15 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 598284dcb255..a72ba1d58846 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -112,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.14"; - sha256 = "0pq4sfnnlj91gxyxvyzzrgglnvh8xpan90gnc9jvnnb23iv4q96l"; + version = "0.12.15"; + sha256 = "18kvgb2sjldis7bykb11zqzx6avr7a4ry91xsfq4v0iwbi5k383b"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From d793d53b0d829090b8a38b14384dfcaae9ab1ae5 Mon Sep 17 00:00:00 2001 From: David Kleuker Date: Fri, 15 Nov 2019 00:32:09 +0100 Subject: [PATCH 19/68] doc/rl-1909: fix language (#71516) --- nixos/doc/manual/release-notes/rl-1909.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 8bd353a34304..4102fe206e19 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -543,7 +543,7 @@ The option is unsupported in combination with - in anticipation of defaulting to it by default. + in anticipation of defaulting to it. It has to be set to false and enabled per interface with From 5f373708ddec0e1754fc7d69c2b5bbbf016f22ad Mon Sep 17 00:00:00 2001 From: Kyle Sferrazza Date: Wed, 6 Nov 2019 10:50:14 -0500 Subject: [PATCH 20/68] denemo: add WrapGAppsHook closes #52958 remove wrapProgram in favor of gappsWrapperArgs move gettext and pkgconfig to nativeBuildInputs --- pkgs/applications/audio/denemo/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index 331e3fb96989..f3adec4fece2 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -2,7 +2,7 @@ , libjack2, gettext, intltool, guile_2_0, lilypond , glib, libxml2, librsvg, libsndfile, aubio , gtk3, gtksourceview, evince, fluidsynth, rubberband -, portaudio, portmidi, fftw, makeWrapper }: +, portaudio, portmidi, fftw, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "denemo"; @@ -14,17 +14,21 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libjack2 gettext guile_2_0 lilypond pkgconfig glib libxml2 librsvg libsndfile + libjack2 guile_2_0 lilypond glib libxml2 librsvg libsndfile aubio gtk3 gtksourceview evince fluidsynth rubberband portaudio fftw portmidi - makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/denemo --prefix PATH : ${lilypond}/bin + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lilypond}/bin" + ) ''; nativeBuildInputs = [ + wrapGAppsHook intltool + gettext + pkgconfig ]; meta = with stdenv.lib; { From 736860d34bfa427fa9bb2a48669f703325bce208 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 14 Nov 2019 21:25:10 -0500 Subject: [PATCH 21/68] nifticlib and niftseg: change platform from linux to unix since these build on OSX --- pkgs/applications/science/biology/niftyseg/default.nix | 2 +- .../development/libraries/science/biology/nifticlib/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix index 689d3e42c979..f70054e97716 100644 --- a/pkgs/applications/science/biology/niftyseg/default.nix +++ b/pkgs/applications/science/biology/niftyseg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg; description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix index 51eed36312dd..8c7da7968f5c 100644 --- a/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = https://sourceforge.net/projects/niftilib; description = "Medical imaging format C API"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.publicDomain; }; } From 6df2a88049966f139060a34869331734c8852311 Mon Sep 17 00:00:00 2001 From: Ahmed Kamal Date: Fri, 15 Nov 2019 04:30:34 +0200 Subject: [PATCH 22/68] xmrig-proxy: 3.2.0 -> 5.0.0 --- pkgs/applications/misc/xmrig/proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 09eed4aa4912..54fdbdb7cc19 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "3.2.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "0scz78cc5zcdd6z4gm0zqsb36jf0z8fyn2ki52814ndxrk7nr4xg"; + sha256 = "0h0yxzpar952ix94j10qyf31c20g45w0nxr02vfybjip48dvlf76"; }; nativeBuildInputs = [ cmake ]; From dafbcb986ab850fb68f8edd6defca2b3c9b0857f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 14 Nov 2019 23:49:36 +0100 Subject: [PATCH 23/68] Revert "python37Packages.pyspf: 2.0.12 -> 2.0.13" This reverts commit e3f9c4d79041c6114a67ff67772186b737477393. This fixes #72791. Version 2.0.13 of pyspf introduced a bug where some incoming mails can cause a crash and be falsely rejected. (https://github.com/sdgathman/pyspf/issues/17) --- pkgs/development/python-modules/pyspf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 48e731004c1c..61beac17ab3d 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspf"; - version = "2.0.13"; + version = "2.0.12"; # version 2.0.13 should not be used, see #72791 src = fetchPypi { inherit pname version; - sha256 = "16wjj99d2pikz6z1gwnl1jjvad6qjgpsf3a85lh47qqrjpiipp32"; + sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la"; }; propagatedBuildInputs = [ pydns ]; From 5dad4bdd6fed11ae1db4fef7f3ca5facc53e95c1 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 15 Nov 2019 05:57:51 +0100 Subject: [PATCH 24/68] kubernetes: 1.15.4 -> 1.16.3 Signed-off-by: Sascha Grunert --- pkgs/applications/networking/cluster/kubernetes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 1ad7ad3e393d..c2751ac270a7 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.15.4"; + version = "1.16.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p"; + sha256 = "0s2k7ik2aa7knh25r0qki7ldr3g9h87dgi8nm64j8n0yy4xvg2h3"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = https://kubernetes.io; - maintainers = with maintainers; [johanot offline]; + maintainers = with maintainers; [johanot offline saschagrunert]; platforms = platforms.unix; }; } From 7f358a5f3b1404464529b383960ec572c603f2af Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 15 Nov 2019 05:58:35 +0100 Subject: [PATCH 25/68] nixos/kubernetes: Module and test compatibility with kubernetes 1.16 Signed-off-by: Sascha Grunert --- nixos/doc/manual/release-notes/rl-2003.xml | 6 +++++- .../services/cluster/kubernetes/addons/dns.nix | 12 ++++++------ .../modules/services/cluster/kubernetes/flannel.nix | 1 + .../modules/services/cluster/kubernetes/kubelet.nix | 4 ++-- nixos/modules/services/cluster/kubernetes/proxy.nix | 9 +++++++++ nixos/tests/kubernetes/base.nix | 1 + 6 files changed, 24 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 72766f16eb9f..7370614b70a9 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -71,7 +71,11 @@ - + + The kubernetes kube-proxy now supports a new hostname configuration + services.kubernetes.proxy.hostname which has to + be set if the hostname of the node should be non default. + diff --git a/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 47e588de3c93..f12e866930da 100644 --- a/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -3,7 +3,7 @@ with lib; let - version = "1.5.0"; + version = "1.6.4"; cfg = config.services.kubernetes.addons.dns; ports = { dns = 10053; @@ -55,9 +55,9 @@ in { type = types.attrs; default = { imageName = "coredns/coredns"; - imageDigest = "sha256:e83beb5e43f8513fa735e77ffc5859640baea30a882a11cc75c4c3244a737d3c"; + imageDigest = "sha256:493ee88e1a92abebac67cbd4b5658b4730e0f33512461442d8d9214ea6734a9b"; finalImageTag = version; - sha256 = "15sbmhrxjxidj0j0cccn1qxpg6al175w43m6ngspl0mc132zqc9q"; + sha256 = "0fm9zdjavpf5hni8g7fkdd3csjbhd7n7py7llxjc66sbii087028"; }; }; }; @@ -68,7 +68,7 @@ in { services.kubernetes.addonManager.bootstrapAddons = { coredns-cr = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "ClusterRole"; metadata = { labels = { @@ -94,7 +94,7 @@ in { }; coredns-crb = { - apiVersion = "rbac.authorization.k8s.io/v1beta1"; + apiVersion = "rbac.authorization.k8s.io/v1"; kind = "ClusterRoleBinding"; metadata = { annotations = { @@ -170,7 +170,7 @@ in { }; coredns-deploy = { - apiVersion = "extensions/v1beta1"; + apiVersion = "apps/v1"; kind = "Deployment"; metadata = { labels = { diff --git a/nixos/modules/services/cluster/kubernetes/flannel.nix b/nixos/modules/services/cluster/kubernetes/flannel.nix index d799e638fc94..548ffed1ddb5 100644 --- a/nixos/modules/services/cluster/kubernetes/flannel.nix +++ b/nixos/modules/services/cluster/kubernetes/flannel.nix @@ -40,6 +40,7 @@ in cni.config = mkDefault [{ name = "mynet"; type = "flannel"; + cniVersion = "0.3.1"; delegate = { isDefaultGateway = true; bridge = "docker0"; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 250da4c807ec..62d893dfefc6 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -92,7 +92,7 @@ in default = []; example = literalExample '' [{ - "cniVersion": "0.2.0", + "cniVersion": "0.3.1", "name": "mynet", "type": "bridge", "bridge": "cni0", @@ -106,7 +106,7 @@ in ] } } { - "cniVersion": "0.2.0", + "cniVersion": "0.3.1", "type": "loopback" }] ''; diff --git a/nixos/modules/services/cluster/kubernetes/proxy.nix b/nixos/modules/services/cluster/kubernetes/proxy.nix index bd4bf04ea833..3943c908840c 100644 --- a/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -31,6 +31,12 @@ in type = listOf str; }; + hostname = mkOption { + description = "Kubernetes proxy hostname override."; + default = config.networking.hostName; + type = str; + }; + kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy"; verbosity = mkOption { @@ -59,6 +65,7 @@ in "--cluster-cidr=${top.clusterCidr}"} \ ${optionalString (cfg.featureGates != []) "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ + --hostname-override=${cfg.hostname} \ --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ ${cfg.extraOpts} @@ -69,6 +76,8 @@ in }; }; + services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName; + services.kubernetes.pki.certs = { kubeProxyClient = top.lib.mkCert { name = "kube-proxy-client"; diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index f21634c4ffbf..adb736506895 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -53,6 +53,7 @@ let services.flannel.iface = "eth1"; services.kubernetes = { addons.dashboard.enable = true; + proxy.hostname = "${masterName}.${domain}"; easyCerts = true; inherit (machine) roles; From 3c824cd0f6a71a98ba5c6527c23f3f3560ea146c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 10 Oct 2019 17:53:48 +0300 Subject: [PATCH 26/68] mariadb: remove development components --- .../mariadb/cmake-libmariadb-includedir.patch | 21 -------------- pkgs/servers/sql/mariadb/default.nix | 29 +++++++------------ 2 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch diff --git a/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch b/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch deleted file mode 100644 index dee77d9ab171..000000000000 --- a/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in -index 703c9466..c6d3f1bc 100644 ---- a/libmariadb/mariadb_config/mariadb_config.c.in -+++ b/libmariadb/mariadb_config/mariadb_config.c.in -@@ -5,13 +5,13 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" -+#define INCLUDE "-I@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_INCLUDEDIR@/mysql" -+#define LIBS "-L@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_LIBDIR@/ -lmariadb" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE - #define VERSION "@MARIADB_CLIENT_VERSION@" - #define CC_VERSION "@CPACK_PACKAGE_VERSION@" --#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" -+#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_PLUGINDIR@" - #define SOCKET "@MARIADB_UNIX_ADDR@" - #define PORT "@MARIADB_PORT@" - #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index bb9818cf9bba..1357e93fc7f4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -44,7 +44,6 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch - ./cmake-libmariadb-includedir.patch ]; cmakeFlags = [ @@ -86,10 +85,14 @@ common = rec { # attributes common to both builds ]; postInstall = '' + # Remove Development components. Need to use libmysqlclient. rm "$out"/lib/mysql/plugin/daemon_example.ini - mkdir -p "$dev"/bin && mv "$out"/bin/{mariadb_config,mysql_config} "$dev"/bin - mkdir -p "$dev"/lib/ && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib - mkdir -p "$dev"/lib/mysql/plugin && mv "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$dev"/lib/mysql/plugin + rm "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} + rm "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} + rm "$out"/bin/{mariadb_config,mysql_config} + rm -r $out/include + rm -r $out/lib/pkgconfig + rm -r $out/share/{aclocal,pkgconfig} ''; enableParallelBuilding = true; @@ -108,9 +111,7 @@ common = rec { # attributes common to both builds client = stdenv.mkDerivation (common // { pname = "mariadb-client"; - outputs = [ "out" "dev" "man" ]; - - propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc + outputs = [ "out" "man" ]; patches = common.patches ++ [ ./cmake-plugin-includedir.patch @@ -123,11 +124,6 @@ client = stdenv.mkDerivation (common // { "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" ]; - preConfigure = '' - cmakeFlags="$cmakeFlags \ - -DCMAKE_INSTALL_PREFIX_DEV=$dev" - ''; - postInstall = common.postInstall + '' rm -r "$out"/share/doc rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan} @@ -141,7 +137,7 @@ client = stdenv.mkDerivation (common // { server = stdenv.mkDerivation (common // { pname = "mariadb-server"; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.isDarwin) makeWrapper; @@ -176,12 +172,7 @@ server = stdenv.mkDerivation (common // { "-DWITHOUT_TOKUDB=1" ]; - preConfigure = '' - cmakeFlags="$cmakeFlags \ - -DCMAKE_INSTALL_PREFIX_DEV=$dev - -DINSTALL_SHAREDIR=$dev/share/mysql - -DINSTALL_SUPPORTFILESDIR=$dev/share/mysql" - '' + optionalString (!stdenv.isDarwin) '' + preConfigure = optionalString (!stdenv.isDarwin) '' patchShebangs scripts/mytop.sh ''; From 7470e6e6deb3c3119b09e2ab4989beeb285a56a2 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 10 Oct 2019 21:14:01 +0300 Subject: [PATCH 27/68] mariadb: refactor build configuration --- pkgs/servers/sql/mariadb/default.nix | 37 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 1357e93fc7f4..d451c1dab5c9 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl -, fixDarwinDylibNames, cctools, CoreServices -, asio, buildEnv, check, scons, less +, fixDarwinDylibNames, cctools, CoreServices, less , withoutClient ? false }: @@ -35,8 +34,8 @@ common = rec { # attributes common to both builds buildInputs = [ ncurses openssl zlib pcre jemalloc libiconv curl - ] ++ optionals stdenv.isLinux [ libaio systemd libkrb5 ] - ++ optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; + ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] + ++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -74,7 +73,7 @@ common = rec { # attributes common to both builds "-DWITH_SAFEMALLOC=OFF" "-DWITH_UNIT_TESTS=OFF" "-DEMBEDDED_LIBRARY=OFF" - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides # to pass in java explicitly. @@ -139,18 +138,18 @@ server = stdenv.mkDerivation (common // { outputs = [ "out" "man" ]; - nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.isDarwin) makeWrapper; + nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl - ++ optional stdenv.isLinux linux-pam - ++ optional (!stdenv.isDarwin) mytopEnv; + ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl + ++ optional stdenv.hostPlatform.isLinux linux-pam + ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; patches = common.patches ++ [ ./cmake-without-client.patch - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -165,39 +164,39 @@ server = stdenv.mkDerivation (common // { "-DWITH_INNODB_DISALLOW_WRITES=ON" "-DWITHOUT_EXAMPLE=1" "-DWITHOUT_FEDERATED=1" - ] ++ stdenv.lib.optionals withoutClient [ + ] ++ optionals withoutClient [ "-DWITHOUT_CLIENT=ON" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_TOKUDB=1" ]; - preConfigure = optionalString (!stdenv.isDarwin) '' + preConfigure = optionalString (!stdenv.hostPlatform.isDarwin) '' patchShebangs scripts/mytop.sh ''; postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common - rm "$out"/bin/mysql_client_test + rm "$out"/bin/{mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data - rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString withoutClient '' ${ # We don't build with GSSAPI on Darwin - optionalString (!stdenv.isDarwin) '' + optionalString (!stdenv.hostPlatform.isDarwin) '' rm "$out"/lib/mysql/plugin/auth_gssapi_client.so '' } rm "$out"/lib/mysql/plugin/client_ed25519.so - '' + optionalString (!stdenv.isDarwin) '' + rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} + '' + optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; # perlPackages.DBDmysql is broken on darwin - postFixup = optionalString (!stdenv.isDarwin) '' + postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/mytop --set PATH ${less}/bin/less ''; - CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; + CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive"; }); in mariadb From 8ef9a614b6a9d7816c147a22fb4e766e9c30b3bd Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 10 Oct 2019 22:05:19 +0300 Subject: [PATCH 28/68] zoneminder: fix build --- pkgs/servers/zoneminder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index df6cad8c759b..2dcaf44010e7 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, cmake, makeWrapper, pkgconfig -, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, mysql, pcre, perl, perlPackages +, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib , coreutils, procps, psmisc }: @@ -123,7 +123,7 @@ in stdenv.mkDerivation rec { done substituteInPlace scripts/zmdbbackup.in \ - --replace /usr/bin/mysqldump ${mysql}/bin/mysqldump + --replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ scripts/zmupdate.pl.in \ @@ -140,7 +140,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - curl ffmpeg glib libjpeg libselinux libsepol mp4v2 mysql pcre perl polkit x264 zlib + curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib utillinuxMinimal # for libmount ] ++ (with perlPackages; [ # build-time dependencies From 144735a049a2760c4bcfd7da20f072a73ec21c3e Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 11 Oct 2019 10:38:33 +0300 Subject: [PATCH 29/68] perlPackages.SysCPU: fix checkPhase on Aarch64 --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9b9eb3ff230a..f82e379a7ac4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16674,6 +16674,18 @@ let url = mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz; sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; }; + patches = [ + # Bug #95400 for Sys-CPU: Tests fail on ARM and AArch64 Linux + # https://rt.cpan.org/Public/Bug/Display.html?id=95400 + (fetchpatch { + url = "https://rt.cpan.org/Ticket/Attachment/1359669/721669/0001-Add-support-for-cpu_type-on-ARM-and-AArch64-Linux-pl.patch"; + sha256 = "0rmazzdy34znksdhh8drc83lk754slhjgvnk4kk27z3kw5gm10m0"; + }) + (fetchpatch { + url = "https://rt.cpan.org/Ticket/Attachment/1388036/737125/0002-cpu_clock-can-be-undefined-on-an-ARM.patch"; + sha256 = "0z3wqfahc9av7y34aqp6biq3sf8v8q4yynx7bv290vds50dsjb4w"; + }) + ]; buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; doCheck = !stdenv.isAarch64; }; From bef560f578e0467010077ddec35e3782597fb93a Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Fri, 15 Nov 2019 11:18:59 +0100 Subject: [PATCH 30/68] microcodeIntel: 20191112 -> 20191113 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20191113 (#73383) --- pkgs/os-specific/linux/microcode/intel.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index bf76ec74b0ff..4ada201263f8 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20191112"; + version = "20191113"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "059hkl172kk5gcsv87z02vh3vdayk63qa6m6yrsipi1203dmyvzw"; + sha256 = "04138j9n14197ybkh2vxfjy21wcgvbd183ya4b6k262y9nzjmvsa"; }; nativeBuildInputs = [ iucode-tool libarchive ]; From 85c2bb37816dd79724a27ce7b97647a2ebf21ec0 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 15 Nov 2019 15:05:42 +0100 Subject: [PATCH 31/68] =?UTF-8?q?doc/contributing:=20mention=20the=20word?= =?UTF-8?q?=20=E2=80=9Cbackporting=E2=80=9D=20for=20grep-ability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a contributor wants to know how to do this ominous “backporting” everybody is talking about, a grep should be enough to find it. --- doc/contributing/submitting-changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml index 6a8b4e0b249e..950e1ea974a0 100644 --- a/doc/contributing/submitting-changes.xml +++ b/doc/contributing/submitting-changes.xml @@ -441,7 +441,7 @@ Additional information. - If you're cherry-picking a commit to a stable release branch, always use git cherry-pick -xe and ensure the message contains a clear description about why this needs to be included in the stable branch. + If you're cherry-picking a commit to a stable release branch (“backporting”), always use git cherry-pick -xe and ensure the message contains a clear description about why this needs to be included in the stable branch. An example of a cherry-picked commit would look like this: From 2685391917c43f85a4997916c3237416fb330925 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 15 Nov 2019 06:50:44 -0800 Subject: [PATCH 32/68] ntl: 11.3.4 -> 11.4.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/ntl/versions (#71728) --- pkgs/development/libraries/ntl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index efb307507a38..10e59c5117c0 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -14,11 +14,11 @@ assert withGf2x -> gf2x != null; stdenv.mkDerivation rec { pname = "ntl"; - version = "11.3.4"; + version = "11.4.1"; src = fetchurl { url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; - sha256 = "0fdy63x6iglp20ypqhkpjj6wqjzpxlyl2wfw2dqlgiy6l6ibm4rd"; + sha256 = "03k2hb6yn49d1f9cdig2ci7h5ga0x3nb3li60hh19wdqzg28f1m3"; }; buildInputs = [ From fd7d88f6035bdec48d34beee1a46228eb4dda1b6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 15 Nov 2019 16:41:00 +0100 Subject: [PATCH 33/68] nixos/lorri: add to environment.systemPackages most likely, people enabling the lorri module also want to use it, without explicitly having to add it to users.users..packages. cc @curiousleo @Profpatsch --- nixos/modules/services/development/lorri.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/development/lorri.nix b/nixos/modules/services/development/lorri.nix index 618785ee53ca..68264ee869d1 100644 --- a/nixos/modules/services/development/lorri.nix +++ b/nixos/modules/services/development/lorri.nix @@ -41,5 +41,7 @@ in { Restart = "on-failure"; }; }; + + environment.systemPackages = [ pkgs.lorri ]; }; } From 9d10b20a63b18afc76ebd2cea49df16d7118f5b1 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 8 Nov 2019 16:44:21 +0100 Subject: [PATCH 34/68] riot-desktop: fix missing tray icon The tray icon has always been missing for me (on sway / waybar). It turns out that it is looked up in a different location than where we package it. Overall, it seems we are not at all following the upstream layout as can be seen in data.tar.xz available at packages.riot.im/debian/pool/main/r/riot-web/riot-web_1.4.2_amd64.deb This is a small fix that works for me. May not be optimal :-). --- .../networking/instant-messengers/riot/riot-desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index de941d94fc87..ec3b42c15534 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -31,6 +31,7 @@ in yarn2nix-moretea.mkYarnPackage rec { ln -s '${riot-web}' "$out/share/riot/webapp" cp -r '${riot-web-src}/origin_migrator' "$out/share/riot/origin_migrator" cp -r './deps/riot-web' "$out/share/riot/electron" + cp -r './deps/riot-web/img' "$out/share/riot" rm "$out/share/riot/electron/node_modules" cp -r './node_modules' "$out/share/riot/electron" From 75667c2916d4bd60db2f5a1f1838d67af87a3610 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Fri, 15 Nov 2019 17:59:55 +0100 Subject: [PATCH 35/68] pythonPackages.nixpart: unmark broken --- pkgs/tools/filesystems/nixpart/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 8f59ff809a83..809c5256873e 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -16,6 +16,5 @@ buildPythonApplication rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.aszlig ]; platforms = stdenv.lib.platforms.linux; - broken = true; }; } From d587092e9e7df9786495c19f710cf6469d72eecb Mon Sep 17 00:00:00 2001 From: SRGOM Date: Sat, 16 Nov 2019 00:31:11 +0530 Subject: [PATCH 36/68] pplatex: init at unstable-2015-09-14 (#73461) --- .../tools/typesetting/tex/pplatex/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/typesetting/tex/pplatex/default.nix diff --git a/pkgs/tools/typesetting/tex/pplatex/default.nix b/pkgs/tools/typesetting/tex/pplatex/default.nix new file mode 100644 index 000000000000..01777f3dd428 --- /dev/null +++ b/pkgs/tools/typesetting/tex/pplatex/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre }: + +stdenv.mkDerivation { + pname = "pplatex"; + version = "unstable-2015-09-14"; + + src = fetchFromGitHub { + owner = "stefanhepp"; + repo = "pplatex"; + rev = "5cec891ad6aec0115081cdd114ae1cc4f1ed7c06"; + sha256 = "0wrkkbz6b6x91650nm8gccz7xghlp7b1i31fxwalz9xw3py9xygb"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ pcre ]; + + installPhase = '' + runHook preInstall + install -Dm555 src/pplatex "$out"/bin/pplatex + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = + "A tool to reformat the output of latex and friends into readable messages"; + homepage = "https://github.com/stefanhepp/pplatex"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.srgom ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0210a42d003c..0be07adc109f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5740,6 +5740,8 @@ in ppl = callPackage ../development/libraries/ppl { }; + pplatex = callPackage ../tools/typesetting/tex/pplatex { }; + ppp = callPackage ../tools/networking/ppp { }; pptp = callPackage ../tools/networking/pptp {}; From 35b81fb1a494485918438352820528d205d7d38b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Nov 2019 14:21:45 +0100 Subject: [PATCH 37/68] LTS Haskell 14.14 --- .../configuration-hackage2nix.yaml | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6c62c84266c7..1b24c8585721 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,7 +43,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 14.13 + # LTS Haskell 14.14 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -60,7 +60,7 @@ default-package-overrides: - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 - aeson-compat ==0.3.9 - - aeson-diff ==1.1.0.7 + - aeson-diff ==1.1.0.8 - aeson-extra ==0.4.1.3 - aeson-generic-compat ==0.0.1.3 - aeson-iproute ==0.2 @@ -72,7 +72,7 @@ default-package-overrides: - al ==0.1.4.2 - alarmclock ==0.7.0.2 - alerts ==0.1.2.0 - - alex ==3.2.4 + - alex ==3.2.5 - alg ==0.2.12.0 - algebraic-graphs ==0.4 - Allure ==0.9.5.0 @@ -90,7 +90,7 @@ default-package-overrides: - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - aos-signature ==0.1.1 - - apecs ==0.8.1 + - apecs ==0.8.2 - apecs-gloss ==0.2.3 - apecs-physics ==0.4.2 - api-field-json-th ==0.1.0.2 @@ -111,7 +111,7 @@ default-package-overrides: - asn1-parse ==0.9.5 - asn1-types ==0.3.3 - assert-failure ==0.1.2.2 - - assoc ==1 + - assoc ==1.0.1 - astro ==0.4.2.1 - async ==2.2.2 - async-extra ==0.2.0.0 @@ -134,12 +134,12 @@ default-package-overrides: - authenticate ==1.3.4 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - autoexporter ==1.1.14 + - autoexporter ==1.1.15 - auto-update ==0.1.6 - avers ==0.0.17.1 - avers-api ==0.1.0 - avers-server ==0.1.0.1 - - avro ==0.4.5.3 + - avro ==0.4.5.4 - avwx ==0.3.0.2 - aws-cloudfront-signed-cookies ==0.2.0.1 - aws-lambda-haskell-runtime ==2.0.1 @@ -311,7 +311,7 @@ default-package-overrides: - chiphunk ==0.1.2.1 - choice ==0.2.2 - chronologique ==0.3.1.1 - - chronos ==1.0.7 + - chronos ==1.0.8 - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 @@ -513,7 +513,7 @@ default-package-overrides: - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 - deriving-compat ==0.5.7 - - derulo ==1.0.5 + - derulo ==1.0.7 - detour-via-sci ==1.0.0 - dhall ==1.24.0 - dhall-bash ==1.0.21 @@ -521,7 +521,7 @@ default-package-overrides: - diagrams ==1.4 - diagrams-contrib ==1.4.3 - diagrams-core ==1.4.2 - - diagrams-lib ==1.4.2.3 + - diagrams-lib ==1.4.3 - diagrams-postscript ==1.4.1 - diagrams-rasterific ==1.4.1.1 - diagrams-solve ==0.1.1 @@ -532,7 +532,7 @@ default-package-overrides: - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - di-monad ==1.3 + - di-monad ==1.3.1 - directory-tree ==0.12.1 - direct-sqlite ==2.3.24 - discount ==0.1.1 @@ -550,7 +550,7 @@ default-package-overrides: - doctemplates ==0.2.2.1 - doctest ==0.16.2 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.1 + - doctest-driver-gen ==0.3.0.2 - doldol ==0.4.1.2 - do-list ==1.0.1 - dom-parser ==3.1.0 @@ -799,7 +799,7 @@ default-package-overrides: - gingersnap ==0.3.1.0 - gi-pango ==1.0.22 - githash ==0.1.3.3 - - github-release ==1.2.4 + - github-release ==1.2.5 - github-types ==0.2.1 - github-webhooks ==0.10.1 - gitrev ==1.3.1 @@ -876,7 +876,7 @@ default-package-overrides: - haskey-btree ==0.3.0.1 - haskintex ==0.8.0.0 - haskoin-core ==0.9.6 - - hasql ==1.4 + - hasql ==1.4.0.1 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 - hasql-transaction ==0.7.2 @@ -895,7 +895,7 @@ default-package-overrides: - hedgehog ==1.0.1 - hedgehog-corpus ==0.1.0 - hedgehog-fn ==1.0 - - hedis ==0.12.8 + - hedis ==0.12.9 - hedn ==0.2.0.1 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1148,7 +1148,7 @@ default-package-overrides: - js-jquery ==3.3.1 - json ==0.9.3 - json-alt ==1.0.0 - - json-feed ==1.0.6 + - json-feed ==1.0.7 - jsonpath ==0.1.0.2 - json-rpc ==1.0.0 - json-rpc-client ==0.2.5.0 @@ -1176,7 +1176,7 @@ default-package-overrides: - kraken ==0.1.0 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.9 + - lackey ==1.0.10 - LambdaHack ==0.9.5.0 - lame ==0.2.0 - language-c ==0.8.3 @@ -1225,7 +1225,7 @@ default-package-overrides: - libmpd ==0.9.0.10 - liboath-hs ==0.0.1.1 - libraft ==0.5.0.0 - - libyaml ==0.1.1.0 + - libyaml ==0.1.1.1 - LibZip ==1.0.1 - lifted-async ==0.10.0.4 - lifted-base ==0.2.3.12 @@ -1262,7 +1262,7 @@ default-package-overrides: - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - lsp-test ==0.6.1.0 - - lucid ==2.9.11 + - lucid ==2.9.12 - lucid-extras ==0.2.2 - lxd-client-config ==0.1.0.1 - lzma ==0.0.0.3 @@ -1356,7 +1356,7 @@ default-package-overrides: - monad-loops ==0.4.3 - monad-memo ==0.5.1 - monad-metrics ==0.2.1.4 - - monad-par ==0.3.4.8 + - monad-par ==0.3.5 - monad-parallel ==0.7.2.3 - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 @@ -1378,7 +1378,6 @@ default-package-overrides: - mono-traversable-instances ==0.1.0.0 - mono-traversable-keys ==0.1.0 - more-containers ==0.2.1.2 - - morpheus-graphql ==0.6.2 - mountpoints ==1.0.2 - mpi-hs ==0.5.3.0 - msgpack ==1.0.1.0 @@ -1432,7 +1431,7 @@ default-package-overrides: - network-conduit-tls ==1.3.2 - network-house ==0.1.0.2 - network-info ==0.2.0.10 - - network-ip ==0.3.0.2 + - network-ip ==0.3.0.3 - network-messagepack-rpc ==0.1.1.4 - network-multicast ==0.3.2 - network-simple ==0.4.5 @@ -1452,7 +1451,7 @@ default-package-overrides: - nonempty-containers ==0.3.2.0 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.2 - - nonempty-vector ==0.1.0.0 + - nonempty-vector ==0.2.0.1 - non-negative ==0.1.2 - not-gloss ==0.7.7.0 - no-value ==1.0.0.0 @@ -1724,10 +1723,10 @@ default-package-overrides: - rank2classes ==1.3.1.2 - Rasterific ==0.7.4.4 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.8 - - ratel-wai ==1.1.0 + - ratel ==1.0.9 + - ratel-wai ==1.1.1 - rattle ==0.1 - - rattletrap ==9.0.6 + - rattletrap ==9.0.7 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 @@ -1822,7 +1821,7 @@ default-package-overrides: - salak-toml ==0.3.5.3 - salak-yaml ==0.3.5.3 - saltine ==0.1.0.2 - - salve ==1.0.6 + - salve ==1.0.8 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.3 @@ -2033,7 +2032,7 @@ default-package-overrides: - stripe-scotty ==1.0.0.0 - stripe-signature ==1.0.0.1 - stripe-wreq ==1.0.1.0 - - strive ==5.0.8 + - strive ==5.0.9 - structs ==0.1.2 - structured-cli ==2.5.1.0 - summoner ==1.3.0.1 @@ -2126,7 +2125,7 @@ default-package-overrides: - text-region ==0.3.1.0 - text-short ==0.1.3 - text-show ==3.8.2 - - text-show-instances ==3.8.2 + - text-show-instances ==3.8.3 - text-zipper ==0.10.1 - tfp ==1.0.1.1 - tf-random ==0.5 @@ -2195,7 +2194,7 @@ default-package-overrides: - transformers-bifunctors ==0.1 - transformers-compat ==0.6.5 - transformers-fix ==1.0 - - traverse-with-class ==1.0.0.0 + - traverse-with-class ==1.0.1.0 - tree-diff ==0.1 - tree-fun ==0.8.1.0 - trifecta ==2 @@ -2391,7 +2390,7 @@ default-package-overrides: - writer-cps-mtl ==0.1.1.6 - writer-cps-transformers ==0.5.6.1 - ws ==0.0.5 - - wuss ==1.1.14 + - wuss ==1.1.15 - X11 ==1.9.1 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 @@ -2429,7 +2428,7 @@ default-package-overrides: - xmonad-extras ==0.15.2 - xss-sanitize ==0.3.6 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.1.2 + - yaml ==0.11.2.0 - yeshql ==4.1.0.1 - yeshql-core ==4.1.0.2 - yeshql-hdbc ==4.1.0.2 From b06de887f7c34090ac381d23db47749c529bd60d Mon Sep 17 00:00:00 2001 From: "William R. Arellano" Date: Tue, 12 Nov 2019 08:09:27 -0500 Subject: [PATCH 38/68] dotenv: fix broken package version 0.8.0.2 --- pkgs/development/haskell-modules/configuration-nix.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 5308296c8332..909accb9a979 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -624,5 +624,7 @@ self: super: builtins.intersectAttrs super { # need it during the build itself, too. cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"]; - + + # Tests fails because of missing test file + dotenv = dontCheck super.dotenv; } From afd42d621dceaec96f8a2cdcb18af0c3a368e342 Mon Sep 17 00:00:00 2001 From: "William R. Arellano" Date: Tue, 12 Nov 2019 08:17:05 -0500 Subject: [PATCH 39/68] dotenv: remove from broken packages --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1b24c8585721..fc9a121e0faf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4310,7 +4310,6 @@ broken-packages: - domplate - dot-linker - dot2graphml - - dotenv - dotfs - doublify-toolkit - dovin From 227a8e0e7c3fe86d43efd0546b9a0605101af643 Mon Sep 17 00:00:00 2001 From: "William R. Arellano" Date: Tue, 12 Nov 2019 08:26:05 -0500 Subject: [PATCH 40/68] dotnev: move changes from configuration-nix to configuration-common --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-nix.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9c68b8c35608..1017ebba29e2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -275,6 +275,7 @@ self: super: { dlist = dontCheck super.dlist; docopt = dontCheck super.docopt; # http://hydra.cryp.to/build/499172/log/raw dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw + dotenv = dontCheck super.dotenv; dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw ed25519 = dontCheck super.ed25519; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 909accb9a979..1cd14dd3317b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -625,6 +625,4 @@ self: super: builtins.intersectAttrs super { cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"]; - # Tests fails because of missing test file - dotenv = dontCheck super.dotenv; } From ea6b44b6d5ee420c7727656b9b5c9ef89fbcacee Mon Sep 17 00:00:00 2001 From: "William R. Arellano" Date: Tue, 12 Nov 2019 08:46:38 -0500 Subject: [PATCH 41/68] dotenv: add comment for future reference --- 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 1017ebba29e2..70a95cf4ddd2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -275,7 +275,7 @@ self: super: { dlist = dontCheck super.dlist; docopt = dontCheck super.docopt; # http://hydra.cryp.to/build/499172/log/raw dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw - dotenv = dontCheck super.dotenv; + dotenv = dontCheck super.dotenv; # Tests fail because of missing test file on version 0.8.0.2 fixed on version 0.8.0.4 dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw ed25519 = dontCheck super.ed25519; From 266ee8d74d1d0cd96cf6ee4ace255ae0ce8ee252 Mon Sep 17 00:00:00 2001 From: "William R. Arellano" Date: Tue, 12 Nov 2019 08:44:00 -0500 Subject: [PATCH 42/68] Update pkgs/development/haskell-modules/configuration-nix.nix Co-Authored-By: Dennis Gosnell --- pkgs/development/haskell-modules/configuration-nix.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 1cd14dd3317b..47b97e7d65f3 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -624,5 +624,4 @@ self: super: builtins.intersectAttrs super { # need it during the build itself, too. cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"]; - } From 750a3ba2ce97210d141f31d648fb070cb025e8f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Nov 2019 20:48:15 +0100 Subject: [PATCH 43/68] hackage2nix: disable builds that break evaluation on Hydra --- .../haskell-modules/configuration-hackage2nix.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fc9a121e0faf..f57768ecb773 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5186,6 +5186,8 @@ broken-packages: - GrowlNotify - grpc-api-etcd - grpc-etcd-client + - grpc-haskell + - grpc-haskell-core - gruff - gruff-examples - gsc-weighting @@ -6154,6 +6156,7 @@ broken-packages: - http-dispatch - http-enumerator - http-grammar + - http-io-streams - http-kinder - http-monad - http-pony-serve-wai @@ -7446,6 +7449,7 @@ broken-packages: - NestedFunctor - nestedmap - net-mqtt + - net-mqtt-rpc - net-spider - net-spider-cli - net-spider-pangraph @@ -8550,6 +8554,7 @@ broken-packages: - rws - RxHaskell - s-expression + - S3 - SableCC2Hs - safe-access - safe-buffer-monad @@ -8682,6 +8687,7 @@ broken-packages: - Semantique - semdoc - semi-iso + - semialign-extras - semialign-indexed - semialign-optics - semibounded-lattices From 22890f7b13052cfa64144c8dfed8d228fa78db74 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 15 Nov 2019 10:21:36 +0900 Subject: [PATCH 44/68] haskellPackages.llvm-hs: fix build on darwin --- .../haskell-modules/configuration-nix.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 47b97e7d65f3..dbdad1ddf1d0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -297,10 +297,22 @@ self: super: builtins.intersectAttrs super { ); llvm-hs = - let dontCheckDarwin = if pkgs.stdenv.isDarwin - then dontCheck - else pkgs.lib.id; - in dontCheckDarwin (super.llvm-hs.override { llvm-config = pkgs.llvm_8; }); + let llvmHsWithLlvm8 = super.llvm-hs.override { llvm-config = pkgs.llvm_8; }; + in + if pkgs.stdenv.isDarwin + then + overrideCabal llvmHsWithLlvm8 (oldAttrs: { + # One test fails on darwin. + doCheck = false; + # llvm-hs's Setup.hs file tries to add the lib/ directory from LLVM8 to + # the DYLD_LIBRARY_PATH environment variable. This messes up clang + # when called from GHC, probably because clang is version 7, but we are + # using LLVM8. + preCompileBuildDriver = oldAttrs.preCompileBuildDriver or "" + '' + substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()" + ''; + }) + else llvmHsWithLlvm8; # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; From 1e7e4d8e93e97ea406149ebdb49698a85d260fd0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Nov 2019 20:50:57 +0100 Subject: [PATCH 45/68] git-annex: update sha256 hash for new version 7.20191114 --- 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 70a95cf4ddd2..1041b58010ef 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -74,7 +74,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 = "1ahjddwl8wfkhc5sj2j2snh3cq0vg4apgv2maq3wdncin8bj7my6"; + sha256 = "04l1yrjq7n4nlzkmkg73xp6p7vpw1iq53mrmyb8162wqb7zapg4f"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From aed8e9536d4e7579d060072f1ca9ac378a2c6283 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Nov 2019 20:59:53 +0100 Subject: [PATCH 46/68] haskell-src-exts-simple: add override to fix version of the dependencies --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1041b58010ef..9fd343870b9b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1315,4 +1315,7 @@ self: super: { ]; }); + # Needs the corresponding version of haskell-src-exts. + haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_22_0; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 72515c590e91c02ebbf65044b52c6414008ece4d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 Nov 2019 02:30:34 +0100 Subject: [PATCH 47/68] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-6-g12ceeb2 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/99180e68fe22f24f5b6c544f6741c8ccdf12855c. --- .../haskell-modules/hackage-packages.nix | 2219 ++++++++++------- 1 file changed, 1252 insertions(+), 967 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2d1e866ac09b..8f21ebfc1493 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3163,12 +3163,14 @@ self: { }: mkDerivation { pname = "ClustalParser"; - version = "1.2.3"; - sha256 = "0wjs6bsbyykrm0hjdybnap86zsnhjjifampm08dqg7fqp7f7pmpy"; + version = "1.3.0"; + sha256 = "0zm0n4pvs9dspfh3x7zfjs20k78mkhsqy6xkg4002b7g8c5bwkp6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec text vector ]; - executableHaskellDepends = [ base cmdargs either-unwrap ]; + executableHaskellDepends = [ + base cmdargs either-unwrap parsec text vector + ]; testHaskellDepends = [ base hspec hspec-discover parsec text ]; testToolDepends = [ hspec-discover ]; description = "Libary for parsing Clustal tools output"; @@ -12837,15 +12839,15 @@ self: { }: mkDerivation { pname = "MagicHaskeller"; - version = "0.9.6.7"; - sha256 = "0cl0lq45x8pxsbdiqg9sx39jvs8h2h32mni5zq2jb61ac7wim9g1"; + version = "0.9.6.8"; + sha256 = "1091s8jrynjb76wg5r53kp0siv0dgbsxsb9y2djrq1iz06h01m55"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers directory ghc ghc-paths hashable haskell-src html mtl network network-uri pretty random syb - template-haskell tf-random time + template-haskell tf-random time transformers ]; executableHaskellDepends = [ abstract-par array base bytestring cgi containers directory @@ -16175,15 +16177,14 @@ self: { }: mkDerivation { pname = "R-pandoc"; - version = "0.2.2"; - sha256 = "1kb9dnwbkinx3wi7fr8i9a7dpl1gx08f4ysml1jacf1p6nvhi1lq"; + version = "0.2.3"; + sha256 = "05pb2gr0s4fjd3lj90r6hdj30bzsz16jsibmi99xi3172plyk449"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath pandoc-types process split ]; executableHaskellDepends = [ base pandoc-types ]; - description = "A pandoc filter to express R plots inside markdown"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -16931,6 +16932,8 @@ self: { ]; description = "Library for accessing S3 compatible storage services"; license = stdenv.lib.licenses.gpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "SBench" = callPackage @@ -22003,19 +22006,20 @@ self: { "acid-state" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , criterion, deepseq, directory, filelock, filepath, hedgehog - , hspec, hspec-discover, mtl, network, random, safecopy, stm - , system-fileio, system-filepath, template-haskell, text - , th-expand-syns, time, unix + , hspec, hspec-discover, mtl, network, network-bsd, random + , safecopy, stm, system-fileio, system-filepath, template-haskell + , text, th-expand-syns, time, unix }: mkDerivation { pname = "acid-state"; - version = "0.15.2"; - sha256 = "08v807yxkd13m1zffw1yryifjgn7w28a31hb0sg0n3yw7vzk9ny3"; + version = "0.16.0"; + sha256 = "18pdxawx28wsvjah2rih6fa8mgxpkrpskfkvb5gjb1yn29dd8cmn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base bytestring cereal containers directory filelock filepath - mtl network safecopy stm template-haskell th-expand-syns unix + mtl network network-bsd safecopy stm template-haskell + th-expand-syns unix ]; executableHaskellDepends = [ base directory ]; testHaskellDepends = [ @@ -23105,21 +23109,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "advent-of-code-api_0_2_1_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , deepseq, directory, filepath, finite-typelits, http-api-data - , http-client, http-client-tls, http-media, HUnit, mtl, servant + "advent-of-code-api_0_2_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, filepath, finite-typelits, http-api-data, http-client + , http-client-tls, http-media, HUnit, megaparsec, mtl, servant , servant-client, servant-client-core, stm, tagsoup, text, time }: mkDerivation { pname = "advent-of-code-api"; - version = "0.2.1.0"; - sha256 = "1p6lix0sj7zkcmijc2dphy3bndvam9fmgwzn1a0lniixjz0jkhpd"; + version = "0.2.2.0"; + sha256 = "1r06kb8l6h4hm4r1f7prch3px0zigdcp8vrzi1x0qw6g1wj4zii0"; libraryHaskellDepends = [ - aeson attoparsec base bytestring containers deepseq directory - filepath finite-typelits http-api-data http-client http-client-tls - http-media mtl servant servant-client servant-client-core stm - tagsoup text time + aeson base bytestring containers deepseq directory filepath + finite-typelits http-api-data http-client http-client-tls + http-media megaparsec mtl servant servant-client + servant-client-core stm tagsoup text time ]; testHaskellDepends = [ base directory filepath HUnit text ]; description = "Advent of Code REST API bindings and servant API"; @@ -23232,6 +23236,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson_1_4_6_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, base-orphans + , base16-bytestring, bytestring, containers, deepseq, Diff + , directory, dlist, filepath, generic-deriving, ghc-prim, hashable + , hashable-time, integer-logarithms, primitive, QuickCheck + , quickcheck-instances, scientific, tagged, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text + , th-abstraction, time, time-compat, unordered-containers + , uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.4.6.0"; + sha256 = "12s8nfsady47zlz94f7m978irwwj0l0v2x41hk8w1i14wb3b4gwj"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable primitive scientific tagged template-haskell text + th-abstraction time time-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers Diff directory dlist filepath + generic-deriving ghc-prim hashable hashable-time integer-logarithms + QuickCheck quickcheck-instances scientific tagged tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-compat unordered-containers uuid-types vector + ]; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -23367,33 +23404,6 @@ self: { }) {}; "aeson-diff" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , edit-distance-vector, filepath, Glob, hashable, mtl - , optparse-applicative, QuickCheck, quickcheck-instances - , scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-diff"; - version = "1.1.0.7"; - sha256 = "01d48pd7d1mb9cd5yxfajln8rmjdjq8ch91s0lav4qw1azv6vp2r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring edit-distance-vector hashable mtl scientific - text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring optparse-applicative text - ]; - testHaskellDepends = [ - aeson base bytestring directory doctest filepath Glob QuickCheck - quickcheck-instances text unordered-containers vector - ]; - description = "Extract and apply patches to JSON documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-diff_1_1_0_8" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , edit-distance-vector, filepath, Glob, hashable, mtl , optparse-applicative, QuickCheck, quickcheck-instances @@ -23418,7 +23428,6 @@ self: { ]; description = "Extract and apply patches to JSON documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-diff-generic" = callPackage @@ -24752,23 +24761,6 @@ self: { }) {}; "alex" = callPackage - ({ mkDerivation, array, base, containers, directory, happy, process - }: - mkDerivation { - pname = "alex"; - version = "3.2.4"; - sha256 = "0cpjixgsr0b2x4s6hz4aa6gnmjw9i7xd9nlfi8m37zqlidq4v3nm"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ array base containers directory ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base process ]; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alex_3_2_5" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process }: mkDerivation { @@ -24783,7 +24775,6 @@ self: { testHaskellDepends = [ base process ]; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-meta" = callPackage @@ -28147,8 +28138,8 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.3.7.1"; - sha256 = "1z7jf7ai7r2rlnwylqs60pqcz0h4dxj4g372c919lcvinmql1yfx"; + version = "0.4.0.0"; + sha256 = "0x56yif31bkf01993xh7qvd775c9k8sc6db0ghg8yd10l9fnr92c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -28739,21 +28730,22 @@ self: { "ansi-terminal-game" = callPackage ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal , clock, exceptions, hspec, linebreak, mintty, mtl, QuickCheck - , split, terminal-size, timers-tick + , random, split, terminal-size, timers-tick }: mkDerivation { pname = "ansi-terminal-game"; - version = "0.5.0.0"; - sha256 = "1j56cia0361fdkcskwbj05gxybssrhkqd0x9bfp6zrw0m040cqk6"; + version = "0.6.0.0"; + sha256 = "117j5s87pw1cmh9klzcc3jcc3hvynsrwknkqys8lqlhp2xkvha5y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal array base bytestring cereal clock exceptions - linebreak mintty mtl QuickCheck split terminal-size timers-tick + linebreak mintty mtl QuickCheck random split terminal-size + timers-tick ]; testHaskellDepends = [ ansi-terminal array base bytestring cereal clock exceptions hspec - linebreak mtl QuickCheck split terminal-size timers-tick + linebreak mtl QuickCheck random split terminal-size timers-tick ]; description = "sdl-like functions for terminal applications, based on ansi-terminal"; license = stdenv.lib.licenses.gpl3; @@ -29405,23 +29397,6 @@ self: { }) {}; "apecs" = callPackage - ({ mkDerivation, array, base, containers, criterion, linear, mtl - , QuickCheck, template-haskell, vector - }: - mkDerivation { - pname = "apecs"; - version = "0.8.1"; - sha256 = "10m3lbfg97psnk3z2ml1q9g2ymwa2fnsknrh6ggp9k5c7mskslv0"; - libraryHaskellDepends = [ - array base containers mtl template-haskell vector - ]; - testHaskellDepends = [ base containers linear QuickCheck vector ]; - benchmarkHaskellDepends = [ base criterion linear ]; - description = "Fast Entity-Component-System library for game programming"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apecs_0_8_2" = callPackage ({ mkDerivation, array, base, containers, criterion, linear, mtl , QuickCheck, template-haskell, vector }: @@ -29436,7 +29411,6 @@ self: { benchmarkHaskellDepends = [ base criterion linear ]; description = "Fast Entity-Component-System library for game programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apecs-gloss" = callPackage @@ -31417,8 +31391,8 @@ self: { }: mkDerivation { pname = "arrayfire"; - version = "0.4.0.0"; - sha256 = "1skdwl2dnjhc0lbnj0vji9n23xb8hnw029k4wbp14czk91h3pzjz"; + version = "0.6.0.0"; + sha256 = "0vm1m3bc3c29dwbpzkp0pnxnz7rah8gqrgc0p4haivm5w4r10bf8"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -32157,19 +32131,6 @@ self: { }) {inherit (pkgs) assimp;}; "assoc" = callPackage - ({ mkDerivation, base, bifunctors }: - mkDerivation { - pname = "assoc"; - version = "1"; - sha256 = "0i1jj6lrabl0fhh1iya4nxr2hw1s4xmhca5qnim93ng5znziv9n2"; - revision = "1"; - editedCabalFile = "0hcpyypnj9qwbpk079h6lnm8aa3mp3fzjilk9qwibkmnnqwwwcld"; - libraryHaskellDepends = [ base bifunctors ]; - description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "assoc_1_0_1" = callPackage ({ mkDerivation, base, bifunctors, tagged }: mkDerivation { pname = "assoc"; @@ -32178,7 +32139,6 @@ self: { libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "assoc-list" = callPackage @@ -32943,8 +32903,8 @@ self: { }: mkDerivation { pname = "ats-format"; - version = "0.2.0.32"; - sha256 = "0waxsxj13jcxams5zz13skg46lbf5c0zkwmjap8hibrrkrrilbcv"; + version = "0.2.0.34"; + sha256 = "146l1zlm4jc83v8rs3ci9j53x2gsvpdb2wjx06d4zg1h2ri8064i"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup filepath ]; @@ -32969,8 +32929,8 @@ self: { }: mkDerivation { pname = "ats-pkg"; - version = "3.3.0.4"; - sha256 = "0s9n7nf2n313ci1hn6yirf4gkyrp612cm600vnb6l7pjhj6zw3yp"; + version = "3.3.0.7"; + sha256 = "15xr1g3ivmfnwmbrh2ga75vppyv1qk6zcx556f69jxx1ab492zyq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -33737,20 +33697,6 @@ self: { }) {}; "autoexporter" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; - version = "1.1.14"; - sha256 = "0ijykr8qg7ijadlkn0gx3n06n14ihar8dvaddmmaab2awpmaa3l8"; - 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_15" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; @@ -33762,7 +33708,6 @@ self: { executableHaskellDepends = [ base Cabal directory filepath ]; description = "Automatically re-export modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autom" = callPackage @@ -34103,40 +34048,6 @@ self: { }) {}; "avro" = callPackage - ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors - , binary, bytestring, containers, data-binary-ieee754, deepseq - , directory, extra, fail, gauge, hashable, hspec, hspec-discover - , lens, lens-aeson, mtl, pure-zlib, QuickCheck, random - , raw-strings-qq, scientific, semigroups, tagged, template-haskell - , text, tf-random, transformers, unordered-containers, vector, zlib - }: - mkDerivation { - pname = "avro"; - version = "0.4.5.3"; - sha256 = "0az1mlil8h7scpma16f52zwkbi5iw6mdl6r7vywqhlgsdd2xl9kx"; - libraryHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers data-binary-ieee754 deepseq fail hashable mtl scientific - semigroups tagged template-haskell text tf-random - unordered-containers vector zlib - ]; - testHaskellDepends = [ - aeson array base base16-bytestring bifunctors binary bytestring - containers directory extra fail hashable hspec lens lens-aeson mtl - pure-zlib QuickCheck raw-strings-qq scientific semigroups tagged - text tf-random transformers unordered-containers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - aeson base bytestring containers gauge hashable mtl random - raw-strings-qq template-haskell text transformers - unordered-containers vector - ]; - description = "Avro serialization support for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "avro_0_4_5_4" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, extra, fail, gauge, hashable, hspec, hspec-discover @@ -34168,7 +34079,6 @@ self: { ]; description = "Avro serialization support for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avwx" = callPackage @@ -42575,25 +42485,25 @@ self: { "box" = callPackage ({ mkDerivation, async, attoparsec, base, concurrency , contravariant, dejafu, doctest, exceptions, foldl, generic-lens - , lens, pipes, profunctors, protolude, random, streaming, text - , time, transformers, transformers-base + , lens, mtl, pipes, profunctors, random, streaming, text, time + , transformers, transformers-base }: mkDerivation { pname = "box"; - version = "0.0.1.5"; - sha256 = "0iqza6n4p8vnnppvc0jba8in77i66nz1rzbsmv3yki55qaf9fkvb"; + version = "0.1.0"; + sha256 = "1q03sgz4qzm61rs5chkvk0h9qj7idxxzmyr29awkxigv18nab18h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base concurrency contravariant exceptions foldl - lens pipes profunctors protolude streaming text time transformers + lens pipes profunctors streaming text time transformers transformers-base ]; executableHaskellDepends = [ - base concurrency dejafu generic-lens lens protolude random - streaming text transformers + base concurrency dejafu generic-lens lens mtl random streaming text + transformers ]; - testHaskellDepends = [ base doctest protolude ]; + testHaskellDepends = [ base doctest ]; description = "boxes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43323,6 +43233,8 @@ self: { pname = "brotli-streams"; version = "0.0.0.0"; sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; + revision = "1"; + editedCabalFile = "1mpd5wf027g1f46a9a2g1wvsaxhr1asyj5f3k69vq3226dfisnn7"; libraryHaskellDepends = [ base brotli bytestring io-streams ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -44458,16 +44370,16 @@ self: { }) {}; "byteslice" = callPackage - ({ mkDerivation, base, primitive, primitive-addr, run-st, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, bytestring, primitive, primitive-addr + , run-st, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "byteslice"; - version = "0.1.3.0"; - sha256 = "0lx69pcac7p20zs790x6ygqlgc3vljn4wjjp1jlcnp1jv6nhfwgf"; + version = "0.1.4.0"; + sha256 = "0kpamfmbgc31xha3p3rm2mqgngmdivkxl4z8lr0rjbil16r02nqr"; libraryHaskellDepends = [ base primitive primitive-addr run-st ]; testHaskellDepends = [ - base primitive tasty tasty-hunit tasty-quickcheck + base bytestring primitive tasty tasty-hunit tasty-quickcheck ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; @@ -44476,19 +44388,21 @@ self: { }) {}; "bytesmith" = callPackage - ({ mkDerivation, base, byteslice, bytestring, contiguous, gauge - , primitive, run-st, tasty, tasty-hunit, tasty-quickcheck - , text-short + ({ mkDerivation, base, byte-order, byteslice, bytestring + , contiguous, gauge, primitive, run-st, tasty, tasty-hunit + , tasty-quickcheck, text-short, wide-word }: mkDerivation { pname = "bytesmith"; - version = "0.3.0.0"; - sha256 = "0zwa0klj1slazsvd37l33p5j2ii3ab114ic5fvd10aic37y6w82s"; + version = "0.3.1.0"; + sha256 = "1wkwxb9ygc6hii90jr7cjbv4s5d0l4wv0197p9jn4lj7h4i79iqd"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short + wide-word ]; testHaskellDepends = [ - base byteslice primitive tasty tasty-hunit tasty-quickcheck + base byte-order byteslice primitive tasty tasty-hunit + tasty-quickcheck text-short wide-word ]; benchmarkHaskellDepends = [ base byteslice bytestring gauge primitive @@ -48302,6 +48216,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cassava-megaparsec_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, cassava, hspec, hspec-megaparsec + , megaparsec, unordered-containers, vector + }: + mkDerivation { + pname = "cassava-megaparsec"; + version = "2.0.1"; + sha256 = "0q4skw98nzy6icmgpwqvgw0c5pqcgi25rf7nmwh2pksvv94pi3p3"; + libraryHaskellDepends = [ + base bytestring cassava megaparsec unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring cassava hspec hspec-megaparsec vector + ]; + description = "Megaparsec parser of CSV files that plays nicely with Cassava"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-records" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cassava, containers , foldl, HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -50625,10 +50558,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.0.7"; - sha256 = "0yqk43ax20sk3rpxd5s857ivbgigvd5qdq4axawzmqr2na6jlikx"; - revision = "1"; - editedCabalFile = "0rf2rcdx7cvx1aa6yb9khbgkrh08v4l52sg1w89qz0245dalw14r"; + version = "1.0.8"; + sha256 = "08lxf5f40nhqpxx7f75d3lp5xyjmh3gk1hljm4iq7p8mm22nl2fn"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -50645,7 +50576,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "chronos_1_0_8" = callPackage + "chronos_1_0_9" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clock , criterion, deepseq, doctest, hashable, HUnit, old-locale , primitive, QuickCheck, semigroups, test-framework @@ -50654,8 +50585,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "1.0.8"; - sha256 = "08lxf5f40nhqpxx7f75d3lp5xyjmh3gk1hljm4iq7p8mm22nl2fn"; + version = "1.0.9"; + sha256 = "103vwpdjqk1csw8famc62ba5ck9s6yd8w5hfa6a0qj3bx9vmf9qv"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock hashable primitive semigroups text torsor vector @@ -52333,8 +52264,8 @@ self: { }: mkDerivation { pname = "cli-setup"; - version = "0.2.0.7"; - sha256 = "1fp1m48rpgnq3db4nvcnry3h46m7k07g8blivv0mb62w8fdm9smq"; + version = "0.2.1.0"; + sha256 = "010rra96lw9qkqm2jvnjxzb6q7xmg8drxaiywbmpb93slrb56r6n"; libraryHaskellDepends = [ base bytestring directory file-embed process ]; @@ -53117,6 +53048,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-gfm_0_2_1" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.2.1"; + sha256 = "1qbhcirg7a0r68l3ifq8q9clnkai5hyhk62jb232bjplrl6y4c23"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -59064,6 +59013,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cookie_0_4_5" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + , time + }: + mkDerivation { + pname = "cookie"; + version = "0.4.5"; + sha256 = "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq text time + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + text time + ]; + description = "HTTP cookie parsing and rendering"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cookies" = callPackage ({ mkDerivation, base, bytestring, chronos, hashable, text, time }: mkDerivation { @@ -59298,6 +59268,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-data_0_2_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.3"; + sha256 = "1l5q8ayhpr6cjvsj9y4hj8b9iq2013rg9dq1f8b349c9mz98bxqa"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + prettyprinter-ansi-terminal scientific text unordered-containers + vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -59324,8 +59313,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.2.0"; - sha256 = "1k92rj2y48hdr844rnp1wqksm1blq7jahxfqqq21f252vyjj06pq"; + version = "0.2.2.3"; + sha256 = "0yyhvi84qw67lql1vdf9j1psxglqv1nd43wh6kxz92n1im7canks"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath hashable hinotify hourglass mtl prettyprinter @@ -59355,6 +59344,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-text_0_2_2_3" = callPackage + ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable + , prettyprinter, prettyprinter-ansi-terminal, template-haskell + , text, text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.2.2.3"; + sha256 = "00ac8f7pajqr77r48g332kgfwsmnybdw2f2z9f7dx03hm3x9vgyx"; + libraryHaskellDepends = [ + base bytestring deepseq fingertree hashable prettyprinter + prettyprinter-ansi-terminal template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -59959,8 +59966,8 @@ self: { ({ mkDerivation, base, containers, directory, parallel }: mkDerivation { pname = "cpsa"; - version = "3.6.4"; - sha256 = "05q3di6p3xr3qmw36bpbc4dzhjrfl7vf3v44i5v7shxpma2qylpf"; + version = "3.6.5"; + sha256 = "03qf4gd28097ra0vndizxxdqvqdgl4p3cl41w9r0rfcw4367bzjf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -60059,6 +60066,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cql_4_0_2" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, Decimal + , iproute, network, QuickCheck, tasty, tasty-quickcheck + , template-haskell, text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "cql"; + version = "4.0.2"; + sha256 = "0b6806ahmg4yacx5wc4v53gihhkwywajhqm13kb11nxabww3lapl"; + libraryHaskellDepends = [ + base bytestring cereal containers Decimal iproute network + template-haskell text time transformers uuid vector + ]; + testHaskellDepends = [ + base bytestring cereal Decimal iproute network QuickCheck tasty + tasty-quickcheck text time uuid + ]; + description = "Cassandra CQL binary protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cql-io" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptonite, data-default-class, Decimal, exceptions @@ -68073,21 +68102,6 @@ self: { }) {}; "derulo" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "derulo"; - version = "1.0.5"; - sha256 = "1pyal6rhnyhqx8gwyh42vf66i18y9nplmqka546ikzps439rvmly"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Parse and render JSON simply"; - license = stdenv.lib.licenses.mit; - }) {}; - - "derulo_1_0_7" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { pname = "derulo"; @@ -68100,7 +68114,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Parse and render JSON simply"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "describe" = callPackage @@ -68948,21 +68961,6 @@ self: { }) {}; "di-monad" = callPackage - ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes - , stm, transformers - }: - mkDerivation { - pname = "di-monad"; - version = "1.3"; - sha256 = "019k7jc3lvh6cgmrgdjq13hcvh6ar76n38li4nviikqbsvxmpqsl"; - libraryHaskellDepends = [ - base containers di-core exceptions mtl pipes stm transformers - ]; - description = "mtl flavoured typeful hierarchical structured logging for di-core"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "di-monad_1_3_1" = callPackage ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes , stm, transformers }: @@ -68975,7 +68973,6 @@ self: { ]; description = "mtl flavoured typeful hierarchical structured logging for di-core"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dia-base" = callPackage @@ -69168,6 +69165,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-contrib_1_4_4" = callPackage + ({ mkDerivation, base, circle-packing, colour, containers + , cubicbezier, data-default, data-default-class, diagrams-core + , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens + , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat + , parsec, QuickCheck, random, semigroups, split, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "diagrams-contrib"; + version = "1.4.4"; + sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; + libraryHaskellDepends = [ + base circle-packing colour containers cubicbezier data-default + data-default-class diagrams-core diagrams-lib diagrams-solve + force-layout hashable lens linear mfsolve MonadRandom monoid-extras + mtl mtl-compat parsec random semigroups split text + ]; + testHaskellDepends = [ + base containers diagrams-lib HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + description = "Collection of user contributions to diagrams EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-core" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors @@ -69290,39 +69314,6 @@ self: { }) {}; "diagrams-lib" = callPackage - ({ mkDerivation, active, adjunctions, array, base, bytestring - , cereal, colour, containers, criterion, data-default-class - , deepseq, diagrams-core, diagrams-solve, directory, distributive - , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable - , intervals, JuicyPixels, lens, linear, monoid-extras, mtl - , numeric-extras, optparse-applicative, process, profunctors - , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "diagrams-lib"; - version = "1.4.2.3"; - sha256 = "175yzi5kw4yd8ykdkpf64q85c7j3p89l90m3h6qcsx9ipv6av9r5"; - revision = "3"; - editedCabalFile = "157y2qdsh0aczs81vzlm377mks976mpv6y3aqnchwsnr7apzp8ai"; - libraryHaskellDepends = [ - active adjunctions array base bytestring cereal colour containers - data-default-class diagrams-core diagrams-solve directory - distributive dual-tree exceptions filepath fingertree fsnotify - hashable intervals JuicyPixels lens linear monoid-extras mtl - optparse-applicative process profunctors semigroups tagged text - transformers unordered-containers - ]; - testHaskellDepends = [ - base deepseq diagrams-solve distributive lens numeric-extras tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion diagrams-core ]; - description = "Embedded domain-specific language for declarative graphics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-lib_1_4_3" = callPackage ({ mkDerivation, active, adjunctions, array, base, bytestring , cereal, colour, containers, criterion, data-default-class , deepseq, diagrams-core, diagrams-solve, directory, distributive @@ -69351,7 +69342,6 @@ self: { benchmarkHaskellDepends = [ base criterion diagrams-core ]; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-pandoc" = callPackage @@ -71107,8 +71097,8 @@ self: { }: mkDerivation { pname = "diskhash"; - version = "0.0.4.0"; - sha256 = "03kc5jc63726vk3airvwag69855rilanvjvqcqxi3ylvjg2p9dil"; + version = "0.0.4.2"; + sha256 = "0rjbjjvvr75ki8kw8y3xf1z8x8cg46h10c73600lcz3bnxba188c"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring directory HUnit QuickCheck test-framework @@ -72757,23 +72747,6 @@ self: { }) {}; "doctest-driver-gen" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "doctest-driver-gen"; - version = "0.3.0.1"; - sha256 = "1sa47c1wml8k00h4h1gzbckfzbr3w7k3j0lvr1x5z6fh05s5xbsn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Generate driver file for doctest's cabal integration"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "doctest-driver-gen_0_3_0_2" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; @@ -73157,8 +73130,35 @@ self: { ]; description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; + }) {}; + + "dotenv_0_8_0_4" = callPackage + ({ mkDerivation, base, base-compat, containers, directory + , exceptions, hspec, hspec-megaparsec, megaparsec + , optparse-applicative, process, text, transformers, yaml + }: + mkDerivation { + pname = "dotenv"; + version = "0.8.0.4"; + sha256 = "05dqa91zmxkzkz1dcpx2jxkzhdr4f51gw0qql47da9bllavl0jj4"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat containers directory exceptions megaparsec process + text transformers yaml + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + transformers yaml + ]; + testHaskellDepends = [ + base base-compat containers directory exceptions hspec + hspec-megaparsec megaparsec process text transformers yaml + ]; + description = "Loads environment variables from dotenv files"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dotfs" = callPackage @@ -74247,6 +74247,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "duet" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, edit-distance + , exceptions, hspec, monad-logger, mtl, optparse-simple, parsec + , syb, text + }: + mkDerivation { + pname = "duet"; + version = "0.0.1"; + sha256 = "00f9j3zcna8gxs9g3rnmcm6xqsx7sm9ivygbzjw5dyhmiivh6nr7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers deepseq edit-distance exceptions monad-logger + mtl parsec syb text + ]; + executableHaskellDepends = [ + aeson base containers deepseq exceptions monad-logger mtl + optparse-simple syb text + ]; + testHaskellDepends = [ + aeson base containers deepseq edit-distance exceptions hspec + monad-logger mtl parsec syb text + ]; + description = "A tiny language, a subset of Haskell (with type classes) aimed at aiding teachers teach Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dumb-cas" = callPackage ({ mkDerivation, base, containers, decimal-literals, hashable , tasty, tasty-hunit, template-haskell, unordered-containers @@ -75877,30 +75904,29 @@ self: { }) {}; "egison" = callPackage - ({ mkDerivation, alex, array, base, containers, criterion, deepseq - , directory, filepath, ghc, ghc-paths, Glob, happy, hashable - , haskeline, HUnit, mtl, optparse-applicative, parallel, parsec - , process, random, regex-tdfa, split, test-framework - , test-framework-hunit, text, transformers, unordered-containers - , vector + ({ mkDerivation, array, base, containers, criterion, deepseq + , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline + , HUnit, megaparsec, mtl, optparse-applicative, parsec + , parser-combinators, process, random, regex-tdfa, split + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "egison"; - version = "3.9.1"; - sha256 = "1q4hyvr52zv2p827cvkmi4rl1d1dvrdg9bly6wykbhdv6ycbihn5"; + version = "3.9.3"; + sha256 = "03scyzfwrzn8hbkk3r02ix7lw2pfx6r5qyf60xgvi0fgxhg7v7cv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base containers directory ghc ghc-paths hashable haskeline - mtl parallel parsec process random regex-tdfa split text - transformers unordered-containers vector + megaparsec mtl parsec parser-combinators process random regex-tdfa + split text transformers unordered-containers vector ]; - libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline - mtl optparse-applicative parsec process regex-tdfa text - transformers unordered-containers vector + mtl optparse-applicative parsec process text transformers + unordered-containers vector ]; testHaskellDepends = [ base filepath Glob HUnit mtl test-framework test-framework-hunit @@ -75937,8 +75963,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.7.14"; - sha256 = "1ar5yg00arqd09wva0q1y4d8lfpd0vjw9sgk47jsyqs7ydm59hnb"; + version = "3.9.3"; + sha256 = "0p55bak45hxqajpz0kh6d4czhxm8xm1jkcmk7la6h0fvazz4665p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85771,8 +85797,8 @@ self: { }: mkDerivation { pname = "floskell"; - version = "0.10.1"; - sha256 = "1y79f6a6frcmhs70z34rdcpm5bqpgqf46bx29jnixgs313lwz229"; + version = "0.10.2"; + sha256 = "1id1bwvzl5x4wq6i2ailvmvy2gcdzfgs8q59pg7s2j5cv35gf80h"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -89731,33 +89757,84 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects_1_0_0_0" = callPackage + ({ mkDerivation, base, containers, gauge, hedgehog, hedgehog-fn + , inspection-testing, markdown-unlit, mtl, tasty, tasty-hedgehog + , tasty-hunit, transformers + }: + mkDerivation { + pname = "fused-effects"; + version = "1.0.0.0"; + sha256 = "120jvgh35wl5vb2qad8c1dhpr1ddlbhm5b03dy9kcb7d8s89qfs6"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ + base containers hedgehog hedgehog-fn inspection-testing mtl tasty + tasty-hedgehog tasty-hunit transformers + ]; + testToolDepends = [ markdown-unlit ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "A fast, flexible, fused effect system"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fused-effects-exceptions" = callPackage - ({ mkDerivation, base, fused-effects, safe-exceptions - , unliftio-core + ({ mkDerivation, base, fused-effects, markdown-unlit, tasty + , tasty-hunit, transformers }: mkDerivation { pname = "fused-effects-exceptions"; - version = "0.2.0.0"; - sha256 = "1hgvl48vdrgcb45izmwad40x5jgxiaf3rdhhm5x0gjd9848drmbb"; - libraryHaskellDepends = [ - base fused-effects safe-exceptions unliftio-core + version = "1.0.0.0"; + sha256 = "13ki1fzjsqd762bbc5ia9k4agsa634lflidnzs6lahxmar1sqmid"; + libraryHaskellDepends = [ base fused-effects transformers ]; + testHaskellDepends = [ + base fused-effects tasty tasty-hunit transformers ]; + testToolDepends = [ markdown-unlit ]; description = "Handle exceptions thrown in IO with fused-effects"; license = stdenv.lib.licenses.bsd3; }) {}; "fused-effects-lens" = callPackage - ({ mkDerivation, base, fused-effects, hspec, lens, microlens }: + ({ mkDerivation, base, fused-effects, hspec, microlens }: mkDerivation { pname = "fused-effects-lens"; - version = "0.2.0.0"; - sha256 = "199afrkhb1dhah3jy3xyq5k71cqbzf9m8ninyh95qmam600r8q0m"; + version = "1.0.0.0"; + sha256 = "0qix94bw9rzv7frwxn4d9l8bz133fbmazzsvmilfz6bm6k8ci6nx"; libraryHaskellDepends = [ base fused-effects microlens ]; - testHaskellDepends = [ base fused-effects hspec lens ]; + testHaskellDepends = [ base fused-effects hspec microlens ]; description = "Monadic lens combinators for fused-effects"; license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects-random" = callPackage + ({ mkDerivation, base, fused-effects, MonadRandom, random + , transformers + }: + mkDerivation { + pname = "fused-effects-random"; + version = "1.0.0.0"; + sha256 = "14s65ndb5ik47wasn62pd0m5ls02a0v2vinv69jz9z630q9y7ay4"; + libraryHaskellDepends = [ + base fused-effects MonadRandom random transformers + ]; + description = "Random number generation for fused-effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "fused-effects-resumable" = callPackage + ({ mkDerivation, base, deepseq, fused-effects, transformers }: + mkDerivation { + pname = "fused-effects-resumable"; + version = "0.1.0.0"; + sha256 = "0w0ih8sspb7ffpvbf9bcqsiv7683g3ccfpgd48hq0h819zpa58m9"; + libraryHaskellDepends = [ + base deepseq fused-effects transformers + ]; + description = "Resumable exceptions for the fused-effects ecosystem"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fusion" = callPackage ({ mkDerivation, base, directory, doctest, filepath, pipes-safe , transformers, void @@ -89789,8 +89866,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.12.2"; - sha256 = "1q9k725wwf94gamjsi7rjazjgwdmh42h3fchlf25qm0w27llcrkc"; + version = "0.12.3"; + sha256 = "02ddxa7mkmbwg16ylvjdld85fw479n8jvi21mn7fak7vaqjdd2hw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90684,6 +90761,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gdp_0_0_3_0" = callPackage + ({ mkDerivation, base, lawful }: + mkDerivation { + pname = "gdp"; + version = "0.0.3.0"; + sha256 = "0pkx6j557p9rm39pr6pw8p2j3nz8s4q839n6y9p6c31dnlz0zxx0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base lawful ]; + executableHaskellDepends = [ base ]; + description = "Reason about invariants and preconditions with ghosts of departed proofs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gearbox" = callPackage ({ mkDerivation, base, GLUT, OpenGLRaw, Vec }: mkDerivation { @@ -91511,19 +91603,15 @@ self: { }) {}; "generic-xmlpickler" = callPackage - ({ mkDerivation, base, generic-deriving, hxt, hxt-pickle-utils - , tasty, tasty-hunit, tasty-th, text + ({ mkDerivation, base, generic-deriving, hxt, tasty, tasty-hunit + , tasty-th, text }: mkDerivation { pname = "generic-xmlpickler"; - version = "0.1.0.5"; - sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym"; - revision = "8"; - editedCabalFile = "1hpcglml4b5yv192syxazminr5v7qjrgqwb2wk0cf7f0sjpm5d0q"; + version = "0.1.0.6"; + sha256 = "0cbigrfiilwr2dfcnd2mskj1pjgwrjj72anfpa1yii7q9rs0gdh3"; libraryHaskellDepends = [ base generic-deriving hxt text ]; - testHaskellDepends = [ - base hxt hxt-pickle-utils tasty tasty-hunit tasty-th - ]; + testHaskellDepends = [ base hxt tasty tasty-hunit tasty-th ]; description = "Generic generation of HXT XmlPickler instances using GHC Generics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -95797,8 +95885,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "7.20191106"; - sha256 = "1zvs011vqwyjk1xgz1c8gflih9903rjqg3l5km15p45lny8y8j4b"; + version = "7.20191114"; + sha256 = "1afrn5g3b80f3n6ncfph6pmf9jdpc7a6ay55k2pmkn96pyv4hfmm"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-f-networkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -96397,29 +96485,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; - version = "1.2.4"; - sha256 = "1s4vmqrzq7w35kfij9pyxm9b672khhx03whi4adz6l51xij6a3yb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_2_5" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers, uri-templater @@ -96440,7 +96505,6 @@ self: { ]; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-rest" = callPackage @@ -102974,8 +103038,8 @@ self: { }: mkDerivation { pname = "grpc-haskell"; - version = "0.0.0.0"; - sha256 = "1d1njhrg6sfwy9f6xaxj0p8bbp2g6qjsa4cq7zq43h3vc1lkb0ii"; + version = "0.0.1.0"; + sha256 = "1cl12g88wvml3s5jazcb4gi4zwf6fp28hc9jp1fj25qpbr14il5c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102994,7 +103058,34 @@ self: { license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {grpc-haskell-core = null;}; + }) {}; + + "grpc-haskell-core" = callPackage + ({ mkDerivation, async, base, bytestring, c2hs, clock, containers + , gpr, grpc, managed, pipes, proto3-suite, QuickCheck, safe + , sorted-list, stm, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, turtle, unix + }: + mkDerivation { + pname = "grpc-haskell-core"; + version = "0.0.0.0"; + sha256 = "1pvcdr1jrn94nwhni5992l8mv401150wl8yi519hncs173n2fx88"; + libraryHaskellDepends = [ + base bytestring clock containers managed sorted-list stm + transformers + ]; + librarySystemDepends = [ gpr grpc ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + async base bytestring clock containers managed pipes proto3-suite + QuickCheck safe tasty tasty-hunit tasty-quickcheck text time + transformers turtle unix + ]; + description = "Haskell implementation of gRPC layered on shared C library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {gpr = null; inherit (pkgs) grpc;}; "gruff" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath @@ -107801,22 +107892,22 @@ self: { ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-uri, old-locale, parsec, process, semigroups, sendfile - , syb, system-filepath, template-haskell, text, threads, time - , transformers, transformers-base, transformers-compat, unix + , network-bsd, network-uri, old-locale, parsec, process, semigroups + , sendfile, syb, system-filepath, template-haskell, text, threads + , time, transformers, transformers-base, transformers-compat, unix , utf8-string, xhtml, zlib }: mkDerivation { pname = "happstack-server"; - version = "7.5.4"; - sha256 = "0i7csvmwv7n68gkwqzi985p2mjdgzipjnlj873sdiknhx9pfmq70"; + version = "7.6.0"; + sha256 = "0dixzrqr6y96ldx7ls2n19ilfph798jkflgcpzbj6gaw3y20w2b7"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html - monad-control mtl network network-uri old-locale parsec process - semigroups sendfile syb system-filepath template-haskell text - threads time transformers transformers-base transformers-compat - unix utf8-string xhtml zlib + monad-control mtl network network-bsd network-uri old-locale parsec + process semigroups sendfile syb system-filepath template-haskell + text threads time transformers transformers-base + transformers-compat unix utf8-string xhtml zlib ]; testHaskellDepends = [ base bytestring containers HUnit parsec zlib @@ -107834,8 +107925,8 @@ self: { }: mkDerivation { pname = "happstack-server-tls"; - version = "7.1.6.7"; - sha256 = "18jvim1hm1d4ia8ka2kxwzzzpdvs6wy0v2k5qz6bg9lsv4wi9xil"; + version = "7.2.1"; + sha256 = "1cihzjxl1v5sgmaxn8qny8b9yzm7p1gccgy1iaa3dk2jpl07a2dp"; libraryHaskellDepends = [ base bytestring extensible-exceptions happstack-server hslogger HsOpenSSL network sendfile time unix @@ -108418,8 +108509,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.0.23"; - sha256 = "0zxmwkr0zgj5bz95nay9irl10fbfda4sawgizfmjhvxdfcwslbkv"; + version = "0.0.0.24"; + sha256 = "16hybk7f8rx81a50zbj6i4isx4fi2yr7aw9n36h8qab4dxil4szy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110495,6 +110586,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src_1_0_3_1" = callPackage + ({ mkDerivation, array, base, happy, pretty, syb }: + mkDerivation { + pname = "haskell-src"; + version = "1.0.3.1"; + sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; + libraryHaskellDepends = [ array base pretty syb ]; + libraryToolDepends = [ happy ]; + description = "Support for manipulating Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-exts_1_19_1" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck @@ -112119,8 +112223,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.18.6"; - sha256 = "0hgjawlvlvz2wz711dgfbg8wvinzl4faisw8fpi7v00v6agwz2gx"; + version = "0.18.7"; + sha256 = "1cdj43n3y7j9gcw1196y9g5n188yf2dhjrj277impvlrf5y5qqs7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112976,34 +113080,6 @@ self: { }) {inherit (pkgs) aspell;}; "hasql" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring - , bytestring-strict-builder, contravariant, contravariant-extras - , criterion, dlist, hashable, hashtables, loch-th, mtl - , placeholders, postgresql-binary, postgresql-libpq, profunctors - , QuickCheck, quickcheck-instances, rebase, rerebase, tasty - , tasty-hunit, tasty-quickcheck, text, text-builder, transformers - , vector - }: - mkDerivation { - pname = "hasql"; - version = "1.4"; - sha256 = "0j2arb96i1dinpz1yxl2cjl4qhbljk9yph52cj9az50mvl8vx3w4"; - libraryHaskellDepends = [ - attoparsec base base-prelude bytestring bytestring-strict-builder - contravariant contravariant-extras dlist hashable hashtables - loch-th mtl placeholders postgresql-binary postgresql-libpq - profunctors text text-builder transformers vector - ]; - testHaskellDepends = [ - bug QuickCheck quickcheck-instances rebase rerebase tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ bug criterion rerebase ]; - description = "An efficient PostgreSQL driver with a flexible mapping API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasql_1_4_0_1" = callPackage ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , criterion, dlist, hashable, hashtables, loch-th, mtl @@ -113029,7 +113105,6 @@ self: { benchmarkHaskellDepends = [ bug criterion rerebase ]; description = "An efficient PostgreSQL driver with a flexible mapping API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-backend" = callPackage @@ -114548,6 +114623,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hdaemonize_0_5_6" = callPackage + ({ mkDerivation, base, bytestring, extensible-exceptions, filepath + , hsyslog, mtl, unix + }: + mkDerivation { + pname = "hdaemonize"; + version = "0.5.6"; + sha256 = "097fgjgskigy3grnd3ijzyhdq34vjmd9bjk2rscixi59j8j30vxd"; + libraryHaskellDepends = [ + base bytestring extensible-exceptions filepath hsyslog mtl unix + ]; + description = "Library to handle the details of writing daemons for UNIX"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hdaemonize-buildfix" = callPackage ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog , mtl, unix @@ -115259,6 +115350,18 @@ self: { broken = true; }) {}; + "heckin" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "heckin"; + version = "0.0.1.0"; + sha256 = "0nvcjkpsk4n96hjah4m85issr47abz3g0csv34sdwk59dx201zbi"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Oh heck, it's a heckin' case conversion library"; + license = stdenv.lib.licenses.mit; + }) {}; + "heckle" = callPackage ({ mkDerivation, base, blaze-html, directory, pandoc, pandoc-types , process, split, tagsoup, time @@ -115459,30 +115562,6 @@ self: { }) {}; "hedis" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri - , resource-pool, scanner, stm, test-framework, test-framework-hunit - , text, time, tls, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.12.8"; - sha256 = "119j0g6b2ci04bax6xl2biwwf7cfk2vybypx3089fm69xgm8spcz"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors HTTP mtl - network network-uri resource-pool scanner stm text time tls - unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring doctest HUnit mtl stm test-framework - test-framework-hunit text time - ]; - benchmarkHaskellDepends = [ base mtl time ]; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hedis_0_12_9" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri , resource-pool, scanner, stm, test-framework, test-framework-hunit @@ -115504,7 +115583,6 @@ self: { benchmarkHaskellDepends = [ base mtl time ]; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-config" = callPackage @@ -120759,8 +120837,8 @@ self: { }: mkDerivation { pname = "hmp3-ng"; - version = "2.7.1"; - sha256 = "1flwj8dp18w1vn34lzd44i5wy13m8qmcykmaziwbhz9npv097pnc"; + version = "2.7.3.1"; + sha256 = "1g4r9kkd0cqcarg220bj481b2j1gid68l0dfycy47hl8glqhv2w9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -123670,6 +123748,78 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hreq-client" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, Cabal + , cabal-doctest, containers, doctest, exceptions, hreq-core, hspec + , hspec-discover, http-client, http-client-tls, http-media + , http-types, mtl, retry, stm, string-conversions, text, time + , unliftio-core + }: + mkDerivation { + pname = "hreq-client"; + version = "0.1.0.0"; + sha256 = "0slvpkypfxk4szrls0jsbjn00izgslskzixn9i2fq108wadm0b1b"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat bytestring containers exceptions hreq-core + http-client http-client-tls http-media http-types mtl retry stm + string-conversions text time unliftio-core + ]; + executableHaskellDepends = [ aeson base text ]; + testHaskellDepends = [ + aeson base containers doctest hreq-core hspec http-types + ]; + testToolDepends = [ hspec-discover ]; + description = "A Type dependent Highlevel HTTP client library"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hreq-conduit" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest + , conduit, doctest, exceptions, hreq-client, hreq-core, hspec + , hspec-discover, http-client, http-types, markdown-unlit, mtl + , retry, string-conversions, text, unliftio-core + }: + mkDerivation { + pname = "hreq-conduit"; + version = "0.1.0.0"; + sha256 = "0rdi3nxmq3g7gzlc3w1vc27djwd2pbsifm6mvi6d9nk3ynnrc2vv"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring conduit exceptions hreq-client hreq-core + http-client http-types mtl retry unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring conduit doctest hspec http-types + string-conversions text + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Conduit streaming support for Hreq"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hreq-core" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , Cabal, cabal-doctest, containers, doctest, exceptions + , http-api-data, http-media, http-types, mtl, string-conversions + , text + }: + mkDerivation { + pname = "hreq-core"; + version = "0.1.0.0"; + sha256 = "0ndbwdfcs89n8k96h2piw9n2hs0dbpp8vr7kpzdavaji0jzg0w20"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring containers exceptions + http-api-data http-media http-types mtl string-conversions text + ]; + testHaskellDepends = [ base doctest ]; + description = "Core functionality for Hreq Http client library"; + license = stdenv.lib.licenses.mit; + }) {}; + "hrfsize" = callPackage ({ mkDerivation, base, process, tasty, tasty-hunit }: mkDerivation { @@ -128898,8 +129048,8 @@ self: { pname = "htoml-megaparsec"; version = "2.1.0.3"; sha256 = "1fpvfrib4igcmwhfms1spxr2b78srhrh4hrflrlgdgdn9x1m5w1x"; - revision = "1"; - editedCabalFile = "07zw749vwqdr2lznxivfa22smq7k3h0innanl5wwyf29dq4gk464"; + revision = "2"; + editedCabalFile = "0vlyr965g1x5hk2mxlp8w4vv9ijq1gbm3i76slkl2aa38bf2i4ki"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl text time unordered-containers vector @@ -129062,6 +129212,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_4_1_1" = callPackage + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat + , bytestring, containers, cookie, hashable, hspec, hspec-discover + , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged + , text, time-compat, unordered-containers, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.4.1.1"; + sha256 = "1s93m2vh4c1p073xasvknnj3czbf8xsyg48kyznr4jwfhzi17anh"; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base base-compat bytestring + containers cookie hashable http-types tagged text time-compat + unordered-containers uuid-types + ]; + testHaskellDepends = [ + base base-compat bytestring cookie hspec HUnit nats QuickCheck + quickcheck-instances text time-compat unordered-containers + uuid-types + ]; + testToolDepends = [ hspec-discover ]; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -129585,23 +129761,24 @@ self: { "http-io-streams" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, case-insensitive, containers, directory, HsOpenSSL - , io-streams, mtl, network, network-uri, openssl-streams, text - , transformers + , brotli-streams, bytestring, case-insensitive, containers + , directory, HsOpenSSL, io-streams, mtl, network, network-uri + , openssl-streams, text, transformers }: mkDerivation { pname = "http-io-streams"; - version = "0.1.0.0"; - sha256 = "0fxz7p5n7gd99xjq9rwm6x74qzpfp4wdmhj1hm08c7hkinizdvgv"; - revision = "2"; - editedCabalFile = "0l6afs6bhf5q73nmlmc37qi0anr1dlrz1x10m9ipfssnkb5hp25k"; + version = "0.1.1.0"; + sha256 = "1f6galfrdvk5r83vxmmrvmq4p5hyv302ghnyra0w4wxmjq9lilc5"; libraryHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive containers directory HsOpenSSL io-streams mtl - network network-uri openssl-streams text transformers + attoparsec base base64-bytestring blaze-builder brotli-streams + bytestring case-insensitive containers directory HsOpenSSL + io-streams mtl network network-uri openssl-streams text + transformers ]; description = "HTTP client based on io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "http-kinder" = callPackage @@ -137916,8 +138093,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2location"; - version = "8.1.0"; - sha256 = "07n5xnspl318hrmff4gr274zpgszgviilwhjd7vdrhm1sq9sdir8"; + version = "8.2.0"; + sha256 = "01ia5647y608xr5kqkxaamhaxs39k3x81wpj8aqzf24mirkalf23"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; license = stdenv.lib.licenses.mit; @@ -140483,6 +140660,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances + , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.2.0"; + sha256 = "0kv2kmws9kwymx8pm6j8nnlk1d8pwv22hw2ka2kwlipjvmb7mld4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -141078,25 +141286,6 @@ self: { }) {}; "json-feed" = callPackage - ({ mkDerivation, aeson, base, bytestring, filepath, hspec - , mime-types, network-uri, tagsoup, text, time - }: - mkDerivation { - pname = "json-feed"; - version = "1.0.6"; - sha256 = "1j5x5ibax81348m4m1fv8pz0044gbvlskgh9gpn5dn8d0cpd7vf7"; - libraryHaskellDepends = [ - aeson base bytestring mime-types network-uri tagsoup text time - ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec mime-types network-uri tagsoup - text time - ]; - description = "JSON Feed"; - license = stdenv.lib.licenses.mit; - }) {}; - - "json-feed_1_0_7" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, hspec , mime-types, network-uri, tagsoup, text, time }: @@ -141113,7 +141302,6 @@ self: { ]; description = "JSON Feed"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-fu" = callPackage @@ -142196,8 +142384,8 @@ self: { pname = "jwt"; version = "0.10.0"; sha256 = "1a1fqmqfm2ajq75mq2x6la8jb2g5hzl4dk8cgx9xsrikp8c7n75w"; - revision = "1"; - editedCabalFile = "0agwck6lidcxlixk5jgw0pw162xrsnlsgj8y8jwlyhjpqfq52ifi"; + revision = "2"; + editedCabalFile = "1ld5dh4x3sb28416bk3k39k46vmx1s7agk17v7cb5cxam4hj3c1c"; libraryHaskellDepends = [ aeson base bytestring containers cryptonite http-types memory network-uri scientific semigroups text time unordered-containers @@ -142268,6 +142456,20 @@ self: { broken = true; }) {}; + "kafka-client-sync" = callPackage + ({ mkDerivation, base, containers, hw-kafka-client, monad-parallel + , text + }: + mkDerivation { + pname = "kafka-client-sync"; + version = "0.1.1.0"; + sha256 = "0m8y3sinyl7f6srqk0q9yvj6f896y70zisrz4qa5qfnjik0c8ds1"; + libraryHaskellDepends = [ base containers hw-kafka-client ]; + testHaskellDepends = [ base hw-kafka-client monad-parallel text ]; + description = "Synchronous Kafka Client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "kafka-device" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal, linear , milena, mtl @@ -143593,8 +143795,8 @@ self: { }: mkDerivation { pname = "keycloak-hs"; - version = "1.0.0"; - sha256 = "1nls2l8b6bnfgihdnr71jwyxka3scylvyfrqiwv14hc6syw2p447"; + version = "1.1.1"; + sha256 = "1ycr1q7sfr68zbx1jxnfv0c19w2nv2rxczi5aixd01ck8v1kx798"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144747,18 +144949,6 @@ self: { }) {}; "lackey" = callPackage - ({ mkDerivation, base, hspec, servant, servant-foreign, text }: - mkDerivation { - pname = "lackey"; - version = "1.0.9"; - sha256 = "0prkaxa9f03m5a333zsl75jdv2hi48w9ghv1ff1r68gnqf4hbvlr"; - libraryHaskellDepends = [ base servant servant-foreign text ]; - testHaskellDepends = [ base hspec servant servant-foreign text ]; - description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - }) {}; - - "lackey_1_0_10" = callPackage ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; @@ -144768,7 +144958,6 @@ self: { testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lacroix" = callPackage @@ -150077,17 +150266,6 @@ self: { }) {xslt = null;}; "libyaml" = callPackage - ({ mkDerivation, base, bytestring, conduit, resourcet }: - mkDerivation { - pname = "libyaml"; - version = "0.1.1.0"; - sha256 = "0psznm9c3yjsyj9aj8m2svvv9m2v0x90hnwarcx5sbswyi3l00va"; - libraryHaskellDepends = [ base bytestring conduit resourcet ]; - description = "Low-level, streaming YAML interface"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "libyaml_0_1_1_1" = callPackage ({ mkDerivation, base, bytestring, conduit, resourcet }: mkDerivation { pname = "libyaml"; @@ -150096,7 +150274,6 @@ self: { libraryHaskellDepends = [ base bytestring conduit resourcet ]; description = "Low-level, streaming YAML interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libzfs" = callPackage @@ -150427,14 +150604,13 @@ self: { ({ mkDerivation, async, base, bytestring, chronos, containers , http-types, http2-client, http2-client-grpc , http2-grpc-proto-lens, lens, mtl, proto-lens - , proto-lens-protobuf-types, proto-lens-runtime, req - , safe-exceptions, stm, text, transformers, unordered-containers - , wai, warp + , proto-lens-protobuf-types, proto-lens-runtime, safe-exceptions + , stm, text, transformers, unordered-containers, wai }: mkDerivation { pname = "lightstep-haskell"; - version = "0.4.0"; - sha256 = "0qi26xqn09j484myj8aa9588qdrzcvbibxckwnda6gzh36mavszg"; + version = "0.4.4"; + sha256 = "0y1pvb4ic9q3ma9vjlsg0spw3wq6ll9za8nys88083bm08098wfd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150443,9 +150619,6 @@ self: { proto-lens-protobuf-types proto-lens-runtime safe-exceptions stm text transformers unordered-containers wai ]; - executableHaskellDepends = [ - async base http-types http2-client req text wai warp - ]; description = "LightStep OpenTracing client library"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -150682,13 +150855,13 @@ self: { }) {}; "line-drawing" = callPackage - ({ mkDerivation, base, hspec }: + ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "line-drawing"; - version = "0.1.0.0"; - sha256 = "19hdx810mraygd1li8bw9l3i18ygbzmyxsqkyvh6q90saayglr4f"; + version = "0.4.0.0"; + sha256 = "0f0dj3hr1b9vryrmd88ghhn0jrv3nn5yhl5kj1bwwl99z59ww7bp"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec QuickCheck ]; description = "raster line drawing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -153475,6 +153648,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_3_8" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , prettyprinter, semigroups, stm, stm-delay, text, time + , transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "logging-effect"; + version = "1.3.8"; + sha256 = "0ksavyvcz0c9fadik9yksm4zskzh313srf3713migwrdza5ci5q3"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl prettyprinter + semigroups stm stm-delay text time transformers transformers-base + unliftio-core + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + prettyprinter text time + ]; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, prettyprinter @@ -154666,31 +154863,6 @@ self: { }) {}; "lucid" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph - , mtl, parsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.11"; - sha256 = "13xz21hf9ywbyqwm33z8pfrjq03rzffhqswi30xsi13rrawj99cc"; - revision = "1"; - editedCabalFile = "10k3x9cn4a23kqk909xiv8phkfgagf7p16qlfpr9swn1dn4xasgf"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text transformers - ]; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_12" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph , mtl, parsec, text, transformers, unordered-containers @@ -154711,7 +154883,6 @@ self: { ]; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-colonnade" = callPackage @@ -154853,16 +155024,17 @@ self: { }) {objc = null;}; "lukko" = callPackage - ({ mkDerivation, async, base, bytestring, filepath, tasty - , tasty-hunit, temporary + ({ mkDerivation, async, base, bytestring, filepath, singleton-bool + , tasty, tasty-expected-failure, tasty-hunit, temporary }: mkDerivation { pname = "lukko"; - version = "0.1"; - sha256 = "1ph8fc3bj6nkyjxag1pk8mpbcfsfb149ygbi5m3s9rm8kja1dhad"; + version = "0.1.1"; + sha256 = "1wy2dqs304cynsgnwpc47fwnm9gcy7ch53xxhj5schc0kak3xxbq"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ - async base bytestring filepath tasty tasty-hunit temporary + async base bytestring filepath singleton-bool tasty + tasty-expected-failure tasty-hunit temporary ]; description = "File locking"; license = "GPL-2.0-or-later AND BSD-3-Clause"; @@ -155645,6 +155817,28 @@ self: { broken = true; }) {}; + "mad-props" = callPackage + ({ mkDerivation, base, containers, lens, logict, MonadRandom, mtl + , psqueues, random, random-shuffle, raw-strings-qq, transformers + }: + mkDerivation { + pname = "mad-props"; + version = "0.2.1.0"; + sha256 = "0cz01majj5m0a9wszdzlz4arzf3xzppi835k2xrkd3hpzl2fxpiv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers lens logict MonadRandom mtl psqueues random + random-shuffle raw-strings-qq transformers + ]; + executableHaskellDepends = [ + base containers lens logict MonadRandom mtl psqueues random + random-shuffle raw-strings-qq transformers + ]; + description = "Monadic DSL for building constraint solvers using basic propagators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "madlang" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, Cabal, cli-setup , composition-prelude, containers, criterion, directory, file-embed @@ -155655,8 +155849,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "4.0.2.15"; - sha256 = "0fv2p6f6gj9jg72kmlf56nymvs3sf6hn98jh4q0ighn6k5dkhbf3"; + version = "4.0.2.16"; + sha256 = "0n4y2s5m854akdy482wmhh3m5s77mgq1q91619lc2lsfg21xr80w"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; @@ -157378,6 +157572,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv-io_0_1_8_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , directory, filepath, JuicyPixels, massiv, netpbm, process, vector + }: + mkDerivation { + pname = "massiv-io"; + version = "0.1.8.0"; + sha256 = "0c67lcqgbzwxcpp3gp0x35f3njai1sgainwxhjckn9bjddad6vrq"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq directory filepath + JuicyPixels massiv netpbm process vector + ]; + description = "Import/export of Image files into massiv Arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-scheduler" = callPackage ({ mkDerivation, atomic-primops, base, Cabal, cabal-doctest , deepseq, doctest, exceptions, hspec, QuickCheck, template-haskell @@ -161882,8 +162093,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn5"; - version = "0.4.0.1"; - sha256 = "0pgymj7y7szbnz8wbba5x7y9gvp88b3rh63v3m5yvhkw7jlndic9"; + version = "0.4.2.1"; + sha256 = "1cq8180xkq01jpqwiv6f7wiwyjhs76gh5a148hvxhffvfhnsarb8"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; license = stdenv.lib.licenses.mit; @@ -162923,6 +163134,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger-syslog_0_1_5_0" = callPackage + ({ mkDerivation, base, bytestring, fast-logger, hsyslog + , monad-logger, text, transformers + }: + mkDerivation { + pname = "monad-logger-syslog"; + version = "0.1.5.0"; + sha256 = "0y96f5qan5na32s8xilky7z30mc7yci1s5i3585aqvqsyyvshchf"; + libraryHaskellDepends = [ + base bytestring fast-logger hsyslog monad-logger text transformers + ]; + description = "syslog output for monad-logger"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-loops" = callPackage ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { @@ -163102,30 +163329,6 @@ self: { }) {}; "monad-par" = callPackage - ({ mkDerivation, abstract-deque, abstract-par, array, base - , containers, deepseq, HUnit, monad-par-extras, mtl, mwc-random - , parallel, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, time - }: - mkDerivation { - pname = "monad-par"; - version = "0.3.4.8"; - sha256 = "0ldrzqy24fsszvn2a2nr77m2ih7xm0h9bgkjyv1l274aj18xyk7q"; - libraryHaskellDepends = [ - abstract-deque abstract-par array base containers deepseq - monad-par-extras mtl mwc-random parallel - ]; - testHaskellDepends = [ - abstract-deque abstract-par array base containers deepseq HUnit - monad-par-extras mtl mwc-random QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 test-framework-th - time - ]; - description = "A library for parallel programming based on a monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-par_0_3_5" = callPackage ({ mkDerivation, abstract-deque, abstract-par, array, base , containers, deepseq, HUnit, monad-par-extras, mtl, mwc-random , parallel, QuickCheck, test-framework, test-framework-hunit @@ -163149,7 +163352,6 @@ self: { ]; description = "A library for parallel programming based on a monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-par-extras" = callPackage @@ -169084,8 +169286,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.6.1.1"; - sha256 = "1ym4p5p3g0bzxvvijjafsdh3rkz17infvn2kc2rwpdrvig7j65yg"; + version = "0.6.2.0"; + sha256 = "0mryfsjcvybfx7zrakn6h8hw2l8fdq7g194kmiy9xafkkgyza1pk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169110,6 +169312,29 @@ self: { broken = true; }) {}; + "net-mqtt-rpc" = callPackage + ({ mkDerivation, base, bytestring, net-mqtt, network-uri + , optparse-applicative, random, stm, text, uuid + }: + mkDerivation { + pname = "net-mqtt-rpc"; + version = "0.1.0.0"; + sha256 = "0wzpsjyskgbnyyy7bbbg7plsypwnyi2rblvyn17a33ak43zi1fx5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring net-mqtt random stm text uuid + ]; + executableHaskellDepends = [ + base bytestring net-mqtt network-uri optparse-applicative random + stm text uuid + ]; + description = "Make RPC calls via an MQTT broker"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "net-spider" = callPackage ({ mkDerivation, aeson, base, containers, data-interval, doctest , doctest-discover, extended-reals, greskell, greskell-websocket @@ -170151,27 +170376,6 @@ self: { }) {}; "network-ip" = callPackage - ({ mkDerivation, base, data-default-class, data-dword, data-endian - , data-serializer, data-textual, hashable, parsers, tasty - , tasty-quickcheck, text-printer, type-hint - }: - mkDerivation { - pname = "network-ip"; - version = "0.3.0.2"; - sha256 = "1zjy232pamkd3977cyaq5w5r6ksbpqpgzzlds15zrahjccirs9gf"; - libraryHaskellDepends = [ - base data-default-class data-dword data-endian data-serializer - data-textual hashable parsers text-printer type-hint - ]; - testHaskellDepends = [ - base data-dword data-textual parsers tasty tasty-quickcheck - text-printer - ]; - description = "Internet Protocol data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-ip_0_3_0_3" = callPackage ({ mkDerivation, base, data-default-class, data-dword, data-endian , data-serializer, data-textual, hashable, parsers, tasty , tasty-quickcheck, text-printer, type-hint @@ -170190,7 +170394,6 @@ self: { ]; description = "Internet Protocol data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-manager-tui" = callPackage @@ -170233,6 +170436,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-messagepack-rpc_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, data-msgpack, safe-exceptions + , text, unordered-containers + }: + mkDerivation { + pname = "network-messagepack-rpc"; + version = "0.1.2.0"; + sha256 = "118agkkbvfyynk6qg5yzazbs0s7w0bw9n0ndj8nm35yy6cil9lky"; + libraryHaskellDepends = [ + base bytestring data-msgpack safe-exceptions text + unordered-containers + ]; + description = "MessagePack RPC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-messagepack-rpc-websocket" = callPackage ({ mkDerivation, async, base, bytestring, data-msgpack, envy, hspec , network-messagepack-rpc, QuickCheck, skews, text, websockets @@ -172225,6 +172445,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "non-empty-sequence_0_2_0_4" = callPackage + ({ mkDerivation, base, containers, semigroups }: + mkDerivation { + pname = "non-empty-sequence"; + version = "0.2.0.4"; + sha256 = "0a6xk2ijj3lzhqzdrk6q89538d1a62aw8x0ccvkq2kyl1dlahwc0"; + libraryHaskellDepends = [ base containers semigroups ]; + description = "Non-empty sequence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "non-empty-text" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, text }: mkDerivation { @@ -172341,22 +172573,6 @@ self: { }) {}; "nonempty-vector" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, primitive, semigroups - , vector - }: - mkDerivation { - pname = "nonempty-vector"; - version = "0.1.0.0"; - sha256 = "1yc9x0mc30fl348by3586wf2g7q40c98yskyw15cnxj3588p5zv3"; - libraryHaskellDepends = [ - base deepseq primitive semigroups vector - ]; - testHaskellDepends = [ base hedgehog semigroups vector ]; - description = "Non-empty vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "nonempty-vector_0_2_0_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest , primitive, semigroups, vector }: @@ -172371,7 +172587,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Non-empty vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonemptymap" = callPackage @@ -173299,6 +173514,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "numhask_0_3_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "numhask"; + version = "0.3.1"; + sha256 = "0r7raa7sw9k6p5xb3kl7jfpfkg4dym2kb8hrdkq9xvj2yrajzg77"; + libraryHaskellDepends = [ base ]; + description = "numeric classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, deepseq, dimensions , distributive, doctest, hedgehog, numhask-hedgehog @@ -173328,8 +173555,8 @@ self: { }: mkDerivation { pname = "numhask-hedgehog"; - version = "0.3"; - sha256 = "0f7h2ah0z63v40hnk4fcxhj4b8qzi1fy8hipxwvi29g0mvpkxjds"; + version = "0.3.1"; + sha256 = "1glg0lapr0fm06z5s8k4xsi99yx3khay4ynvic3kb1xf0iqay818"; libraryHaskellDepends = [ base hedgehog numhask numhask-prelude numhask-space ]; @@ -173359,13 +173586,12 @@ self: { }) {}; "numhask-prelude" = callPackage - ({ mkDerivation, base, doctest, numhask, numhask-space, protolude - }: + ({ mkDerivation, base, doctest, numhask, protolude }: mkDerivation { pname = "numhask-prelude"; - version = "0.3.1"; - sha256 = "1j9da7ldacfzkw4yxrc84p0diygvbglj4xdqj9bam8ld2hv5i1mq"; - libraryHaskellDepends = [ base numhask numhask-space protolude ]; + version = "0.3.2"; + sha256 = "1884pm13wyhqwwl9n2k9wv7r7q86x4c682m78291sh6yinrymazk"; + libraryHaskellDepends = [ base numhask protolude ]; testHaskellDepends = [ doctest ]; description = "A numeric prelude"; license = stdenv.lib.licenses.bsd3; @@ -173396,17 +173622,18 @@ self: { }) {}; "numhask-space" = callPackage - ({ mkDerivation, adjunctions, base, distributive, foldl, lattices - , semigroupoids, text, time + ({ mkDerivation, adjunctions, base, containers, distributive + , doctest, foldl, lattices, semigroupoids, tdigest, text, time }: mkDerivation { pname = "numhask-space"; - version = "0.2.0"; - sha256 = "088g7phwdw7g75ljjp78rbcbpgwcm45944c0w6qlnxmqfz270b78"; + version = "0.3.0"; + sha256 = "0j75qig7smx2lnl6drmsj2zs4zg6rw9vvcb1d0cjv47haw9xgz62"; libraryHaskellDepends = [ - adjunctions base distributive foldl lattices semigroupoids text - time + adjunctions base containers distributive foldl lattices + semigroupoids tdigest text time ]; + testHaskellDepends = [ base doctest ]; description = "numerical spaces"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -173671,8 +173898,8 @@ self: { }: mkDerivation { pname = "nyx-game"; - version = "1.0.0.0"; - sha256 = "16a1bkw8i81qcp7diblgkc17snxppdsfqly6diirm0sxpbsx5d8s"; + version = "1.0.1.0"; + sha256 = "14zxg7znqjglzqlsfvgksknz5ry369x0smjja8dx6h2ih0xf3i06"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -174742,18 +174969,17 @@ self: { }) {}; "online" = callPackage - ({ mkDerivation, base, doctest, foldl, numhask-prelude, protolude - , tasty, tdigest, vector, vector-algorithms + ({ mkDerivation, base, doctest, foldl, tasty, tdigest, vector + , vector-algorithms }: mkDerivation { pname = "online"; - version = "0.3.0.0"; - sha256 = "056a9dkrzfgj0wf9f9d9d25f6yc03jx9z0p0z5xm8n8brk6b3bds"; + version = "0.4.0.0"; + sha256 = "1vb9x90qzmqjydxjcn06gz5lfikwrx73jkkhmqdd5vxmzzj36spz"; libraryHaskellDepends = [ - base foldl numhask-prelude protolude tdigest vector - vector-algorithms + base foldl tdigest vector vector-algorithms ]; - testHaskellDepends = [ base doctest protolude tasty ]; + testHaskellDepends = [ base doctest tasty ]; description = "online statistics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -178183,6 +178409,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_20" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.20"; + sha256 = "0wz89ywyhvxz8daw4ia132kg6ynx5y4wva4g899wvq4kyjy1dixa"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-unlit" = callPackage ({ mkDerivation, base, pandoc }: mkDerivation { @@ -180901,6 +181151,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) pcre;}; + "pcre-light_0_4_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, mtl, pcre }: + mkDerivation { + pname = "pcre-light"; + version = "0.4.1.0"; + sha256 = "0lqvsmc6bfhdv6igm3fmw8nklyhw3j3jsl0s1k6r3fhb6ambzxhn"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ pcre ]; + testHaskellDepends = [ base bytestring containers HUnit mtl ]; + description = "Portable regex library for Perl 5 compatible regular expressions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) pcre;}; + "pcre-light-extra" = callPackage ({ mkDerivation, base, bytestring, pcre-light }: mkDerivation { @@ -181333,8 +181597,8 @@ self: { }: mkDerivation { pname = "pell"; - version = "0.1.2.0"; - sha256 = "14h8m77f0afk36pycv7q8k3xy64787ya6pjg2dvax3yaa5q7lmv9"; + version = "0.1.3.0"; + sha256 = "07l623ja134s99qlhvjrsfcyaj9s504xfm9ml8afc78k9yarly9w"; libraryHaskellDepends = [ arithmoi base containers ]; testHaskellDepends = [ arithmoi base Cabal cabal-test-quickcheck containers primes @@ -183975,6 +184239,25 @@ self: { broken = true; }) {}; + "pine" = callPackage + ({ mkDerivation, base, containers, sdl2, sdl2-image, stm, text }: + mkDerivation { + pname = "pine"; + version = "0.1.0.2"; + sha256 = "0896l27g1cmrvkq2b1bdy7sfr6z0jg2pk1mvhwr1n3f0gwgiy36i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers sdl2 sdl2-image stm text + ]; + executableHaskellDepends = [ + base containers sdl2 sdl2-image stm text + ]; + testHaskellDepends = [ base containers sdl2 sdl2-image stm text ]; + description = "Functional 2D Game Framework"; + license = stdenv.lib.licenses.zlib; + }) {}; + "ping" = callPackage ({ mkDerivation, base, cpu, ip, posix-api, primitive , primitive-addr, primitive-containers, stm, transformers @@ -189297,7 +189580,7 @@ self: { }) {}; "predicate-typed" = callPackage - ({ mkDerivation, aeson, assoc, base, binary, bytestring, comonad + ({ mkDerivation, aeson, base, binary, bytestring, comonad , containers, deepseq, directory, doctest, ghc-prim, lens, mtl , pcre-heavy, pcre-light, pretty, pretty-terminal, QuickCheck, safe , stm, tasty, tasty-hunit, tasty-quickcheck, template-haskell, text @@ -189305,17 +189588,16 @@ self: { }: mkDerivation { pname = "predicate-typed"; - version = "0.2.0.0"; - sha256 = "1355dfsvm6k334hp3z6kiv9216ly9vfk8nb3vf0vd1ad63jm3vmv"; + version = "0.4.0.0"; + sha256 = "1inbwv7g98b8pc0z3ri4hrmang6caaam99mv6vd1pam11kpw6l8g"; libraryHaskellDepends = [ - aeson assoc base binary bytestring comonad containers deepseq - directory ghc-prim lens mtl pcre-heavy pcre-light pretty - pretty-terminal QuickCheck safe template-haskell text th-lift these - time tree-view + aeson base binary bytestring comonad containers deepseq directory + ghc-prim lens mtl pcre-heavy pcre-light pretty pretty-terminal + QuickCheck safe template-haskell text th-lift these time tree-view ]; testHaskellDepends = [ - aeson assoc base binary bytestring comonad containers deepseq - directory doctest ghc-prim lens mtl pcre-heavy pcre-light pretty + aeson base binary bytestring comonad containers deepseq directory + doctest ghc-prim lens mtl pcre-heavy pcre-light pretty pretty-terminal QuickCheck safe stm tasty tasty-hunit tasty-quickcheck template-haskell text th-lift these time tree-view ]; @@ -190476,8 +190758,8 @@ self: { ({ mkDerivation, base, primitive, QuickCheck }: mkDerivation { pname = "primitive-foreign"; - version = "0.1"; - sha256 = "0qznygyj4fsgdggrb02nc78nfjyvfjsdaznw01a0sw2b1yld0zqg"; + version = "0.1.1"; + sha256 = "15fv32c5q1x1q4qwwcaqhn01bzv887njc8qnqhnp7p3h5m0xz2pc"; libraryHaskellDepends = [ base primitive ]; testHaskellDepends = [ base primitive QuickCheck ]; description = "using the `Prim` interface for the FFI"; @@ -190858,6 +191140,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "probability_0_2_6" = callPackage + ({ mkDerivation, base, containers, random, transformers, utility-ht + }: + mkDerivation { + pname = "probability"; + version = "0.2.6"; + sha256 = "12qzgn9jb9hvbpbkb75ad55yhmhai945rvdbamx6zspbrjlsb9sz"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers random transformers utility-ht + ]; + description = "Probabilistic Functional Programming"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "probable" = callPackage ({ mkDerivation, base, criterion, mtl, mwc-random, mwc-random-monad , primitive, statistics, transformers, vector @@ -191349,6 +191647,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "profunctor-arrows" = callPackage + ({ mkDerivation, base, comonad, profunctors }: + mkDerivation { + pname = "profunctor-arrows"; + version = "0.0.0.1"; + sha256 = "1zcka3xdg3zpy3bxafgipsxyj04jbywl2yf4x6qa13287lxwn6wm"; + libraryHaskellDepends = [ base comonad profunctors ]; + description = "Profunctor arrows"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "profunctor-extras" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -191765,16 +192074,16 @@ self: { "prometheus" = callPackage ({ mkDerivation, atomic-primops, base, bytestring, containers - , http-client, http-types, network-uri, text, transformers, wai - , warp + , http-client, http-client-tls, http-types, network-uri, text + , transformers, wai, warp }: mkDerivation { pname = "prometheus"; - version = "2.1.2"; - sha256 = "1qr8nnijzlp0rwz3rab7y49kxwa4ka7ipix9dix5d1mzqpa1sj5m"; + version = "2.1.3"; + sha256 = "1z8mar0l8kh8wd0hsv4ckgnr5ha1vsx83afg63z9pwmv5l3phj0q"; libraryHaskellDepends = [ - atomic-primops base bytestring containers http-client http-types - network-uri text transformers wai warp + atomic-primops base bytestring containers http-client + http-client-tls http-types network-uri text transformers wai warp ]; description = "Prometheus Haskell Client"; license = stdenv.lib.licenses.bsd3; @@ -191962,8 +192271,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.9.1"; - sha256 = "1v4cpj4kbmhl4xkxm7gxm2z9pqf6zmr4psawaxixvsav6xpxgphr"; + version = "5.10.1"; + sha256 = "1ymjlfp7gri82sa26s6a10lqqmzplvl68siai04wshx3jwr3b5y8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -192481,9 +192790,10 @@ self: { "proto3-suite" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, bytestring, cereal, containers - , contravariant, deepseq, doctest, filepath, foldl, hashable - , haskell-src, insert-ordered-containers, lens, mtl - , neat-interpolation, optparse-generic, parsec, parsers, pretty + , contravariant, deepseq, doctest, filepath, foldl + , generic-arbitrary, hashable, haskell-src + , insert-ordered-containers, lens, mtl, neat-interpolation + , optparse-applicative, optparse-generic, parsec, parsers, pretty , pretty-show, proto3-wire, QuickCheck, quickcheck-instances , range-set-list, safe, semigroups, swagger2, system-filepath , tasty, tasty-hunit, tasty-quickcheck, text, transformers, turtle @@ -192491,8 +192801,8 @@ self: { }: mkDerivation { pname = "proto3-suite"; - version = "0.3.0.0"; - sha256 = "1dmblb640jc2smm023py3sg49k07v85qmalir5swkj154vlszgli"; + version = "0.4.0.0"; + sha256 = "0pmd7fhw4y90h1qffmgxkqijdscqw0qj7nhj0pvrvz1av6svhvr1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -192505,14 +192815,14 @@ self: { system-filepath text transformers turtle vector ]; executableHaskellDepends = [ - base containers optparse-generic proto3-wire range-set-list - system-filepath text turtle + base containers mtl optparse-applicative optparse-generic + proto3-wire range-set-list system-filepath text turtle ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring cereal - containers doctest pretty-show proto3-wire QuickCheck semigroups - swagger2 tasty tasty-hunit tasty-quickcheck text transformers - turtle vector + containers deepseq doctest generic-arbitrary mtl pretty-show + proto3-wire QuickCheck semigroups swagger2 tasty tasty-hunit + tasty-quickcheck text transformers turtle vector ]; description = "A low level library for writing out data in the Protocol Buffers wire format"; license = stdenv.lib.licenses.asl20; @@ -192527,8 +192837,10 @@ self: { }: mkDerivation { pname = "proto3-wire"; - version = "1.0.0"; - sha256 = "1r090s4mqmx0ixr8y6xyzkgcwv0sfjwah7jhb4vr75zpzsvx0bqk"; + version = "1.1.0"; + sha256 = "1f8vllbysz6d7njkqd6f52k4nixjj4wf2k4nh4gb4b7dihdzhnmg"; + revision = "1"; + editedCabalFile = "1ws072947d8lmchknyhrzpg9mh6dacya872a4b9dw0cdgkn13zm8"; libraryHaskellDepends = [ base bytestring cereal containers deepseq hashable QuickCheck safe text unordered-containers @@ -193597,10 +193909,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.13.4"; - sha256 = "06qy5il369z6f7723zb676wjwqa4rj5wz75isq3s346avsmr3j84"; - revision = "1"; - editedCabalFile = "1048nmqysgblxiq6685lsx8wmxg52jkmqrvzvjhp0gl6x54n0rh3"; + version = "0.13.5"; + sha256 = "0plqzlcfaw2ik2im7aq8yy1b1y88cnc8qd7wwaayndbdz060s9j4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196275,6 +196585,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rainbow_0_34_0_0" = callPackage + ({ mkDerivation, base, bytestring, lens, process, QuickCheck, text + }: + mkDerivation { + pname = "rainbow"; + version = "0.34.0.0"; + sha256 = "17v87fkr2skdq1rqcfd5x6philvr5zvnw6sdy9qj0ljafcq31mdd"; + libraryHaskellDepends = [ base bytestring lens process text ]; + testHaskellDepends = [ + base bytestring lens process QuickCheck text + ]; + description = "Print text to terminal with colors and effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rainbow-tests" = callPackage ({ mkDerivation, barecheck, base, QuickCheck, rainbow, terminfo , text @@ -196311,6 +196637,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rainbox_0_24_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, QuickCheck + , rainbow, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "rainbox"; + version = "0.24.0.0"; + sha256 = "1y2zs6062y7xfhcach4s4q4nhhhb111dwggziwgzl3a60cnfhln3"; + libraryHaskellDepends = [ + base bytestring containers lens rainbow text + ]; + testHaskellDepends = [ + base bytestring containers lens QuickCheck rainbow tasty + tasty-quickcheck text + ]; + description = "Two-dimensional box pretty printing, with colors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rake" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -197314,27 +197660,6 @@ self: { }) {}; "ratel" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, hspec, http-client, http-client-tls - , http-types, text, uuid - }: - mkDerivation { - pname = "ratel"; - version = "1.0.8"; - sha256 = "045hr0jilydb1xcvhh9q5iwazpf1k1d2q1y0h4gkgnbn6qmgwhnk"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive containers filepath hspec - http-client http-client-tls http-types text uuid - ]; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel_1_0_9" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, filepath, hspec, http-client, http-client-tls , http-types, text, uuid @@ -197353,25 +197678,9 @@ self: { ]; description = "Notify Honeybadger about exceptions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ratel-wai" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "1.1.0"; - sha256 = "1wgmlcazfbz4y4q9k6367i76l8cal1qgqhqbh2p69ca365w9pf56"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel-wai_1_1_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai }: @@ -197384,7 +197693,6 @@ self: { ]; description = "Notify Honeybadger about exceptions via a WAI middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rating-chgk-info" = callPackage @@ -197478,39 +197786,6 @@ self: { }) {}; "rattletrap" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits - , bytestring, containers, filepath, http-client, http-client-tls - , HUnit, scientific, template-haskell, temporary, text - , transformers - }: - mkDerivation { - pname = "rattletrap"; - version = "9.0.6"; - sha256 = "1kb3nfm8izgb97f6lbkwcvnc9a2z4hy89hj5hnxmnph7r9s1njii"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls scientific template-haskell - text transformers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls scientific template-haskell - text transformers - ]; - testHaskellDepends = [ - aeson aeson-pretty base binary binary-bits bytestring containers - filepath http-client http-client-tls HUnit scientific - template-haskell temporary text transformers - ]; - description = "Parse and generate Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "rattletrap_9_0_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, containers, filepath, http-client, http-client-tls , HUnit, scientific, template-haskell, temporary, text @@ -198459,16 +198734,16 @@ self: { "readme-lhs" = callPackage ({ mkDerivation, base, containers, doctest, pandoc, pandoc-types - , protolude, text + , protolude, text, transformers }: mkDerivation { pname = "readme-lhs"; - version = "0.2.2"; - sha256 = "1lxa119c7zbqwvjhxrr6cli14f3zrj93ziivi9y8nr0hcv1dx9z6"; + version = "0.3.0"; + sha256 = "1w113jr7sjmq4wkilwjmcaic6sgxp3vzg67dfs0imbd730xhqda8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers pandoc pandoc-types protolude text + base containers pandoc pandoc-types protolude text transformers ]; executableHaskellDepends = [ base protolude ]; testHaskellDepends = [ base doctest protolude ]; @@ -199719,8 +199994,8 @@ self: { }: mkDerivation { pname = "reflex-dom"; - version = "0.5"; - sha256 = "167yghrwf6fay03y46xf87p9bhr6s3rlxn0yk5vnx1s5i95ps1x5"; + version = "0.5.2.0"; + sha256 = "01sqql44jcn7d9xcb00br99zgyghiyqzcmncfpz4dgik10dam1hv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199773,32 +200048,33 @@ self: { , containers, contravariant, data-default, dependent-map , dependent-sum, dependent-sum-template, directory , exception-transformers, exceptions, filepath, ghcjs-dom, hlint - , hspec, hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp - , keycode, lens, lifted-base, monad-control, mtl, network - , network-uri, primitive, process, random, ref-tf, reflex - , semigroups, silently, stm, template-haskell, temporary, text - , these, transformers, unix, wai, wai-websockets, warp, webdriver - , websockets, zenc + , hspec, hspec-core, hspec-webdriver, http-types, HUnit, jsaddle + , jsaddle-warp, keycode, lens, lifted-base, monad-control, mtl + , network, network-uri, primitive, process, random, ref-tf, reflex + , semialign, semigroups, silently, stm, template-haskell, temporary + , text, these, transformers, unix, wai, wai-websockets, warp + , webdriver, websockets, which, zenc }: mkDerivation { pname = "reflex-dom-core"; - version = "0.5"; - sha256 = "1vzlrqgl48krvm58w4mg5s3xwyc565rgjy7f2g1rxxljr30z95p4"; + version = "0.5.2.0"; + sha256 = "1vqd6viqg9di9z0wchi3ffcia4spljf3dal8l21k7qhwcbz4g3jz"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring constraints containers contravariant data-default dependent-map dependent-sum dependent-sum-template directory exception-transformers ghcjs-dom jsaddle keycode lens monad-control mtl network-uri primitive random - ref-tf reflex semigroups stm template-haskell text these + ref-tf reflex semialign semigroups stm template-haskell text these transformers unix zenc ]; testHaskellDepends = [ aeson base bytestring chrome-test-utils constraints constraints-extras containers dependent-map dependent-sum dependent-sum-template directory exceptions filepath ghcjs-dom - hlint hspec hspec-webdriver http-types HUnit jsaddle jsaddle-warp - lens lifted-base network process random ref-tf reflex silently - temporary text wai wai-websockets warp webdriver websockets + hlint hspec hspec-core hspec-webdriver http-types HUnit jsaddle + jsaddle-warp lens lifted-base network process random ref-tf reflex + silently temporary text wai wai-websockets warp webdriver + websockets which ]; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; @@ -200203,6 +200479,8 @@ self: { pname = "regex"; version = "1.0.2.0"; sha256 = "1f2z025hif1fr24b5khq3qxxyvpxrnhyx8xmbms332arw28rpkda"; + revision = "1"; + editedCabalFile = "1476dxzj482j6zkvbvyszsjw1bm7jn2nwk40rq99ylvzm2sj0asn"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text @@ -200802,6 +201080,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-wrapper" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hashable + , regex-tdfa, string-conv, text + }: + mkDerivation { + pname = "regex-wrapper"; + version = "0.1.0.1"; + sha256 = "0ibkdd5xpilzm5qngn01csrin6ial1hhjzgpi3wjv6krlswdil34"; + libraryHaskellDepends = [ + aeson base bytestring containers hashable regex-tdfa string-conv + text + ]; + description = "Types that can only be constructed if they match a regular expression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "regex-xmlschema" = callPackage ({ mkDerivation, base, haskell98, parsec }: mkDerivation { @@ -205209,17 +205503,18 @@ self: { "rosa" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, lens , namecoin-update, optparse-applicative, text, unordered-containers - , vector, wreq + , uri-encode, vector, wreq }: mkDerivation { pname = "rosa"; - version = "0.4.0.0"; - sha256 = "0326ghscyg5rrw54610x8n6mkdr5pim3c7pspb01dg77gbzr0mrm"; + version = "0.5.0.1"; + sha256 = "1nk56nm6gcrcgi2i3x683i0ygbl8x5qc3xqhq14n2s5l45fmgw10"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring directory lens namecoin-update - optparse-applicative text unordered-containers vector wreq + optparse-applicative text unordered-containers uri-encode vector + wreq ]; description = "Query the namecoin blockchain"; license = stdenv.lib.licenses.gpl3; @@ -207187,18 +207482,6 @@ self: { }) {inherit (pkgs) libsodium;}; "salve" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "salve"; - version = "1.0.6"; - sha256 = "1vgpj0yg27n6hw1gb763hgxv99hpq7511n2ihys0qdi0ri8bpj1j"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - description = "Semantic version numbers and constraints"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salve_1_0_8" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { pname = "salve"; @@ -207208,7 +207491,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Semantic version numbers and constraints"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salvia" = callPackage @@ -208571,31 +208853,33 @@ self: { }) {}; "scidb-hquery" = callPackage - ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal - , connection, cryptonite, data-default-class, directory, exceptions - , filepath, happy, haskeline, hostname-validate, HTTP, http-client - , http-client-tls, http-conduit, http-types, memory, mtl, network - , process, regex, safe, split, terminal-size, text, tls, x509-store + ({ mkDerivation, alex, array, base, base-compat, BNFC, bytestring + , Cabal, connection, cryptonite, data-default-class, directory + , exceptions, filepath, happy, haskeline, hostname-validate, HTTP + , http-client, http-client-tls, http-conduit, http-types, memory + , mtl, network, process, regex, safe, split, terminal-size, text + , tls, x509-store }: mkDerivation { pname = "scidb-hquery"; - version = "2.8.0.434"; - sha256 = "0q994ac1krcw312nklxxjr9d4r231s50lb2crbpph1swv6h8jwrq"; + version = "2.8.0.436"; + sha256 = "0mkicmfvwc7xg37d46s7xrcsdaff09v7x86npd1bgv1k60m4c8gq"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - array base bytestring connection cryptonite data-default-class - exceptions haskeline hostname-validate HTTP http-client - http-client-tls http-conduit http-types memory mtl network process - regex safe split terminal-size text tls x509-store + array base base-compat bytestring connection cryptonite + data-default-class exceptions haskeline hostname-validate HTTP + http-client http-client-tls http-conduit http-types memory mtl + network process regex safe split terminal-size text tls x509-store ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - array base bytestring connection cryptonite data-default-class - directory exceptions filepath haskeline hostname-validate HTTP - http-client http-client-tls http-conduit http-types memory mtl - network process regex safe split terminal-size text tls x509-store + array base base-compat bytestring connection cryptonite + data-default-class directory exceptions filepath haskeline + hostname-validate HTTP http-client http-client-tls http-conduit + http-types memory mtl network process regex safe split + terminal-size text tls x509-store ]; description = "Haskell query for SciDB via shim"; license = stdenv.lib.licenses.gpl3; @@ -210373,6 +210657,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semialign-extras" = callPackage + ({ mkDerivation, base, doctest, lens, QuickCheck, semialign + , semialign-indexed, these, witherable + }: + mkDerivation { + pname = "semialign-extras"; + version = "0.1.0.0"; + sha256 = "0wnaspwfj9rm7g9mz2q9xad5a9rvkfsrjb5lir64csppy3p11276"; + libraryHaskellDepends = [ + base lens semialign semialign-indexed these witherable + ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "Extra functions for working with Semialigns"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "semialign-indexed" = callPackage ({ mkDerivation, base, containers, hashable, lens, semialign, these , unordered-containers, vector @@ -211675,8 +211977,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.5.3.0"; - sha256 = "0i9i89a9h9xq6r23p6xxyf7ywgr90p2dyw8862qz0pdj0qdbbi5v"; + version = "0.5.4.0"; + sha256 = "1rjmhyskxypl9gm4g8yq9zfj91dmbz72qxmrijd1gjjv5s5cr91m"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -213831,8 +214133,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.9.1"; - sha256 = "09l9d43ls4ca10y0fx39l8bqsmb226sa0f5yprsm5jz5nbvl70qv"; + version = "0.9.3"; + sha256 = "09mxwqzwcv7dzrb39jiqfay91jh64ajdcp2j2zsp0j1d6g3n8ywf"; libraryHaskellDepends = [ aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis amazonka-s3 base bytestring case-insensitive http-types iproute @@ -214666,8 +214968,8 @@ self: { }: mkDerivation { pname = "sgd"; - version = "0.8.0.2"; - sha256 = "1lzfnzk2iqjrsp6xksfa4qm7a2qh4q1y10mdqigl8slr5nsy9045"; + version = "0.8.0.3"; + sha256 = "0nl7hiw9b25jgp2742ykx8f4c7irz1b7rd9i19vpcmshkkmqcvsl"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq filepath hmatrix logfloat monad-par mtl parallel pipes primitive random @@ -214985,8 +215287,8 @@ self: { ({ mkDerivation, base, directory, shake }: mkDerivation { pname = "shake-ext"; - version = "3.1.0.2"; - sha256 = "04nhjq2s7iycjabh33jwbdc8pxdyxnfrwjvl1mxmwrx0zx96dbi9"; + version = "3.1.1.0"; + sha256 = "12pfi6rc4y8rjndym0crzyjfmcqnnrh61hww1vrnl614hs00iw6h"; libraryHaskellDepends = [ base directory shake ]; description = "Helper functions for linting with shake"; license = stdenv.lib.licenses.bsd3; @@ -224922,8 +225224,8 @@ self: { }: mkDerivation { pname = "standalone-haddock"; - version = "1.3.0.0"; - sha256 = "1s9b2frpsgvc7nghi314adga8z8rmj1x40j7cic2m3m88nqz3g77"; + version = "1.4.0.0"; + sha256 = "0ans74cbh592yramp50056n66cqn3fmyv4qkd1gz4awx6d6xryc1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -225176,6 +225478,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "statestack_0_3" = callPackage + ({ mkDerivation, base, mtl, transformers, transformers-compat }: + mkDerivation { + pname = "statestack"; + version = "0.3"; + sha256 = "1b8yd314h8a97ggjv82cy4mr0f4scb5pjvslxq7hwxxq7cw7mgns"; + libraryHaskellDepends = [ + base mtl transformers transformers-compat + ]; + description = "Simple State-like monad transformer with saveable and restorable state"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statethread" = callPackage ({ mkDerivation, applicative, base, transformers }: mkDerivation { @@ -226532,7 +226848,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "store_0_6_0_1" = callPackage + "store_0_7_0" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq @@ -226546,8 +226862,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.6.0.1"; - sha256 = "0h64fm3rrz6c5bhg1bk9hvl7invjh24mrh7db4dsx12hc8vlz17p"; + version = "0.7.0"; + sha256 = "0vm0gmdgay66wyvg3inlpdc4p7clpvd23767wldfilvvq5zcjq1q"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -227442,6 +227758,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streamly_0_7_0" = callPackage + ({ mkDerivation, atomic-primops, base, containers, deepseq + , directory, exceptions, gauge, ghc-prim, heaps, hspec + , lockfree-queue, monad-control, mtl, network, QuickCheck, random + , transformers, transformers-base + }: + mkDerivation { + pname = "streamly"; + version = "0.7.0"; + sha256 = "1v9fndyh1bhdidwg9jpq4j10i5d1w9hw0rbhd69x8pd02gzqkpbh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base containers deepseq directory exceptions + ghc-prim heaps lockfree-queue monad-control mtl network + transformers transformers-base + ]; + testHaskellDepends = [ + base containers exceptions hspec mtl QuickCheck random transformers + ]; + benchmarkHaskellDepends = [ base deepseq gauge random ]; + description = "Beautiful Streaming, Concurrent and Reactive Composition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streamly-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, criterion, exceptions , hspec, mtl, QuickCheck, quickcheck-instances, streaming @@ -228287,29 +228629,6 @@ self: { }) {}; "strive" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-client, http-client-tls, http-types, markdown-unlit - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "strive"; - version = "5.0.8"; - sha256 = "0wfi3s8hv11xs0wpvbc9z4nsskdpg5q7ivcpci8cnhn20wffb0nn"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types template-haskell text time transformers - ]; - testHaskellDepends = [ - aeson base bytestring data-default gpolyline http-client - http-client-tls http-types markdown-unlit template-haskell text - time transformers - ]; - testToolDepends = [ markdown-unlit ]; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "strive_5_0_9" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit , template-haskell, text, time, transformers @@ -228330,7 +228649,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "A client for the Strava V3 API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strongswan-sql" = callPackage @@ -228673,18 +228991,18 @@ self: { "stylist" = callPackage ({ mkDerivation, base, css-syntax, hashable, hspec, network-uri - , QuickCheck, text, unordered-containers + , QuickCheck, scientific, text, unordered-containers }: mkDerivation { pname = "stylist"; - version = "1.0.0.0"; - sha256 = "0lh8x8wqq4rsy4zn025qhs6jr9iaw65xqpbrk233h620prj23525"; + version = "1.1.0.0"; + sha256 = "1sgfyslbsppndgbywlqynzfxd63y6vr9mig6d76czh427qvn7qpp"; libraryHaskellDepends = [ base css-syntax hashable network-uri text unordered-containers ]; testHaskellDepends = [ - base css-syntax hashable hspec network-uri QuickCheck text - unordered-containers + base css-syntax hashable hspec network-uri QuickCheck scientific + text unordered-containers ]; description = "Apply CSS styles to a document tree"; license = stdenv.lib.licenses.mit; @@ -232234,8 +232552,8 @@ self: { }: mkDerivation { pname = "tagsoup-navigate"; - version = "0.1.0.2"; - sha256 = "16n0s9vpwrnbknm9yfsh3qv2j3k1h579fwfqjbr1kzjn40729348"; + version = "0.1.0.3"; + sha256 = "1vfadi0ls4wqv8kzpil5ph715mihxp70nb2nnjq70gsdgarndv2j"; libraryHaskellDepends = [ base deriving-compat lens mmorph mtl semigroupoids semigroups tagsoup tagsoup-selection transformers @@ -233375,8 +233693,8 @@ self: { }: mkDerivation { pname = "tasty-tap"; - version = "0.0.4"; - sha256 = "0xgz5qyvaabj13jnb5ry1i05c9lldnhaqnyxd9sz7kbvdwsycpn8"; + version = "0.1.0"; + sha256 = "16i7pd0xis1fyqgmsy4mq04y87ny61dh2lddnjijcf1s9jz9b6x8"; libraryHaskellDepends = [ base containers stm tasty ]; testHaskellDepends = [ base directory tasty tasty-golden tasty-hunit @@ -234773,8 +235091,8 @@ self: { }: mkDerivation { pname = "terminal-punch"; - version = "0.1.1"; - sha256 = "11z6jb130300yjkrl511960anjac9ncc3g1yj6jqpah6j2imsa8s"; + version = "0.1.3"; + sha256 = "1hc8gl0bjrz8h9nfrvlkxbkgys62xr7mcdk22lm8dc1cl8y42nkv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -235646,6 +235964,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "texmath_0_12" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12"; + sha256 = "09c1ga3nw0r0wcw84lf862mp02h5ykhprm2wawrqfhklfyl1a6ay"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process temporary text + utf8-string xml + ]; + description = "Conversion between formats used to represent mathematics"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -236370,39 +236711,6 @@ self: { }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, base-compat-batteries, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, semigroups - , tagged, template-haskell, terminfo, text, text-short, text-show - , th-orphans, time, transformers, transformers-compat, unix - , unordered-containers, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.8.2"; - sha256 = "075a2dzbdkh13q9a1w4v0dm40rqrv1wq8nsqh4g4872h29df5mka"; - libraryHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - semigroups tagged template-haskell terminfo text text-short - text-show time transformers transformers-compat unix - unordered-containers vector xhtml - ]; - testHaskellDepends = [ - base base-compat-batteries bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - tagged template-haskell terminfo text-short text-show th-orphans - time transformers transformers-compat unix unordered-containers - vector xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show-instances_3_8_3" = callPackage ({ mkDerivation, base, base-compat-batteries, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time @@ -236433,7 +236741,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -237295,14 +237602,14 @@ self: { "th-tc" = callPackage ({ mkDerivation, base, containers, lens, mtl, template-haskell - , transformers + , th-orphans, transformers }: mkDerivation { pname = "th-tc"; - version = "0.1.1.0"; - sha256 = "0i2j3iwr5az4hmxhnanh6zrvi1k51jjmwaly4z3rw3h4n717qa2m"; + version = "0.2.1.0"; + sha256 = "1wgvglb6k73mslrw1whxyqgxp90l042lm4865qdgvvbli5gk5dva"; libraryHaskellDepends = [ - base containers lens mtl template-haskell transformers + base containers lens mtl template-haskell th-orphans transformers ]; description = "Typechecking in Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -239898,25 +240205,27 @@ self: { broken = true; }) {}; - "tmp-postgres_1_4_0_0" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , either, generic-monoid, hspec, mtl, port-utils, postgres-options - , postgresql-libpq, postgresql-simple, process, temporary - , transformers, unix + "tmp-postgres_1_13_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring + , containers, criterion, directory, generic-monoid, hspec, mtl + , port-utils, postgres-options, postgresql-simple, process, random + , temporary, transformers, unix }: mkDerivation { pname = "tmp-postgres"; - version = "1.4.0.0"; - sha256 = "1jh2w600qw2zjfgja4ys0w28w2vaxhqr22fz9njzckpx2404d7gm"; + version = "1.13.0.0"; + sha256 = "01xpa5jignp7a3fw2rczyciaz9h6m1hf0i1iwanadbacnvzh7ing"; libraryHaskellDepends = [ - async base bytestring containers directory either generic-monoid - port-utils postgres-options postgresql-simple process temporary - transformers unix + ansi-wl-pprint async base bytestring containers directory + generic-monoid port-utils postgres-options postgresql-simple + process random temporary transformers unix ]; testHaskellDepends = [ - base bytestring containers directory either hspec mtl port-utils - postgres-options postgresql-libpq postgresql-simple process - temporary transformers unix + base containers directory hspec mtl port-utils postgres-options + postgresql-simple process temporary unix + ]; + benchmarkHaskellDepends = [ + base criterion postgres-options postgresql-simple ]; description = "Start and stop a temporary postgres"; license = stdenv.lib.licenses.bsd3; @@ -240380,6 +240689,8 @@ self: { pname = "tomland"; version = "1.2.1.0"; sha256 = "0bzwmk3zw2lzhppgr73b5v3i4qz0hxn1zag665vpakq6knssj7qy"; + revision = "1"; + editedCabalFile = "00lb4ivrqrj5yqnfz5ji3vjaa284img9xhkjvrzc291bs83vl4kr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -241911,20 +242222,6 @@ self: { }) {}; "traverse-with-class" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "traverse-with-class"; - version = "1.0.0.0"; - sha256 = "1fqz35kaffq79qs7kgdx2bml2a99x6k87hlczsfjcs1bcpqj18k5"; - libraryHaskellDepends = [ base template-haskell transformers ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - description = "Generic applicative traversals"; - license = stdenv.lib.licenses.mit; - }) {}; - - "traverse-with-class_1_0_1_0" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, template-haskell , transformers }: @@ -241936,7 +242233,6 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Generic applicative traversals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "travis" = callPackage @@ -254818,23 +255114,23 @@ self: { "web-rep" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, box, clay - , foldl, formatting, generic-lens, interpolatedstring-perl6 - , javascript-bridge, JuicyPixels, language-javascript, lens, lucid - , lucid-svg, mmorph, mtl, optparse-generic, protolude, scotty - , streaming, tasty, tasty-hspec, text, transformers + , foldl, generic-lens, interpolatedstring-perl6, javascript-bridge + , JuicyPixels, language-javascript, lens, lucid, lucid-svg, mmorph + , mtl, optparse-generic, protolude, scotty, streaming, tasty + , tasty-hspec, text, text-format, transformers , unordered-containers, wai, wai-extra, wai-middleware-static }: mkDerivation { pname = "web-rep"; - version = "0.1.2"; - sha256 = "170n5x5niimb5blgpr53ckfv6lr1dfnkzy17i6fn18gp7g1hxx85"; + version = "0.1.3"; + sha256 = "174q9zaznsy5v9zypxxf6c5xi5syyhdzmwgi07siqp07in8w1jvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base bifunctors box clay foldl formatting - generic-lens interpolatedstring-perl6 javascript-bridge JuicyPixels + aeson attoparsec base bifunctors box clay foldl generic-lens + interpolatedstring-perl6 javascript-bridge JuicyPixels language-javascript lens lucid lucid-svg mmorph mtl protolude - scotty streaming text transformers unordered-containers + scotty streaming text text-format transformers unordered-containers wai-middleware-static ]; executableHaskellDepends = [ @@ -258041,20 +258337,6 @@ self: { }) {}; "wuss" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "1.1.14"; - sha256 = "1r0ljrp7kfksvmm4029b633cypdg5lqk5nga31si22bi5yz7fkiq"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wuss_1_1_15" = callPackage ({ mkDerivation, base, bytestring, connection, network, websockets }: mkDerivation { @@ -258066,7 +258348,6 @@ self: { ]; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wx" = callPackage @@ -261008,35 +261289,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.11.1.2"; - sha256 = "028pz77n92l6kjgjv263h4b6yhw1iibdbf3a3dkn5qnz537xpzhc"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath libyaml mtl resourcet scientific template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq - resourcet scientific template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific @@ -261063,7 +261315,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -261573,22 +261824,18 @@ self: { "yaya" = callPackage ({ mkDerivation, base, bifunctors, comonad, constraints, containers - , deriving-compat, distributive, either, errors, free, hedgehog - , kan-extensions, lens, profunctors, template-haskell, transformers - , yaya-hedgehog + , distributive, either, errors, free, kan-extensions, lens + , profunctors, template-haskell, transformers }: mkDerivation { pname = "yaya"; - version = "0.2.1.0"; - sha256 = "0wm01cspfpnfhijmbxpr4n0nr1qgc8g8cg9lqpz8n4lkd8i8bfds"; + version = "0.2.1.2"; + sha256 = "179mq32b5gjlwfpldm4msqnxv316gb2gj3s0kzhkcyk0l3i3y8fi"; libraryHaskellDepends = [ base bifunctors comonad constraints containers distributive either errors free kan-extensions lens profunctors template-haskell transformers ]; - testHaskellDepends = [ - base deriving-compat hedgehog yaya-hedgehog - ]; description = "Total recursion schemes"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -261599,8 +261846,8 @@ self: { ({ mkDerivation, base, deriving-compat, hedgehog, yaya }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.1.1.0"; - sha256 = "070xv97j402li75fzhs03svankg0nl2fb1g223kjkq7a704f3dk1"; + version = "0.1.2.1"; + sha256 = "18lyhb7fqdbp2p71y5jydcb8xzbahqzy1jmsnsb4hym8v8ax71cv"; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; @@ -261609,17 +261856,16 @@ self: { }) {}; "yaya-unsafe" = callPackage - ({ mkDerivation, base, bifunctors, comonad, either, free, hedgehog - , lens, yaya, yaya-hedgehog + ({ mkDerivation, base, bifunctors, comonad, either, free, lens + , yaya }: mkDerivation { pname = "yaya-unsafe"; - version = "0.1.1.0"; - sha256 = "081lha6m5c3iyy61xfrj237g0098l5jsm94yqjbaddl4qixk697q"; + version = "0.1.1.2"; + sha256 = "0cvfrzqx5d56nld60p1n5qmwn4j4gbsvy7jf5lk4ar5da4w8a90c"; libraryHaskellDepends = [ base bifunctors comonad either free lens yaya ]; - testHaskellDepends = [ base hedgehog yaya yaya-hedgehog ]; description = "Non-total extensions to the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -262377,6 +262623,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_6_0_4" = callPackage + ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, http-client, http-client-tls, http-reverse-proxy + , http-types, network, optparse-applicative, process + , project-template, say, split, stm, streaming-commons, tar, text + , time, transformers, transformers-compat, unliftio + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.0.4"; + sha256 = "0wz44w4c86513ss81a18rknkrkalxyj2g4rlq324ykqwwkihlr1a"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal conduit conduit-extra containers + data-default-class directory file-embed filepath fsnotify + http-client http-client-tls http-reverse-proxy http-types network + optparse-applicative process project-template say split stm + streaming-commons tar text time transformers transformers-compat + unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib + ]; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -264073,6 +264347,19 @@ self: { broken = true; }) {}; + "yhseq" = callPackage + ({ mkDerivation, base, hspec, hspec-discover }: + mkDerivation { + pname = "yhseq"; + version = "0.2.1.2"; + sha256 = "1mxjfbnic6pn4jnyc83afpmgq4wnb09f72d359pwx693mfi6vbiy"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec hspec-discover ]; + testToolDepends = [ hspec-discover ]; + description = "Calculation of Y-sequence Hexirp edition"; + license = stdenv.lib.licenses.asl20; + }) {}; + "yi" = callPackage ({ mkDerivation, base, microlens-platform, mtl , optparse-applicative, yi-core, yi-frontend-vty, yi-keymap-emacs @@ -264916,14 +265203,12 @@ self: { }) {}; "yx" = callPackage - ({ mkDerivation, array, base, bytestring, hspec }: + ({ mkDerivation, array, base, bytestring, hspec, lattices }: mkDerivation { pname = "yx"; - version = "0.0.2.0"; - sha256 = "05xh7x02ddh87kwslgckzh3g5i22r01vfrb160gns3zl6fv8sj2z"; - revision = "1"; - editedCabalFile = "19px5wf8ca7awam013ij62z04rsplgn7ks56j8jzhznarsg45ksq"; - libraryHaskellDepends = [ array base bytestring ]; + version = "0.0.3.0"; + sha256 = "068xdmi5dn00cx58qrc5hx6vz6byvnh5cp803j7inlynziw3fcgz"; + libraryHaskellDepends = [ array base bytestring lattices ]; testHaskellDepends = [ array base bytestring hspec ]; description = "Row-major coordinates"; license = stdenv.lib.licenses.bsd3; From 3c531669b14ac10f19573f0d94d1c82262c9cc68 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 Nov 2019 21:33:45 +0100 Subject: [PATCH 48/68] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-9-g650d530 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/e761da20a90d133bb78c01781a8cf359ec2df0a6. --- .../haskell-modules/hackage-packages.nix | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8f21ebfc1493..0e66938e67d6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -86013,7 +86013,7 @@ self: { "fltkhs" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath - , fltk14, libGLU_combined, mtl, OpenGLRaw, parsec, pkgconfig, text + , fltk14, libGL, libGLU, mtl, OpenGLRaw, parsec, pkg-config, text , vector }: mkDerivation { @@ -86026,15 +86026,15 @@ self: { setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base bytestring text vector ]; librarySystemDepends = [ fltk14 ]; - libraryPkgconfigDepends = [ libGLU_combined ]; - libraryToolDepends = [ c2hs pkgconfig ]; + libraryPkgconfigDepends = [ libGL libGLU ]; + libraryToolDepends = [ c2hs pkg-config ]; executableHaskellDepends = [ base directory filepath mtl OpenGLRaw parsec text ]; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) fltk14; inherit (pkgs) libGLU_combined; - pkgconfig = null;}; + }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; + inherit (pkgs) libGLU; inherit (pkgs) pkg-config;}; "fltkhs-demos" = callPackage ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm @@ -120063,7 +120063,7 @@ self: { pname = "hlibsass"; version = "0.1.8.0"; sha256 = "1ssgvr0jvl79k1vckp5nq2zw6mx8l4xasydymzjwmhg0fl99mpi6"; - configureFlags = [ "-fexternalLibsass" ]; + configureFlags = [ "-fexternallibsass" ]; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsass ]; @@ -137850,7 +137850,7 @@ self: { sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la"; revision = "1"; editedCabalFile = "0n0qs5lgryh3zxy73j3qbpnxand43yd2bj6pclvyii8apqqp901a"; - configureFlags = [ "-fNoInteractiveTests" ]; + configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive process text time transformers vector zlib-bindings @@ -148823,22 +148823,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-regex-pcre_1_0_0_1" = callPackage - ({ mkDerivation, base, bytestring, gauge, hspec, lens, pcre-heavy - , template-haskell, text + "lens-regex-pcre_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, gauge, hspec, lens + , pcre-heavy, pcre-light, template-haskell, text }: mkDerivation { pname = "lens-regex-pcre"; - version = "1.0.0.1"; - sha256 = "0g103a415npasr9a8ay1bs1f7m24w8f53h9x3wrpvvbaf0v3z74i"; + version = "1.1.0.0"; + sha256 = "06540l3rylgpdhfdvd9nwkf6v8hyky4l3igs45zblrmhz4sdql5i"; libraryHaskellDepends = [ - base bytestring lens pcre-heavy template-haskell text + base bytestring containers lens pcre-heavy pcre-light + template-haskell text ]; testHaskellDepends = [ - base bytestring hspec lens pcre-heavy template-haskell text + base bytestring containers hspec lens pcre-heavy pcre-light + template-haskell text ]; benchmarkHaskellDepends = [ - base bytestring gauge lens pcre-heavy template-haskell text + base bytestring containers gauge lens pcre-heavy pcre-light + template-haskell text ]; description = "A lensy interface to regular expressions"; license = stdenv.lib.licenses.bsd3; @@ -178247,19 +178250,20 @@ self: { "pandoc-placetable" = callPackage ({ mkDerivation, aeson, base, bytestring, explicit-exception - , http-conduit, pandoc-types, spreadsheet, text, utf8-string + , http-conduit, pandoc, pandoc-types, spreadsheet, text + , utf8-string }: mkDerivation { pname = "pandoc-placetable"; version = "0.5.1"; sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112"; - configureFlags = [ "-finlineMarkdown" ]; + configureFlags = [ "-finlinemarkdown" ]; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - aeson base bytestring explicit-exception http-conduit pandoc-types - spreadsheet text utf8-string + aeson base bytestring explicit-exception http-conduit pandoc + pandoc-types spreadsheet text utf8-string ]; description = "Pandoc filter to include CSV files"; license = "GPL"; @@ -198451,7 +198455,7 @@ self: { pname = "reactive-banana-wx"; version = "1.1.1.0"; sha256 = "1yzymc6qpjj8d0fal09vxy2yicbrgrg42khylbbsrzmdgqfnf3kr"; - configureFlags = [ "-f-buildExamples" ]; + configureFlags = [ "-f-buildexamples" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; From 2151d7406fa543f9d163cec8199c31290f53aef4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 Nov 2019 21:55:21 +0100 Subject: [PATCH 49/68] androidStudioPackages.{dev,canary}: 4.0.0.2 -> 4.0.0.3 --- 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 4254bca34380..8b8a41e0dfe6 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0017g7nvjiadd64in9fl4wq5lf8b7pyrdasbnwzjcphpbzy1390x"; }; latestVersion = { # canary & dev - version = "4.0.0.2"; # "Android Studio 4.0 Canary 2" - build = "192.5984562"; - sha256Hash = "0p29a6np31396970lnb3di2yrcqi3z8nqcn27hcnb4c4g7kjm0qw"; + version = "4.0.0.3"; # "Android Studio 4.0 Canary 3" + build = "192.5994236"; + sha256Hash = "14ig352anjs0df72f41v4r6jl7mlm2n4pn9syanmykaj87dm4kf4"; }; in { # Attributes are named by their corresponding release channels From fd97974b216bd517fe0ab35b27d285c13d79ad41 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 Nov 2019 21:56:16 +0100 Subject: [PATCH 50/68] androidStudioPackages.beta: 3.6.0.15 -> 3.6.0.16 --- 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 8b8a41e0dfe6..c9bd1d089ca2 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0kcd6kd5rn4b76damkfddin18d1r0dck05piv8mq1ns7x1n4hf7q"; }; betaVersion = { - version = "3.6.0.15"; # "Android Studio 3.6 Beta 3" - build = "192.5982640"; - sha256Hash = "0017g7nvjiadd64in9fl4wq5lf8b7pyrdasbnwzjcphpbzy1390x"; + version = "3.6.0.16"; # "Android Studio 3.6 Beta 4" + build = "192.5994180"; + sha256Hash = "0wyyr6r0jzb1l4rn1mfgp0nnzvgk3x62imq629z6vrdbymy8psf1"; }; latestVersion = { # canary & dev version = "4.0.0.3"; # "Android Studio 4.0 Canary 3" From 7a90d4a946a5d02e701dbc8da88a14c16e77fc65 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 Nov 2019 22:13:58 +0100 Subject: [PATCH 51/68] quiterss: 0.18.12 -> 0.19.0 --- pkgs/applications/networking/newsreaders/quiterss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 3a72ae8ce5f9..28eccf6f37d2 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quiterss"; - version = "0.18.12"; + version = "0.19.0"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = version; - sha256 = "0xav9qr8n6310636nfbgx4iix65fs3ya5rz2isxsf38bkjm7r3pa"; + sha256 = "1czz8n21f4iaazvkq37m867bqy40sdkj44bqggfjcw49pl60kvjn"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; From a27a14da2a592402ecb89abc040700b2cf90d3c7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 Nov 2019 22:17:47 +0100 Subject: [PATCH 52/68] gns3-{gui,server}: 2.2.2 -> 2.2.3 --- pkgs/applications/networking/gns3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 6bc2554d8c90..1e6a0fd5b7f5 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,16 +1,16 @@ { callPackage }: let - stableVersion = "2.2.2"; - previewVersion = "2.2.2"; + stableVersion = "2.2.3"; + previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "0i335fjbadixp39l75w0fl5iwz2cb8rcdj2xvx1my3vzhg8lijfl"; - serverSrcHash = "1g6km8jc53y8ph14ifjxscbimdxma6bw5ir9gqzvkjn39k9fy1w6"; + guiSrcHash = "1l40q3d3hsmhgwb4d8hj73vhgckm0dvsc6l6qzacypd202iq1v8a"; + serverSrcHash = "1qcypb1rmfdl8fl3ykqf5phcapmjid6jrxd6xpncd5dhyl2hr94n"; in { guiStable = mkGui { stable = true; From d0e1277dfda427990c00f3db1ada4cc5767b5754 Mon Sep 17 00:00:00 2001 From: Raymond Date: Sat, 16 Nov 2019 01:08:28 +0300 Subject: [PATCH 53/68] mtr: patch for "Error decoding localhost address" --- pkgs/tools/networking/mtr/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 217f3b7d7cc8..18850fab3300 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig , libcap, ncurses , withGtk ? false, gtk2 ? null }: @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw"; }; + + patches = [ + # https://github.com/traviscross/mtr/pull/315 + (fetchpatch { + url = https://github.com/traviscross/mtr/pull/315.patch?full_index=1; + sha256 = "18qcsj9058snc2qhq6v6gdbqhz021gi5fgw9h7vfczv45gf0qasa"; + }) + ]; # we need this before autoreconfHook does its thing postPatch = '' From c1966522d7d5fa54db068140d212cba18731dd98 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 8 Nov 2019 17:57:24 +0000 Subject: [PATCH 54/68] =?UTF-8?q?gnumeric:=201.12.45=20=E2=86=92=201.12.46?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit goffice: 0.10.45 → 0.10.46 --- pkgs/applications/office/gnumeric/default.nix | 17 ++++------------- pkgs/development/libraries/goffice/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 70d1e3d79ba5..979c960f7a81 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,31 +1,22 @@ { stdenv, fetchurl, pkgconfig, intltool, perlPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, pythonPackages -, itstool, autoreconfHook +, itstool }: let inherit (pythonPackages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.45"; # TODO next release: remove gamma patch and autoreconfHook + version = "1.12.46"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c8dl1kvnj3g32qy3s92qpqpqfy0in59cx005gjvvzsflahav61h"; + sha256 = "9fdc67377af52dfe69a7db4f533938024a75f454fc5d25ab43b8e6739be0b5e1"; }; - patches = stdenv.lib.optional stdenv.isDarwin - # https://gitlab.gnome.org/GNOME/gnumeric/issues/402 - (fetchurl { - name = "math-gamma.patch"; - url = "https://gitlab.gnome.org/GNOME/gnumeric/uploads/cf8d162bc719de92e97d01cb0ba5b637/ppp"; - sha256 = "17wiigs06qc86a1nghwcg3pcnpa28123jblgsxpy3j7drardgnlp"; - }); - configureFlags = [ "--disable-component" ]; - nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ] - ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]; # ToDo: optional libgda, introspection? buildInputs = [ diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index a18bdb177449..f41fa73a6ef4 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.45"; + version = "0.10.46"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "702ba567e9ec0bbdd9b1a8161cd24648b4868d57a6cb89128f13c125f6f31947"; + sha256 = "058d6d3a40e1f60525682ec6b857c441d5deb50d0d30a76804f9f36f865a13a9"; }; nativeBuildInputs = [ pkgconfig intltool ]; From 9367367dfd6e0373c04650e9893deed426d48aa2 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 16 Nov 2019 01:41:23 +0100 Subject: [PATCH 55/68] Treewide: fix URL permanent redirects Permanent redirects on homepages and/or source URLs as reported by Repology --- pkgs/applications/misc/cmatrix/default.nix | 2 +- pkgs/applications/misc/fetchmail/default.nix | 2 +- pkgs/applications/networking/browsers/luakit/default.nix | 2 +- .../networking/feedreaders/castget/default.nix | 2 +- pkgs/applications/science/chemistry/octopus/default.nix | 2 +- pkgs/applications/science/logic/aspino/default.nix | 2 +- pkgs/applications/science/math/glsurf/default.nix | 4 ++-- pkgs/applications/science/medicine/aliza/default.nix | 2 +- pkgs/data/fonts/babelstone-han/default.nix | 2 +- pkgs/data/fonts/gohufont/default.nix | 4 ++-- pkgs/data/fonts/input-fonts/default.nix | 2 +- pkgs/desktops/enlightenment/ephoto.nix | 2 +- pkgs/desktops/xfce/core/exo.nix | 2 +- pkgs/development/compilers/factor-lang/default.nix | 4 ++-- pkgs/development/libraries/boehm-gc/7.6.6.nix | 6 +++--- pkgs/development/libraries/boehm-gc/default.nix | 6 +++--- pkgs/development/libraries/c-blosc/default.nix | 2 +- pkgs/development/libraries/fltk/1.4.nix | 4 ++-- pkgs/development/libraries/fltk/default.nix | 4 ++-- pkgs/development/libraries/freetds/default.nix | 2 +- pkgs/development/libraries/geoip/default.nix | 2 +- pkgs/development/libraries/liburing/default.nix | 2 +- pkgs/development/libraries/linbox/default.nix | 2 +- pkgs/development/libraries/mapnik/default.nix | 2 +- pkgs/development/libraries/opencolorio/default.nix | 2 +- pkgs/development/ocaml-modules/easy-format/default.nix | 2 +- pkgs/development/ocaml-modules/iso8601/default.nix | 2 +- pkgs/development/ocaml-modules/yojson/default.nix | 2 +- pkgs/development/python-modules/ansi2html/default.nix | 2 +- pkgs/development/python-modules/cssmin/default.nix | 2 +- pkgs/development/python-modules/dmenu/default.nix | 2 +- pkgs/development/python-modules/eyed3/default.nix | 2 +- pkgs/development/tools/build-managers/meson/default.nix | 2 +- pkgs/development/tools/ocaml/cppo/default.nix | 2 +- pkgs/games/arx-libertatis/default.nix | 4 ++-- pkgs/games/gcs/default.nix | 8 ++++---- pkgs/misc/jackaudio/default.nix | 2 +- pkgs/misc/jackaudio/jack1.nix | 6 +++--- pkgs/os-specific/linux/hostapd/default.nix | 2 +- pkgs/os-specific/linux/pam_ccreds/default.nix | 6 +++--- pkgs/os-specific/linux/pam_ldap/default.nix | 4 ++-- pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/default.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 2 +- pkgs/servers/irc/charybdis/default.nix | 2 +- pkgs/servers/sql/mariadb/galera/default.nix | 2 +- pkgs/tools/archivers/innoextract/default.nix | 4 ++-- pkgs/tools/backup/lvmsync/default.nix | 2 +- pkgs/tools/security/ossec/default.nix | 4 ++-- pkgs/tools/system/fio/default.nix | 2 +- pkgs/tools/system/proot/default.nix | 2 +- pkgs/tools/text/papertrail/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 53 files changed, 73 insertions(+), 73 deletions(-) diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index cc57e58c56a4..9f86ec94f184 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { CMatrix simulates the display from "The Matrix" and is based on the screensaver from the movie's website. ''; - homepage = http://www.asty.org/cmatrix/; + homepage = https://github.com/abishekvashok/cmatrix; platforms = ncurses.meta.platforms; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index bbbf1a0aff9b..6c4ecf6fa392 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ssl=${openssl.dev}" ]; meta = { - homepage = http://www.fetchmail.info/; + homepage = https://www.fetchmail.info/; description = "A full-featured remote-mail retrieval and forwarding utility"; longDescription = '' A full-featured, robust, well-documented remote-mail retrieval and diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index d679eb56f5bd..0605eda7fc76 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, small, webkit based browser framework extensible in Lua"; - homepage = http://luakit.org; + homepage = https://luakit.github.io/; license = licenses.gpl3; platforms = platforms.linux; # Only tested linux }; diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix index 83132f030145..33f8d8ca2383 100644 --- a/pkgs/applications/networking/feedreaders/castget/default.nix +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { castget is a simple, command-line based RSS enclosure downloader. It is primarily intended for automatic, unattended downloading of podcasts. ''; - homepage = "http://castget.johndal.com/"; + homepage = "https://castget.johndal.com/"; maintainers = with maintainers; [ doronbehar ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 6dec5b3b11f1..d37f8d17336e 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-space time dependent density-functional theory code"; - homepage = http://octopus-code.org; + homepage = https://octopus-code.org; maintainers = with maintainers; [ markuskowa ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index d6190942efab..6af7eaf3a5b8 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ gebner ma27 ]; platforms = platforms.unix; license = licenses.asl20; - homepage = http://alviano.net/software/maxino/; + homepage = https://alviano.net/software/maxino/; # See pkgs/applications/science/logic/glucose/default.nix badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 1cd5e364208a..609e73b327ad 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "glsurf-3.3.1"; src = fetchurl { - url = "https://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz"; + url = "https://raffalli.eu/~christophe/glsurf/glsurf-3.3.1.tar.gz"; sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; + homepage = https://raffalli.eu/~christophe/glsurf/; description = "A program to draw implicit surfaces and curves"; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index 2633f4c8db1b..53d5ad6ab4cc 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Medical imaging software with 2D, 3D and 4D capabilities"; - homepage = http://www.aliza-dicom-viewer.com; + homepage = https://www.aliza-dicom-viewer.com; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; platforms = platforms.linux; diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index 113ee5b92041..3485b181d5af 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "babelstone-han-${version}"; - url = http://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; + url = https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 29b4241be92c..e4e9954d1187 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.1"; src = fetchurl { - url = "http://font.gohu.org/${pname}-${version}.tar.gz"; + url = "https://font.gohu.org/${pname}-${version}.tar.gz"; sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm"; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { description = '' A monospace bitmap font well suited for programming and terminal use ''; - homepage = http://font.gohu.org/; + homepage = https://font.gohu.org/; license = licenses.wtfpl; maintainers = with maintainers; [ epitrochoid rnhmjoj ]; }; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 3bc836fa4e48..68322bd54828 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { generous spacing, large punctuation, and easily distinguishable characters — but without the limitations of a fixed width. ''; - homepage = http://input.fontbureau.com; + homepage = https://input.fontbureau.com; license = licenses.unfree; maintainers = with maintainers; [ romildo ]; platforms = platforms.all; diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index 3563b9aabc1c..b00b3d7a8462 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; - homepage = http://smhouston.us/ephoto/; + homepage = https://smhouston.us/projects/ephoto/; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index 6b5ee4b31328..1a7cdd39d101 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor-icon-theme ]; meta = with stdenv.lib; { - homepage = "http://www.xfce.org/projects/${p_name}"; + homepage = "https://docs.xfce.org/xfce/${p_name}/start"; description = "Application library for the Xfce desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ef445faec923..314a2d0fc525 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; src = fetchurl { - url = http://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip; + url = https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip; sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri"; }; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://factorcode.org; + homepage = https://factorcode.org; license = licenses.bsd2; description = "A concatenative, stack-based programming language"; diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index c2b5c7b60626..1cbbee469e6b 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ - "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" ]; sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79"; @@ -63,10 +63,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = http://hboehm.info/gc/; + homepage = https://hboehm.info/gc/; # non-copyleft, X11-style license - license = http://hboehm.info/gc/license.txt; + license = https://hboehm.info/gc/license.txt; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 5ae6200473bd..f061626a897d 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { urls = [ "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" - "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" ]; sha256 = "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"; }; @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = http://hboehm.info/gc/; + homepage = https://hboehm.info/gc/; # non-copyleft, X11-style license - license = http://hboehm.info/gc/license.txt; + license = https://hboehm.info/gc/license.txt; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index 196dd9ca3f9b..4a9e627e5442 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A blocking, shuffling and loss-less compression library"; - homepage = http://www.blosc.org; + homepage = https://www.blosc.org; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index eebe119d142f..183f0c2bb70c 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz"; + url = "https://www.fltk.org/pub/fltk/snapshots/fltk-${version}.tar.gz"; sha256 = "1v8wxvxcbk99i82x2v5fpqg5vj8n7g8a38g30ry7nzcjn5sf3r63"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C++ cross-platform lightweight GUI library"; - homepage = http://www.fltk.org; + homepage = https://www.fltk.org; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index a22b5eef8d2e..ad317b06bbb3 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; + url = "https://www.fltk.org/pub/fltk/${version}/fltk-${version}-source.tar.gz"; sha256 = "00jp24z1818k9n6nn6lx7qflqf2k13g4kxr0p8v1d37kanhb4ac7"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C++ cross-platform lightweight GUI library"; - homepage = http://www.fltk.org; + homepage = https://www.fltk.org; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 0ff9cea3d27c..855ca0385dfd 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = http://www.freetds.org; + homepage = https://www.freetds.org; license = licenses.lgpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/geoip/default.nix b/pkgs/development/libraries/geoip/default.nix index 4525f9232862..d55983952b8c 100644 --- a/pkgs/development/libraries/geoip/default.nix +++ b/pkgs/development/libraries/geoip/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ thoughtpolice raskin ]; license = licenses.lgpl21; platforms = platforms.unix; - homepage = "http://maxmind.com"; + homepage = "https://www.maxmind.com"; }; } diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index ad8c08b3cce0..386354b48e4d 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace library for the Linux io_uring API"; - homepage = http://git.kernel.dk/cgit/liburing/; + homepage = https://git.kernel.dk/cgit/liburing/; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 70320ead5d11..709a237aed9b 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; platforms = stdenv.lib.platforms.unix; - homepage = http://linalg.org/; + homepage = https://linalg.org/; }; } diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 1feea915c025..53c4594f535b 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source toolkit for developing mapping applications"; - homepage = http://mapnik.org; + homepage = https://mapnik.org; maintainers = with maintainers; [ hrdinka ]; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index cbd05848173a..06eff9d17f36 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://opencolorio.org; + homepage = https://opencolorio.org; description = "A color management framework for visual effects and animation"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index bbf4d82b5196..5c1155a723bd 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A high-level and functional interface to the Format module of the OCaml standard library"; - homepage = "http://mjambon.com/${pname}.html"; + homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 40db8246f4aa..96f0205aa792 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://sagotch.github.io/ISO8601.ml/; + homepage = https://ocaml-community.github.io/ISO8601.ml/; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index c660ca648566..84d5e488b253 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation ({ meta = with stdenv.lib; { description = "An optimized parsing and printing library for the JSON format"; - homepage = "http://mjambon.com/${pname}.html"; + homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 2a705b53538a..18a2b0dde7f6 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert text with ANSI color codes to HTML"; - homepage = http://github.com/ralphbean/ansi2html; + homepage = https://github.com/ralphbean/ansi2html; license = licenses.lgpl3Plus; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index 7cb01001fac2..2d1ffaccd6f8 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python port of the YUI CSS compression algorithm"; - homepage = http://github.com/zacharyvoase/cssmin; + homepage = https://github.com/zacharyvoase/cssmin; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix index d7ec8161ef5e..7897138d59f8 100644 --- a/pkgs/development/python-modules/dmenu/default.nix +++ b/pkgs/development/python-modules/dmenu/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A Python wrapper for dmenu"; - homepage = http://dmenu.readthedocs.io; + homepage = https://dmenu.readthedocs.io; license = lib.licenses.mit; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index a06f276232ef..5af13c488baf 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python module and command line program for processing ID3 tags"; - homepage = http://eyed3.nicfit.net/; + homepage = https://eyed3.nicfit.net/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 595d93327396..75658dcbb3ea 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -111,7 +111,7 @@ python3Packages.buildPythonApplication rec { isCross = stdenv.targetPlatform != stdenv.hostPlatform; meta = with lib; { - homepage = http://mesonbuild.com; + homepage = https://mesonbuild.com; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; license = licenses.asl20; maintainers = with maintainers; [ mbe rasendubi ]; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index bde5cce6048f..27c608fc7195 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: let pname = "cppo"; - webpage = "http://mjambon.com/${pname}.html"; + webpage = "https://github.com/ocaml-community/${pname}"; in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index d3f18d4c2182..354787e0f074 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -47,14 +47,14 @@ stdenv.mkDerivation { '' + optionalString withCrashReporter '' wrapQtApp "$out/libexec/arxcrashreporter" ''; - + meta = { description = '' A cross-platform, open source port of Arx Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by Arkane Studios. ''; - homepage = http://arx-libertatis.org/; + homepage = https://arx-libertatis.org/; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index 3665467407a9..f1230b739bb1 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { cd ../toolkit ant - + cd ../gcs ant @@ -60,15 +60,15 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java find gcs/libraries toolkit/libraries apple_stubs/ \( -name '*.jar' -and -not -name '*-src.jar' \) -exec cp '{}' $out/share/java ';' - + makeWrapper ${jre8}/bin/java $out/bin/gcs \ --set GCS_LIBRARY ${library} \ --add-flags "-cp $out/share/java/gcs-${version}.jar com.trollworks.gcs.app.GCS" - ''; + ''; meta = with stdenv.lib; { description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; - homepage = http://gurpscharactersheet.com/; + homepage = https://gurpscharactersheet.com/; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; []; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 6ca09c9516b2..4bd0a96fb3ac 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = http://jackaudio.org; + homepage = https://jackaudio.org; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index cb487677881a..39c0d7d50c78 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "0.125.0"; src = fetchurl { - url = "http://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; + url = "https://jackaudio.org/downloads/jack-audio-connection-kit-${version}.tar.gz"; sha256 = "0i6l25dmfk2ji2lrakqq9icnwjxklgcjzzk65dmsff91z2zva5rm"; }; @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JACK audio connection kit"; - homepage = http://jackaudio.org; - license = "GPL"; + homepage = https://jackaudio.org; + license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.unix; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index e90470cd5891..41d7f2366822 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hostap.epitest.fi; + homepage = https://hostap.epitest.fi; repositories.git = git://w1.fi/hostap.git; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index 8293ac0a830a..012750c22adc 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pam, openssl, db}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "pam_ccreds-10"; src = fetchurl { - url = "http://www.padl.com/download/pam_ccreds.tgz"; + url = "https://www.padl.com/download/${name}.tar.gz"; sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz"; }; patchPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ pam openssl db ]; meta = with stdenv.lib; { - homepage = http://www.padl.com/OSS/pam_ccreds.html; + homepage = https://www.padl.com/OSS/pam_ccreds.html; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 5b34a8bc82b5..2b3a300eccaa 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "pam_ldap-186"; src = fetchurl { - url = "http://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/${name}.tar.gz"; sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam openldap ]; meta = { - homepage = http://www.padl.com/OSS/pam_ldap.html; + homepage = https://www.padl.com/OSS/pam_ldap.html; description = "LDAP backend for PAM"; longDescription = '' The pam_ldap module provides the means for Solaris and Linux servers and diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 2156177f6415..5e355ac7c9a7 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -32,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem"; - homepage = http://kernelshark.org/; + homepage = https://kernelshark.org/; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ basvandijk ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 99425b6799ca..dc5b4289a451 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hostap.epitest.fi/wpa_supplicant/; + homepage = https://hostap.epitest.fi/wpa_supplicant/; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; maintainers = with maintainers; [ marcweber ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 7c6f595bfafd..d02901e0cc1c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -25,7 +25,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Qt-based GUI for wpa_supplicant"; - homepage = http://hostap.epitest.fi/wpa_supplicant/; + homepage = https://hostap.epitest.fi/wpa_supplicant/; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index c6b2af3d3876..ecbedcfbec8e 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; - homepage = http://atheme.org/projects/charybdis.html; + homepage = https://github.com/charybdis-ircd/charybdis; license = licenses.gpl2; maintainers = with maintainers; [ lassulus fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 263a21983e26..73d37ba11a22 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Galera 3 wsrep provider library"; - homepage = http://galeracluster.com/; + homepage = https://galeracluster.com/; license = licenses.lgpl2; maintainers = with maintainers; [ izorkin ]; platforms = platforms.all; diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 6b0ca7e15285..6a8c8c712747 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "innoextract-1.8"; src = fetchurl { - url = "http://constexpr.org/innoextract/files/${name}.tar.gz"; + url = "https://constexpr.org/innoextract/files/${name}.tar.gz"; sha256 = "0saj50n8ds85shygy4mq1h6s99510r9wgjjdll4dmvhra4lzcy2y"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to unpack installers created by Inno Setup"; - homepage = http://constexpr.org/innoextract/; + homepage = https://constexpr.org/innoextract/; license = licenses.zlib; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index 814c02267ba9..8c23d804d0b8 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimised synchronisation of LVM snapshots over a network"; - homepage = http://theshed.hezmatt.org/lvmsync/; + homepage = https://theshed.hezmatt.org/lvmsync/; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ jluttine nicknovitski ]; diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 7231f6821daf..2b52099e70b3 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -31,8 +31,8 @@ yes ''; meta = { - description = "Open soruce host-based instrusion detection system"; - homepage = http://www.ossec.net; + description = "Open source host-based instrusion detection system"; + homepage = https://www.ossec.net; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index b6ad10ec6454..79b2769ab0d2 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flexible IO Tester - an IO benchmark tool"; - homepage = "http://git.kernel.dk/?p=fio.git;a=summary;"; + homepage = "https://git.kernel.dk/cgit/fio/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 0764844dbfc9..5ff8ff95f8ae 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://proot-me.github.io; + homepage = https://proot-me.github.io; description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index be85511a92b8..d20727f725a2 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command-line client for Papertrail log management service"; - homepage = http://github.com/papertrail/papertrail-cli/; + homepage = https://github.com/papertrail/papertrail-cli/; license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; platforms = ruby.meta.platforms; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5f37899d276d..c5b6bc3f0491 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -445,7 +445,7 @@ let meta = { description = "A container for functions of the ClusterSSH programs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "http://github.com/duncs/clusterssh/wiki"; + homepage = "https://github.com/duncs/clusterssh/wiki"; }; }; From 82ed6bded2ad2df99a5ceff736949e91e0da217f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 27 Oct 2019 21:56:35 +0100 Subject: [PATCH 56/68] avldrums: 0.3.5 -> 0.4.0 --- pkgs/applications/audio/avldrums-lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix index 7ca5d83b48b2..eeb0f67d1937 100644 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ b/pkgs/applications/audio/avldrums-lv2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "avldrums.lv2"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "x42"; repo = pname; rev = "v${version}"; - sha256 = "00n2varc7iwp0xbfi45hpq4vlpxxb2kbrdzvrc20qp2265994bqf"; + sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv"; fetchSubmodules = true; }; From d5053d12eb23377bcc860f8cb3bfa65c4507772d Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Wed, 13 Nov 2019 23:13:02 +0100 Subject: [PATCH 57/68] ocamlPackages.lwt_ppx: fix dependency propagation dune was showing this error when using lwt_ppx: File "/nix/store/sz4cg32ph84lapgs50xv73s3a0baqq2s-ocaml4.08.1-lwt_ppx-4.2.1/lib/ocaml/4.08.1/site-lib/lwt_ppx/dune-package", line 11, characters 56-75: 11 | (requires compiler-libs.common ocaml-migrate-parsetree ppx_tools_versioned) ^^^^^^^^^^^^^^^^^^^ Error: Library "ppx_tools_versioned" not found. -> required by library "lwt_ppx" in /nix/store/sz4cg32ph84lapgs50xv73s3a0baqq2s-ocaml4.08.1-lwt_ppx-4.2.1/lib/ocaml/4.08.1/site-lib/lwt_ppx -> required by executable wizytests in dune:6 Hint: try: dune external-lib-deps --missing @@default --- pkgs/development/ocaml-modules/lwt/ppx.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index fbd061a6566b..4ad6fc2c4710 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -5,8 +5,7 @@ buildDunePackage { inherit (lwt) src version; - buildInputs = [ ppx_tools_versioned ]; - propagatedBuildInputs = [ lwt ]; + propagatedBuildInputs = [ lwt ppx_tools_versioned ]; meta = { description = "Ppx syntax extension for Lwt"; From 0e283d6a2daf0b34336c1712cf40b3e0f5d3141b Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Sat, 16 Nov 2019 04:34:53 +0000 Subject: [PATCH 58/68] http-prompt: fix build I don't really understand why this works: - Building with python3 because python2 fails with "error: invalid command 'bdist_wheel'". - Specifying the path to prompt_toolkit v1 because otherwise the dependency resolution fails with "ERROR: Could not find a version that satisfies the requirement prompt-toolkit<2.0.0,>=1.0.0 (from http-prompt==1.0.0) (from versions: none) ERROR: No matching distribution found for prompt-toolkit<2.0.0,>=1.0.0 (from http-prompt==1.0.0)". --- pkgs/tools/networking/http-prompt/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 049fb7a1a6e6..9ed2f000f325 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages, httpie }: +{ stdenv, fetchFromGitHub, python3Packages, httpie }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "http-prompt"; version = "1.0.0"; @@ -11,11 +11,11 @@ pythonPackages.buildPythonApplication rec { sha256 = "0kngz2izcqjphbrdkg489p0xmf65xjc8ki1a2szcc8sgwc7z74xy"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ click httpie parsimonious - prompt_toolkit + (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) pygments six ]; @@ -30,6 +30,5 @@ pythonPackages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux ++ platforms.darwin; - broken = true; }; } From e651f5d5168331f942c38ee7764f71a12f963d23 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 26 Jul 2019 10:09:10 -0500 Subject: [PATCH 59/68] purple-matrix: pname, fix cflags, restore hardening --- .../pidgin-plugins/purple-matrix/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 8a15a3bdd85e..44133e777c76 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchgit, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : +{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : -let - version = "2018-08-03"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "purple-matrix-unstable"; - inherit version; + version = "2019-06-06"; - src = fetchgit { - url = "https://github.com/matrix-org/purple-matrix"; - rev = "5a7166a3f54f85793c6b60662f8d12196aeaaeb0"; - sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; + src = fetchFromGitHub { + owner = "matrix-org"; + repo = "purple-matrix"; + rev = "4494ba22b479917f0b1f96a3019792d3d75bcff1"; + sha256 = "1gjm0z4wa5vi9x1xk43rany5pffrwg958n180ahdj9a7sa8a4hpm"; }; - # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = [ + # glib-2.62 deprecations + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + # override "-O0 -Werror" set by build system + "-O3" "-Wno-error" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; - hardeningDisable = [ "fortify" ]; # upstream compiles with -O0 - makeFlags = [ "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" From 1459e57db156d8c39ba0a0e6bff3d6835dffcc48 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 16 Nov 2019 09:51:54 +0100 Subject: [PATCH 60/68] rfc-bibtex: fix homepage url Incorrect schema: "ttps://" -> "https://" --- pkgs/development/python-modules/rfc-bibtex/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix index db6fedd89a45..dd114fd70960 100644 --- a/pkgs/development/python-modules/rfc-bibtex/default.nix +++ b/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { disabled = !isPy3k; meta = with stdenv.lib; { - homepage = ttps://github.com/iluxonchik/rfc-bibtex/; + homepage = https://github.com/iluxonchik/rfc-bibtex/; description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts"; license = licenses.mit; maintainers = with maintainers; [ teto ]; From 206c264c7dd885efce2df4807fef6a7f268501ae Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 16 Nov 2019 10:11:17 +0100 Subject: [PATCH 61/68] gzrt: fix homepage and src url redirect + meta.license is GPL2+ --- pkgs/tools/compression/gzrt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 59a11e2d4d75..6ce50bb3d996 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "gzrt-0.8"; src = fetchurl { - url = "http://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz"; + url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz"; sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; }; @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.urbanophile.com/arenn/hacking/gzrt/; + homepage = https://www.urbanophile.com/arenn/hacking/gzrt/; description = "The gzip Recovery Toolkit"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; } From 25dbbd2f816d02e478e23302cffe864de0fa945b Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 15 Nov 2019 00:14:31 +0100 Subject: [PATCH 62/68] ledger-live-desktop: 1.15.0 -> 1.18.2 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 09cb3c329b91..d5e84a71d276 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "1.15.0"; + version = "1.18.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0r7gm7q7gj39v36jd5xz20931za94nf2fpf3clbghkhlbrm0kbnq"; + sha256 = "1giy8xg1yfv7b7gh98dmfc05wh54xqpd53nanacwcc7lakzizqnn"; }; appimageContents = appimageTools.extractType2 { From 9c691e6fd72f9ac8272e5b92e49ae96377eb5516 Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Thu, 14 Nov 2019 13:59:26 -0700 Subject: [PATCH 63/68] discord-canary: 0.0.97 -> 0.0.98 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a54c4f4955aa..70b36c663873 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.97"; + version = "0.0.98"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "17kwgk2kwrfqgjqmfv055gvlqq144gz7bywwrs6i2x7mimz4345x"; + sha256 = "0raqsfakjbcsh7g280yi7sg2jsrmy2q4jldg73wb868z35radld4"; }; }; }.${branch} From 227c4c8b0b0d5e4f3d992fec4c5377d2fd6f75f5 Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Fri, 15 Nov 2019 18:31:15 +0100 Subject: [PATCH 64/68] multibootusb: Fix QT and refactor Also removed myself as maintainer because I don't care about this software anymore. --- .../misc/multibootusb/default.nix | 72 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 48 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index a2678d6067f9..142014832943 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -1,21 +1,33 @@ -{ stdenv, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5, runtimeShell }: +{ fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, + python36Packages, qt5, runtimeShell, stdenv, utillinux, wrapQtAppsHook }: + +# Note: Multibootusb is tricky to maintain. It relies on the +# $PYTHONPATH variable containing some of their code, so that +# something like: +# +# from scripts import config +# +# works. It also relies on the current directory to find some runtime +# resources thanks to a use of __file__. +# +# https://github.com/mbusb/multibootusb/blob/0d34d70c3868f1d7695cfd141141b17c075de967/scripts/osdriver.py#L59 + python36Packages.buildPythonApplication rec { pname = "multibootusb"; name = "${pname}-${version}"; version = "9.2.0"; + nativeBuildInputs = [ + wrapQtAppsHook + ]; + buildInputs = [ - python36Packages.dbus-python - python36Packages.pyqt5 - python36Packages.pytest-shutil - python36Packages.python - python36Packages.pyudev - python36Packages.six libxcb mtools p7zip parted procps + python36Packages.python qt5.full utillinux ]; @@ -28,32 +40,42 @@ python36Packages.buildPythonApplication rec { sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3"; }; - # Skip the fixup stage where stuff is shrinked (can't shrink text files) - phases = [ "unpackPhase" "installPhase" ]; + # Tests can't run inside the NixOS sandbox + # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" + doCheck = false; - installPhase = '' - share="$out/share/${pname}" - mkdir -p "$share" - cp -r data "$share/data" - cp -r scripts "$share/scripts" - cp "${pname}" "$share/${pname}" + pythonPath = [ + python36Packages.dbus-python + python36Packages.pyqt5 + python36Packages.pytest-shutil + python36Packages.pyudev + python36Packages.six + ]; - mkdir "$out/bin" - cat > "$out/bin/${pname}" < Date: Wed, 13 Nov 2019 00:57:07 +0100 Subject: [PATCH 65/68] jitterentropy: Find strip when crosscompiling --- pkgs/development/libraries/jitterentropy/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index f6a70deb8c2d..ddf4ba621697 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { preInstall = '' mkdir -p $out/include + substituteInPlace Makefile \ + --replace "install -m 0755 -s" \ + 'install -m 0755 -s --strip-program $(STRIP)' ''; installFlags = [ From 08a897676b2b11bd6ee07121c1de67d610d6659e Mon Sep 17 00:00:00 2001 From: Kolby Crouch Date: Tue, 12 Nov 2019 03:31:53 -0600 Subject: [PATCH 66/68] retroarch: 1.7.8.4 -> 1.8.1 --- pkgs/misc/emulators/retroarch/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 3b55c44d173e..8787cd9d39e4 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -2,12 +2,14 @@ , ffmpeg, libGLU_combined, freetype, libxml2, python3 , libobjc, AppKit, Foundation , alsaLib ? null +, libdrm ? null , libpulseaudio ? null , libv4l ? null , libX11 ? null , libXdmcp ? null , libXext ? null , libXxf86vm ? null +, mesa ? null , SDL2 ? null , udev ? null , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null @@ -27,12 +29,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.7.8.4"; + version = "1.8.1"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "1i3i23xwvmck8k2fpalr49np7xjzfg507243mybqrljawlnbxvph"; + sha256 = "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7"; rev = "v${version}"; }; @@ -43,11 +45,13 @@ in stdenv.mkDerivation rec { ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optional withVulkan [ vulkan-loader ] ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] - ++ optionals stdenv.isLinux [ alsaLib libpulseaudio libv4l libX11 - libXdmcp libXext libXxf86vm udev ]; + ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 + libXdmcp libXext libXxf86vm mesa udev ]; enableParallelBuilding = true; + configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else ""; + postInstall = optionalString withVulkan '' wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib '' + optionalString stdenv.targetPlatform.isDarwin '' From 17e0d73278e5fd172cb7d62b662bcb457e4a0951 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 9 Nov 2019 15:48:22 +0000 Subject: [PATCH 67/68] =?UTF-8?q?ocamlPackages.facile:=201.1.3=20=E2=86=92?= =?UTF-8?q?=201.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/facile/default.nix | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix index e8553ebf812e..8834de53a8fa 100644 --- a/pkgs/development/ocaml-modules/facile/default.nix +++ b/pkgs/development/ocaml-modules/facile/default.nix @@ -1,38 +1,19 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ lib, fetchurl, buildDunePackage }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-facile-${version}"; - - version = "1.1.3"; +buildDunePackage rec { + pname = "facile"; + version = "1.1.4"; src = fetchurl { - url = "http://opti.recherche.enac.fr/facile/distrib/facile-${version}.tar.gz"; - sha256 = "1v4apqcw4gm36ph5xwf1wxaaza0ggvihvgsdslnf33fa1pdkvdjw"; + url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz"; + sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp"; }; - dontAddPrefix = 1; - - buildInputs = [ ocaml findlib ]; - - createFindlibDestdir = true; - - installFlags = [ "FACILEDIR=$(OCAMLFIND_DESTDIR)/facile" ]; - - postInstall = '' - cat > $OCAMLFIND_DESTDIR/facile/META < Date: Mon, 11 Nov 2019 10:13:14 +0300 Subject: [PATCH 68/68] gpxsee: 7.16 -> 7.17 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 674b0061d6da..cad738908f06 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.16"; + version = "7.17"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1mkfhb2c9qafjpva600nyn6yik49l4q1k6id1xvrci37wsn6ijav"; + sha256 = "10mch709m4ws73yzkrx9lm2hwzl179ggpk6xkbhkvnl7rsd2yz08"; }; nativeBuildInputs = [ qmake ];