diff --git a/default.nix b/default.nix index e2227b13bbb..12c3cf87618 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -let requiredVersion = "1.10"; in +let requiredVersion = import ./lib/minver.nix; in if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then diff --git a/lib/minver.nix b/lib/minver.nix new file mode 100644 index 00000000000..4f448266d06 --- /dev/null +++ b/lib/minver.nix @@ -0,0 +1,2 @@ +# Expose the minimum required version for evaluating Nixpkgs +"1.10" diff --git a/lib/types.nix b/lib/types.nix index 7276f9af9fe..b833417e73d 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -193,9 +193,9 @@ rec { nullOr = elemType: mkOptionType { name = "null or ${elemType.name}"; - check = x: builtins.isNull x || elemType.check x; + check = x: x == null || elemType.check x; merge = loc: defs: - let nrNulls = count (def: isNull def.value) defs; in + let nrNulls = count (def: def.value == null) defs; in if nrNulls == length defs then null else if nrNulls != 0 then throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}." @@ -230,11 +230,18 @@ rec { substSubModules = m: submodule m; }; - enum = values: mkOptionType { - name = "one of ${concatStringsSep ", " values}"; - check = flip elem values; - merge = mergeOneOption; - }; + enum = values: + let + show = v: + if builtins.isString v then ''"${v}"'' + else if builtins.isInt v then builtins.toString v + else ''<${builtins.typeOf v}>''; + in + mkOptionType { + name = "one of ${concatMapStringsSep ", " show values}"; + check = flip elem values; + merge = mergeOneOption; + }; either = t1: t2: mkOptionType { name = "${t1.name} or ${t2.name}"; diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix index e2202e1e17d..b10846ac18a 100644 --- a/nixos/modules/hardware/video/bumblebee.nix +++ b/nixos/modules/hardware/video/bumblebee.nix @@ -2,10 +2,20 @@ with lib; let + cfg = config.hardware.bumblebee; + kernel = config.boot.kernelPackages; - bumblebee = if config.hardware.bumblebee.connectDisplay - then pkgs.bumblebee_display - else pkgs.bumblebee; + + useNvidia = cfg.driver == "nvidia"; + + bumblebee = pkgs.bumblebee.override { + inherit useNvidia; + useDisplayDevice = cfg.connectDisplay; + }; + + primus = pkgs.primus.override { + inherit useNvidia; + }; in @@ -29,6 +39,7 @@ in type = types.str; description = ''Group for bumblebee socket''; }; + hardware.bumblebee.connectDisplay = mkOption { default = false; type = types.bool; @@ -40,26 +51,30 @@ in Only nvidia driver is supported so far. ''; }; + + hardware.bumblebee.driver = mkOption { + default = "nvidia"; + type = types.enum [ "nvidia" "nouveau" ]; + description = '' + Set driver used by bumblebeed. Supported are nouveau and nvidia. + ''; + }; }; config = mkIf config.hardware.bumblebee.enable { boot.blacklistedKernelModules = [ "nouveau" "nvidia" ]; boot.kernelModules = [ "bbswitch" ]; - boot.extraModulePackages = [ kernel.bbswitch kernel.nvidia_x11 ]; + boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11; - environment.systemPackages = [ bumblebee pkgs.primus ]; + environment.systemPackages = [ bumblebee primus ]; systemd.services.bumblebeed = { description = "Bumblebee Hybrid Graphics Switcher"; wantedBy = [ "display-manager.service" ]; path = [ kernel.bbswitch bumblebee ]; serviceConfig = { - ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}"; - Restart = "always"; - RestartSec = 60; - CPUSchedulingPolicy = "idle"; + ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}"; }; - environment.LD_LIBRARY_PATH="/run/opengl-driver/lib/"; environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix index 23b6edcefd1..6427c5be681 100644 --- a/nixos/modules/services/hardware/tlp.nix +++ b/nixos/modules/services/hardware/tlp.nix @@ -10,7 +10,6 @@ enableRDW = config.networking.networkmanager.enable; tlp = pkgs.tlp.override { inherit enableRDW; - kmod = config.system.sbin.modprobe; }; # XXX: We can't use writeTextFile + readFile here because it triggers @@ -69,6 +68,8 @@ in ExecStart = "${tlp}/bin/tlp init start"; ExecStop = "${tlp}/bin/tlp init stop"; }; + + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; tlp-sleep = { @@ -87,6 +88,8 @@ in ExecStart = "${tlp}/bin/tlp suspend"; ExecStop = "${tlp}/bin/tlp resume"; }; + + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 4505c5ceb84..949357ab20f 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -27,6 +27,7 @@ let http_settings: self_signed_cert: false repos_path: "${cfg.stateDir}/repositories" + secret_file: "${cfg.stateDir}/config/gitlab_shell_secret" log_file: "${cfg.stateDir}/log/gitlab-shell.log" redis: bin: ${pkgs.redis}/bin/redis-cli @@ -142,7 +143,7 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ gitlab-runner pkgs.gitlab-shell ]; + environment.systemPackages = [ pkgs.git gitlab-runner pkgs.gitlab-shell ]; assertions = [ { assertion = cfg.databasePassword != ""; @@ -154,7 +155,6 @@ in { services.redis.enable = mkDefault true; # We use postgres as the main data store. services.postgresql.enable = mkDefault true; - services.postgresql.package = mkDefault pkgs.postgresql; # Use postfix to send out mails. services.postfix.enable = mkDefault true; @@ -209,6 +209,23 @@ in { }; }; + systemd.services.gitlab-git-http-server = { + after = [ "network.target" "gitlab.service" ]; + wantedBy = [ "multi-user.target" ]; + environment.HOME = "${cfg.stateDir}/home"; + path = with pkgs; [ + gitAndTools.git + openssh + ]; + serviceConfig = { + Type = "simple"; + User = "gitlab"; + Group = "gitlab"; + TimeoutSec = "300"; + ExecStart = "${pkgs.gitlab-git-http-server}/bin/gitlab-git-http-server -listenUmask 0 -listenNetwork unix -listenAddr ${cfg.stateDir}/tmp/sockets/gitlab-git-http-server.socket -authBackend http://localhost:8080 ${cfg.stateDir}/repositories"; + }; + }; + systemd.services.gitlab = { after = [ "network.target" "postgresql.service" "redis.service" ]; wantedBy = [ "multi-user.target" ]; @@ -219,6 +236,8 @@ in { environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log"; environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites"; environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}"; + environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml"; + environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret"; environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories"; environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks"; environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile"; @@ -247,7 +266,7 @@ in { rm -rf ${cfg.stateDir}/config mkdir -p ${cfg.stateDir}/config # TODO: What exactly is gitlab-shell doing with the secret? - head -c 20 /dev/urandom > ${cfg.stateDir}/config/gitlab_shell_secret + tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 20 > ${cfg.stateDir}/config/gitlab_shell_secret mkdir -p ${cfg.stateDir}/home/.ssh touch ${cfg.stateDir}/home/.ssh/authorized_keys @@ -272,6 +291,7 @@ in { fi fi + ${bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile db:migrate RAILS_ENV=production # Install the shell required to push repositories ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} ${cfg.stateDir}/shell/config.yml export GITLAB_SHELL_CONFIG_PATH=""${cfg.stateDir}/shell/config.yml @@ -296,5 +316,4 @@ in { }; }; - } diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix index 533f1ea6644..dd98ecab828 100644 --- a/nixos/modules/services/monitoring/teamviewer.nix +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -14,7 +14,7 @@ in options = { - services.teamviewer.enable = mkEnableOption "teamviewer daemon"; + services.teamviewer.enable = mkEnableOption "TeamViewer daemon"; }; @@ -27,9 +27,9 @@ in systemd.services.teamviewerd = { description = "TeamViewer remote control daemon"; - wantedBy = [ "graphical.target" ]; + wantedBy = [ "multi-user.target" ]; after = [ "NetworkManager-wait-online.service" "network.target" ]; - preStart = "mkdir -pv /var/tmp/teamviewer10/{logs,config}"; + preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer"; serviceConfig = { Type = "forking"; diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 36d9f5d2f16..e85f2681125 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -300,22 +300,8 @@ in options = { services.nsd = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the NSD authoritative domain name server. - ''; - }; - - bind8Stats = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - Wheter to enable BIND8 like statisics. - ''; - }; + enable = mkEnableOption "NSD authoritative DNS server"; + bind8Stats = mkEnableOption "BIND8 like statistics"; rootServer = mkOption { type = types.bool; @@ -483,13 +469,7 @@ in ratelimit = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable ratelimit capabilities. - ''; - }; + enable = mkEnableOption "ratelimit capabilities"; size = mkOption { type = types.int; @@ -548,13 +528,7 @@ in remoteControl = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Wheter to enable remote control via nsd-control(8). - ''; - }; + enable = mkEnableOption "remote control via nsd-control"; interfaces = mkOption { type = types.listOf types.str; diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixos/modules/services/x11/window-managers/afterstep.nix index 395dabb86b5..ba88a64c702 100644 --- a/nixos/modules/services/x11/window-managers/afterstep.nix +++ b/nixos/modules/services/x11/window-managers/afterstep.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.afterstep.enable = mkOption { - default = false; - description = "Enable the Afterstep window manager."; - }; + services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index d234a432e9a..8b4e91d25aa 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -8,12 +8,7 @@ in { options = { - services.xserver.windowManager.bspwm.enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable the bspwm window manager."; - }; + services.xserver.windowManager.bspwm.enable = mkEnableOption "bspwm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index 9d8eecb56c7..176c1f46127 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -8,14 +8,7 @@ in { options = { - services.xserver.windowManager.clfswm = { - enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable the clfswm tiling window manager."; - }; - }; + services.xserver.windowManager.clfswm.enable = mkEnableOption "clfswm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix index ffd71e5f91e..539a83f9906 100644 --- a/nixos/modules/services/x11/window-managers/compiz.nix +++ b/nixos/modules/services/x11/window-managers/compiz.nix @@ -15,10 +15,7 @@ in services.xserver.windowManager.compiz = { - enable = mkOption { - default = false; - description = "Enable the Compiz window manager."; - }; + enable = mkEnableOption "compiz"; renderingFlag = mkOption { default = ""; diff --git a/nixos/modules/services/x11/window-managers/fluxbox.nix b/nixos/modules/services/x11/window-managers/fluxbox.nix index 4748ce99ccf..b409335702a 100644 --- a/nixos/modules/services/x11/window-managers/fluxbox.nix +++ b/nixos/modules/services/x11/window-managers/fluxbox.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.fluxbox.enable = mkOption { - default = false; - description = "Enable the Fluxbox window manager."; - }; + services.xserver.windowManager.fluxbox.enable = mkEnableOption "fluxbox"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixos/modules/services/x11/window-managers/herbstluftwm.nix index 6cda910b6b3..829935fa432 100644 --- a/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -8,12 +8,7 @@ in { options = { - services.xserver.windowManager.herbstluftwm.enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable the herbstluftwm window manager."; - }; + services.xserver.windowManager.herbstluftwm.enable = mkEnableOption "herbstluftwm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix index e85c3bce591..0d5816e363d 100644 --- a/nixos/modules/services/x11/window-managers/i3.nix +++ b/nixos/modules/services/x11/window-managers/i3.nix @@ -9,11 +9,7 @@ in { options = { services.xserver.windowManager.i3 = { - enable = mkOption { - default = false; - example = true; - description = "Enable the i3 tiling window manager."; - }; + enable = mkEnableOption "i3"; configFile = mkOption { default = null; diff --git a/nixos/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix index 9a3e8022189..f4ae9222df6 100644 --- a/nixos/modules/services/x11/window-managers/icewm.nix +++ b/nixos/modules/services/x11/window-managers/icewm.nix @@ -8,7 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.icewm.enable = mkEnableOption "oroborus"; + services.xserver.windowManager.icewm.enable = mkEnableOption "icewm"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index d13cbcfe40e..3e5229be634 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -12,13 +12,7 @@ in { options = { - - services.xserver.windowManager.metacity.enable = mkOption { - default = false; - example = true; - description = "Enable the metacity window manager."; - }; - + services.xserver.windowManager.metacity.enable = mkEnableOption "metacity"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/notion.nix b/nixos/modules/services/x11/window-managers/notion.nix index 1bfc2a86e96..4ece0d241c9 100644 --- a/nixos/modules/services/x11/window-managers/notion.nix +++ b/nixos/modules/services/x11/window-managers/notion.nix @@ -8,13 +8,7 @@ in { options = { - services.xserver.windowManager.notion = { - enable = mkOption { - default = false; - example = true; - description = "Enable the notion tiling window manager."; - }; - }; + services.xserver.windowManager.notion.enable = mkEnableOption "notion"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix index 8fc759dda68..091b533b28b 100644 --- a/nixos/modules/services/x11/window-managers/openbox.nix +++ b/nixos/modules/services/x11/window-managers/openbox.nix @@ -1,5 +1,6 @@ {lib, pkgs, config, ...}: +with lib; let inherit (lib) mkOption mkIf; cfg = config.services.xserver.windowManager.openbox; @@ -7,13 +8,7 @@ in { options = { - services.xserver.windowManager.openbox = { - enable = mkOption { - default = false; - example = true; - description = "Enable the Openbox window manager."; - }; - }; + services.xserver.windowManager.openbox.enable = mkEnableOption "oroborus"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/ratpoison.nix b/nixos/modules/services/x11/window-managers/ratpoison.nix index c203c35cd1b..0d58481d457 100644 --- a/nixos/modules/services/x11/window-managers/ratpoison.nix +++ b/nixos/modules/services/x11/window-managers/ratpoison.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.ratpoison.enable = mkOption { - default = false; - description = "Enable the Ratpoison window manager."; - }; + services.xserver.windowManager.ratpoison.enable = mkEnableOption "ratpoison"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/sawfish.nix b/nixos/modules/services/x11/window-managers/sawfish.nix index 74a11926020..b988b5e1829 100644 --- a/nixos/modules/services/x11/window-managers/sawfish.nix +++ b/nixos/modules/services/x11/window-managers/sawfish.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.sawfish.enable = mkOption { - default = false; - description = "Enable the Sawfish window manager."; - }; + services.xserver.windowManager.sawfish.enable = mkEnableOption "sawfish"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/spectrwm.nix b/nixos/modules/services/x11/window-managers/spectrwm.nix index 5db6b41ba8f..a1dc298d242 100644 --- a/nixos/modules/services/x11/window-managers/spectrwm.nix +++ b/nixos/modules/services/x11/window-managers/spectrwm.nix @@ -9,13 +9,7 @@ in { options = { - services.xserver.windowManager.spectrwm = { - enable = mkOption { - default = false; - example = true; - description = "Enable the spectrwm window manager."; - }; - }; + services.xserver.windowManager.spectrwm.enable = mkEnableOption "spectrwm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix index eb7b8665f23..3d3f2e0028c 100644 --- a/nixos/modules/services/x11/window-managers/stumpwm.nix +++ b/nixos/modules/services/x11/window-managers/stumpwm.nix @@ -8,14 +8,7 @@ in { options = { - services.xserver.windowManager.stumpwm = { - enable = mkOption { - type = types.bool; - default = false; - example = true; - description = "Enable the stumpwm tiling window manager."; - }; - }; + services.xserver.windowManager.stumpwm.enable = mkEnableOption "stumpwm"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/twm.nix b/nixos/modules/services/x11/window-managers/twm.nix index 684b34c2f24..fc09901aae3 100644 --- a/nixos/modules/services/x11/window-managers/twm.nix +++ b/nixos/modules/services/x11/window-managers/twm.nix @@ -13,12 +13,7 @@ in ###### interface options = { - - services.xserver.windowManager.twm.enable = mkOption { - default = false; - description = "Enable the twm window manager."; - }; - + services.xserver.windowManager.twm.enable = mkEnableOption "twm"; }; diff --git a/nixos/modules/services/x11/window-managers/windowmaker.nix b/nixos/modules/services/x11/window-managers/windowmaker.nix index 27cedb7da0c..b6272375805 100644 --- a/nixos/modules/services/x11/window-managers/windowmaker.nix +++ b/nixos/modules/services/x11/window-managers/windowmaker.nix @@ -8,10 +8,7 @@ in { ###### interface options = { - services.xserver.windowManager.windowmaker.enable = mkOption { - default = false; - description = "Enable the Windowmaker window manager."; - }; + services.xserver.windowManager.windowmaker.enable = mkEnableOption "windowmaker"; }; ###### implementation diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix index e6f534a1be6..30c8df78224 100644 --- a/nixos/modules/services/x11/window-managers/wmii.nix +++ b/nixos/modules/services/x11/window-managers/wmii.nix @@ -1,5 +1,6 @@ -{ config, lib, pkgs, options, modulesPath }: +{ config, lib, pkgs, options, modulesPath, ... }: +with lib; let inherit (lib) mkOption mkIf singleton; cfg = config.services.xserver.windowManager.wmii; @@ -7,11 +8,7 @@ let in { options = { - services.xserver.windowManager.wmii.enable = mkOption { - default = false; - example = true; - description = "Enable the wmii window manager."; - }; + services.xserver.windowManager.wmii.enable = mkEnableOption "wmii"; }; config = mkIf cfg.enable { diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix index 288800d514d..6af88d4f645 100644 --- a/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/nixos/modules/services/x11/window-managers/xmonad.nix @@ -1,5 +1,6 @@ {pkgs, lib, config, ...}: +with lib; let inherit (lib) mkOption mkIf optionals literalExample; cfg = config.services.xserver.windowManager.xmonad; @@ -13,12 +14,7 @@ in { options = { services.xserver.windowManager.xmonad = { - enable = mkOption { - default = false; - example = true; - description = "Enable the xmonad window manager."; - }; - + enable = mkEnableOption "xmonad"; haskellPackages = mkOption { default = pkgs.haskellPackages; defaultText = "pkgs.haskellPackages"; diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix index 5969da7062b..e36e9f85f1e 100644 --- a/nixos/modules/tasks/kbd.nix +++ b/nixos/modules/tasks/kbd.nix @@ -56,6 +56,8 @@ in # it has a restart trigger. systemd.services."systemd-vconsole-setup" = { wantedBy = [ "multi-user.target" ]; + before = [ "display-manager.service" ]; + after = [ "systemd-udev-settle.service" ]; restartTriggers = [ vconsoleConf ]; }; diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix index 44c83aee273..13e36e7888b 100644 --- a/nixos/modules/virtualisation/nova-image.nix +++ b/nixos/modules/virtualisation/nova-image.nix @@ -21,7 +21,6 @@ with lib; imports = [ ../profiles/qemu-guest.nix ../profiles/headless.nix - ./ec2-data.nix ]; fileSystems."/".device = "/dev/disk/by-label/nixos"; diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix deleted file mode 100644 index 7a8c9dfd71e..00000000000 --- a/pkgs/applications/misc/rofi/pass.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, rofi, wmctrl, xprop, xdotool}: - -stdenv.mkDerivation rec { - name = "rofi-pass-${version}"; - version = "1.2"; - - src = fetchgit { - url = "https://github.com/carnager/rofi-pass"; - rev = "refs/tags/${version}"; - sha256 = "1dlaplr18qady5g8sp8xgiqdw81mfx9iisihf8appr5s4sjm559h"; - }; - - buildInputs = [ rofi wmctrl xprop xdotool ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin - cp -a $src/rofi-pass $out/bin/rofi-pass - - mkdir -p $out/share/doc/rofi-pass/ - cp -a $src/config.example $out/share/doc/rofi-pass/config.example - ''; - - meta = { - description = "A script to make rofi work with password-store"; - homepage = https://github.com/carnager/rofi-pass; - maintainers = [stdenv.lib.maintainers.hiberno]; - }; -} diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index 02d26f66001..f0a48cfb8d4 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Extract URLs from text"; homepage = http://packages.qa.debian.org/u/urlview.html; licencse = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix deleted file mode 100644 index 5de60180c69..00000000000 --- a/pkgs/applications/networking/remote/teamviewer/10.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, -wineUnstable, makeWrapper, libXau , patchelf, config }: - -with stdenv.lib; - -let - topath = "${wineUnstable}/bin"; - - toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); -in -stdenv.mkDerivation { - name = "teamviewer-10.0.37742"; - src = fetchurl { - url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb"; - sha256 = config.teamviewer10.sha256 or "10risay1a5a85ijbjaz2vxqbfxygpxslvh0dvzz32k988hr9p1gk"; - }; - - buildInputs = [ makeWrapper patchelf ]; - - unpackPhase = '' - ar x $src - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/share/teamviewer $out/bin - cp -a opt/teamviewer/* $out/share/teamviewer - rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share} - - cat > $out/bin/teamviewer << EOF - #!${stdenv.shell} - export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=${topath}\''${PATH:+:\$PATH} - $out/share/teamviewer/tv_bin/script/teamviewer "\$@" - EOF - chmod +x $out/bin/teamviewer - - ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/ - rm -rf $out/share/teamviewer/logfiles $out/share/teamviewer/config - ln -sv /var/tmp/teamviewer10/logs/ $out/share/teamviewer/logfiles - ln -sv /var/tmp/teamviewer10/config/ $out/share/teamviewer/config - ''; - - # the fixupPhase undoes the rpath patch - postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd - patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd - ''; - - meta = { - homepage = "http://www.teamviewer.com"; - license = licenses.unfree; - description = "Desktop sharing application, providing remote support and online meetings"; - maintainers = with maintainers; [ jagajaga ]; - }; -} diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix deleted file mode 100644 index 28b272045b7..00000000000 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf, config }: - -let - topath = "${wineUnstable}/bin"; - - toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); -in -stdenv.mkDerivation { - name = "teamviewer-8.0.17147"; - src = fetchurl { - url = config.teamviewer8.url or "http://download.teamviewer.com/download/version_8x/teamviewer_linux_x64.deb"; - sha256 = config.teamviewer8.sha256 or "0s5m15f99rdmspzwx3gb9mqd6jx1bgfm0d6rfd01k9rf7gi7qk0k"; - }; - - buildInputs = [ makeWrapper patchelf ]; - - unpackPhase = '' - ar x $src - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/share/teamviewer8 $out/bin - cp -a opt/teamviewer8/* $out/share/teamviewer8 - rm -R $out/share/teamviewer8/tv_bin/wine/{bin,lib,share} - - cat > $out/bin/teamviewer << EOF - #!${bash}/bin/sh - export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=${topath}\''${PATH:+:\$PATH} - $out/share/teamviewer8/tv_bin/script/teamviewer "\$@" - EOF - chmod +x $out/bin/teamviewer - - patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd - ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/ - ''; - - meta = { - homepage = "http://www.teamviewer.com"; - license = stdenv.lib.licenses.unfree; - description = "Desktop sharing application, providing remote support and online meetings"; - }; -} diff --git a/pkgs/applications/networking/remote/teamviewer/9.nix b/pkgs/applications/networking/remote/teamviewer/9.nix deleted file mode 100644 index 9b272a618b5..00000000000 --- a/pkgs/applications/networking/remote/teamviewer/9.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau -, bash, patchelf, config }: - -let - topath = "${wineUnstable}/bin"; - - toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); -in -stdenv.mkDerivation { - name = "teamviewer-9.0.32150"; - src = fetchurl { - url = config.teamviewer9.url or "http://download.teamviewer.com/download/version_9x/teamviewer_linux_x64.deb"; - sha256 = config.teamviewer9.sha256 or "0wpwbx0xzn3vlzavszxhfvfcaj3pijlpwvlz5m7w19mb6cky3q13"; - }; - - buildInputs = [ makeWrapper patchelf ]; - - unpackPhase = '' - ar x $src - tar xf data.tar.gz - ''; - - installPhase = '' - mkdir -p $out/share/teamviewer9 $out/bin - cp -a opt/teamviewer9/* $out/share/teamviewer9 - rm -R $out/share/teamviewer9/tv_bin/wine/{bin,lib,share} - - cat > $out/bin/teamviewer << EOF - #!${bash}/bin/sh - export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} - export PATH=${topath}\''${PATH:+:\$PATH} - $out/share/teamviewer9/tv_bin/script/teamviewer "\$@" - EOF - chmod +x $out/bin/teamviewer - - patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd - ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/ - ''; - - meta = { - homepage = "http://www.teamviewer.com"; - license = stdenv.lib.licenses.unfree; - description = "Desktop sharing application, providing remote support and online meetings"; - }; -} diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix new file mode 100644 index 00000000000..2c70d44570c --- /dev/null +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -0,0 +1,86 @@ +{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }: + +let + version = "11.0.52520"; + + ld32 = + if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" + else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" + else abort "Unsupported architecture"; + ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; + + mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]); + + deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]); + tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux); + tvldpath64 = lib.makeLibraryPath (deps pkgs); + +in +stdenv.mkDerivation { + name = "teamviewer-${version}"; + src = fetchurl { + # There is a 64-bit package, but it has no differences apart from Debian dependencies. + # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason. + url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb"; + sha256 = "1430dimcv69plpj0ad0wsn10k15x9fwlk6fiq7yz51qbcr5l9wk6"; + }; + + unpackPhase = '' + ar x $src + tar xf data.tar.* + ''; + + installPhase = '' + mkdir -p $out/share/teamviewer $out/bin $out/share/applications + cp -a opt/teamviewer/* $out/share/teamviewer + rm -R \ + $out/share/teamviewer/logfiles \ + $out/share/teamviewer/config \ + $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \ + $out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh} + + ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin + ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin + ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer-teamviewer*.desktop $out/share/applications + ln -s /var/lib/teamviewer $out/share/teamviewer/config + ln -s /var/log/teamviewer $out/share/teamviewer/logfiles + ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + + pushd $out/share/teamviewer/tv_bin + + sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config + ${if stdenv.system == "x86_64-linux" then '' + sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config + '' else '' + sed -i ",TV_LD64_PATH=.*,d" script/tvw_config + ''} + + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop + + for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do + echo "patching $i" + patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true + done + for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do + echo "patching $i" + patchelf --set-rpath ${tvldpath32} $i || true + done + ${if stdenv.system == "x86_64-linux" then '' + patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64 + '' else '' + rm TVGuiSlave.64 + ''} + popd + ''; + + dontPatchELF = true; + dontStrip = true; + + meta = with stdenv.lib; { + homepage = "http://www.teamviewer.com"; + license = licenses.unfree; + description = "Desktop sharing application, providing remote support and online meetings"; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ jagajaga ]; + }; +} diff --git a/pkgs/applications/version-management/gitlab-git-http-server/default.nix b/pkgs/applications/version-management/gitlab-git-http-server/default.nix new file mode 100644 index 00000000000..98b14d2ce86 --- /dev/null +++ b/pkgs/applications/version-management/gitlab-git-http-server/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchgit, git, go }: + +stdenv.mkDerivation rec { + version = "0.2.14"; + name = "gitlab-git-http-server-${version}"; + + srcs = fetchgit { + url = "https://gitlab.com/gitlab-org/gitlab-git-http-server.git"; + rev = "7c63f08f7051348e56b903fc0bbefcfed398fc1c"; + sha256 = "557d63a90c61371598b971a06bc056993610b58c2ef5762d9ef145ec2fdada78"; + }; + + buildInputs = [ git go ]; + + buildPhase = '' + make PREFIX=$out + ''; + + installPhase = '' + mkdir -p $out/bin + make install PREFIX=$out + ''; +} diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 467e39f7141..5ee59c1e255 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { srcs = fetchgit { url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; - rev = "823aba63e444afa2f45477819770fec3cb5f0159"; - sha256 = "0ppf547xs9pvmk49v4h043d0j93k5n4q0yx3b9ssrc4qf2smflgq"; + rev = "ebbb9d80811c23d49a7d1b75d7a7d2b8ffe7437b"; + sha256 = "fe69ab85d75a3871b4afa11ebc17f43008d135bbdbd6c581f6bebee2a4a3c75d"; }; buildInputs = [ @@ -31,16 +31,13 @@ stdenv.mkDerivation rec { substituteInPlace lib/gitlab_config.rb --replace\ "File.join(ROOT_PATH, 'config.yml')"\ "ENV['GITLAB_SHELL_CONFIG_PATH']" - substituteInPlace lib/gitlab_net.rb --replace\ - "File.read File.join(ROOT_PATH, '.gitlab_shell_secret')"\ - "File.read ENV['GITLAB_SHELL_SECRET_PATH']" # Note that we're running gitlab-shell from current-system/sw # because otherwise updating gitlab-shell won't be reflected in # the hardcoded path of the authorized-keys file: substituteInPlace lib/gitlab_keys.rb --replace\ - "auth_line = \"command=\\\"#{ROOT_PATH}/bin/gitlab-shell"\ - "auth_line = \"command=\\\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} GITLAB_SHELL_SECRET_PATH=#{ENV['GITLAB_SHELL_SECRET_PATH']} /run/current-system/sw/bin/gitlab-shell" + "\"#{ROOT_PATH}/bin/gitlab-shell"\ + "\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} /run/current-system/sw/bin/gitlab-shell" # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key # environment because we need it in gitlab_configrb diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index f6f3607cbd1..66261426c01 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -8,145 +8,174 @@ def linux_only(require_as) RUBY_PLATFORM.include?('linux') && require_as end -gem "rails", "~> 4.1.0" +gem 'rails', '4.1.12' -# Make links from text -gem 'rails_autolink', '~> 1.1' +# Specify a sprockets version due to security issue +# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY +gem 'sprockets', '~> 2.12.3' # Default values for AR models gem "default_value_for", "~> 3.0.0" # Supported DBs -gem "mysql2", group: :mysql -gem "pg", group: :postgres +gem "mysql2", '~> 0.3.16', group: :mysql +gem "pg", '~> 0.18.2', group: :postgres -# Auth -gem "devise", '3.2.4' -gem "devise-async", '0.9.0' -gem 'omniauth', "~> 1.1.3" -gem 'omniauth-google-oauth2' -gem 'omniauth-twitter' -gem 'omniauth-github' -gem 'omniauth-shibboleth' +# Authentication libraries +gem "devise", '~> 3.5.2' +gem "devise-async", '~> 0.9.0' +gem 'omniauth', "~> 1.2.2" +gem 'omniauth-google-oauth2', '~> 0.2.5' +gem 'omniauth-twitter', '~> 1.0.1' +gem 'omniauth-github', '~> 1.1.1' +gem 'omniauth-shibboleth', '~> 1.1.1' +gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos +gem 'omniauth-gitlab', '~> 1.0.0' +gem 'omniauth-bitbucket', '~> 0.0.2' +gem 'omniauth-saml', '~> 1.4.0' +gem 'doorkeeper', '~> 2.1.3' +gem 'omniauth_crowd' +gem "rack-oauth2", "~> 1.0.5" + +# Two-factor authentication +gem 'devise-two-factor', '~> 2.0.0' +gem 'rqrcode-rails3', '~> 0.1.7' +gem 'attr_encrypted', '~> 1.3.4' + +# Browser detection +gem "browser", '~> 1.0.0' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.0.rc10' - -# Ruby/Rack Git Smart-HTTP Server Handler -gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' +gem "gitlab_git", '~> 7.2.15' # LDAP Auth -gem 'gitlab_omniauth-ldap', '1.1.0', require: "omniauth-ldap" +# GitLab fork with several improvements to original library. For full list of changes +# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master +gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap" # Git Wiki -gem 'gollum-lib', '~> 3.0.0' +gem 'gollum-lib', '~> 4.0.2' # Language detection -gem "gitlab-linguist", "~> 3.0.0", require: "linguist" +# GitLab fork of linguist does not require pygments/python dependency. +# New version of original gem also dropped pygments support but it has strict +# dependency to unstable rugged version. We have internal issue for replacing +# fork with original gem when we meet on same rugged version - https://dev.gitlab.org/gitlab/gitlabhq/issues/2052. +gem "gitlab-linguist", "~> 3.0.1", require: "linguist" # API gem "grape", "~> 0.6.1" gem "grape-entity", "~> 0.4.2" -gem 'rack-cors', require: 'rack/cors' +gem 'rack-cors', '~> 0.2.9', require: 'rack/cors' # Format dates and times # based on human-friendly examples -gem "stamp" +gem "stamp", '~> 0.5.0' # Enumeration fields -gem 'enumerize' +gem 'enumerize', '~> 0.7.0' # Pagination gem "kaminari", "~> 0.15.1" # HAML -gem "haml-rails" +gem "haml-rails", '~> 0.5.3' # Files attachments -gem "carrierwave" +gem "carrierwave", '~> 0.9.0' # Drag and Drop UI -gem 'dropzonejs-rails' +gem 'dropzonejs-rails', '~> 0.7.1' # for aws storage -gem "fog", "~> 1.14" -gem "unf" +gem "fog", "~> 1.25.0" +gem "unf", '~> 0.1.4' # Authorization -gem "six" +gem "six", '~> 0.2.0' # Seed data -gem "seed-fu" +gem "seed-fu", '~> 2.3.5' -# Markup pipeline for GitLab -gem 'html-pipeline-gitlab', '~> 0.1.0' - -# Markdown to HTML -gem "github-markup" - -# Required markup gems by github-markdown -gem 'redcarpet', '~> 3.1.2' -gem 'RedCloth' -gem 'rdoc', '~>3.6' -gem 'org-ruby', '= 0.9.9' -gem 'creole', '~>0.3.6' -gem 'wikicloth', '=0.8.1' -gem 'asciidoctor', '= 0.1.4' +# Markdown and HTML processing +gem 'html-pipeline', '~> 1.11.0' +gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' +gem 'github-markup', '~> 1.3.1' +gem 'redcarpet', '~> 3.3.2' +gem 'RedCloth', '~> 4.2.9' +gem 'rdoc', '~>3.6' +gem 'org-ruby', '~> 0.9.12' +gem 'creole', '~>0.3.6' +gem 'wikicloth', '0.8.1' +gem 'asciidoctor', '~> 1.5.2' # Diffs gem 'diffy', '~> 3.0.3' # Application server group :unicorn do - gem "unicorn", '~> 4.6.3' - gem 'unicorn-worker-killer' + gem "unicorn", '~> 4.8.2' + gem 'unicorn-worker-killer', '~> 0.4.2' end # State machine -gem "state_machine" +gem "state_machine", '~> 1.2.0' +# Run events after state machine commits +gem 'after_commit_queue' # Issue tags -gem "acts-as-taggable-on" +gem 'acts-as-taggable-on', '~> 3.4' # Background jobs -gem 'slim' -gem 'sinatra', require: nil -gem 'sidekiq', '2.17.0' +gem 'slim', '~> 2.0.2' +gem 'sinatra', '~> 1.4.4', require: nil +gem 'sidekiq', '3.3.0' +gem 'sidetiq', '~> 0.6.3' # HTTP requests -gem "httparty" +gem "httparty", '~> 0.13.3' # Colored output to console -gem "colored" +gem "colored", '~> 1.2' +gem "colorize", '~> 0.5.8' # GitLab settings -gem 'settingslogic' +gem 'settingslogic', '~> 2.0.9' # Misc -gem "foreman" -gem 'version_sorter' + +gem 'version_sorter', '~> 2.0.0' # Cache -gem "redis-rails" +gem "redis-rails", '~> 4.0.0' # Campfire integration gem 'tinder', '~> 1.9.2' # HipChat integration -gem "hipchat", "~> 0.14.0" +gem 'hipchat', '~> 1.5.0' # Flowdock integration -gem "gitlab-flowdock-git-hook", "~> 0.4.2" +gem "gitlab-flowdock-git-hook", "~> 1.0.1" # Gemnasium integration gem "gemnasium-gitlab-service", "~> 0.2" # Slack integration -gem "slack-notifier", "~> 0.3.2" +gem "slack-notifier", "~> 1.0.0" + +# Asana integration +gem 'asana', '~> 0.0.6' + +# FogBugz integration +gem 'ruby-fogbugz', '~> 0.2.1' # d3 -gem "d3_rails", "~> 3.1.4" +gem 'd3_rails', '~> 3.5.5' + +#cal-heatmap +gem "cal-heatmap-rails", "~> 0.0.1" # underscore-rails gem "underscore-rails", "~> 1.4.4" @@ -155,104 +184,133 @@ gem "underscore-rails", "~> 1.4.4" gem "sanitize", '~> 2.0' # Protect against bruteforcing -gem "rack-attack" +gem "rack-attack", '~> 4.3.0' # Ace editor -gem 'ace-rails-ap' +gem 'ace-rails-ap', '~> 2.0.1' # Keyboard shortcuts -gem 'mousetrap-rails' +gem 'mousetrap-rails', '~> 1.4.6' -# Semantic UI Sass for Sidebar -gem 'semantic-ui-sass', '~> 0.16.1.0' +# Detect and convert string character encoding +gem 'charlock_holmes', '~> 0.6.9.4' -gem "sass-rails", '~> 4.0.2' -gem "coffee-rails" -gem "uglifier" -gem "therubyracer" -gem 'turbolinks' -gem 'jquery-turbolinks' +gem "sass-rails", '~> 4.0.5' +gem "coffee-rails", '~> 4.1.0' +gem "uglifier", '~> 2.3.2' +gem 'turbolinks', '~> 2.5.0' +gem 'jquery-turbolinks', '~> 2.0.1' -gem 'select2-rails' -gem 'jquery-atwho-rails', "~> 0.3.3" -gem "jquery-rails" -gem "jquery-ui-rails" -gem "jquery-scrollto-rails" -gem "raphael-rails", "~> 2.1.2" -gem 'bootstrap-sass', '~> 3.0' -gem "font-awesome-rails", '~> 4.2' -gem "gitlab_emoji", "~> 0.0.1.1" -gem "gon", '~> 5.0.0' -gem 'nprogress-rails' -gem 'request_store' -gem "virtus" +gem 'addressable', '~> 2.3.8' +gem 'bootstrap-sass', '~> 3.0' +gem 'font-awesome-rails', '~> 4.2' +gem 'gitlab_emoji', '~> 0.1' +gem 'gon', '~> 5.0.0' +gem 'jquery-atwho-rails', '~> 1.0.0' +gem 'jquery-rails', '~> 3.1.3' +gem 'jquery-scrollto-rails', '~> 1.4.3' +gem 'jquery-ui-rails', '~> 4.2.1' +gem 'nprogress-rails', '~> 0.1.2.3' +gem 'raphael-rails', '~> 2.1.2' +gem 'request_store', '~> 1.2.0' +gem 'select2-rails', '~> 3.5.9' +gem 'virtus', '~> 1.0.1' group :development do - gem "annotate", "~> 2.6.0.beta2" - gem "letter_opener" - gem 'quiet_assets', '~> 1.0.1' - gem 'rack-mini-profiler', require: false + gem "foreman" + gem 'brakeman', '3.0.1', require: false + + gem "annotate", "~> 2.6.0" + gem "letter_opener", '~> 1.1.2' + gem 'quiet_assets', '~> 1.0.2' + gem 'rack-mini-profiler', '~> 0.9.0', require: false + gem 'rerun', '~> 0.10.0' # Better errors handler - gem 'better_errors' - gem 'binding_of_caller' - - gem 'rails_best_practices' + gem 'better_errors', '~> 1.0.1' + gem 'binding_of_caller', '~> 0.7.2' # Docs generator - gem "sdoc" + gem "sdoc", '~> 0.3.20' # thin instead webrick - gem 'thin' + gem 'thin', '~> 1.6.1' end group :development, :test do - gem 'coveralls', require: false - # gem 'rails-dev-tweaks' - gem 'spinach-rails' - gem "rspec-rails" - gem "capybara", '~> 2.2.1' - gem "pry" - gem "awesome_print" - gem "database_cleaner" - gem "launchy" - gem 'factory_girl_rails' + gem 'byebug', platform: :mri + gem 'pry-rails' + + gem 'awesome_print', '~> 1.2.0' + gem 'fuubar', '~> 2.0.0' + + gem 'database_cleaner', '~> 1.4.0' + gem 'factory_girl_rails', '~> 4.3.0' + gem 'rspec-rails', '~> 3.3.0' + gem 'spinach-rails', '~> 0.2.1' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.3.0' + gem 'minitest', '~> 5.7.0' # Generate Fake data - gem "ffaker" + gem 'ffaker', '~> 2.0.0' - # Guard - gem 'guard-rspec' - gem 'guard-spinach' + gem 'capybara', '~> 2.4.0' + gem 'capybara-screenshot', '~> 1.0.0' + gem 'poltergeist', '~> 1.6.0' - # Notification - gem 'rb-fsevent', require: darwin_only('rb-fsevent') - gem 'growl', require: darwin_only('growl') - gem 'rb-inotify', require: linux_only('rb-inotify') + gem 'teaspoon', '~> 1.0.0' + gem 'teaspoon-jasmine', '~> 2.2.0' - # PhantomJS driver for Capybara - gem 'poltergeist', '~> 1.5.1' + gem 'spring', '~> 1.3.6' + gem 'spring-commands-rspec', '~> 1.0.4' + gem 'spring-commands-spinach', '~> 1.0.0' + gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'jasmine', '2.0.2' - - gem "spring", '1.1.3' - gem "spring-commands-rspec", '1.0.1' - gem "spring-commands-spinach", '1.0.0' + gem 'rubocop', '~> 0.28.0', require: false + gem 'coveralls', '~> 0.8.2', require: false + gem 'simplecov', '~> 0.10.0', require: false end group :test do - gem "simplecov", require: false - gem "shoulda-matchers", "~> 2.1.0" - gem 'email_spec' - gem "webmock" - gem 'test_after_commit' + gem 'shoulda-matchers', '~> 2.8.0', require: false + gem 'email_spec', '~> 1.6.0' + gem 'webmock', '~> 1.21.0' + gem 'test_after_commit', '~> 0.2.2' + gem 'sham_rack' end group :production do gem "gitlab_meta", '7.0' end -gem "newrelic_rpm" +gem "newrelic_rpm", '~> 3.9.4.245' +gem 'newrelic-grape' + +gem 'octokit', '~> 3.7.0' + +gem "mail_room", "~> 0.5.2" + +gem 'email_reply_parser', '~> 0.5.8' + +## CI +gem 'activerecord-deprecated_finders', '~> 1.0.3' +gem 'activerecord-session_store', '~> 0.1.0' +gem "nested_form", '~> 0.3.2' + +# Scheduled +gem 'whenever', '~> 0.8.4', require: false + +# OAuth +gem 'oauth2', '~> 1.0.0' + +# Soft deletion +gem "paranoia", "~> 2.0" + +group :development, :test do + gem 'guard-rspec', '~> 4.2.0' + + gem 'rb-fsevent', require: darwin_only('rb-fsevent') + gem 'growl', require: darwin_only('growl') + gem 'rb-inotify', require: linux_only('rb-inotify') +end diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index c7db793060e..56db3f61985 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -1,203 +1,304 @@ GEM remote: https://rubygems.org/ specs: + CFPropertyList (2.3.1) RedCloth (4.2.9) ace-rails-ap (2.0.1) - actionmailer (4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - mail (~> 2.5.4) - actionpack (4.1.1) - actionview (= 4.1.1) - activesupport (= 4.1.1) + actionmailer (4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.12) + actionview (= 4.1.12) + activesupport (= 4.1.12) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.1) - activesupport (= 4.1.1) + actionview (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.1) - activesupport (= 4.1.1) + activemodel (4.1.12) + activesupport (= 4.1.12) builder (~> 3.1) - activerecord (4.1.1) - activemodel (= 4.1.1) - activesupport (= 4.1.1) + activerecord (4.1.12) + activemodel (= 4.1.12) + activesupport (= 4.1.12) arel (~> 5.0.0) - activesupport (4.1.1) + activerecord-deprecated_finders (1.0.4) + activerecord-session_store (0.1.1) + actionpack (>= 4.0.0, < 5) + activerecord (>= 4.0.0, < 5) + railties (>= 4.0.0, < 5) + activeresource (4.0.0) + activemodel (~> 4.0) + activesupport (~> 4.0) + rails-observers (~> 0.1.1) + activesupport (4.1.12) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - acts-as-taggable-on (2.4.1) - rails (>= 3, < 5) - addressable (2.3.5) - annotate (2.6.0) - activerecord (>= 2.3.0) - rake (>= 0.8.7) + acts-as-taggable-on (3.5.0) + activerecord (>= 3.2, < 5) + addressable (2.3.8) + after_commit_queue (1.1.0) + rails (>= 3.0) + annotate (2.6.10) + activerecord (>= 3.2, <= 4.3) + rake (~> 10.4) arel (5.0.1.20140414130214) - asciidoctor (0.1.4) + asana (0.0.6) + activeresource (>= 3.2.3) + asciidoctor (1.5.2) + ast (2.1.0) + astrolabe (1.3.1) + parser (~> 2.2) + attr_encrypted (1.3.4) + encryptor (>= 1.3.0) + attr_required (1.0.0) + autoprefixer-rails (5.2.1.2) + execjs + json awesome_print (1.2.0) - axiom-types (0.0.5) - descendants_tracker (~> 0.0.1) - ice_nine (~> 0.9) - bcrypt (3.1.7) + axiom-types (0.1.1) + descendants_tracker (~> 0.0.4) + ice_nine (~> 0.11.0) + thread_safe (~> 0.3, >= 0.3.1) + bcrypt (3.1.10) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.0.3.0) - sass (~> 3.2) + bootstrap-sass (3.3.5) + autoprefixer-rails (>= 5.0.0.1) + sass (>= 3.2.19) + brakeman (3.0.1) + erubis (~> 2.6) + fastercsv (~> 1.5) + haml (>= 3.0, < 5.0) + highline (~> 1.6.20) + multi_json (~> 1.2) + ruby2ruby (~> 2.1.1) + ruby_parser (~> 3.5.0) + sass (~> 3.0) + terminal-table (~> 1.4) + browser (1.0.0) builder (3.2.2) - capybara (2.2.1) + byebug (6.0.2) + cal-heatmap-rails (0.0.1) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) + capybara-screenshot (1.0.11) + capybara (>= 1.0, < 3) + launchy carrierwave (0.9.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) json (>= 1.7) - celluloid (0.15.2) - timers (~> 1.1.0) + celluloid (0.16.0) + timers (~> 4.0.0) charlock_holmes (0.6.9.4) + chronic (0.10.2) + chunky_png (1.3.4) cliver (0.3.2) - code_analyzer (0.4.3) - sexp_processor coderay (1.1.0) coercible (1.0.0) descendants_tracker (~> 0.0.1) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.6.3) + coffee-script-source (1.9.1.1) colored (1.2) colorize (0.5.8) - connection_pool (1.2.0) - coveralls (0.7.0) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.1) - safe_yaml (~> 0.9.0) + connection_pool (2.2.0) + coveralls (0.8.2) + json (~> 1.8) + rest-client (>= 1.6.8, < 2) + simplecov (~> 0.10.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) + crack (0.4.2) + safe_yaml (~> 1.0.0) creole (0.3.8) - d3_rails (3.1.10) + d3_rails (3.5.6) railties (>= 3.1.0) - daemons (1.1.9) - database_cleaner (1.3.0) + daemons (1.2.3) + database_cleaner (1.4.1) debug_inspector (0.0.2) - default_value_for (3.0.0) + default_value_for (3.0.1) activerecord (>= 3.2.0, < 5.0) - descendants_tracker (0.0.3) - devise (3.2.4) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + responders thread_safe (~> 0.1) warden (~> 1.2.3) devise-async (0.9.0) devise (~> 3.2) + devise-two-factor (2.0.0) + activesupport + attr_encrypted (~> 1.3.2) + devise (~> 3.5.0) + railties + rotp (~> 2) diff-lcs (1.2.5) - diffy (3.0.3) + diffy (3.0.7) docile (1.1.5) - dotenv (0.9.0) - dropzonejs-rails (0.4.14) + domain_name (0.5.24) + unf (>= 0.0.5, < 1.0.0) + doorkeeper (2.1.4) + railties (>= 3.2) + dropzonejs-rails (0.7.1) rails (> 3.1) - email_spec (1.5.0) + email_reply_parser (0.5.8) + email_spec (1.6.0) launchy (~> 2.1) mail (~> 2.2) - emoji (1.0.1) - json + encryptor (1.3.0) enumerize (0.7.0) activesupport (>= 3.2) - equalizer (0.0.8) + equalizer (0.0.11) erubis (2.7.0) escape_utils (0.2.4) - eventmachine (1.0.3) - excon (0.32.1) - execjs (2.0.2) + eventmachine (1.0.8) + excon (0.45.4) + execjs (2.6.0) expression_parser (0.9.0) factory_girl (4.3.0) activesupport (>= 3.0.0) factory_girl_rails (4.3.0) factory_girl (~> 4.3.0) railties (>= 3.0.0) - faraday (0.8.9) + faraday (0.8.10) multipart-post (~> 1.2.0) - faraday_middleware (0.9.0) - faraday (>= 0.7.4, < 0.9) - ffaker (1.22.1) - ffi (1.9.3) - fog (1.21.0) - fog-brightbox - fog-core (~> 1.21, >= 1.21.1) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + fastercsv (1.5.5) + ffaker (2.0.0) + ffi (1.9.10) + fission (0.5.0) + CFPropertyList (~> 2.2) + flowdock (0.7.0) + httparty (~> 0.7) + multi_json + fog (1.25.0) + fog-brightbox (~> 0.4) + fog-core (~> 1.25) fog-json + fog-profitbricks + fog-radosgw (>= 0.0.2) + fog-sakuracloud (>= 0.0.4) + fog-softlayer + fog-terremark + fog-vmfusion + fog-voxel + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) nokogiri (~> 1.5, >= 1.5.11) - fog-brightbox (0.0.1) - fog-core + opennebula + fog-brightbox (0.9.0) + fog-core (~> 1.22) fog-json - fog-core (1.21.1) + inflecto (~> 0.0.2) + fog-core (1.32.1) builder - excon (~> 0.32) - formatador (~> 0.2.0) + excon (~> 0.45) + formatador (~> 0.2) mime-types net-scp (~> 1.1) net-ssh (>= 2.1.3) - fog-json (1.0.0) - multi_json (~> 1.0) - font-awesome-rails (4.2.0.0) + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-profitbricks (0.0.5) + fog-core + fog-xml + nokogiri + fog-radosgw (0.0.4) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-sakuracloud (1.0.1) + fog-core + fog-json + fog-softlayer (0.4.7) + fog-core + fog-json + fog-terremark (0.1.0) + fog-core + fog-xml + fog-vmfusion (0.1.0) + fission + fog-core + fog-voxel (0.1.0) + fog-core + fog-xml + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.4.0.0) railties (>= 3.2, < 5.0) - foreman (0.63.0) - dotenv (>= 0.7) - thor (>= 0.13.6) - formatador (0.2.4) - gemnasium-gitlab-service (0.2.2) - rugged (~> 0.19) - gherkin-ruby (0.3.1) - racc - github-markup (1.1.0) - gitlab-flowdock-git-hook (0.4.2.2) + foreman (0.78.0) + thor (~> 0.19.1) + formatador (0.2.5) + fuubar (2.0.0) + rspec (~> 3.0) + ruby-progressbar (~> 1.4) + gemnasium-gitlab-service (0.2.6) + rugged (~> 0.21) + gemojione (2.0.1) + json + get_process_mem (0.2.0) + gherkin-ruby (0.3.2) + github-markup (1.3.3) + gitlab-flowdock-git-hook (1.0.1) + flowdock (~> 0.7) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.0.pre) - rack (~> 1.5.1) - gitlab-grit (2.6.12) + gitlab-grit (2.7.3) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (~> 1.15) posix-spawn (~> 0.3) - gitlab-linguist (3.0.0) + gitlab-linguist (3.0.1) charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) - gitlab_emoji (0.0.1.1) - emoji (~> 1.0.1) - gitlab_git (7.0.0.rc10) + gitlab_emoji (0.1.1) + gemojione (~> 2.0) + gitlab_git (7.2.15) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) - rugged (~> 0.21.0) + rugged (~> 0.22.2) gitlab_meta (7.0) - gitlab_omniauth-ldap (1.1.0) - net-ldap (~> 0.7.0) + gitlab_omniauth-ldap (1.2.1) + net-ldap (~> 0.9) omniauth (~> 1.0) pyu-ruby-sasl (~> 0.0.3.1) - rubyntlm (~> 0.1.1) - gollum-lib (3.0.0) - github-markup (~> 1.1.0) - gitlab-grit (~> 2.6.5) - nokogiri (~> 1.6.1) - rouge (~> 1.3.3) + rubyntlm (~> 0.3) + gollum-grit_adapter (1.0.0) + gitlab-grit (~> 2.7, >= 2.7.1) + gollum-lib (4.0.3) + github-markup (~> 1.3.3) + gollum-grit_adapter (~> 1.0) + nokogiri (~> 1.6.4) + rouge (~> 1.10.1) sanitize (~> 2.1.0) stringex (~> 2.5.1) - gon (5.0.1) + gon (5.0.4) actionpack (>= 2.3.0) json grape (0.6.1) @@ -210,23 +311,23 @@ GEM rack-accept rack-mount virtus (>= 1.0.0) - grape-entity (0.4.2) + grape-entity (0.4.8) activesupport multi_json (>= 1.3.2) growl (1.0.3) - guard (2.2.4) + guard (2.13.0) formatador (>= 0.2.4) - listen (~> 2.1) + listen (>= 2.7, <= 4.0) lumberjack (~> 1.0) + nenv (~> 0.1) + notiffany (~> 0.0) pry (>= 0.9.12) + shellany (~> 0.0) thor (>= 0.18.1) - guard-rspec (4.2.0) - guard (>= 2.1.1) + guard-rspec (4.2.10) + guard (~> 2.1) rspec (>= 2.14, < 4.0) - guard-spinach (0.0.2) - guard (>= 1.1) - spinach - haml (4.0.5) + haml (4.0.7) tilt haml-rails (0.5.3) actionpack (>= 4.0.1) @@ -234,185 +335,222 @@ GEM haml (>= 3.1, < 5.0) railties (>= 4.0.1) hashie (2.1.2) + highline (1.6.21) hike (1.2.3) - hipchat (0.14.0) - httparty + hipchat (1.5.2) httparty + mimemagic + hitimes (1.2.3) html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) - html-pipeline-gitlab (0.1.5) - actionpack (~> 4) - gitlab_emoji (~> 0.0.1) - html-pipeline (~> 1.11.0) - sanitize (~> 2.1) + http-cookie (1.0.2) + domain_name (~> 0.5) http_parser.rb (0.5.3) - httparty (0.13.0) + httparty (0.13.5) json (~> 1.8) multi_xml (>= 0.5.2) - httpauth (0.2.1) - i18n (0.6.11) - ice_nine (0.10.0) - jasmine (2.0.2) - jasmine-core (~> 2.0.0) - phantomjs - rack (>= 1.2.1) - rake - jasmine-core (2.0.0) - jquery-atwho-rails (0.3.3) - jquery-rails (3.1.0) + httpclient (2.6.0.1) + i18n (0.7.0) + ice_cube (0.11.1) + ice_nine (0.11.1) + inflecto (0.0.2) + ipaddress (0.8.0) + jquery-atwho-rails (1.0.1) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-scrollto-rails (1.4.3) railties (> 3.1, < 5.0) - jquery-turbolinks (2.0.1) + jquery-turbolinks (2.0.2) railties (>= 3.1.0) turbolinks jquery-ui-rails (4.2.1) railties (>= 3.2.16) - json (1.8.1) - jwt (0.1.13) - multi_json (>= 1.5) + json (1.8.3) + jwt (1.5.1) kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kgio (2.8.1) - launchy (2.4.2) + kgio (2.9.3) + launchy (2.4.3) addressable (~> 2.3) letter_opener (1.1.2) launchy (~> 2.2) - libv8 (3.16.14.11) - listen (2.3.1) - celluloid (>= 0.15.2) + listen (2.10.1) + celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.4) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + lumberjack (1.0.9) + macaddr (1.7.1) + systemu (~> 2.6.2) + mail (2.6.3) + mime-types (>= 1.16, < 3) + mail_room (0.5.2) method_source (0.8.2) mime-types (1.25.1) - mini_portile (0.6.0) - minitest (5.3.5) + mimemagic (0.3.0) + mini_portile (0.6.2) + minitest (5.7.0) mousetrap-rails (1.4.6) - multi_json (1.10.1) + multi_json (1.11.2) multi_xml (0.5.5) multipart-post (1.2.0) - mysql2 (0.3.16) - net-ldap (0.7.0) - net-scp (1.1.2) + mysql2 (0.3.20) + nenv (0.2.0) + nested_form (0.3.2) + net-ldap (0.11) + net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.8.0) + net-ssh (2.9.2) + netrc (0.10.3) + newrelic-grape (2.0.0) + grape + newrelic_rpm newrelic_rpm (3.9.4.245) - nokogiri (1.6.2.1) - mini_portile (= 0.6.0) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + notiffany (0.0.7) + nenv (~> 0.1) + shellany (~> 0.0) nprogress-rails (0.1.2.3) oauth (0.4.7) - oauth2 (0.8.1) - faraday (~> 0.8) - httpauth (~> 0.1) - jwt (~> 0.1.4) - multi_json (~> 1.0) + oauth2 (1.0.0) + faraday (>= 0.8, < 0.10) + jwt (~> 1.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) rack (~> 1.2) - omniauth (1.1.4) - hashie (>= 1.2, < 3) - rack - omniauth-github (1.1.1) + octokit (3.7.1) + sawyer (~> 0.6.0, >= 0.5.3) + omniauth (1.2.2) + hashie (>= 1.2, < 4) + rack (~> 1.0) + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) + omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-google-oauth2 (0.2.5) + omniauth-gitlab (1.0.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.0) + omniauth-google-oauth2 (0.2.6) omniauth (> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-oauth (1.0.1) + omniauth-kerberos (0.2.0) + omniauth-multipassword + timfel-krb5-auth (~> 0.8) + omniauth-multipassword (0.4.2) + omniauth (~> 1.0) + omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.1.1) - oauth2 (~> 0.8.0) - omniauth (~> 1.0) - omniauth-shibboleth (1.1.1) + omniauth-oauth2 (1.3.1) + oauth2 (~> 1.0) + omniauth (~> 1.2) + omniauth-saml (1.4.1) + omniauth (~> 1.1) + ruby-saml (~> 1.0.0) + omniauth-shibboleth (1.1.2) omniauth (>= 1.0.0) omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - org-ruby (0.9.9) + omniauth_crowd (2.2.3) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0) + opennebula (4.12.1) + json + nokogiri + rbvmomi + org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - pg (0.15.1) - phantomjs (1.9.2.0) - poltergeist (1.5.1) + paranoia (2.1.3) + activerecord (~> 4.0) + parser (2.2.2.6) + ast (>= 1.1, < 3.0) + pg (0.18.2) + poltergeist (1.6.0) capybara (~> 2.1) cliver (~> 0.3.1) multi_json (~> 1.0) websocket-driver (>= 0.2.0) - polyglot (0.3.4) - posix-spawn (0.3.9) - pry (0.9.12.4) - coderay (~> 1.0) - method_source (~> 0.8) + posix-spawn (0.3.11) + powerpack (0.0.9) + pry (0.10.1) + coderay (~> 1.1.0) + method_source (~> 0.8.1) slop (~> 3.4) + pry-rails (0.3.4) + pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) - quiet_assets (1.0.2) + quiet_assets (1.0.3) railties (>= 3.1, < 5.0) - racc (1.4.10) - rack (1.5.2) + rack (1.5.5) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (2.3.0) + rack-attack (4.3.0) rack rack-cors (0.2.9) - rack-mini-profiler (0.9.0) + rack-mini-profiler (0.9.7) rack (>= 1.1.3) rack-mount (0.8.3) rack (>= 1.0.0) - rack-protection (1.5.1) + rack-oauth2 (1.0.10) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) + rack-protection (1.5.3) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (4.1.1) - actionmailer (= 4.1.1) - actionpack (= 4.1.1) - actionview (= 4.1.1) - activemodel (= 4.1.1) - activerecord (= 4.1.1) - activesupport (= 4.1.1) + rails (4.1.12) + actionmailer (= 4.1.12) + actionpack (= 4.1.12) + actionview (= 4.1.12) + activemodel (= 4.1.12) + activerecord (= 4.1.12) + activesupport (= 4.1.12) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.1) + railties (= 4.1.12) sprockets-rails (~> 2.0) - rails_autolink (1.1.6) - rails (> 3.1) - rails_best_practices (1.14.4) - activesupport - awesome_print - code_analyzer (>= 0.4.3) - colored - erubis - i18n - require_all - ruby-progressbar - railties (4.1.1) - actionpack (= 4.1.1) - activesupport (= 4.1.1) + rails-observers (0.1.2) + activemodel (~> 4.0) + railties (4.1.12) + actionpack (= 4.1.12) + activesupport (= 4.1.12) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - raindrops (0.12.0) - rake (10.3.2) + rainbow (2.0.0) + raindrops (0.15.0) + rake (10.4.2) raphael-rails (2.1.2) - rb-fsevent (0.9.3) - rb-inotify (0.9.2) + rb-fsevent (0.9.5) + rb-inotify (0.9.5) ffi (>= 0.5.0) + rbvmomi (1.8.2) + builder + nokogiri (>= 1.4.1) + trollop rdoc (3.12.2) json (~> 1.4) - redcarpet (3.1.2) - redis (3.0.6) + redcarpet (3.3.2) + redis (3.2.1) redis-actionpack (4.0.0) actionpack (~> 4) redis-rack (~> 1.5.0) redis-store (~> 1.1.0) - redis-activesupport (4.0.0) + redis-activesupport (4.1.1) activesupport (~> 4) redis-store (~> 1.1.0) - redis-namespace (1.4.1) - redis (~> 3.0.4) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) redis-rack (1.5.0) rack (~> 1.5) redis-store (~> 1.1.0) @@ -420,132 +558,180 @@ GEM redis-actionpack (~> 4) redis-activesupport (~> 4) redis-store (~> 1.1.0) - redis-store (1.1.4) + redis-store (1.1.6) redis (>= 2.2) - ref (1.0.5) - request_store (1.0.5) - require_all (1.3.2) - rest-client (1.6.7) - mime-types (>= 1.16) + request_store (1.2.0) + rerun (0.10.0) + listen (~> 2.7, >= 2.7.3) + responders (1.1.2) + railties (>= 3.2, < 4.2) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) rinku (1.7.3) - rouge (1.3.3) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.7) - rspec-expectations (2.14.4) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.4) - rspec-rails (2.14.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - ruby-progressbar (1.2.0) - rubyntlm (0.1.1) + rotp (2.1.1) + rouge (1.10.1) + rqrcode (0.7.0) + chunky_png + rqrcode-rails3 (0.1.7) + rqrcode (>= 0.4.2) + rspec (3.3.0) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-core (3.3.2) + rspec-support (~> 3.3.0) + rspec-expectations (3.3.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-mocks (3.3.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.3.0) + rspec-rails (3.3.3) + actionpack (>= 3.0, < 4.3) + activesupport (>= 3.0, < 4.3) + railties (>= 3.0, < 4.3) + rspec-core (~> 3.3.0) + rspec-expectations (~> 3.3.0) + rspec-mocks (~> 3.3.0) + rspec-support (~> 3.3.0) + rspec-support (3.3.0) + rubocop (0.28.0) + astrolabe (~> 1.3) + parser (>= 2.2.0.pre.7, < 3.0) + powerpack (~> 0.0.6) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.4) + ruby-fogbugz (0.2.1) + crack (~> 0.4) + ruby-progressbar (1.7.5) + ruby-saml (1.0.0) + nokogiri (>= 1.5.10) + uuid (~> 2.3) + ruby2ruby (2.1.4) + ruby_parser (~> 3.1) + sexp_processor (~> 4.0) + ruby_parser (3.5.0) + sexp_processor (~> 4.1) + rubyntlm (0.5.2) rubypants (0.2.0) - rugged (0.21.0) - safe_yaml (0.9.7) + rugged (0.22.2) + safe_yaml (1.0.4) sanitize (2.1.0) nokogiri (>= 1.4.4) sass (3.2.19) - sass-rails (4.0.3) + sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) + sass (~> 3.2.2) + sprockets (~> 2.8, < 3.0) sprockets-rails (~> 2.0) + sawyer (0.6.0) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) sdoc (0.3.20) json (>= 1.1.3) rdoc (~> 3.10) - seed-fu (2.3.1) - activerecord (>= 3.1, < 4.2) - activesupport (>= 3.1, < 4.2) - select2-rails (3.5.2) + seed-fu (2.3.5) + activerecord (>= 3.1, < 4.3) + activesupport (>= 3.1, < 4.3) + select2-rails (3.5.9.3) thor (~> 0.14) - semantic-ui-sass (0.16.1.0) - sass (~> 3.2) settingslogic (2.0.9) - sexp_processor (4.4.0) - shoulda-matchers (2.1.0) + sexp_processor (4.6.0) + sham_rack (1.3.6) + rack + shellany (0.0.1) + shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (2.17.0) - celluloid (>= 0.15.2) - connection_pool (>= 1.0.0) + sidekiq (3.3.0) + celluloid (>= 0.16.0) + connection_pool (>= 2.0.0) json - redis (>= 3.0.4) + redis (>= 3.0.6) redis-namespace (>= 1.3.1) + sidetiq (0.6.3) + celluloid (>= 0.14.1) + ice_cube (= 0.11.1) + sidekiq (>= 3.0.0) simple_oauth (0.1.9) - simplecov (0.9.0) + simplecov (0.10.0) docile (~> 1.1.0) - multi_json - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - sinatra (1.4.4) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.6) rack (~> 1.4) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) + tilt (>= 1.3, < 3) six (0.2.0) - slack-notifier (0.3.2) - slim (2.0.2) + slack-notifier (1.0.0) + slim (2.0.3) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) - slop (3.4.7) - spinach (0.8.7) - colorize (= 0.5.8) - gherkin-ruby (>= 0.3.1) + slop (3.6.0) + spinach (0.8.10) + colorize + gherkin-ruby (>= 0.3.2) + json spinach-rails (0.2.1) capybara (>= 2.0.0) railties (>= 3) spinach (>= 0.4) - spring (1.1.3) - spring-commands-rspec (1.0.1) + spring (1.3.6) + spring-commands-rspec (1.0.4) spring (>= 0.9.1) spring-commands-spinach (1.0.0) spring (>= 0.9.1) - sprockets (2.11.0) + spring-commands-teaspoon (0.0.2) + spring (>= 0.9.1) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) + sprockets-rails (2.3.2) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) stamp (0.5.0) state_machine (1.2.0) - stringex (2.5.1) - temple (0.6.7) - term-ansicolor (1.2.2) - tins (~> 0.8) - test_after_commit (0.2.2) - therubyracer (0.12.0) - libv8 (~> 3.16.14.0) - ref - thin (1.6.1) - daemons (>= 1.0.9) - eventmachine (>= 1.0.0) - rack (>= 1.0.0) - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - timers (1.1.0) - tinder (1.9.3) + stringex (2.5.2) + systemu (2.6.5) + task_list (1.0.2) + html-pipeline + teaspoon (1.0.2) + railties (>= 3.2.5, < 5) + teaspoon-jasmine (2.2.0) + teaspoon (>= 1.0.0) + temple (0.6.10) + term-ansicolor (1.3.2) + tins (~> 1.0) + terminal-table (1.5.2) + test_after_commit (0.2.7) + activerecord (>= 3.2) + thin (1.6.3) + daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) - faraday (~> 0.8) + rack (~> 1.0) + thor (0.19.1) + thread_safe (0.3.5) + tilt (1.4.1) + timers (4.0.4) + hitimes + timfel-krb5-auth (0.8.3) + tinder (1.9.4) + eventmachine (~> 1.0) + faraday (~> 0.8.9) faraday_middleware (~> 0.9) hashie (>= 1.0, < 3) json (~> 1.8.0) mime-types (~> 1.19) multi_json (~> 1.7) twitter-stream (~> 0.1) - tins (0.13.1) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - turbolinks (2.0.0) + tins (1.6.0) + trollop (2.1.2) + turbolinks (2.5.3) coffee-rails twitter-stream (0.1.16) eventmachine (>= 0.12.8) @@ -553,31 +739,39 @@ GEM simple_oauth (~> 0.1.4) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.3.2) + uglifier (2.3.3) execjs (>= 0.3.0) json (>= 1.8.0) underscore-rails (1.4.4) unf (0.1.4) unf_ext - unf_ext (0.0.6) - unicorn (4.6.3) + unf_ext (0.0.7.1) + unicorn (4.8.3) kgio (~> 2.6) rack raindrops (~> 0.7) - unicorn-worker-killer (0.4.2) + unicorn-worker-killer (0.4.3) + get_process_mem (~> 0) unicorn (~> 4) - version_sorter (1.1.0) - virtus (1.0.1) - axiom-types (~> 0.0.5) + uuid (2.3.8) + macaddr (~> 1.0) + version_sorter (2.0.0) + virtus (1.0.5) + axiom-types (~> 0.1) coercible (~> 1.0) - descendants_tracker (~> 0.0.1) - equalizer (~> 0.0.7) + descendants_tracker (~> 0.0, >= 0.0.3) + equalizer (~> 0.0, >= 0.0.9) warden (1.2.3) rack (>= 1.0) - webmock (1.16.0) - addressable (>= 2.2.7) + webmock (1.21.0) + addressable (>= 2.3.6) crack (>= 0.3.2) - websocket-driver (0.3.3) + websocket-driver (0.6.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + whenever (0.8.4) + activesupport (>= 2.3.4) + chronic (>= 0.6.3) wikicloth (0.8.1) builder expression_parser @@ -589,124 +783,157 @@ PLATFORMS ruby DEPENDENCIES - RedCloth - ace-rails-ap - acts-as-taggable-on - annotate (~> 2.6.0.beta2) - asciidoctor (= 0.1.4) - awesome_print - better_errors - binding_of_caller + RedCloth (~> 4.2.9) + ace-rails-ap (~> 2.0.1) + activerecord-deprecated_finders (~> 1.0.3) + activerecord-session_store (~> 0.1.0) + acts-as-taggable-on (~> 3.4) + addressable (~> 2.3.8) + after_commit_queue + annotate (~> 2.6.0) + asana (~> 0.0.6) + asciidoctor (~> 1.5.2) + attr_encrypted (~> 1.3.4) + awesome_print (~> 1.2.0) + better_errors (~> 1.0.1) + binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.0) - capybara (~> 2.2.1) - carrierwave - coffee-rails - colored - coveralls + brakeman (= 3.0.1) + browser (~> 1.0.0) + byebug + cal-heatmap-rails (~> 0.0.1) + capybara (~> 2.4.0) + capybara-screenshot (~> 1.0.0) + carrierwave (~> 0.9.0) + charlock_holmes (~> 0.6.9.4) + coffee-rails (~> 4.1.0) + colored (~> 1.2) + colorize (~> 0.5.8) + coveralls (~> 0.8.2) creole (~> 0.3.6) - d3_rails (~> 3.1.4) - database_cleaner + d3_rails (~> 3.5.5) + database_cleaner (~> 1.4.0) default_value_for (~> 3.0.0) - devise (= 3.2.4) - devise-async (= 0.9.0) + devise (~> 3.5.2) + devise-async (~> 0.9.0) + devise-two-factor (~> 2.0.0) diffy (~> 3.0.3) - dropzonejs-rails - email_spec - enumerize - factory_girl_rails - ffaker - fog (~> 1.14) + doorkeeper (~> 2.1.3) + dropzonejs-rails (~> 0.7.1) + email_reply_parser (~> 0.5.8) + email_spec (~> 1.6.0) + enumerize (~> 0.7.0) + factory_girl_rails (~> 4.3.0) + ffaker (~> 2.0.0) + fog (~> 1.25.0) font-awesome-rails (~> 4.2) foreman + fuubar (~> 2.0.0) gemnasium-gitlab-service (~> 0.2) - github-markup - gitlab-flowdock-git-hook (~> 0.4.2) - gitlab-grack (~> 2.0.0.pre) - gitlab-linguist (~> 3.0.0) - gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc10) + github-markup (~> 1.3.1) + gitlab-flowdock-git-hook (~> 1.0.1) + gitlab-linguist (~> 3.0.1) + gitlab_emoji (~> 0.1) + gitlab_git (~> 7.2.15) gitlab_meta (= 7.0) - gitlab_omniauth-ldap (= 1.1.0) - gollum-lib (~> 3.0.0) + gitlab_omniauth-ldap (~> 1.2.1) + gollum-lib (~> 4.0.2) gon (~> 5.0.0) grape (~> 0.6.1) grape-entity (~> 0.4.2) growl - guard-rspec - guard-spinach - haml-rails - hipchat (~> 0.14.0) - html-pipeline-gitlab (~> 0.1.0) - httparty - jasmine (= 2.0.2) - jquery-atwho-rails (~> 0.3.3) - jquery-rails - jquery-scrollto-rails - jquery-turbolinks - jquery-ui-rails + guard-rspec (~> 4.2.0) + haml-rails (~> 0.5.3) + hipchat (~> 1.5.0) + html-pipeline (~> 1.11.0) + httparty (~> 0.13.3) + jquery-atwho-rails (~> 1.0.0) + jquery-rails (~> 3.1.3) + jquery-scrollto-rails (~> 1.4.3) + jquery-turbolinks (~> 2.0.1) + jquery-ui-rails (~> 4.2.1) kaminari (~> 0.15.1) - launchy - letter_opener - minitest (~> 5.3.0) - mousetrap-rails - mysql2 - newrelic_rpm - nprogress-rails - omniauth (~> 1.1.3) - omniauth-github - omniauth-google-oauth2 - omniauth-shibboleth - omniauth-twitter - org-ruby (= 0.9.9) - pg - poltergeist (~> 1.5.1) - pry - quiet_assets (~> 1.0.1) - rack-attack - rack-cors - rack-mini-profiler - rails (~> 4.1.0) - rails_autolink (~> 1.1) - rails_best_practices + letter_opener (~> 1.1.2) + mail_room (~> 0.5.2) + minitest (~> 5.7.0) + mousetrap-rails (~> 1.4.6) + mysql2 (~> 0.3.16) + nested_form (~> 0.3.2) + newrelic-grape + newrelic_rpm (~> 3.9.4.245) + nprogress-rails (~> 0.1.2.3) + oauth2 (~> 1.0.0) + octokit (~> 3.7.0) + omniauth (~> 1.2.2) + omniauth-bitbucket (~> 0.0.2) + omniauth-github (~> 1.1.1) + omniauth-gitlab (~> 1.0.0) + omniauth-google-oauth2 (~> 0.2.5) + omniauth-kerberos (~> 0.2.0) + omniauth-saml (~> 1.4.0) + omniauth-shibboleth (~> 1.1.1) + omniauth-twitter (~> 1.0.1) + omniauth_crowd + org-ruby (~> 0.9.12) + paranoia (~> 2.0) + pg (~> 0.18.2) + poltergeist (~> 1.6.0) + pry-rails + quiet_assets (~> 1.0.2) + rack-attack (~> 4.3.0) + rack-cors (~> 0.2.9) + rack-mini-profiler (~> 0.9.0) + rack-oauth2 (~> 1.0.5) + rails (= 4.1.12) raphael-rails (~> 2.1.2) rb-fsevent rb-inotify rdoc (~> 3.6) - redcarpet (~> 3.1.2) - redis-rails - request_store - rspec-rails + redcarpet (~> 3.3.2) + redis-rails (~> 4.0.0) + request_store (~> 1.2.0) + rerun (~> 0.10.0) + rqrcode-rails3 (~> 0.1.7) + rspec-rails (~> 3.3.0) + rubocop (~> 0.28.0) + ruby-fogbugz (~> 0.2.1) sanitize (~> 2.0) - sass-rails (~> 4.0.2) - sdoc - seed-fu - select2-rails - semantic-ui-sass (~> 0.16.1.0) - settingslogic - shoulda-matchers (~> 2.1.0) - sidekiq (= 2.17.0) - simplecov - sinatra - six - slack-notifier (~> 0.3.2) - slim - spinach-rails - spring (= 1.1.3) - spring-commands-rspec (= 1.0.1) - spring-commands-spinach (= 1.0.0) - stamp - state_machine - test_after_commit - therubyracer - thin + sass-rails (~> 4.0.5) + sdoc (~> 0.3.20) + seed-fu (~> 2.3.5) + select2-rails (~> 3.5.9) + settingslogic (~> 2.0.9) + sham_rack + shoulda-matchers (~> 2.8.0) + sidekiq (= 3.3.0) + sidetiq (~> 0.6.3) + simplecov (~> 0.10.0) + sinatra (~> 1.4.4) + six (~> 0.2.0) + slack-notifier (~> 1.0.0) + slim (~> 2.0.2) + spinach-rails (~> 0.2.1) + spring (~> 1.3.6) + spring-commands-rspec (~> 1.0.4) + spring-commands-spinach (~> 1.0.0) + spring-commands-teaspoon (~> 0.0.2) + sprockets (~> 2.12.3) + stamp (~> 0.5.0) + state_machine (~> 1.2.0) + task_list (~> 1.0.2) + teaspoon (~> 1.0.0) + teaspoon-jasmine (~> 2.2.0) + test_after_commit (~> 0.2.2) + thin (~> 1.6.1) tinder (~> 1.9.2) - turbolinks - uglifier + turbolinks (~> 2.5.0) + uglifier (~> 2.3.2) underscore-rails (~> 1.4.4) - unf - unicorn (~> 4.6.3) - unicorn-worker-killer - version_sorter - virtus - webmock + unf (~> 0.1.4) + unicorn (~> 4.8.2) + unicorn-worker-killer (~> 0.4.2) + version_sorter (~> 2.0.0) + virtus (~> 1.0.1) + webmock (~> 1.21.0) + whenever (~> 0.8.4) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 4f75bb94a29..8af64ce78e9 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,15 +1,8 @@ { stdenv, lib, bundler, fetchgit, bundlerEnv, defaultGemConfig, libiconv, ruby -, tzdata, git +, tzdata, git, nodejs, procps }: let - gitlab = fetchgit { - url = "https://github.com/gitlabhq/gitlabhq.git"; - rev = "477743a154e85c411e8a533980abce460b5669fc"; - fetchSubmodules = false; - sha256 = "1gk77j886w6zvw5cawpgja6f87qirmjx7y4g5i3psxm4j67llxdp"; - }; - env = bundlerEnv { name = "gitlab"; inherit ruby; @@ -28,18 +21,18 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "7.4.2"; - buildInputs = [ ruby bundler tzdata git ]; - unpackPhase = '' - runHook preUnpack - cp -r ${gitlab}/* . - chmod -R +w . - cp ${./Gemfile} Gemfile - cp ${./Gemfile.lock} Gemfile.lock - runHook postUnpack - ''; + version = "8.0.5"; + buildInputs = [ ruby bundler tzdata git nodejs procps ]; + src = fetchgit { + url = "https://github.com/gitlabhq/gitlabhq.git"; + rev = "2866c501b5a5abb69d101cc07261a1d684b4bd4c"; + fetchSubmodules = false; + sha256 = "edc6bedd5e79940189355d8cb343d20b0781b69fcef56ccae5906fa5e81ed521"; + }; + patches = [ ./remove-hardcoded-locations.patch + ./disable-dump-schema-after-migration.patch ]; postPatch = '' # For reasons I don't understand "bundle exec" ignores the @@ -49,6 +42,10 @@ stdenv.mkDerivation rec { rm lib/tasks/test.rake mv config/gitlab.yml.example config/gitlab.yml + rm config/initializers/gitlab_shell_secret_token.rb + + substituteInPlace app/controllers/admin/background_jobs_controller.rb \ + --replace "ps -U" "${procps}/bin/ps -U" # required for some gems: cat > config/database.yml < + email_display_name: GitLab + email_reply_to: noreply@example.com - # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). - -@@ -230,12 +230,12 @@ production: &base +@@ -298,12 +298,12 @@ production: &base # GitLab Satellites satellites: # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) @@ -58,10 +62,10 @@ index e7a8d08..834ecaf 100644 backup: - path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) + path: <%= ENV['GITLAB_BACKUP_PATH'] %> + # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) - # upload: - # # Fog storage connection settings, see http://fog.io/storage/ . -@@ -249,11 +249,11 @@ production: &base + # pg_schema: public # default: nil, it means that all schemas will be backed up +@@ -322,15 +322,15 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -74,9 +78,14 @@ index e7a8d08..834ecaf 100644 + repos_path: <%= ENV['GITLAB_REPOSITORIES_PATH'] %> + hooks_path: <%= ENV['GITLAB_SHELL_HOOKS_PATH'] %> + # File that contains the secret key for verifying access for gitlab-shell. + # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). +- # secret_file: /home/git/gitlab/.gitlab_shell_secret ++ secret_file: <%= ENV['GITLAB_SHELL_SECRET_PATH'] %> + # Git over HTTP upload_pack: true -@@ -266,7 +266,7 @@ production: &base +@@ -343,7 +343,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: @@ -85,7 +94,7 @@ index e7a8d08..834ecaf 100644 # The next value is the maximum memory size grit can use # Given in number of bytes per git object (e.g. a commit) # This value can be increased if you have very large commits -@@ -299,7 +299,7 @@ test: +@@ -388,7 +388,7 @@ test: gravatar: enabled: true gitlab: @@ -95,14 +104,14 @@ index e7a8d08..834ecaf 100644 # When you run tests we clone and setup gitlab-shell diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb -index 8e4717b..abfe2e4 100644 +index dddcb25..d61f10a 100644 --- a/lib/gitlab/app_logger.rb +++ b/lib/gitlab/app_logger.rb @@ -1,7 +1,7 @@ module Gitlab class AppLogger < Gitlab::Logger - def self.file_name -- 'application.log' + def self.file_name_noext +- 'application' + ENV["GITLAB_APPLICATION_LOG_PATH"] end diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 07ad9d8526b..b02ab0eb8a9 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,8 +1,23 @@ -{ stdenv, fetchFromGitHub, kodi, steam }: +{ stdenv, fetchFromGitHub, cmake, kodi, steam, libcec_platform, tinyxml }: let - pluginDir = "/lib/kodi/plugin"; + pluginDir = "/share/kodi/addons"; + + kodi-platform = stdenv.mkDerivation rec { + project = "kodi-platform"; + version = "15.2"; + name = "${project}-${version}"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = project; + rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1"; + sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi"; + }; + + buildInputs = [ cmake kodi libcec_platform tinyxml ]; + }; mkKodiPlugin = { plugin, namespace, version, src, meta, ... }: stdenv.lib.makeOverridable stdenv.mkDerivation rec { @@ -134,4 +149,36 @@ in propagatedBuildinputs = [ steam ]; }; + pvr-hts = (mkKodiPlugin rec { + plugin = "pvr-hts"; + namespace = "pvr.hts"; + version = "2.1.18"; + + src = fetchFromGitHub { + owner = "kodi-pvr"; + repo = "pvr.hts"; + rev = "016b0b3251d6d5bffaf68baf59010e4347759c4a"; + sha256 = "03lhxipz03r516pycabqc9b89kd7wih3c2dr4p602bk64bsmpi0j"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/kodi-pvr/pvr.hts; + description = "Kodi's Tvheadend HTSP client addon"; + platforms = platforms.all; + maintainers = with maintainers; [ page ]; + }; + }).override { + buildInputs = [ cmake kodi libcec_platform kodi-platform ]; + + # disables check ensuring install prefix is that of kodi + cmakeFlags = [ "-DOVERRIDE_PATHS=1" ]; + + # kodi checks for plugin .so libs existance in the addon folder (share/...) + # and the non-wrapped kodi lib/... folder before even trying to dlopen + # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use + installPhase = '' + make install + ln -s $out/lib/kodi/addons/pvr.hts/pvr.hts.so $out/share/kodi/addons/pvr.hts + ''; + }; } diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 9f7a87f9987..716eef466fb 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; buildCommand = '' - mkdir -p $out/share/kodi/addons/packages + mkdir -p $out/share/kodi/addons ${stdenv.lib.concatMapStrings (plugin: "ln -s ${plugin.out + plugin.kodiPlugin @@ -50,4 +50,4 @@ stdenv.mkDerivation { }; -} \ No newline at end of file +} diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix index 0ae461bcca9..caa72f49b94 100644 --- a/pkgs/applications/virtualization/openstack/glance.nix +++ b/pkgs/applications/virtualization/openstack/glance.nix @@ -23,11 +23,12 @@ pythonPackages.buildPythonPackage rec { # oslo componenets oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization + MySQL_python ]; buildInputs = with pythonPackages; [ Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8 - testresources testscenarios testtools psutil_1 oslotest psycopg2 MySQL_python + testresources testscenarios testtools psutil_1 oslotest psycopg2 sqlite which strace ]; diff --git a/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch b/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch new file mode 100644 index 00000000000..d7a2caa2bde --- /dev/null +++ b/pkgs/applications/virtualization/openstack/neutron-iproute-4.patch @@ -0,0 +1,93 @@ +From 3aefdf4de76fdcdc02093bc631e339f9ecd4c707 Mon Sep 17 00:00:00 2001 +From: James Page +Date: Fri, 18 Sep 2015 16:38:47 +0100 +Subject: Add compatibility with iproute2 >= 4.0 + +The ip netns list command adds additional id data in more recent +versions of iproute2 of the format: + + qdhcp-35fc068a-750d-4add-b1d2-af392dbd8790 (id: 1) + +Update parsing to deal with old and new formats. + +Change-Id: I0d3fc4262284172f5ad31e4f2f78ae1fb33b4228 +Closes-Bug: 1497309 +--- + neutron/agent/linux/ip_lib.py | 6 +++--- + neutron/tests/functional/agent/test_l3_agent.py | 2 +- + neutron/tests/unit/agent/linux/test_ip_lib.py | 15 +++++++++++++++ + 3 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/neutron/agent/linux/ip_lib.py b/neutron/agent/linux/ip_lib.py +index 551341a..a717bf6 100644 +--- a/neutron/agent/linux/ip_lib.py ++++ b/neutron/agent/linux/ip_lib.py +@@ -208,7 +208,7 @@ class IPWrapper(SubProcessBase): + @classmethod + def get_namespaces(cls): + output = cls._execute([], 'netns', ('list',)) +- return [l.strip() for l in output.split('\n')] ++ return [l.split()[0] for l in output.splitlines()] + + + class IPDevice(SubProcessBase): +@@ -819,8 +819,8 @@ class IpNetnsCommand(IpCommandBase): + output = self._parent._execute( + ['o'], 'netns', ['list'], + run_as_root=cfg.CONF.AGENT.use_helper_for_ns_read) +- for line in output.split('\n'): +- if name == line.strip(): ++ for line in [l.split()[0] for l in output.splitlines()]: ++ if name == line: + return True + return False + +diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py +index ffa20e6..84b16df 100644 +--- a/neutron/tests/functional/agent/test_l3_agent.py ++++ b/neutron/tests/functional/agent/test_l3_agent.py +@@ -790,7 +790,7 @@ class L3HATestFramework(L3AgentTestFramework): + get_ns_name = mock.patch.object( + namespaces.RouterNamespace, '_get_ns_name').start() + get_ns_name.return_value = "%s%s%s" % ( +- namespaces.RouterNamespace._get_ns_name(router_info['id']), ++ 'qrouter-' + router_info['id'], + self.NESTED_NAMESPACE_SEPARATOR, self.agent.host) + router1 = self.manage_router(self.agent, router_info) + +diff --git a/neutron/tests/unit/agent/linux/test_ip_lib.py b/neutron/tests/unit/agent/linux/test_ip_lib.py +index 2de408d..bdfc9d7 100644 +--- a/neutron/tests/unit/agent/linux/test_ip_lib.py ++++ b/neutron/tests/unit/agent/linux/test_ip_lib.py +@@ -27,6 +27,11 @@ NETNS_SAMPLE = [ + 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', + 'cccccccc-cccc-cccc-cccc-cccccccccccc'] + ++NETNS_SAMPLE_IPROUTE2_4 = [ ++ '12345678-1234-5678-abcd-1234567890ab (id: 1)', ++ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb (id: 0)', ++ 'cccccccc-cccc-cccc-cccc-cccccccccccc (id: 2)'] ++ + LINK_SAMPLE = [ + '1: lo: mtu 16436 qdisc noqueue state UNKNOWN \\' + 'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00 promiscuity 0', +@@ -279,6 +284,16 @@ class TestIpWrapper(base.BaseTestCase): + + self.execute.assert_called_once_with([], 'netns', ('list',)) + ++ def test_get_namespaces_iproute2_4(self): ++ self.execute.return_value = '\n'.join(NETNS_SAMPLE_IPROUTE2_4) ++ retval = ip_lib.IPWrapper.get_namespaces() ++ self.assertEqual(retval, ++ ['12345678-1234-5678-abcd-1234567890ab', ++ 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', ++ 'cccccccc-cccc-cccc-cccc-cccccccccccc']) ++ ++ self.execute.assert_called_once_with([], 'netns', ('list',)) ++ + def test_add_tuntap(self): + ip_lib.IPWrapper().add_tuntap('tap0') + self.execute.assert_called_once_with([], 'tuntap', +-- +cgit v0.11.2 + diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index ce3e71b16ee..ce44ed2913c 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -1,5 +1,4 @@ - -{ stdenv, fetchurl, pythonPackages, xmlsec, which }: +{ stdenv, fetchurl, pythonPackages, xmlsec, which, dnsmasq }: pythonPackages.buildPythonPackage rec { name = "neutron-${version}"; @@ -29,9 +28,11 @@ pythonPackages.buildPythonPackage rec { ]; # make sure we include migrations - patchPhase = '' + prePatch = '' echo "graft neutron" >> MANIFEST.in + substituteInPlace etc/neutron/rootwrap.d/dhcp.filters --replace "/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" ''; + patches = [ ./neutron-iproute-4.patch ]; buildInputs = with pythonPackages; [ cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 243b6464bb5..0d54489a189 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted sqlalchemy_migrate_0_7 - distutils_extra simplejson readline glance cheetah lockfile httplib2 + distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index adcefe6004a..62b5bea47fa 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes PasteDeploy m2crypto ipy twisted sqlalchemy_migrate - distutils_extra simplejson readline glance cheetah lockfile httplib2 + distutils_extra simplejson readline glanceclient cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. libvirt libxml2Python urlgrabber diff --git a/pkgs/build-support/build-fhs-chrootenv/default.nix b/pkgs/build-support/build-fhs-chrootenv/default.nix index 461f4762aba..dfce8edcb23 100644 --- a/pkgs/build-support/build-fhs-chrootenv/default.nix +++ b/pkgs/build-support/build-fhs-chrootenv/default.nix @@ -1,4 +1,4 @@ -{ stdenv } : { env } : +{ stdenv } : { env, extraInstallCommands ? "" } : let # References to shell scripts that set up or tear down the environment @@ -43,5 +43,6 @@ in stdenv.mkDerivation { -e "s|@name@|${name}|g" \ ${destroySh} > destroy-${name}-chrootenv chmod +x destroy-${name}-chrootenv + ${extraInstallCommands} ''; } diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index 424adf081ca..aa95080ac52 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -1,4 +1,5 @@ -{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash", extraBindMounts ? [] } : +{ runCommand, lib, writeText, writeScriptBin, stdenv, ruby } : +{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "" } : let name = env.pname; @@ -44,4 +45,5 @@ in runCommand name { exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} + ${extraInstallCommands} '' diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 9a3cdd5c77d..767444e7698 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -51,50 +51,12 @@ rec { # GnuPG. gnupg = [ - http://gd.tuwien.ac.at/privacy/gnupg/ - ftp://gd.tuwien.ac.at/privacy/gnupg/ - ftp://gnupg.x-zone.org/pub/gnupg/ - ftp://ftp.gnupg.cz/pub/gcrypt/ - ftp://sunsite.dk/pub/security/gcrypt/ - http://gnupg.wildyou.net/ - http://ftp.gnupg.zone-h.org/ - ftp://ftp.jyu.fi/pub/crypt/gcrypt/ - ftp://trumpetti.atm.tut.fi/gcrypt/ - ftp://mirror.cict.fr/gnupg/ - ftp://ftp.strasbourg.linuxfr.org/pub/gnupg/ - ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/ - ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/ - ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/ - ftp://hal.csd.auth.gr/mirrors/gnupg/ - ftp://igloo.linux.gr/pub/crypto/gnupg/ - ftp://ftp.uoi.gr/mirror/gcrypt/ - ftp://ftp.crysys.hu/pub/gnupg/ - ftp://ftp.kfki.hu/pub/packages/security/gnupg/ - ftp://ftp.hi.is/pub/mirrors/gnupg/ - ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ - ftp://ftp3.linux.it/pub/mirrors/gnupg/ - ftp://ftp.linux.it/pub/mirrors/gnupg/ - ftp://ftp.bit.nl/mirror/gnupg/ - ftp://ftp.demon.nl/pub/mirrors/gnupg/ - ftp://ftp.surfnet.nl/pub/security/gnupg/ - ftp://sunsite.icm.edu.pl/pub/security/gnupg/ - ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/ - http://ftp.gnupg.tsuren.net/ - http://www.mirror386.com/gnupg/ - ftp://ftp.sunet.se/pub/security/gnupg/ - ftp://mirror.switch.ch/mirror/gnupg/ - ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt - - http://gnupg.unixmexico.org/ftp/ - ftp://ftp.gnupg.ca/ - http://gulus.usherbrooke.ca/pub/appl/GnuPG/ - http://mirrors.rootmode.com/ftp.gnupg.org/ - - ftp://ftp.planetmirror.com/pub/gnupg/ - - ftp://pgp.iijlab.net/pub/pgp/gnupg/ - ftp://ftp.ring.gr.jp/pub/net/gnupg/ - ftp://gnupg.cdpa.nsysu.edu.tw/gnupg/ + https://gnupg.org/ftp/gcrypt/ + http://www.ring.gr.jp/pub/net/ + http://gd.tuwien.ac.at/privacy/ + http://mirrors.dotsrc.org/ + http://ftp.heanet.ie/mirrors/ftp.gnupg.org/ + http://www.mirrorservice.org/sites/ftp.gnupg.org/ ]; # kernel.org's /pub (/pub/{linux,software}) tree. diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix deleted file mode 100644 index cbd3234b2d4..00000000000 --- a/pkgs/data/documentation/pthread-man-pages/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -/* Pthread man pages from LinuxThreads. - - Some of these pages are superseded by those in the `man-pages' - package, but not all. Like other distros (e.g., Debian's - `glibc-doc' package) we take man pages from LinuxThreads so that - we can cover pretty much all of pthreads. */ - -{ fetchurl, stdenv, perl }: - -let version = "2.5"; -in - stdenv.mkDerivation rec { - name = "pthread-man-pages-${version}"; - - src = fetchurl { - url = "mirror://gnu/glibc/glibc-linuxthreads-${version}.tar.bz2"; - sha256 = "0b5xg7ba64d1gbqw4k1qk96qgy7h2y4qksr0qx8v7a14c6xaw9zf"; - }; - - buildInputs = [ perl ]; - - unpackPhase = '' - echo "unpacking to \`${name}'" - mkdir "${name}" - cd "${name}" - tar xjvf "$src" - ''; - - patchPhase = '' - mkdir -p "$out/share/man/man3" - - sed -i "linuxthreads/man/Makefile" \ - -e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ; - s|3thr|3|g" - ''; - - preConfigure = "cd linuxthreads/man"; - - postInstall = '' - chmod a-x $out/share/man/man3/*.3 - ''; - - meta = { - description = "POSIX threads (pthreads) manual pages from LinuxThreads"; - homepage = http://www.gnu.org/software/libc/; - maintainers = [ stdenv.lib.maintainers.mornfall ]; - }; - } diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 91bf95d1ea2..fe23b04c551 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ipafont-003.03"; src = fetchurl { - url = "http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php"; + url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5"; }; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 8b0f2509a91..1cd894372bb 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, curl }: +{ stdenv, fetchurl, unzip, curl, makeWrapper, gcc }: stdenv.mkDerivation { name = "dmd-2.067.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0ny99vfllvvgcl79pwisxcdnb3732i827k9zg8c0j4s0n79k5z94"; }; - buildInputs = [ unzip curl ]; + buildInputs = [ unzip curl makeWrapper ]; # Allow to use "clang++", commented in Makefile postPatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -48,6 +48,8 @@ stdenv.mkDerivation { cp -r std $out/include/d2 cp -r etc $out/include/d2 + wrapProgram $out/bin/dmd --prefix PATH ":" "${gcc}/bin/" + cd $out/bin tee dmd.conf << EOF [Environment] diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index 05267d6bf6c..1f1087a85d9 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "coq-flocq-${coq.coq-version}-${version}"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/33979/flocq-2.4.0.tar.gz; - sha256 = "020x4nkkrvndkvp5zwb9vads8a2jh603khcwrm40yhqldgfd8zlv"; + url = https://gforge.inria.fr/frs/download.php/file/35091/flocq-2.5.0.tar.gz; + sha256 = "0v3qiaz7vxfc5nk8rxwi39mik7hm7p5kb040q2pimb69qgfl6vml"; }; buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 36533ab35d5..628aa973562 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, coq, flocq, mathcomp }: stdenv.mkDerivation { - name = "coq-interval-${coq.coq-version}-2.0.0"; + name = "coq-interval-${coq.coq-version}-2.1.0"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/34294/interval-2.0.0.tar.gz; - sha256 = "0wx0z07nhx88hwl20icgb5w4mx6s5pn7mhzyx5jn8f7yl1m46ad2"; + url = https://gforge.inria.fr/frs/download.php/file/35092/interval-2.1.0.tar.gz; + sha256 = "02sn8mh85kxwn7681h2z6r7vnac9idh4ik3hbmr2yvixizakb70b"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9584bb2a0cf..7bfae6b2cda 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -921,9 +921,6 @@ self: super: { librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ]; }); - # https://github.com/fpco/stackage/issues/1004 - gtk2hs-buildtools = super.gtk2hs-buildtools.override { alex = self.alex_3_1_4; }; - # https://github.com/Gabriel439/Haskell-Morte-Library/issues/32 morte = super.morte.override { alex = self.alex_3_1_4; }; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index f8d1b4dcc74..52d479315eb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -1159,6 +1159,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1369,6 +1370,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2652,6 +2654,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2927,6 +2930,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6258,6 +6262,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6964,6 +6969,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 1ae3319f268..e5f36bb7570 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -1159,6 +1159,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1369,6 +1370,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2651,6 +2653,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2926,6 +2929,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6257,6 +6261,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6963,6 +6968,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 1056aafbe28..e3d0cdb9572 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -1159,6 +1159,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1369,6 +1370,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2651,6 +2653,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2926,6 +2929,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6257,6 +6261,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6963,6 +6968,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 8ed1d94af64..515b24f5a66 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -1159,6 +1159,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1369,6 +1370,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2651,6 +2653,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2926,6 +2929,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6257,6 +6261,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6963,6 +6968,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 57c67a4dc5a..a0d8051eb01 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -1159,6 +1159,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1369,6 +1370,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2650,6 +2652,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2925,6 +2928,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6254,6 +6258,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6959,6 +6964,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index f77e85864bb..15fb8882f0d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -1159,6 +1159,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1369,6 +1370,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2650,6 +2652,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2925,6 +2928,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6254,6 +6258,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6959,6 +6964,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 89d33eb2bae..093c4f733ef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -1158,6 +1158,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1368,6 +1369,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2647,6 +2649,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2922,6 +2925,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6249,6 +6253,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6953,6 +6958,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 1b4e9fde2f0..6220b6a28d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -1158,6 +1158,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1368,6 +1369,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2647,6 +2649,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2922,6 +2925,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6249,6 +6253,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6953,6 +6958,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 6e8151f1d1b..faebc05bd3c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -1154,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1364,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2638,6 +2640,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2911,6 +2914,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6236,6 +6240,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2"; @@ -6938,6 +6943,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 64724f52831..d13ec626bd4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -1154,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1364,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2635,6 +2637,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2907,6 +2910,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6227,6 +6231,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6929,6 +6934,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 4d5b39d4c56..b1a2cad2352 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2629,6 +2631,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2901,6 +2904,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6200,6 +6204,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6899,6 +6904,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index f5cc5c96eb6..5263c6d9b86 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2629,6 +2631,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2901,6 +2904,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6196,6 +6200,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6895,6 +6900,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 63aea8eadde..52b2b12117d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2629,6 +2631,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2901,6 +2904,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6195,6 +6199,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6894,6 +6899,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 335529fea2e..826a3070e60 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2628,6 +2630,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2900,6 +2903,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6193,6 +6197,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6892,6 +6897,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 8a46c9fd0fd..7e52c6eea83 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -1152,6 +1152,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1362,6 +1363,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2625,6 +2627,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2897,6 +2900,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6186,6 +6190,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6884,6 +6889,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index a092b655ae6..2c84f74b753 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -1151,6 +1151,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1361,6 +1362,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2621,6 +2623,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2892,6 +2895,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6179,6 +6183,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6875,6 +6880,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index be3654a7a11..9e6d809f2b4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -1154,6 +1154,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1364,6 +1365,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2633,6 +2635,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2905,6 +2908,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6223,6 +6227,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6924,6 +6929,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index d7ef2c4266b..dba69f1dec4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2632,6 +2634,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2904,6 +2907,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6219,6 +6223,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6919,6 +6924,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 65530fced8b..29c37ff9e46 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2631,6 +2633,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2903,6 +2906,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6217,6 +6221,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6917,6 +6922,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 2098562b0bd..56bb92b1892 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2631,6 +2633,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2903,6 +2906,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6211,6 +6215,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6911,6 +6916,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index e59719462e6..40ee1cf5740 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2631,6 +2633,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2903,6 +2906,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6206,6 +6210,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6906,6 +6911,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index aa54cdad1e1..13b6ba12211 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -1153,6 +1153,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1363,6 +1364,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2631,6 +2633,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2903,6 +2906,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_1_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz" = doDistribute super."ersatz_0_2_6_1"; @@ -6203,6 +6207,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_2_1"; @@ -6903,6 +6908,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 25570d4ef90..2a316609484 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -1142,6 +1142,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1351,6 +1352,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2602,6 +2604,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2873,6 +2876,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6120,6 +6124,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6814,6 +6819,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 6adb0c0271c..9edb5a2c836 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -1142,6 +1142,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1351,6 +1352,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2601,6 +2603,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2872,6 +2875,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6118,6 +6122,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6812,6 +6817,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index c2a04d620ec..491de8d0d0e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -1137,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1346,6 +1347,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2586,6 +2588,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2855,6 +2858,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6075,6 +6079,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6764,6 +6769,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 572dd317f9c..04508eb6adc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -1137,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1345,6 +1346,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2585,6 +2587,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2854,6 +2857,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6068,6 +6072,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6756,6 +6761,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index cdab1b0d222..2a1cbd735d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -1137,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1345,6 +1346,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2585,6 +2587,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2854,6 +2857,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6068,6 +6072,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6756,6 +6761,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 54f75d8545a..0adb52db528 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -1137,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1345,6 +1346,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2585,6 +2587,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2854,6 +2857,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6065,6 +6069,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6753,6 +6758,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 05f3a91e99e..9545f51a8ab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -1137,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1344,6 +1345,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2584,6 +2586,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2853,6 +2856,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6062,6 +6066,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6749,6 +6754,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 254573fd157..495f8c59c7c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -1137,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1344,6 +1345,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2584,6 +2586,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2852,6 +2855,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6058,6 +6062,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6745,6 +6750,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 2d1233cb9ba..69008eef6f8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -1136,6 +1136,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1344,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2580,6 +2582,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2848,6 +2851,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6050,6 +6054,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6737,6 +6742,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 6129ad0e9bb..f349c962376 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -1136,6 +1136,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1344,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2577,6 +2579,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2845,6 +2848,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6042,6 +6046,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6728,6 +6733,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 1a7cf2b73f3..afcbcfdba13 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -1136,6 +1136,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1344,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2575,6 +2577,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2842,6 +2845,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6036,6 +6040,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6721,6 +6726,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index bd47f6cd82f..5742e57eeed 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -1136,6 +1136,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1344,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2575,6 +2577,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2842,6 +2845,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6033,6 +6037,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6718,6 +6723,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index c778f56cd1e..f9f9af3edef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -1141,6 +1141,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1350,6 +1351,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2598,6 +2600,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2869,6 +2872,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6113,6 +6117,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6807,6 +6812,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 4a9f5299170..a0ac730e2e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -1136,6 +1136,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1344,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2574,6 +2576,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2841,6 +2844,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6030,6 +6034,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6714,6 +6719,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index aa903d59ff1..455e9b3cbf8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -1136,6 +1136,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1343,6 +1344,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2574,6 +2576,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2841,6 +2844,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6028,6 +6032,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6711,6 +6716,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index bd04099095b..5dbf1176db5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -1135,6 +1135,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1342,6 +1343,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2573,6 +2575,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2840,6 +2843,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6024,6 +6028,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6707,6 +6712,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index abf30ead436..519d1221af5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -1141,6 +1141,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1350,6 +1351,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2598,6 +2600,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2869,6 +2872,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6111,6 +6115,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6805,6 +6810,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index f615a9f39bb..a94a7d2649f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -1141,6 +1141,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1350,6 +1351,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2597,6 +2599,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_1"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2868,6 +2871,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6107,6 +6111,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6800,6 +6805,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index e450ff3ee57..4e538d285ef 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -1141,6 +1141,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1350,6 +1351,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2596,6 +2598,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2867,6 +2870,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6105,6 +6109,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6798,6 +6803,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 32c923a2d21..dba6827cb90 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -1139,6 +1139,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1348,6 +1349,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2593,6 +2595,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2864,6 +2867,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6099,6 +6103,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6792,6 +6797,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index a5cb1f493b6..476f657f88a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -1138,6 +1138,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1347,6 +1348,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2592,6 +2594,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2863,6 +2866,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6098,6 +6102,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6791,6 +6796,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 4be7f48aa66..fb68e8624d9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -1137,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1346,6 +1347,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2591,6 +2593,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2862,6 +2865,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6094,6 +6098,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_1"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3"; @@ -6787,6 +6792,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index d74da0f085d..52601c8d85e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -1137,6 +1137,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1346,6 +1347,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2588,6 +2590,7 @@ self: super: { "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "digits" = dontDistribute super."digits"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2857,6 +2860,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = doDistribute super."errorcall-eq-instance_0_2_0_1"; "errors" = doDistribute super."errors_1_4_7"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -6084,6 +6088,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_1_3_1"; @@ -6775,6 +6780,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index 4576a9e00ad..59f8cf22a0d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -1110,6 +1110,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1303,6 +1304,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2484,6 +2486,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2742,6 +2745,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -4527,6 +4531,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5815,6 +5820,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -6062,6 +6068,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6483,6 +6490,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index ea639732218..77ffcd825bb 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -1110,6 +1110,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1302,6 +1303,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2482,6 +2484,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2740,6 +2743,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -4521,6 +4525,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5807,6 +5812,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -6053,6 +6059,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6473,6 +6480,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index d0b8d4d3002..5653c720f30 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -1101,6 +1101,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1289,6 +1290,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2442,6 +2444,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2695,6 +2698,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4445,6 +4449,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5710,6 +5715,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5946,6 +5952,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6360,6 +6367,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7947,10 +7955,12 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 76531fb7318..7dacd13b53e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -1101,6 +1101,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1289,6 +1290,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2440,6 +2442,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2693,6 +2696,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4439,6 +4443,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5704,6 +5709,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; @@ -5938,6 +5944,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6352,6 +6359,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7936,16 +7944,19 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 56f5d53445f..062cb92bb5b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -1100,6 +1100,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1288,6 +1289,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2435,6 +2437,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2688,6 +2691,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4432,6 +4436,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5695,6 +5700,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; @@ -5929,6 +5935,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6343,6 +6350,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7923,16 +7931,19 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index a63a36c543b..c0a7c2cae54 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -1100,6 +1100,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1288,6 +1289,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2435,6 +2437,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2688,6 +2691,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4431,6 +4435,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5691,6 +5696,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; @@ -5925,6 +5931,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6339,6 +6346,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7917,16 +7925,19 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index f41c754879e..70429d828ec 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -1097,6 +1097,7 @@ self: super: { "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1285,6 +1286,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2426,6 +2428,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2678,6 +2681,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4419,6 +4423,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5677,9 +5682,11 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_1"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5909,6 +5916,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6323,6 +6331,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7897,16 +7906,19 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index ce57746c383..37d26eb294b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -1096,6 +1096,7 @@ self: super: { "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1284,6 +1285,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2425,6 +2427,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2677,6 +2680,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4413,6 +4417,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5670,9 +5675,11 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_1"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5902,6 +5909,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6315,6 +6323,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7884,16 +7893,19 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index 80f46ad3964..39be674d51a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -1095,6 +1095,7 @@ self: super: { "aeson-casing" = dontDistribute super."aeson-casing"; "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1283,6 +1284,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2423,6 +2425,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2675,6 +2678,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4409,6 +4413,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5662,9 +5667,11 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; "persistent-odbc" = dontDistribute super."persistent-odbc"; + "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_1"; "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; @@ -5893,6 +5900,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6304,6 +6312,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7867,16 +7876,19 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; "yesod-datatables" = dontDistribute super."yesod-datatables"; "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; + "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 096565141f8..e999d035891 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -1108,6 +1108,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1299,6 +1300,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2479,6 +2481,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2736,6 +2739,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -4515,6 +4519,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5799,6 +5804,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -6044,6 +6050,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6462,6 +6469,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -8089,6 +8097,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index 34bd947e0a6..0da13e057b7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -1108,6 +1108,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1298,6 +1299,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2475,6 +2477,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2732,6 +2735,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -4508,6 +4512,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5791,6 +5796,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -6036,6 +6042,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6453,6 +6460,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -8076,6 +8084,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index d4e1412764a..dc54a3847b2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -1108,6 +1108,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1298,6 +1299,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2474,6 +2476,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2731,6 +2734,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -4507,6 +4511,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5790,6 +5795,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -6035,6 +6041,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6452,6 +6459,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -8072,6 +8080,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 88c2b0dc029..27acc39fd64 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -1108,6 +1108,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1297,6 +1298,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2471,6 +2473,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2728,6 +2731,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "errors" = doDistribute super."errors_2_0_0"; "ersatz" = dontDistribute super."ersatz"; @@ -4496,6 +4500,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5776,6 +5781,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -6018,6 +6024,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6435,6 +6442,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -8049,6 +8057,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index 491d185e937..76e8151ea55 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -1107,6 +1107,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1296,6 +1297,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2469,6 +2471,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2726,6 +2729,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4487,6 +4491,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5763,6 +5768,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -6004,6 +6010,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6421,6 +6428,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -8032,6 +8040,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index 130a2fcb020..683b6aa1e04 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -1106,6 +1106,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1294,6 +1295,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2462,6 +2464,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2718,6 +2721,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4474,6 +4478,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5746,6 +5751,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5985,6 +5991,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6400,6 +6407,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -8005,6 +8013,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index b49fc0423e1..ad2042e5406 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -1106,6 +1106,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = dontDistribute super."aeson-extra"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1294,6 +1295,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2451,6 +2453,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2707,6 +2710,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4463,6 +4467,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5733,6 +5738,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5970,6 +5976,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6384,6 +6391,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7985,6 +7993,7 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index 3c29fb70471..dfaf44cdce4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -1104,6 +1104,7 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0"; "aeson-filthy" = dontDistribute super."aeson-filthy"; + "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-lens" = dontDistribute super."aeson-lens"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; @@ -1292,6 +1293,7 @@ self: super: { "archlinux-web" = dontDistribute super."archlinux-web"; "archnews" = dontDistribute super."archnews"; "arff" = dontDistribute super."arff"; + "arghwxhaskell" = dontDistribute super."arghwxhaskell"; "argon" = dontDistribute super."argon"; "argparser" = dontDistribute super."argparser"; "arguedit" = dontDistribute super."arguedit"; @@ -2446,6 +2448,7 @@ self: super: { "digit" = dontDistribute super."digit"; "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; "dimensional" = doDistribute super."dimensional_0_13_0_2"; + "dimensional-codata" = dontDistribute super."dimensional-codata"; "dimensional-tf" = dontDistribute super."dimensional-tf"; "dingo-core" = dontDistribute super."dingo-core"; "dingo-example" = dontDistribute super."dingo-example"; @@ -2701,6 +2704,7 @@ self: super: { "error-loc" = dontDistribute super."error-loc"; "error-location" = dontDistribute super."error-location"; "error-message" = dontDistribute super."error-message"; + "error-util" = dontDistribute super."error-util"; "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; "ersatz" = dontDistribute super."ersatz"; "ersatz-toysat" = dontDistribute super."ersatz-toysat"; @@ -4455,6 +4459,7 @@ self: super: { "io-reactive" = dontDistribute super."io-reactive"; "io-region" = dontDistribute super."io-region"; "io-storage" = dontDistribute super."io-storage"; + "io-streams" = doDistribute super."io-streams_1_3_2_0"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -5724,6 +5729,7 @@ self: super: { "persistent-equivalence" = dontDistribute super."persistent-equivalence"; "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; + "persistent-iproute" = dontDistribute super."persistent-iproute"; "persistent-map" = dontDistribute super."persistent-map"; "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_2_2"; "persistent-mysql" = doDistribute super."persistent-mysql_2_2"; @@ -5961,6 +5967,7 @@ self: super: { "prof2dot" = dontDistribute super."prof2dot"; "prof2pretty" = dontDistribute super."prof2pretty"; "profiteur" = dontDistribute super."profiteur"; + "profunctors" = doDistribute super."profunctors_5_1_1"; "progress" = dontDistribute super."progress"; "progressbar" = dontDistribute super."progressbar"; "progression" = dontDistribute super."progression"; @@ -6375,6 +6382,7 @@ self: super: { "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; "rss2irc" = dontDistribute super."rss2irc"; + "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; "rtlsdr" = dontDistribute super."rtlsdr"; "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; @@ -7975,10 +7983,12 @@ self: super: { "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; + "yesod-bin" = doDistribute super."yesod-bin_1_4_14"; "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_15_1"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2eb1c8cebd8..1c153707c7e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10738,8 +10738,8 @@ self: { ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }: mkDerivation { pname = "IntervalMap"; - version = "0.4.0.1"; - sha256 = "2e57335d4bc32de03c5b36b2d1f299a49d712105798d3fa5245a67ae6a6d0033"; + version = "0.4.1.0"; + sha256 = "cbe486ae239e97deeccd6194be2e9933291778f6dd3a0bed7af60caa361ef44f"; libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base Cabal containers deepseq QuickCheck ]; homepage = "http://www.chr-breitkopf.de/comp/IntervalMap"; @@ -11215,8 +11215,10 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.6.3"; - sha256 = "4bdd5d6c9bd41308365f7d8fc9bc50393f440a96ee4390f0c64122bb08f1657a"; + version = "3.2.6.4"; + sha256 = "6268583fd7915913b3d68a399184bfcfebfaa010be9aa10232d76324df65a6ac"; + revision = "1"; + editedCabalFile = "98af5e6f6f65e399f518466813f6ada6cfa80ebc1eae6ba98525065f985ced15"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -14557,25 +14559,24 @@ self: { }) {}; "Paraiso" = callPackage - ({ mkDerivation, array, base, containers, control-monad-failure - , directory, fgl, filepath, HUnit, ListLike, listlike-instances - , mtl, numeric-prelude, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , typelevel-tensor, vector + ({ mkDerivation, array, base, containers, directory, failure, fgl + , filepath, HUnit, mtl, numeric-prelude, process, QuickCheck + , random, repa, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, typelevel-tensor, vector }: mkDerivation { pname = "Paraiso"; - version = "0.3.1.3"; - sha256 = "29f2154111be164bf7018b6f4b453af81e5a6931d4252795feead058a48dfa9c"; + version = "0.3.1.5"; + sha256 = "4448a2a736f5fec503927d6dc9b5729ef67c818bd2ee14044bcf6c0614951525"; libraryHaskellDepends = [ - array base containers control-monad-failure directory fgl filepath - mtl numeric-prelude random text typelevel-tensor vector + array base containers directory failure fgl filepath mtl + numeric-prelude random text typelevel-tensor vector ]; testHaskellDepends = [ - array base containers control-monad-failure directory fgl filepath - HUnit ListLike listlike-instances mtl numeric-prelude QuickCheck - random test-framework test-framework-hunit - test-framework-quickcheck2 text typelevel-tensor vector + array base containers directory fgl filepath HUnit mtl + numeric-prelude process QuickCheck random repa test-framework + test-framework-hunit test-framework-quickcheck2 text + typelevel-tensor vector ]; homepage = "http://www.paraiso-lang.org/wiki/index.php/Main_Page"; description = "a code generator for partial differential equations solvers"; @@ -21894,6 +21895,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-iproute" = callPackage + ({ mkDerivation, aeson, base, iproute, text }: + mkDerivation { + pname = "aeson-iproute"; + version = "0.1.1"; + sha256 = "9fc733cbe7d47e69b33a0003a73e82f337846006de672f87ce1eafbe6bc159af"; + libraryHaskellDepends = [ aeson base iproute text ]; + homepage = "https://github.com/greydot/aeson-iproute"; + description = "Aeson instances for iproute types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-lens" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, lens, text , unordered-containers, vector @@ -28590,6 +28603,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arghwxhaskell" = callPackage + ({ mkDerivation, base, directory, wx }: + mkDerivation { + pname = "arghwxhaskell"; + version = "0.8.2.0"; + sha256 = "6b88ad21393cde84f137f280826de31f121f35cf99c6c3472e423611723cdd5b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory wx ]; + homepage = "https://wiki.haskell.org/Argh!"; + description = "An interpreter for the Argh! programming language in wxHaskell"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "argon" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , containers, directory, docopt, filepath, ghc, ghc-paths @@ -38336,6 +38363,8 @@ self: { pname = "bytestring-builder"; version = "0.10.4.0.1"; sha256 = "2079e5f8b269b4b90095d69f864dcbddfac2499ef985086af8e5d0ddcc341047"; + revision = "1"; + editedCabalFile = "2184b845a3059f681324e4c71d041ec0ee5268208149877a06a5c93618c28e9b"; libraryHaskellDepends = [ base bytestring deepseq ]; doHaddock = false; jailbreak = true; @@ -38350,6 +38379,8 @@ self: { pname = "bytestring-builder"; version = "0.10.4.1.0"; sha256 = "bf728099333a09ba28b8c48b28db52eac86d5e48421f7318e13e825a61ab197e"; + revision = "1"; + editedCabalFile = "44ec650d19703746349ce9f3b78ab2deb3f796836cd7120d796f2720e74fdb86"; libraryHaskellDepends = [ base bytestring deepseq ]; doHaddock = false; jailbreak = true; @@ -48691,8 +48722,8 @@ self: { }: mkDerivation { pname = "conduit-iconv"; - version = "0.1.1.0"; - sha256 = "90a008befeaf1c51412f646c11c9c66ce595725d397061e2f2af3d7c5b99ca2e"; + version = "0.1.1.1"; + sha256 = "54a25274f4f3590a6b35ac86a3753dc867a505867cae5d363f775781f4b6ac05"; libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit mtl QuickCheck test-framework @@ -59458,6 +59489,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dimensional-codata" = callPackage + ({ mkDerivation, base, dimensional, numtype-dk }: + mkDerivation { + pname = "dimensional-codata"; + version = "2014.0.0.0"; + sha256 = "45a4eac9e27997493f2bcb2977098ede8443c6eda263a447125446e203a7cae3"; + libraryHaskellDepends = [ base dimensional numtype-dk ]; + homepage = "https://github.com/dmcclean/dimensional-codata"; + description = "CODATA Recommended Physical Constants with Dimensional Types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dimensional-tf" = callPackage ({ mkDerivation, base, numtype-tf, time }: mkDerivation { @@ -65583,6 +65626,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "error-util" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "error-util"; + version = "0.0.1.1"; + sha256 = "68d133f2211d9be2f66f7529d1d2251ec13f12f9ccdd5f1c96be53f09cf3e193"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/pmlodawski/error-util"; + description = "Set of utils and operators for error handling"; + license = stdenv.lib.licenses.mit; + }) {}; + "errorcall-eq-instance_0_1_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { @@ -76943,33 +76998,6 @@ self: { }) {}; "git-fmt" = callPackage - ({ mkDerivation, aeson, base, exceptions, extra, fast-logger - , filepath, monad-logger, monad-parallel, mtl, optparse-applicative - , pipes, pipes-concurrency, temporary, text, time - , unordered-containers, yaml - }: - mkDerivation { - pname = "git-fmt"; - version = "0.3.1.0"; - sha256 = "9342baf14ec7e0b4dbeb919fdf33588860ecf9ca706297e9601a055483e54ae2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base extra filepath monad-logger mtl pipes text - unordered-containers yaml - ]; - executableHaskellDepends = [ - base exceptions extra fast-logger filepath monad-logger - monad-parallel mtl optparse-applicative pipes pipes-concurrency - temporary text time - ]; - homepage = "https://github.com/hjwylde/git-fmt"; - description = "Custom git command for formatting code"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "git-fmt_0_3_1_1" = callPackage ({ mkDerivation, aeson, base, exceptions, extra, fast-logger , filepath, monad-logger, monad-parallel, mtl, optparse-applicative , pipes, pipes-concurrency, temporary, text, time @@ -77142,31 +77170,27 @@ self: { "git-vogue" = callPackage ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff , directory, filepath, formatting, ghc-mod, haskell-src-exts, hlint - , hscolour, hspec, mtl, optparse-applicative, process, split - , strict, stylish-haskell, temporary, text, transformers, unix + , hscolour, hspec, optparse-applicative, process, split, strict + , stylish-haskell, temporary, text, transformers, unix }: mkDerivation { pname = "git-vogue"; - version = "0.2.0.1"; - sha256 = "2c99b2cdd585c00d819ea492516ce3075f20bdf3187c6472ffb7453779f034d0"; + version = "0.2.1.0"; + sha256 = "cb42012a44e2b106963c3f4ee94dfbd5efba05715eda6753f9b4485e9a45bcd9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory filepath formatting ghc-mod hlint mtl - optparse-applicative process split stylish-haskell text - transformers unix + base containers directory filepath formatting optparse-applicative + process split text transformers unix ]; executableHaskellDepends = [ - base bifunctors Cabal containers cpphs Diff directory filepath - ghc-mod haskell-src-exts hlint hscolour optparse-applicative - process split strict stylish-haskell text + base bifunctors Cabal cpphs Diff directory ghc-mod haskell-src-exts + hlint hscolour optparse-applicative strict stylish-haskell text ]; testHaskellDepends = [ base containers directory filepath hspec process temporary - transformers unix ]; - jailbreak = true; - homepage = "https://github.com/anchor/git-vogue"; + homepage = "https://github.com/oswynb/git-vogue"; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -81333,6 +81357,8 @@ self: { pname = "groundhog-postgresql"; version = "0.7.0.2"; sha256 = "312045c39c973596e8e92b8001776bb86898e3c8766e0a42c71e63b343918da3"; + revision = "1"; + editedCabalFile = "014cf49927d870d99d906064fc27ee219f7145e71a409cc69ae3ed0cdc0699ca"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring containers groundhog monad-control monad-logger postgresql-libpq postgresql-simple @@ -95330,8 +95356,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "0.27"; - sha256 = "691f842116178037a338db298dc179b304b10349d98d3df1a4981ca57b57df4b"; + version = "0.27.1"; + sha256 = "98721c60eb3d30005f51fc1468c6d8a95d87088a2bfa0c95c734569820fd9c4b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -95339,7 +95365,6 @@ self: { hledger hledger-lib HUnit lens pretty-show safe split time transformers vector vty ]; - jailbreak = true; homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; @@ -109331,6 +109356,24 @@ self: { license = "GPL"; }) {}; + "incremental-parser_0_2_4_1" = callPackage + ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck + , tasty, tasty-quickcheck + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.2.4.1"; + sha256 = "1630a763db0808cfa4c1439365e21a53a378b38c2c02957539a9f75bb482b054"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/blamario/incremental-parser"; + description = "Generic parser library capable of providing partial results from partial input"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -110596,7 +110639,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "io-streams" = callPackage + "io-streams_1_3_2_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , deepseq, directory, filepath, HUnit, mtl, network, primitive , process, QuickCheck, test-framework, test-framework-hunit @@ -110620,6 +110663,34 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "io-streams" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , deepseq, directory, filepath, HUnit, mtl, network, primitive + , process, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers, vector + , zlib, zlib-bindings + }: + mkDerivation { + pname = "io-streams"; + version = "1.3.3.1"; + sha256 = "9a0849eb2efaf72312bbba672c2a589763c15dde50e93a53c64d2b594b80f544"; + configureFlags = [ "-fnointeractivetests" ]; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder network primitive + process text time transformers vector zlib-bindings + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder deepseq directory + filepath HUnit mtl network primitive process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time transformers vector zlib zlib-bindings + ]; + doCheck = false; + description = "Simple, composable, and easy-to-use stream I/O"; + license = stdenv.lib.licenses.bsd3; }) {}; "io-streams-http" = callPackage @@ -119609,10 +119680,8 @@ self: { }: mkDerivation { pname = "libravatar"; - version = "0.1.0.1"; - sha256 = "a58713664cab79ddc03c4faa92175a81fe179b51b852ce46570486cb3bb42d03"; - revision = "1"; - editedCabalFile = "decdd92e332caef49c016d1779e401dc3288b753e73317d639e279a8048a766d"; + version = "0.1.0.2"; + sha256 = "3df4437eb2345e46f4a2964c4c8d61b8e56ac936d63c9902227c74eed9671885"; libraryHaskellDepends = [ base bytestring crypto-api dns network-uri pureMD5 random SHA url utf8-string @@ -122603,6 +122672,8 @@ self: { pname = "lol"; version = "0.1.0.0"; sha256 = "be1a72e80ca1f3471b1b630f0407fa6e152ce6410ea7aee86fabda002dff12d0"; + revision = "1"; + editedCabalFile = "f70d927711c82b11f9d38d398bf8d450788482693cdbde540331ca50674b8e68"; libraryHaskellDepends = [ arithmoi base constraints containers data-default deepseq MonadRandom mtl numeric-prelude QuickCheck random reflection repa @@ -123302,8 +123373,8 @@ self: { }: mkDerivation { pname = "luminance"; - version = "0.7.1"; - sha256 = "36aabb520ede1cd9dfe6e6c5dc6a45d21c06500e1fdf66ce497e3081d27d56a0"; + version = "0.7.2"; + sha256 = "0ae406e8958c1e6f2520a01d74a55b70d158198ef0d08bbaf30452dc54e9deab"; libraryHaskellDepends = [ base containers contravariant dlist gl linear mtl resourcet semigroups transformers vector void @@ -127681,16 +127752,13 @@ self: { ({ mkDerivation, base, containers, directory, filepath, tconfig }: mkDerivation { pname = "minimal-configuration"; - version = "0.1.1"; - sha256 = "83b4efb30c599c0262e63f5cad7583fa1b065dfa869029be52c54d302808271b"; - revision = "1"; - editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80"; + version = "0.1.2"; + sha256 = "7debae44339df6a1c35e99be9807df430fac30d6c27b606f36fe23deed4d928e"; libraryHaskellDepends = [ base containers directory filepath tconfig ]; - jailbreak = true; description = "Minimal ini like configuration library with a few extras"; - license = stdenv.lib.licenses.bsd3; + license = "unknown"; }) {}; "minimorph" = callPackage @@ -137451,8 +137519,8 @@ self: { }: mkDerivation { pname = "opencog-atomspace"; - version = "0.1.0.1"; - sha256 = "23fe1b2e746b29b6e4a9339aba4c5274b9369572a53856c87aa00a561057b505"; + version = "0.1.0.2"; + sha256 = "fc7d96645ef0c14e56ffdbcad9537f0ea766616ac3f1dc105e817a53990a30d1"; libraryHaskellDepends = [ base containers directory filepath mtl template-haskell transformers @@ -142707,6 +142775,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent-iproute" = callPackage + ({ mkDerivation, aeson, aeson-iproute, base, bytestring + , http-api-data, iproute, path-pieces, persistent, text + }: + mkDerivation { + pname = "persistent-iproute"; + version = "0.2.1"; + sha256 = "6788ed3e45195a58af71338f1fddecfbe44e079d0a164afac8bf15934199db33"; + libraryHaskellDepends = [ + aeson aeson-iproute base bytestring http-api-data iproute + path-pieces persistent text + ]; + homepage = "https://github.com/greydot/persistent-iproute"; + description = "Persistent instances for types in iproute"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-map" = callPackage ({ mkDerivation, base, binary, containers, directory, EdisonAPI , EdisonCore, filepath, LRU, mtl, stm-io-hooks @@ -143199,7 +143284,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-postgresql" = callPackage + "persistent-postgresql_2_2_1_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent , postgresql-libpq, postgresql-simple, resourcet, text, time @@ -143217,6 +143302,28 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "persistent-postgresql" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-control, monad-logger, persistent + , postgresql-libpq, postgresql-simple, resourcet, text, time + , transformers + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.2.1.2"; + sha256 = "475523d2ac2c9719bf7e4034f97aed79e96c63001ef735b8148b657049e7e83a"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers + monad-control monad-logger persistent postgresql-libpq + postgresql-simple resourcet text time transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -149317,7 +149424,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "profunctors" = callPackage + "profunctors_5_1_1" = callPackage ({ mkDerivation, base, comonad, distributive, tagged, transformers }: mkDerivation { @@ -149330,9 +149437,10 @@ self: { homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "profunctors_5_1_2" = callPackage + "profunctors" = callPackage ({ mkDerivation, base, bifunctors, comonad, contravariant , distributive, tagged, transformers }: @@ -149347,7 +149455,6 @@ self: { homepage = "http://github.com/ekmett/profunctors/"; description = "Profunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "progress" = callPackage @@ -154015,7 +154122,7 @@ self: { }) {}; "reedsolomon" = callPackage - ({ mkDerivation, base, bytestring, bytestring-mmap, clock, cpu + ({ mkDerivation, base, bytestring, bytestring-mmap, clock , criterion, deepseq, exceptions, filepath, gitrev, loop, mtl , optparse-applicative, primitive, profunctors, QuickCheck, random , reedsolomon, statistics, tasty, tasty-ant-xml, tasty-hunit @@ -154023,8 +154130,8 @@ self: { }: mkDerivation { pname = "reedsolomon"; - version = "0.0.1.2"; - sha256 = "fb5a25543a54367aa18c274d51e46b9adeabd74ef1a6ea0d60390f29cd4a219b"; + version = "0.0.2.0"; + sha256 = "f1e61e07374a43ba48d2e8a152a451328ea343432009681c80a87cce8cd85d1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154037,7 +154144,7 @@ self: { optparse-applicative random statistics vector ]; testHaskellDepends = [ - base bytestring cpu exceptions loop mtl primitive profunctors + base bytestring exceptions loop mtl primitive profunctors QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck vector ]; @@ -157769,8 +157876,8 @@ self: { }: mkDerivation { pname = "rethinkdb"; - version = "2.1.0.2"; - sha256 = "80689203aafcbf26b555952953012fc1a1272d2e28cd5dcc30fcceb50951fd07"; + version = "2.2.0.0"; + sha256 = "a3e629d72bb63150f764c33e2fe507391ee1e77bd4097114fbca73a5d24ca429"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159256,6 +159363,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rtcm" = callPackage + ({ mkDerivation, base, basic-prelude, tasty, tasty-hunit }: + mkDerivation { + pname = "rtcm"; + version = "0.1.0"; + sha256 = "efff5ccbb113897027a7a5a24616a498e37d769341c026342ad19f03490bc2a4"; + libraryHaskellDepends = [ base basic-prelude ]; + testHaskellDepends = [ base basic-prelude tasty tasty-hunit ]; + homepage = "http://github.com/swift-nav/librtcm"; + description = "Haskell bindings for RTCM"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rtld" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -171892,8 +172012,8 @@ self: { }: mkDerivation { pname = "sscgi"; - version = "0.3.0"; - sha256 = "f90432d5f11e1f5c411e4478180d8882d573bdacc250cfac27800408bb99705e"; + version = "0.3.1"; + sha256 = "0925d1a384fae39255bd927f2ffa787e84d270fbd747e703f32ae41af06fcf3b"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive containers Glob MonadCatchIO-mtl mtl transformers utf8-string @@ -174043,6 +174163,8 @@ self: { resourcet stm stm-chans test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; + doHaddock = false; + doCheck = false; homepage = "https://github.com/wowus/stm-conduit"; description = "Introduces conduits to channels, and promotes using conduits concurrently"; license = stdenv.lib.licenses.bsd3; @@ -174658,30 +174780,33 @@ self: { }) {}; "streaming" = callPackage - ({ mkDerivation, base, bytestring, mmorph, mtl, time, transformers + ({ mkDerivation, base, bytestring, containers, exceptions, mmorph + , mtl, resourcet, time, transformers, transformers-base }: mkDerivation { pname = "streaming"; - version = "0.1.2.2"; - sha256 = "1d67401731689b4904fff6fa45ed7257c0c076e4e619714c48443804b6e94beb"; + version = "0.1.3.3"; + sha256 = "7199654f1bfbbed976264a49eab8de8c53a350e156115fe5a9da0a5a1798e507"; libraryHaskellDepends = [ - base bytestring mmorph mtl time transformers + base bytestring containers exceptions mmorph mtl resourcet time + transformers transformers-base ]; homepage = "https://github.com/michaelt/streaming"; - description = "an elementary streaming prelude and a general monad transformer for streaming applications"; + description = "an elementary streaming prelude and a general stream type"; license = stdenv.lib.licenses.bsd3; }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, base, bytestring, deepseq, mmorph, mtl, streaming - , transformers + ({ mkDerivation, base, bytestring, deepseq, exceptions, mmorph, mtl + , resourcet, streaming, transformers, transformers-base }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.2.2"; - sha256 = "db5ab6c378458e57c4441f49b8564b9acfb5e64079b2c5c651d116ad0908c48d"; + version = "0.1.3.0"; + sha256 = "6573ebde6c87e608c0b82b02c25ac15094b93f1e99bd57aab275ca68d2630a13"; libraryHaskellDepends = [ - base bytestring deepseq mmorph mtl streaming transformers + base bytestring deepseq exceptions mmorph mtl resourcet streaming + transformers transformers-base ]; homepage = "https://github.com/michaelt/streaming-bytestring"; description = "effectful byte steams, or: bytestring io done right"; @@ -174993,8 +175118,8 @@ self: { }: mkDerivation { pname = "streaming-utils"; - version = "0.1.2.2"; - sha256 = "98aa08e5fb3665b7aa39934f657daf9473553a54946dd3102833e66c7cc65e4e"; + version = "0.1.3.0"; + sha256 = "f591d4e31aada0be4b0b9ac28b23a6b16d3c26db0f37b3ccb9e05239ab81e75b"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls json-stream mtl pipes streaming streaming-bytestring transformers @@ -179758,20 +179883,20 @@ self: { "templatepg" = callPackage ({ mkDerivation, base, binary, bytestring, haskell-src-meta, mtl - , network, old-locale, parsec, regex-compat, regex-posix - , template-haskell, time, utf8-string + , network, parsec, regex-compat, regex-posix, template-haskell + , time, utf8-string }: mkDerivation { pname = "templatepg"; - version = "0.2.6"; - sha256 = "67317c39b93db3a74ec7fc39f37cd273c6ee6673e539c1c1c6433d6a8b8eaac4"; + version = "0.2.7"; + sha256 = "d0b35e35bff5ac9d2605c54fa20586d6286376ae1362dad0e069a65dc9e1002f"; libraryHaskellDepends = [ - base binary bytestring haskell-src-meta mtl network old-locale - parsec regex-compat regex-posix template-haskell time utf8-string + base binary bytestring haskell-src-meta mtl network parsec + regex-compat regex-posix template-haskell time utf8-string ]; homepage = "https://github.com/jekor/templatepg"; description = "A PostgreSQL access library with compile-time SQL type inference"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -190488,8 +190613,8 @@ self: { }: mkDerivation { pname = "validation"; - version = "0.5.1"; - sha256 = "0b170b835eb2df60b0b620ac7e64127926f7f7e5e682ee712acd53999422dd25"; + version = "0.5.2"; + sha256 = "dd1a5857ead5b9ceec3839c9b6af7f3096bbc5694e37e34dfd4be7c1d5f35437"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; @@ -191164,19 +191289,6 @@ self: { }) {}; "vector-fftw" = callPackage - ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: - mkDerivation { - pname = "vector-fftw"; - version = "0.1.3.3"; - sha256 = "131d88fa9ea17e7e46a6d886f37e77282e8e95f2022ccefd2cf11adeca0b9172"; - libraryHaskellDepends = [ base primitive storable-complex vector ]; - librarySystemDepends = [ fftw ]; - homepage = "http://hackage.haskell.org/package/vector-fftw"; - description = "A binding to the fftw library for one-dimensional vectors"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) fftw;}; - - "vector-fftw_0_1_3_5" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; @@ -191187,7 +191299,6 @@ self: { homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage @@ -195801,6 +195912,8 @@ self: { pname = "warp-tls"; version = "3.1.4"; sha256 = "7572b8893160a07051a60323e91553b8911d87d58712c64f997ecced1a5febd7"; + revision = "1"; + editedCabalFile = "39cf89625ffec9af354d3e502b6974ca122adf0241c9e1e6815bf4c11fb34535"; libraryHaskellDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -197809,23 +197922,24 @@ self: { ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-swf, base, basic-prelude, bytestring, conduit , conduit-extra, exceptions, fast-logger, formatting, http-conduit - , lens, monad-control, monad-logger, mtl, mtl-compat + , http-types, lens, monad-control, monad-logger, mtl, mtl-compat , optparse-applicative, resourcet, safe, shelly, tasty, tasty-hunit , text, time, transformers, transformers-base, unordered-containers , uuid, yaml }: mkDerivation { pname = "wolf"; - version = "0.2.1"; - sha256 = "e4ab9971eab661b1c614b02d2f3bb9457a85d8479855cc5f0a3656a05205cbe5"; + version = "0.2.2"; + sha256 = "73a4d33c24eef17da4f09544f478a65ab73935cc720f94d7a62977917b80428b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-swf base basic-prelude bytestring conduit conduit-extra exceptions - fast-logger formatting http-conduit lens monad-control monad-logger - mtl mtl-compat optparse-applicative resourcet safe text time - transformers transformers-base unordered-containers uuid yaml + fast-logger formatting http-conduit http-types lens monad-control + monad-logger mtl mtl-compat optparse-applicative resourcet safe + text time transformers transformers-base unordered-containers uuid + yaml ]; executableHaskellDepends = [ aeson amazonka-core base basic-prelude bytestring @@ -203943,7 +204057,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-bin" = callPackage + "yesod-bin_1_4_14" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, deepseq, directory, file-embed @@ -203974,6 +204088,40 @@ self: { homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-bin" = callPackage + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, deepseq, directory, file-embed + , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, shakespeare, split, streaming-commons, tar + , template-haskell, text, time, transformers, transformers-compat + , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls + , yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.4.15"; + sha256 = "85d132bf823a8638db38aace4770c8e4bf1de9fcd39f91f6537e17ae6a04a4d6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class deepseq + directory file-embed filepath fsnotify ghc ghc-paths http-client + http-conduit http-reverse-proxy http-types lifted-base network + optparse-applicative parsec process project-template resourcet + shakespeare split streaming-commons tar template-haskell text time + transformers transformers-compat unix-compat unordered-containers + wai wai-extra warp warp-tls yaml zlib + ]; + homepage = "http://www.yesodweb.com/"; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-bootstrap" = callPackage @@ -204752,7 +204900,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core" = callPackage + "yesod-core_1_4_15_1" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -204789,6 +204937,46 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-core" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , data-default, deepseq, directory, exceptions, fast-logger, hspec + , hspec-expectations, http-types, HUnit, lifted-base, monad-control + , monad-logger, mtl, mwc-random, network, old-locale, parsec + , path-pieces, primitive, QuickCheck, random, resourcet, safe + , semigroups, shakespeare, streaming-commons, template-haskell + , text, time, transformers, transformers-base, unix-compat + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.16"; + sha256 = "26bab99551e7f6318f367947606129a9360f3a00e04c3ed5d783de9878ebd268"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq directory + exceptions fast-logger http-types lifted-base monad-control + monad-logger mtl mwc-random old-locale parsec path-pieces primitive + random resourcet safe semigroups shakespeare template-haskell text + time transformers transformers-base unix-compat + unordered-containers vector wai wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-crud" = callPackage @@ -205150,7 +205338,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-form" = callPackage + "yesod-form_1_4_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -205172,6 +205360,31 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-form" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , semigroups, shakespeare, template-haskell, text, time + , transformers, wai, xss-sanitize, yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.4.6"; + sha256 = "1a20f58e0f06b92afc5bd31b5ab6b1d5c6645e2f7fd134c4b2e325d818b50e66"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet semigroups shakespeare + template-haskell text time transformers wai xss-sanitize yesod-core + yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + homepage = "http://www.yesodweb.com/"; + description = "Form handling support for Yesod Web Framework"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-form-json" = callPackage diff --git a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch deleted file mode 100644 index 231853fe51a..00000000000 --- a/pkgs/development/interpreters/perl/5.16/cpp-precomp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hints/darwin.sh 2013-05-08 11:13:45.000000000 -0600 -+++ b/hints/darwin.sh 2013-05-08 11:15:04.000000000 -0600 -@@ -129,7 +129,7 @@ - - # Avoid Apple's cpp precompiler, better for extensions - if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then -- cppflags="${cppflags} -no-cpp-precomp" -+ #cppflags="${cppflags} -no-cpp-precomp" - - # This is necessary because perl's build system doesn't - # apply cppflags to cc compile lines as it should. diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix deleted file mode 100644 index 568025edfd4..00000000000 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ lib, stdenv, fetchurl, enableThreading ? true }: - -let - - libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; - -in - -stdenv.mkDerivation rec { - name = "perl-5.16.3"; - - src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "1dpd9lhc4723wmsn4dsn4m320qlqgyw28bvcbhnfqp2nl3f0ikv9"; - }; - - patches = - [ # Do not look in /usr etc. for dependencies. - ./no-sys-dirs.patch - ./no-impure-config-time.patch - ./fixed-man-page-date.patch - ./no-date-in-perl-binary.patch - ] - ++ lib.optional stdenv.isSunOS ./ld-shared.patch - ++ lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; - - # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd - # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them - # while at the same time erasing the PATH environment variable so it unconditionally - # fails. The code in question is guarded by a check for Mac OS, but the patch below - # doesn't have any runtime effect on other platforms. - postPatch = '' - pwd="$(type -P pwd)" - substituteInPlace dist/Cwd/Cwd.pm \ - --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'" - ''; - - # Build a thread-safe Perl with a dynamic libperls.o. We need the - # "installstyle" option to ensure that modules are put under - # $out/lib/perl5 - this is the general default, but because $out - # contains the string "perl", Configure would select $out/lib. - # Miniperl needs -lm. perl needs -lrt. - configureFlags = - [ "-de" - "-Uinstallusrbinperl" - "-Dinstallstyle=lib/perl5" - "-Duseshrplib" - "-Dlocincpth=${libc}/include" - "-Dloclibpth=${libc}/lib" - ] - ++ lib.optional enableThreading "-Dusethreads"; - - configureScript = "${stdenv.shell} ./Configure"; - - dontAddPrefix = true; - - enableParallelBuilding = true; - - preConfigure = - '' - configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - - ${lib.optionalString stdenv.isArm '' - configureFlagsArray=(-Dldflags="-lm -lrt") - ''} - - ${lib.optionalString stdenv.isCygwin '' - cp cygwin/cygwin.c{,.bak} - echo "#define PERLIO_NOT_STDIO 0" > tmp - cat tmp cygwin/cygwin.c.bak > cygwin/cygwin.c - ''} - ''; - - preBuild = lib.optionalString (!(stdenv ? cc && stdenv.cc.nativeTools)) - '' - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" - ''; - - setupHook = ./setup-hook.sh; - - passthru.libPrefix = "lib/perl5/site_perl"; -} diff --git a/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch b/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch deleted file mode 100644 index 79f9bc3658e..00000000000 --- a/pkgs/development/interpreters/perl/5.16/fixed-man-page-date.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cpan/podlators/lib/Pod/Man.pm 2014-04-07 06:25:23.730505243 +0200 -+++ b/cpan/podlators/lib/Pod/Man.pm 2014-04-07 06:26:40.816552603 +0200 -@@ -768,7 +768,7 @@ - } else { - ($name, $section) = $self->devise_title; - } -- my $date = $$self{date} || $self->devise_date; -+ my $date = "1970-01-01"; # Fixed date for NixOS, orig: $$self{date} || $self->devise_date; - $self->preamble ($name, $section, $date) - unless $self->bare_output or DEBUG > 9; - diff --git a/pkgs/development/interpreters/perl/5.16/ld-shared.patch b/pkgs/development/interpreters/perl/5.16/ld-shared.patch deleted file mode 100644 index be45230c8a7..00000000000 --- a/pkgs/development/interpreters/perl/5.16/ld-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 -+++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 -@@ -568,7 +568,7 @@ - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - # fi - ldflags="$ldflags -m64" -- lddlflags="$lddlflags -G -m64" -+ lddlflags="$lddlflags -shared -m64" - ;; - *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch b/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch deleted file mode 100644 index 00ea47ae45f..00000000000 --- a/pkgs/development/interpreters/perl/5.16/no-date-in-perl-binary.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/perl.c 2014-04-07 07:58:01.402831615 +0200 -+++ b/perl.c 2014-04-07 07:59:38.556945298 +0200 -@@ -1754,7 +1754,7 @@ - PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, - sizeof(non_bincompat_options) - 1, SVs_TEMP)); - --#ifdef __DATE__ -+#if 0 - # ifdef __TIME__ - PUSHs(Perl_newSVpvn_flags(aTHX_ - STR_WITH_LEN("Compiled at " __DATE__ " " __TIME__), diff --git a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch b/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch deleted file mode 100644 index 1382de70625..00000000000 --- a/pkgs/development/interpreters/perl/5.16/no-impure-config-time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Configure 2014-04-05 20:21:33.714635700 +0200 -+++ b/Configure 2014-04-05 20:23:23.377441026 +0200 -@@ -3609,6 +3609,8 @@ - - : who configured the system - cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` -+cf_time='Thu Jan 1 00:00:01 UTC 1970' -+ - case "$cf_by" in - "") - cf_by=`(logname) 2>/dev/null` diff --git a/pkgs/development/interpreters/perl/5.16/no-libutil.patch b/pkgs/development/interpreters/perl/5.16/no-libutil.patch deleted file mode 100644 index 9b749bccf32..00000000000 --- a/pkgs/development/interpreters/perl/5.16/no-libutil.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure ---- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 -@@ -1368,7 +1368,7 @@ - : List of libraries we want. - : If anyone needs extra -lxxx, put those in a hint file. - libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" --libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" -+libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. - glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` diff --git a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch deleted file mode 100644 index 883b24889c3..00000000000 --- a/pkgs/development/interpreters/perl/5.16/no-sys-dirs.patch +++ /dev/null @@ -1,225 +0,0 @@ -diff --git a/Configure b/Configure -index fdbbf20..ba1fd07 100755 ---- a/Configure -+++ b/Configure -@@ -106,15 +106,7 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' ) 2>&1 >/dev/null ; then - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1323,8 +1315,7 @@ archobjs='' - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1335,17 +1326,12 @@ DEBUGGING='' - - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1380,8 +1366,6 @@ libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2389,7 +2373,6 @@ uname - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth /lib /usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -4708,7 +4691,7 @@ $rm -f testcpp.c testcpp.out - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8354,13 +8337,8 @@ esac - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -19742,9 +19720,10 @@ $rm_try tryp - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL -index 439f254..2cdfdb0 100644 ---- a/ext/Errno/Errno_pm.PL -+++ b/ext/Errno/Errno_pm.PL -@@ -137,11 +137,7 @@ sub get_files { - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i -- # might be using, say, Intel's icc -- ) { -+ } elsif (0) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives - my $linux_errno_h = -e '/usr/include/errno.h' ? -diff --git a/hints/freebsd.sh b/hints/freebsd.sh -index a67c0bb..0f07ca5 100644 ---- a/hints/freebsd.sh -+++ b/hints/freebsd.sh -@@ -119,21 +119,21 @@ case "$osvers" in - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' -diff --git a/hints/linux.sh b/hints/linux.sh -index 688c68d..c12f5f5 100644 ---- a/hints/linux.sh -+++ b/hints/linux.sh -@@ -60,17 +60,6 @@ libswanted="$*" - # Debian 4.0 puts ndbm in the -lgdbm_compat library. - libswanted="$libswanted gdbm_compat" - --# If you have glibc, then report the version for ./myconfig bug reporting. --# (Configure doesn't need to know the specific version since it just uses --# gcc to load the library for all tests.) --# We don't use __GLIBC__ and __GLIBC_MINOR__ because they --# are insufficiently precise to distinguish things like --# libc-2.0.6 and libc-2.0.7. --if test -L /lib/libc.so.6; then -- libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` -- libc=/lib/$libc --fi -- - # Configure may fail to find lstat() since it's a static/inline - # function in . - d_lstat=define -@@ -154,24 +143,6 @@ case "$optimize" in - ;; - esac - --# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries --# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us --# where to look. We don't want gcc's own libraries, however, so we --# filter those out. --# This could be conditional on Unbuntu, but other distributions may --# follow suit, and this scheme seems to work even on rather old gcc's. --# This unconditionally uses gcc because even if the user is using another --# compiler, we still need to find the math library and friends, and I don't --# know how other compilers will cope with that situation. --# Morever, if the user has their own gcc earlier in $PATH than the system gcc, --# we don't want its libraries. So we try to prefer the system gcc --# Still, as an escape hatch, allow Configure command line overrides to --# plibpth to bypass this check. --if [ -x /usr/bin/gcc ] ; then -- gcc=/usr/bin/gcc --else -- gcc=gcc --fi - - case "$plibpth" in - '') plibpth=`LANG=C LC_ALL=C $gcc -print-search-dirs | grep libraries | -@@ -345,22 +316,6 @@ sparc*) - ;; - esac - --# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than --# true libraries. The scripts cause binding against static --# version of -lgdbm which is a bad idea. So if we have 'nm' --# make sure it can read the file --# NI-S 2003/08/07 --if [ -r /usr/lib/libndbm.so -a -x /usr/bin/nm ] ; then -- if /usr/bin/nm /usr/lib/libndbm.so >/dev/null 2>&1 ; then -- echo 'Your shared -lndbm seems to be a real library.' -- else -- echo 'Your shared -lndbm is not a real library.' -- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` -- shift -- libswanted="$*" -- fi --fi -- - - # This script UU/usethreads.cbu will get 'called-back' by Configure - # after it has prompted the user for whether to use threads. diff --git a/pkgs/development/interpreters/perl/5.16/setup-hook.sh b/pkgs/development/interpreters/perl/5.16/setup-hook.sh deleted file mode 100644 index a8656b8531d..00000000000 --- a/pkgs/development/interpreters/perl/5.16/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/perl5/site_perl -} - -envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index 3ae74057a54..36925bcdf55 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -17,7 +17,7 @@ # This seperates "what to build" (the exact gem versions) from "how to build" # (to make gems behave if necessary). -{ lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which +{ lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin @@ -105,6 +105,10 @@ in ''; }; + timfel-krb5-auth = attrs: { + buildInputs = [ kerberos ]; + }; + therubyracer = attrs: { buildFlags = [ "--with-v8-dir=${v8}" diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index b060498d40a..c6ead673982 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova -, libjpeg, gsl }: +, curl, libjpeg, gsl }: stdenv.mkDerivation { - name = "indilib-1.0.0"; + name = "indilib-1.1.0"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_1.0.0.tar.gz; - sha256 = "0f66jykpjk8mv50lc3rywbqj9mqr4p2n1igfb1222h5fs83c1jhm"; + url = mirror://sourceforge/indi/libindi_1.1.0.tar.gz; + sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; }; patches = [ ./udev-dir.patch ] ; - propagatedBuildInputs = [ cmake cfitsio libusb zlib boost + buildInputs = [ curl cmake cfitsio libusb zlib boost libnova libjpeg gsl ]; meta = { - homepage = http://indi.sf.net; + homepage = http://www.indilib.org/; + license = stdenv.lib.licenses.lgpl2Plus; + description = "Implementaion of the INDI protocol for POSIX operating systems"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 884924f643d..a9c83594179 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.3.0"; + name = "libassuan-2.4.2"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0lh4698pgb2wjrrrbdk14llizad5l74f8pdbg4ma4zq4fbsrkjc7"; + sha256 = "086bbcdnvs48qq5g4iac7dpk76j0q3jrp16mchdvyx0b720xq1mv"; }; buildInputs = [ libgpgerror pth ]; diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix index 9175da0bca4..0c9c62dfb92 100644 --- a/pkgs/development/libraries/openssl/1.0.2.x.nix +++ b/pkgs/development/libraries/openssl/1.0.2.x.nix @@ -8,14 +8,14 @@ let stdenv.cross; in stdenv.mkDerivation rec { - name = "openssl-1.0.2d"; + name = "openssl-1.0.2e"; src = fetchurl { urls = [ "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "d01d17b44663e8ffa6a33a5a30053779d9593c3d"; + sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72"; }; patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 5ed30731a68..21e7706be8c 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -8,14 +8,14 @@ let stdenv.cross; in stdenv.mkDerivation rec { - name = "openssl-1.0.1p"; + name = "openssl-1.0.1q"; src = fetchurl { urls = [ "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "9d1977cc89242cd11471269ece2ed4650947c046"; + sha256 = "1dvz0hx7fjxag06b51pawy154y6d2xajm5rwxmfnlq7ax628nrdk"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch b/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch new file mode 100644 index 00000000000..7757691bfca --- /dev/null +++ b/pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch @@ -0,0 +1,24 @@ +diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py +--- a/django/contrib/gis/gdal/libgdal.py ++++ b/django/contrib/gis/gdal/libgdal.py +@@ -17,7 +17,7 @@ try: + lib_path = settings.GDAL_LIBRARY_PATH + except (AttributeError, EnvironmentError, + ImportError, ImproperlyConfigured): +- lib_path = None ++ lib_path = "@gdal@/lib/libgdal.so" + + if lib_path: + lib_names = None +diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py +--- a/django/contrib/gis/geos/libgeos.py ++++ b/django/contrib/gis/geos/libgeos.py +@@ -23,7 +23,7 @@ try: + lib_path = settings.GEOS_LIBRARY_PATH + except (AttributeError, EnvironmentError, + ImportError, ImproperlyConfigured): +- lib_path = None ++ lib_path = "@geos@/lib/libgeos_c.so" + + # Setting the appropriate names for the GEOS-C library. + if lib_path: diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index d93c64a15a9..4a33a0cd8f3 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, pkgconfig, libelf, zlib, curl, elfutils, python, libiberty, binutils}: +{stdenv, fetchurl, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, binutils}: stdenv.mkDerivation rec { name = "kcov-${version}"; version = "29"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0nspf1bfq8zv7zmcmvkbgg3c90k10qcd56gyg8ln5z64nadvha9d"; }; - buildInputs = [ cmake pkgconfig libelf zlib curl elfutils python libiberty binutils ]; + preConfigure = "patchShebangs src/bin-to-c-source.py"; + buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ]; meta = with stdenv.lib; { description = "code coverage tester for compiled programs, Python scripts and shell scripts"; diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 60ff7b5ba3e..28b0e7f8aa4 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,95 +1,173 @@ GEM remote: https://rubygems.org/ specs: - chef (12.0.3) - chef-zero (~> 3.2) + builder (3.2.2) + chef (12.5.1) + chef-config (= 12.5.1) + chef-zero (~> 4.2, >= 4.2.2) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) - ffi-yajl (~> 1.2) + ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) mixlib-authentication (~> 1.3) mixlib-cli (~> 1.4) - mixlib-config (~> 2.0) mixlib-log (~> 1.3) - mixlib-shellout (>= 2.0.0.rc.0, < 3.0) + mixlib-shellout (~> 2.0) net-ssh (~> 2.6) net-ssh-multi (~> 1.1) - ohai (~> 8.0) + ohai (>= 8.6.0.alpha.1, < 9) plist (~> 3.1.0) pry (~> 0.9) - chef-dk (0.4.0) - chef (~> 12.0) - cookbook-omnifetch (~> 0.2) - ffi-yajl (~> 1.0) + rspec-core (~> 3.2) + rspec-expectations (~> 3.2) + rspec-mocks (~> 3.2) + rspec_junit_formatter (~> 0.2.0) + serverspec (~> 2.7) + specinfra (~> 2.10) + syslog-logger (~> 1.6) + chef-config (12.5.1) + mixlib-config (~> 2.0) + mixlib-shellout (~> 2.0) + chef-dk (0.10.0) + chef (~> 12.0, >= 12.2.1) + chef-provisioning (~> 1.2) + cookbook-omnifetch (~> 0.2, >= 0.2.2) + diff-lcs (~> 1.0) + ffi-yajl (>= 1.0, < 3.0) + minitar (~> 0.5.4) mixlib-cli (~> 1.5) - mixlib-shellout (>= 2.0.0.rc.0, < 3.0.0) - solve (~> 1.2) - chef-zero (3.2.1) - ffi-yajl (~> 1.1) - hashie (~> 2.0) + mixlib-shellout (~> 2.0) + paint (~> 1.0) + solve (~> 2.0, >= 2.0.1) + chef-provisioning (1.5.0) + cheffish (~> 1.3, >= 1.3.1) + inifile (~> 2.0) + mixlib-install (~> 0.7.0) + net-scp (~> 1.0) + net-ssh (~> 2.0) + net-ssh-gateway (~> 1.2.0) + winrm (~> 1.3) + chef-zero (4.3.2) + ffi-yajl (~> 2.2) + hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack uuidtools (~> 2.1) + cheffish (1.6.0) + chef-zero (~> 4.3) coderay (1.1.0) - cookbook-omnifetch (0.2.0) + cookbook-omnifetch (0.2.2) minitar (~> 0.5.4) - dep-selector-libgecode (1.0.2) - dep_selector (1.0.3) - dep-selector-libgecode (~> 1.0) - ffi (~> 1.9) diff-lcs (1.2.5) erubis (2.7.0) - ffi (1.9.6) - ffi-yajl (1.4.0) - ffi (~> 1.5) + ffi (1.9.10) + ffi-yajl (2.2.2) libyajl2 (~> 1.2) - hashie (2.1.2) - highline (1.7.1) + gssapi (1.2.0) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hashie (3.4.3) + highline (1.7.8) + httpclient (2.7.0.1) + inifile (2.0.2) ipaddress (0.8.0) libyajl2 (1.2.0) + little-plugger (1.1.4) + logging (2.0.0) + little-plugger (~> 1.1) + multi_json (~> 1.10) method_source (0.8.2) - mime-types (2.4.3) + mime-types (2.99) minitar (0.5.4) mixlib-authentication (1.3.0) mixlib-log mixlib-cli (1.5.0) - mixlib-config (2.1.0) + mixlib-config (2.2.1) + mixlib-install (0.7.0) mixlib-log (1.6.0) - mixlib-shellout (2.0.1) - net-dhcp (1.3.2) + mixlib-shellout (2.2.5) + molinillo (0.2.3) + multi_json (1.11.2) + net-scp (1.2.1) + net-ssh (>= 2.6.5) net-ssh (2.9.2) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - net-ssh-multi (1.2.0) + net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) - ohai (8.1.1) + net-telnet (0.1.1) + nori (2.6.0) + ohai (8.7.0) + chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) - ffi-yajl (~> 1.1) + ffi-yajl (~> 2.2) ipaddress mime-types (~> 2.0) mixlib-cli mixlib-config (~> 2.0) mixlib-log mixlib-shellout (~> 2.0) - net-dhcp rake (~> 10.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) + paint (1.0.0) plist (3.1.0) - pry (0.10.1) + pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - rack (1.6.0) + rack (1.6.4) rake (10.4.2) + rspec (3.4.0) + rspec-core (~> 3.4.0) + rspec-expectations (~> 3.4.0) + rspec-mocks (~> 3.4.0) + rspec-core (3.4.1) + rspec-support (~> 3.4.0) + rspec-expectations (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-its (1.2.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.4.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.4.0) + rspec-support (3.4.1) + rspec_junit_formatter (0.2.3) + builder (< 4) + rspec-core (>= 2, < 4, != 2.12.0) + rubyntlm (0.4.0) semverse (1.2.1) + serverspec (2.24.3) + multi_json + rspec (~> 3.0) + rspec-its + specinfra (~> 2.43) + sfl (2.2) slop (3.6.0) - solve (1.2.1) - dep_selector (~> 1.0) + solve (2.0.1) + molinillo (~> 0.2.3) semverse (~> 1.1) - systemu (2.6.4) + specinfra (2.44.5) + net-scp + net-ssh (~> 2.7) + net-telnet + sfl + syslog-logger (1.6.8) + systemu (2.6.5) uuidtools (2.1.5) + winrm (1.3.6) + builder (>= 2.1.2) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.4.0) + uuidtools (~> 2.1.2) wmi-lite (1.0.0) PLATFORMS @@ -97,3 +175,6 @@ PLATFORMS DEPENDENCIES chef-dk + +BUNDLED WITH + 1.10.5 diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 043ee8adf42..3b427aae4d2 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { - name = "chefdk-0.4.0"; + name = "chefdk-0.10.0"; inherit ruby; gemfile = ./Gemfile; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index f83e73693d8..cb4c1fcb67d 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -1,11 +1,19 @@ { - "chef" = { - version = "12.0.3"; + "builder" = { + version = "3.2.2"; source = { type = "gem"; - sha256 = "0lqix0mli6fm3lwrf563sjvfkfsrnyzbz8xqkp54q65dkl63ldy0"; + sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; + }; + }; + "chef" = { + version = "12.5.1"; + source = { + type = "gem"; + sha256 = "0hf6766wmh1dg7f09hi80s8hn1knvzgnaimbhvc05b4q973k5lmb"; }; dependencies = [ + "chef-config" "chef-zero" "diff-lcs" "erubis" @@ -13,7 +21,6 @@ "highline" "mixlib-authentication" "mixlib-cli" - "mixlib-config" "mixlib-log" "mixlib-shellout" "net-ssh" @@ -21,28 +28,66 @@ "ohai" "plist" "pry" + "rspec-core" + "rspec-expectations" + "rspec-mocks" + "rspec_junit_formatter" + "serverspec" + "specinfra" + "syslog-logger" + ]; + }; + "chef-config" = { + version = "12.5.1"; + source = { + type = "gem"; + sha256 = "18iqlf9x3iavh6183zlkiasxsz45drshihmk8yj56prrzfiys67m"; + }; + dependencies = [ + "mixlib-config" + "mixlib-shellout" ]; }; "chef-dk" = { - version = "0.4.0"; + version = "0.10.0"; source = { type = "gem"; - sha256 = "12fdk5j6cymwk4vk45mvi5i1hs9a88jvg6g7x6pxbc0bp3if2c6a"; + sha256 = "0gxm8dbq7y4bf9wb8zad9q5idsl88f1nm3rvnd2am0xka6bnxv29"; }; dependencies = [ "chef" + "chef-provisioning" "cookbook-omnifetch" + "diff-lcs" "ffi-yajl" + "minitar" "mixlib-cli" "mixlib-shellout" + "paint" "solve" ]; }; - "chef-zero" = { - version = "3.2.1"; + "chef-provisioning" = { + version = "1.5.0"; source = { type = "gem"; - sha256 = "04zypmygpxz8nwhjs4gvr8rcb9vqhmz37clbh7k7xxh5b2hs654k"; + sha256 = "1xln9hf8mcm81cmw96ccmyzrak54fbjrl9wgii37rx04v4a2435n"; + }; + dependencies = [ + "cheffish" + "inifile" + "mixlib-install" + "net-scp" + "net-ssh" + "net-ssh-gateway" + "winrm" + ]; + }; + "chef-zero" = { + version = "4.3.2"; + source = { + type = "gem"; + sha256 = "1djnxs97kj13vj1hxx4v6978pkwm8i03p76gbirbp3z2zs6jyvjf"; }; dependencies = [ "ffi-yajl" @@ -52,6 +97,16 @@ "uuidtools" ]; }; + "cheffish" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "10aj660azybnf7444a604pjs8p9pvwm3n4mavy8mp3g30yr07paq"; + }; + dependencies = [ + "chef-zero" + ]; + }; "coderay" = { version = "1.1.0"; source = { @@ -60,33 +115,15 @@ }; }; "cookbook-omnifetch" = { - version = "0.2.0"; + version = "0.2.2"; source = { type = "gem"; - sha256 = "027zz78693jd5g0fwp0xlzig2zijsxcgvfw5854ig37gy5a54wy4"; + sha256 = "1ml25xc69nsgbvp9a6w9yi376rav7b659cvyr8qhfb4jaj4l1yd6"; }; dependencies = [ "minitar" ]; }; - "dep-selector-libgecode" = { - version = "1.0.2"; - source = { - type = "gem"; - sha256 = "0755ps446wc4cf26ggmvibr4wmap6ch7zhkh1qmx1p6lic2hr4gn"; - }; - }; - "dep_selector" = { - version = "1.0.3"; - source = { - type = "gem"; - sha256 = "1ic90j3d6hmyxmdxzdz8crwmvw61f4kj0jphk43m6ipcx6bkphzw"; - }; - dependencies = [ - "dep-selector-libgecode" - "ffi" - ]; - }; "diff-lcs" = { version = "1.2.5"; source = { @@ -102,35 +139,68 @@ }; }; "ffi" = { - version = "1.9.6"; + version = "1.9.10"; source = { type = "gem"; - sha256 = "1ckw1336rnyv9yvvl614qgkqqi477g4hljv6xsws2vz14ynlvzhj"; + sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj"; }; }; "ffi-yajl" = { - version = "1.4.0"; + version = "2.2.2"; source = { type = "gem"; - sha256 = "1l289wyzc06v0rn73msqxx4gm48iqgxkd9rins22f13qicpczi5g"; + sha256 = "013n5cf80p2wfpmj1mdjkbmcyx3hg4c81wl3bamglaf4i12a2qk2"; }; dependencies = [ - "ffi" "libyajl2" ]; }; - "hashie" = { - version = "2.1.2"; + "gssapi" = { + version = "1.2.0"; source = { type = "gem"; - sha256 = "08w9ask37zh5w989b6igair3zf8gwllyzix97rlabxglif9f9qd9"; + sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; + }; + dependencies = [ + "ffi" + ]; + }; + "gyoku" = { + version = "1.3.1"; + source = { + type = "gem"; + sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + }; + dependencies = [ + "builder" + ]; + }; + "hashie" = { + version = "3.4.3"; + source = { + type = "gem"; + sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899"; }; }; "highline" = { - version = "1.7.1"; + version = "1.7.8"; source = { type = "gem"; - sha256 = "1355zfwmm6baq44rp0ny7zdnsipgn5maxk19hvii0jx2bsk417fr"; + sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + }; + }; + "httpclient" = { + version = "2.7.0.1"; + source = { + type = "gem"; + sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c"; + }; + }; + "inifile" = { + version = "2.0.2"; + source = { + type = "gem"; + sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25"; }; }; "ipaddress" = { @@ -147,6 +217,24 @@ sha256 = "0n5j0p8dxf9xzb9n4bkdr8w0a8gg3jzrn9indri3n0fv90gcs5qi"; }; }; + "little-plugger" = { + version = "1.1.4"; + source = { + type = "gem"; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + }; + }; + "logging" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "0ka5q88qvc2w7yr9z338jwxcyj1kifmbr9is5hps2f37asismqvb"; + }; + dependencies = [ + "little-plugger" + "multi_json" + ]; + }; "method_source" = { version = "0.8.2"; source = { @@ -155,10 +243,10 @@ }; }; "mime-types" = { - version = "2.4.3"; + version = "2.99"; source = { type = "gem"; - sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq"; + sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2"; }; }; "minitar" = { @@ -186,10 +274,17 @@ }; }; "mixlib-config" = { - version = "2.1.0"; + version = "2.2.1"; source = { type = "gem"; - sha256 = "13mb628614nl4dfwyyqpxc7b688ls6cfnjx06j8c13sl003xkp7g"; + sha256 = "0smhnyhw1va94vrd7zapxplbavbs4dc78h9yd1yfv52fzxx16zk3"; + }; + }; + "mixlib-install" = { + version = "0.7.0"; + source = { + type = "gem"; + sha256 = "0ll1p7v7fp3rf11dz8pifz33jhl4bdg779n4hzlnbia2z7xfsa2w"; }; }; "mixlib-log" = { @@ -200,19 +295,36 @@ }; }; "mixlib-shellout" = { - version = "2.0.1"; + version = "2.2.5"; source = { type = "gem"; - sha256 = "16n2zli15504bfzxwj5riq92zz3h8n8xswvs5gi0dp2dhyjd7lp3"; + sha256 = "1is07rar0x8n9h67j4iyrxz2yfgis4bnhh3x7vhbbi6khqqixg79"; }; }; - "net-dhcp" = { - version = "1.3.2"; + "molinillo" = { + version = "0.2.3"; source = { type = "gem"; - sha256 = "13mq3kwk6k3cd0vhnj1xq0gvbg2hbynzpnvq6fa6vqakbyc0iznd"; + sha256 = "1ylvnpdn20nna488mkzpq3iy6gr866gmkiv090c7g5h88x1qws0b"; }; }; + "multi_json" = { + version = "1.11.2"; + source = { + type = "gem"; + sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; + }; + }; + "net-scp" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + }; + dependencies = [ + "net-ssh" + ]; + }; "net-ssh" = { version = "2.9.2"; source = { @@ -231,23 +343,38 @@ ]; }; "net-ssh-multi" = { - version = "1.2.0"; + version = "1.2.1"; source = { type = "gem"; - sha256 = "0927244ac8h3z6wl5cifkblsa95ddpsxr6k8h2fmdvg5wdqs4ydh"; + sha256 = "13kxz9b6kgr9mcds44zpavbndxyi6pvyzyda6bhk1kfmb5c10m71"; }; dependencies = [ "net-ssh" "net-ssh-gateway" ]; }; - "ohai" = { - version = "8.1.1"; + "net-telnet" = { + version = "0.1.1"; source = { type = "gem"; - sha256 = "1lcbl7lrmy56x6l6ca7miawj9h40ff6nv4b3n6bz3w7fa3vh9xz0"; + sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; + }; + }; + "nori" = { + version = "2.6.0"; + source = { + type = "gem"; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + }; + }; + "ohai" = { + version = "8.7.0"; + source = { + type = "gem"; + sha256 = "1f10kgxh89iwij54yx8q11n1q87653ckvdmdwg8cwz3qlgf4flhy"; }; dependencies = [ + "chef-config" "ffi" "ffi-yajl" "ipaddress" @@ -256,12 +383,18 @@ "mixlib-config" "mixlib-log" "mixlib-shellout" - "net-dhcp" "rake" "systemu" "wmi-lite" ]; }; + "paint" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "0mhwj6w60q40w4f6jz8xx8bv1kghjvsjc3d8q8pnslax4fkmzbp1"; + }; + }; "plist" = { version = "3.1.0"; source = { @@ -270,10 +403,10 @@ }; }; "pry" = { - version = "0.10.1"; + version = "0.10.3"; source = { type = "gem"; - sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z"; + sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg"; }; dependencies = [ "coderay" @@ -282,10 +415,10 @@ ]; }; "rack" = { - version = "1.6.0"; + version = "1.6.4"; source = { type = "gem"; - sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb"; + sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; }; }; "rake" = { @@ -295,6 +428,86 @@ sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; }; }; + "rspec" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s"; + }; + dependencies = [ + "rspec-core" + "rspec-expectations" + "rspec-mocks" + ]; + }; + "rspec-core" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn"; + }; + dependencies = [ + "rspec-support" + ]; + }; + "rspec-expectations" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-its" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3"; + }; + dependencies = [ + "rspec-core" + "rspec-expectations" + ]; + }; + "rspec-mocks" = { + version = "3.4.0"; + source = { + type = "gem"; + sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1"; + }; + dependencies = [ + "diff-lcs" + "rspec-support" + ]; + }; + "rspec-support" = { + version = "3.4.1"; + source = { + type = "gem"; + sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr"; + }; + }; + "rspec_junit_formatter" = { + version = "0.2.3"; + source = { + type = "gem"; + sha256 = "0hphl8iggqh1mpbbv0avf8735x6jgry5wmkqyzgv1zwnimvja1ai"; + }; + dependencies = [ + "builder" + "rspec-core" + ]; + }; + "rubyntlm" = { + version = "0.4.0"; + source = { + type = "gem"; + sha256 = "03xmi8mxcbc5laad10r6b705dk4vyhl9lr7h940f2rhibymxq45x"; + }; + }; "semverse" = { version = "1.2.1"; source = { @@ -302,6 +515,26 @@ sha256 = "0s47lprqwmlhnxm3anrhvd3559g51hgrcqn3mq0fy696zkv8vfd8"; }; }; + "serverspec" = { + version = "2.24.3"; + source = { + type = "gem"; + sha256 = "03v6qqshqjsvbbjf1pwbi2mzgqg84wdbhnqb3gdbl1m9bz7sxg1n"; + }; + dependencies = [ + "multi_json" + "rspec" + "rspec-its" + "specinfra" + ]; + }; + "sfl" = { + version = "2.2"; + source = { + type = "gem"; + sha256 = "0aq7ykbyvx8mx4szkcgp09zs094fg60l2pzxscmxqrgqk9yvyg1j"; + }; + }; "slop" = { version = "3.6.0"; source = { @@ -310,21 +543,41 @@ }; }; "solve" = { - version = "1.2.1"; + version = "2.0.1"; source = { type = "gem"; - sha256 = "0ff5iwhsr6fcp10gd2ivrx1fcw3lm5f5f11srhy2z5dc3v79mcja"; + sha256 = "0009xvg40y59bijds5njnwfshfw68wmj54yz3qy538g9rpxvmqp1"; }; dependencies = [ - "dep_selector" + "molinillo" "semverse" ]; }; - "systemu" = { - version = "2.6.4"; + "specinfra" = { + version = "2.44.5"; source = { type = "gem"; - sha256 = "16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z"; + sha256 = "018i3bmmy7lc21hagvwfmz2sdfj0v87a7yy3z162lcpq62vxw89r"; + }; + dependencies = [ + "net-scp" + "net-ssh" + "net-telnet" + "sfl" + ]; + }; + "syslog-logger" = { + version = "1.6.8"; + source = { + type = "gem"; + sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm"; + }; + }; + "systemu" = { + version = "2.6.5"; + source = { + type = "gem"; + sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; }; }; "uuidtools" = { @@ -334,6 +587,23 @@ sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; }; }; + "winrm" = { + version = "1.3.6"; + source = { + type = "gem"; + sha256 = "1rx42y5w9d3w6axxwdj9zckzsgsjk172zxn52w2jj65spl98vxbc"; + }; + dependencies = [ + "builder" + "gssapi" + "gyoku" + "httpclient" + "logging" + "nori" + "rubyntlm" + "uuidtools" + ]; + }; "wmi-lite" = { version = "1.0.0"; source = { diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 2a5795be93c..fc0e70e4354 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,4 +1,4 @@ -{ lib, buildFHSUserEnv +{ lib, buildFHSUserEnv, steam , withJava ? false , withPrimus ? false }: @@ -48,6 +48,13 @@ buildFHSUserEnv { ln -s ../lib32/steam-runtime steamrt/i386 ''; + extraInstallCommands = '' + mkdir -p $out/share/applications + ln -s ${steam}/share/icons $out/share + ln -s ${steam}/share/pixmaps $out/share + sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop + ''; + profile = '' export STEAM_RUNTIME=/steamrt ''; diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 624f41749aa..8dbd8cd6721 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -247,10 +247,10 @@ }; } rec { - name = "libcomerr2_1.42-1ubuntu2+srt4_amd64"; - md5 = "fc890b8ce50abe33c1c60ec45ca1d203"; + name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64"; + md5 = "12cd8bbe50da1b698d5280c8cd1efe38"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb"; inherit md5; name = "libcomerr2.deb"; }; @@ -283,10 +283,10 @@ }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.6+srt1_amd64"; - md5 = "31ff871795887c7595908ebef7151186"; + name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64"; + md5 = "5082143b56f4d6a72c21244c4b7bc653"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.6+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb"; inherit md5; name = "libdbus-1-3.deb"; }; @@ -328,10 +328,10 @@ }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.1+srt4_amd64"; - md5 = "18307a925d2ce2d432699073fe679b09"; + name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64"; + md5 = "a7148db45279001346cebc02a7d7c1af"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb"; inherit md5; name = "libexpat1.deb"; }; @@ -373,10 +373,10 @@ }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.2+srt1_amd64"; - md5 = "635e6ee1b6dbb9f609f3b7d738b88d83"; + name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64"; + md5 = "06f7ccb54bba06c1e2673471866039a0"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.2+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb"; inherit md5; name = "libfreetype6.deb"; }; @@ -400,10 +400,10 @@ }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.3+srt1_amd64"; - md5 = "869c080b36c95e90484987fc3a46d17b"; + name = "libgcrypt11_1.5.0-3ubuntu0.4+srt1_amd64"; + md5 = "e97b1a78944b7b07871dd36116b07bfe"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.3+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.4+srt1_amd64.deb"; inherit md5; name = "libgcrypt11.deb"; }; @@ -787,10 +787,10 @@ }; } rec { - name = "libnss3_3.17.1-0ubuntu0.12.04.1+srt1_amd64"; - md5 = "d2583ca89a2aa19abfd497be664b2fcd"; + name = "libnss3_3.19.2-0ubuntu0.12.04.1+srt1_amd64"; + md5 = "ba6be27b60728d1bbdc849354376adf8"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.17.1-0ubuntu0.12.04.1+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.19.2-0ubuntu0.12.04.1+srt1_amd64.deb"; inherit md5; name = "libnss3.deb"; }; @@ -868,10 +868,10 @@ }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.1+srt4_amd64"; - md5 = "f3f0e80ce2a6be9e830862184223b3ff"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64"; + md5 = "52134e1b8190957f069268827f2bde74"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb"; inherit md5; name = "libpixman-1-0.deb"; }; @@ -1057,19 +1057,19 @@ }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.1+srt4_amd64"; - md5 = "777bba933183fe2e1ec7cddf7d311609"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64"; + md5 = "1a9c37c32fa46f7d55a2e384cd6ce5a6"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb"; inherit md5; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.21+srt1_amd64"; - md5 = "0f740796454b18233ab65134c8250889"; + name = "libssl1.0.0_1.0.1-4ubuntu5.31+srt1_amd64"; + md5 = "0ea8b768e93487f8108336c5da92b952"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.21+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.31+srt1_amd64.deb"; inherit md5; name = "libssl1.0.0.deb"; }; @@ -1102,10 +1102,10 @@ }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.2+srt1_amd64"; - md5 = "cd6947eb0f8a2fbb31ac5483d7aad25a"; + name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64"; + md5 = "6e092ebafe0cf5a49ee9319e2cf6f4fd"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.2+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb"; inherit md5; name = "libtasn1-3.deb"; }; @@ -1138,10 +1138,10 @@ }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.6+srt3_amd64"; - md5 = "f6f1ba2a0a76245cc05217e6c8385fcc"; + name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64"; + md5 = "7c44d58a6acf73b6c298cfa03e982e0f"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.6+srt3_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb"; inherit md5; name = "libtiff4.deb"; }; @@ -1210,10 +1210,10 @@ }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.1+srt4_amd64"; - md5 = "ad17ca0b0794852836c8166b530b520d"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64"; + md5 = "d31594fc832bfd0bc65c43f2e7f40ac5"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb"; inherit md5; name = "libvdpau1.deb"; }; @@ -1273,28 +1273,28 @@ }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.2+steamrt1+srt4_amd64"; - md5 = "d1dd7819a0bcd2915c6df05f34bd2932"; + name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; + md5 = "22ca2e28aa3f3d70b77632a8772a4a9d"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.2+steamrt1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; inherit md5; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.2+steamrt1+srt4_all"; - md5 = "e9c006f3f06178fd1a47f4fdffcc9da3"; + name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; + md5 = "c012bbc8654c3c012dc7b5901c486f4d"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.2+steamrt1+srt4_all.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; inherit md5; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.2+steamrt1+srt4_amd64"; - md5 = "59f62a1b493eeaa0438d4b5e002fe269"; + name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; + md5 = "e94af0629e0b59f21c1ccc4f4d4088b5"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.2+steamrt1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; inherit md5; name = "libx11-xcb1.deb"; }; @@ -1588,19 +1588,19 @@ }; } rec { - name = "libxext6_1.3.0-3ubuntu0.1+steamrt1+srt1_amd64"; - md5 = "6b395ceb55a4454c5fe2f4cfe45d2a3d"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64"; + md5 = "b6dcf651f5b9dda20fd39912bf03a4c3"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.1+steamrt1+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb"; inherit md5; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.3+srt1_amd64"; - md5 = "462d20f1f3e38c92f22434fe75c4f932"; + name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64"; + md5 = "a80bcd458215e445daddf4cf0d625758"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.3+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb"; inherit md5; name = "libxfixes3.deb"; }; @@ -1615,10 +1615,10 @@ }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise2+srt1_amd64"; - md5 = "c4aa3fcef9981735073c73d822ac52cb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64"; + md5 = "f25d86e540477fe044c0294670b5f1b5"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise2+srt1_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb"; inherit md5; name = "libxi6.deb"; }; @@ -1660,19 +1660,19 @@ }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.2+srt4_amd64"; - md5 = "7fde5d0b6ffa9f94f0300edc4de04ad6"; + name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64"; + md5 = "bde5d98946e1bfd60a42482339e29787"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.2+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb"; inherit md5; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.1+srt4_amd64"; - md5 = "a01473ee15ce4a8bb1a1ac2fc8e81bda"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64"; + md5 = "6781fa18b873dc95da21e82cc61609d6"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.1+srt4_amd64.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb"; inherit md5; name = "libxrender1.deb"; }; @@ -1986,10 +1986,10 @@ }; } rec { - name = "libcomerr2_1.42-1ubuntu2+srt4_i386"; - md5 = "165e9ea1f09704a353220b9ff6cf2f1b"; + name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386"; + md5 = "a7450fa3b218cc993b252f7f51b4f83a"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb"; inherit md5; name = "libcomerr2.deb"; }; @@ -2022,10 +2022,10 @@ }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.6+srt1_i386"; - md5 = "01a50cab2a169d9b0eff71b5cee000ad"; + name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386"; + md5 = "36d5b7a27a90cc6069c14317c5b182e8"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.6+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb"; inherit md5; name = "libdbus-1-3.deb"; }; @@ -2067,10 +2067,10 @@ }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.1+srt4_i386"; - md5 = "4478766ffb8f96db66de0b0f2ccfb290"; + name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386"; + md5 = "44b8336cf9a2340a693528f2ebe19da2"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb"; inherit md5; name = "libexpat1.deb"; }; @@ -2112,10 +2112,10 @@ }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.2+srt1_i386"; - md5 = "257bf20101de39017f83e9934cea06e4"; + name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386"; + md5 = "2b1dd9e53e6a94443e9959de83d8621f"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.2+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb"; inherit md5; name = "libfreetype6.deb"; }; @@ -2139,10 +2139,10 @@ }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.3+srt1_i386"; - md5 = "a857ecbbc060af329d774fefe41b4d5d"; + name = "libgcrypt11_1.5.0-3ubuntu0.4+srt1_i386"; + md5 = "3ee78c6888bcf55b43fb6830059c65e3"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.3+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.4+srt1_i386.deb"; inherit md5; name = "libgcrypt11.deb"; }; @@ -2526,10 +2526,10 @@ }; } rec { - name = "libnss3_3.17.1-0ubuntu0.12.04.1+srt1_i386"; - md5 = "9be8a7f5cc84852f14af1fc7e9c44f56"; + name = "libnss3_3.19.2-0ubuntu0.12.04.1+srt1_i386"; + md5 = "35330de1ca02b0034f468c0df11882bd"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.17.1-0ubuntu0.12.04.1+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.19.2-0ubuntu0.12.04.1+srt1_i386.deb"; inherit md5; name = "libnss3.deb"; }; @@ -2607,10 +2607,10 @@ }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.1+srt4_i386"; - md5 = "cbad5a39d1cb49085cd4b50a2e1d96a6"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386"; + md5 = "630fa4416398e12dfae1816acdac1d89"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb"; inherit md5; name = "libpixman-1-0.deb"; }; @@ -2796,19 +2796,19 @@ }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.1+srt4_i386"; - md5 = "466f9b4663bdf71a2cb36437e8f70fca"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386"; + md5 = "6653a03901b263af6fce56e6c394e9b3"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb"; inherit md5; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.21+srt1_i386"; - md5 = "c530243255161578fbddfa9f7200d30c"; + name = "libssl1.0.0_1.0.1-4ubuntu5.31+srt1_i386"; + md5 = "40b412b5964f9f48ef4f5997702da3d5"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.21+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.31+srt1_i386.deb"; inherit md5; name = "libssl1.0.0.deb"; }; @@ -2841,10 +2841,10 @@ }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.2+srt1_i386"; - md5 = "55364b5ab0d027f6ffaf89444f5c0ad9"; + name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386"; + md5 = "c24dd57cc16746dbead2fbfa571f978a"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.2+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb"; inherit md5; name = "libtasn1-3.deb"; }; @@ -2877,10 +2877,10 @@ }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.6+srt3_i386"; - md5 = "50f018955b48c06df3b00a45c1999c63"; + name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386"; + md5 = "8374a1fc7909c42faa5ee585eb967b20"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.6+srt3_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb"; inherit md5; name = "libtiff4.deb"; }; @@ -2949,10 +2949,10 @@ }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.1+srt4_i386"; - md5 = "b627e61dac887be2c3697d3945b4eee6"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386"; + md5 = "61cd2560476f54dc11b3e859e104daec"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb"; inherit md5; name = "libvdpau1.deb"; }; @@ -3012,28 +3012,28 @@ }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.2+steamrt1+srt4_i386"; - md5 = "ecf312639e19cab505e978dcb75eea4d"; + name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; + md5 = "cc208840d2883eec6f9770b623c24b9d"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.2+steamrt1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; inherit md5; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.2+steamrt1+srt4_all"; - md5 = "e9c006f3f06178fd1a47f4fdffcc9da3"; + name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; + md5 = "c012bbc8654c3c012dc7b5901c486f4d"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.2+steamrt1+srt4_all.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; inherit md5; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.2+steamrt1+srt4_i386"; - md5 = "8ce612a1d9c5b392d7d77c9a49eda59d"; + name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; + md5 = "2ef2ffe569708f8433cfb36e754526ec"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.2+steamrt1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; inherit md5; name = "libx11-xcb1.deb"; }; @@ -3327,19 +3327,19 @@ }; } rec { - name = "libxext6_1.3.0-3ubuntu0.1+steamrt1+srt1_i386"; - md5 = "a68ef50ca2623f2779b5d6668f545c75"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386"; + md5 = "7f18f7c6fb6bca8a033e243ca4222057"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.1+steamrt1+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb"; inherit md5; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.3+srt1_i386"; - md5 = "263f3532430749f671a83ba3ca48b072"; + name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386"; + md5 = "25d8be35a5e5a6bac479d4bdce8dceba"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.3+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb"; inherit md5; name = "libxfixes3.deb"; }; @@ -3354,10 +3354,10 @@ }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise2+srt1_i386"; - md5 = "f9e20e913df71ed877cd5ec6bd7e823d"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386"; + md5 = "5f82357fd11b009d7fee5020e8ff2c8a"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise2+srt1_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb"; inherit md5; name = "libxi6.deb"; }; @@ -3399,19 +3399,19 @@ }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.2+srt4_i386"; - md5 = "44eee22d721a1f41c569400fed1810ca"; + name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386"; + md5 = "659bfe8b731e831f32b047e66643ae05"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.2+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb"; inherit md5; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.1+srt4_i386"; - md5 = "a7a6e50fde5d43c42a9e8f1202f043e5"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386"; + md5 = "e5ea9172d234d61d6a31d86465428b05"; source = fetchurl { - url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.1+srt4_i386.deb"; + url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb"; inherit md5; name = "libxrender1.deb"; }; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 2f2ce921176..b41847c25ba 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -1,26 +1,24 @@ {stdenv, fetchurl, traceDeps ? false}: -stdenv.mkDerivation rec { - name = "${program}-original-${version}"; - program = "steam"; +let + traceLog = "/tmp/steam-trace-dependencies.log"; version = "1.0.0.49"; +in stdenv.mkDerivation rec { + name = "steam-original-${version}"; + src = fetchurl { - url = "http://repo.steampowered.com/steam/pool/steam/s/steam/${program}_${version}.tar.gz"; + url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; sha256 = "1c1gl5pwvb5gnnnqf5d9hpcjnfjjgmn4lgx8v0fbx1am5xf3p2gx"; }; - traceLog = "/tmp/steam-trace-dependencies.log"; - - installPhase = '' - make DESTDIR=$out install - mv $out/usr/* $out #*/ - rmdir $out/usr + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + postInstall = '' rm $out/bin/steamdeps ${stdenv.lib.optionalString traceDeps '' cat > $out/bin/steamdeps <> ${traceLog} cat \$1 >> ${traceLog} echo >> ${traceLog} @@ -32,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A digital distribution platform"; homepage = http://store.steampowered.com/; - license = licenses.unfree; + license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga ]; }; } diff --git a/pkgs/games/steam/update-runtime-shell.nix b/pkgs/games/steam/update-runtime-shell.nix new file mode 100644 index 00000000000..bb9362b9bf0 --- /dev/null +++ b/pkgs/games/steam/update-runtime-shell.nix @@ -0,0 +1,13 @@ +with import {}; + +(python2.buildEnv.override { + extraLibs = with python2Packages; + [ debian + ]; + postBuild = '' + mkdir -p $out/bin + for i in ${nixUnstable}/bin/*; do + ln -s $i $out/bin/$(basename $i) + done + ''; +}).env diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index c75a92f46cf..adb93890066 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,5 +1,5 @@ {stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin -, nix-prefetch-scripts }: +, nix-prefetch-hg, nix-prefetch-git }: /* @@ -310,8 +310,8 @@ rec { echom repeat("=", 80) endif let opts = {} - let opts.nix_prefetch_git = "${nix-prefetch-scripts}/bin/nix-prefetch-git" - let opts.nix_prefetch_hg = "${nix-prefetch-scripts}/bin/nix-prefetch-hg" + let opts.nix_prefetch_git = "${nix-prefetch-git}/bin/nix-prefetch-git" + let opts.nix_prefetch_hg = "${nix-prefetch-hg}/bin/nix-prefetch-hg" let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache' let opts.plugin_dictionaries = [] ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index bf968ae4b39..6c630d9237c 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -21,7 +21,7 @@ , jackSupport ? true, libjack2 , gmeSupport ? true, game-music-emu , icuSupport ? true, icu -, clientSupport ? false, mpd_clientlib +, clientSupport ? true, mpd_clientlib , opusSupport ? true, libopus }: diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index d314c7857ea..d1f0ce93ab4 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,89 +16,63 @@ # # To use at startup, see hardware.bumblebee options. -# This nix expression supports for now only the native nvidia driver. -# It should not be hard to generalize this approach to support the -# nouveau driver as well (parameterize hostEnv, i686Env over the -# module package, and parameterize the two wrappers as well) - -{ stdenv, fetchurl, pkgconfig, help2man -, libX11, glibc, glib, libbsd -, makeWrapper, buildEnv, module_init_tools -, xorg, xkeyboard_config -, nvidia_x11, virtualgl +{ stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper +, glib, libbsd +, libX11, libXext, xorgserver, xkbcomp, module_init_tools, xkeyboard_config, xf86videonouveau +, nvidia_x11, virtualgl, primusLib # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? , nvidia_x11_i686 ? null -, virtualgl_i686 ? null +, primusLib_i686 ? null , useDisplayDevice ? false -, extraDeviceOptions ? "" +, extraNvidiaDeviceOptions ? "" +, extraNouveauDeviceOptions ? "" +, useNvidia ? true }: -with stdenv.lib; + let version = "3.2.1"; + + primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + + primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686); + + nvidia_x11s = [nvidia_x11] ++ lib.optional (nvidia_x11_i686 != null) nvidia_x11_i686; + + nvidiaLibs = lib.makeLibraryPath nvidia_x11s; + + bbdPath = lib.makeSearchPath "bin" [ module_init_tools xorgserver ]; + bbdLibs = lib.makeLibraryPath [ libX11 libXext ]; + + xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); + +in stdenv.mkDerivation rec { name = "bumblebee-${version}"; - # Isolated X11 environment without the acceleration driver module. - # Includes the rest of the components needed for bumblebeed and - # optirun to spawn the second X server and to connect to it. - x11Env = buildEnv { - name = "bumblebee-env"; - paths = [ - module_init_tools - xorg.xorgserver - xorg.xrandr - xorg.xrdb - xorg.setxkbmap - xorg.libX11 - xorg.libXext - xorg.xf86inputevdev - ]; - }; - - # The environment for the host architecture. - hostEnv = buildEnv { - name = "bumblebee-x64-env"; - paths = [ - nvidia_x11 - virtualgl - ]; - }; - - # The environment for the sub architecture, i686, if there is one - i686Env = if virtualgl_i686 != null - then buildEnv { - name = "bumblebee-i686-env"; - paths = [ - nvidia_x11_i686 - virtualgl_i686 - ]; - } - else null; - - allEnvs = [hostEnv] ++ optional (i686Env != null) i686Env; - ldPathString = makeLibraryPath allEnvs; - - # By default we don't want to use a display device - deviceOptions = if useDisplayDevice - then "" - else '' - - # Disable display device - Option "UseEDID" "false" - Option "UseDisplayDevice" "none" - '' - + extraDeviceOptions; - -in stdenv.mkDerivation { - inherit name deviceOptions; - src = fetchurl { url = "http://bumblebee-project.org/${name}.tar.gz"; sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; - patches = [ ./xopts.patch ./nvidia-conf.patch]; + patches = [ ./nixos.patch ]; + + # By default we don't want to use a display device + nvidiaDeviceOptions = lib.optionalString (!useDisplayDevice) '' + # Disable display device + Option "UseEDID" "false" + Option "UseDisplayDevice" "none" + '' + extraNvidiaDeviceOptions; + + nouveauDeviceOptions = extraNouveauDeviceOptions; + + # the have() function is deprecated and not available to bash completions the + # way they are currently loaded in NixOS, so use _have. See #10936 + patchPhase = '' + substituteInPlace scripts/bash_completion/bumblebee \ + --replace "have optirun" "_have optirun" + ''; preConfigure = '' # Substitute the path to the actual modinfo program in module.c. @@ -114,12 +88,16 @@ in stdenv.mkDerivation { # Apply configuration options substituteInPlace conf/xorg.conf.nvidia \ - --subst-var deviceOptions + --subst-var nvidiaDeviceOptions + + substituteInPlace conf/xorg.conf.nouveau \ + --subst-var nouveauDeviceOptions ''; # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ stdenv makeWrapper pkgconfig help2man libX11 glib libbsd ]; + buildInputs = [ libX11 glib libbsd ]; + nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. @@ -130,33 +108,33 @@ in stdenv.mkDerivation { # include the sub architecture components. configureFlags = [ "--with-udev-rules=$out/lib/udev/rules.d" - "CONF_DRIVER=nvidia" - "CONF_DRIVER_MODULE_NVIDIA=nvidia" - "CONF_LDPATH_NVIDIA=${x11Env}/lib:${ldPathString}" - "CONF_MODPATH_NVIDIA=${hostEnv}/lib/xorg/modules,${x11Env}/lib/xorg/modules" + # see #10282 + #"CONF_PRIMUS_LD_PATH=${primusLibs}" + ] ++ lib.optionals useNvidia [ + "CONF_LDPATH_NVIDIA=${nvidiaLibs}" + "CONF_MODPATH_NVIDIA=${nvidia_x11}/lib/xorg/modules" + ]; + + CFLAGS = [ + "-DX_MODULE_APPENDS=\\\"${xmodules}\\\"" + "-DX_XKB_DIR=\\\"${xkeyboard_config}/etc/X11/xkb\\\"" ]; - # create a wrapper environment for bumblebeed and optirun postInstall = '' wrapProgram "$out/sbin/bumblebeed" \ - --prefix PATH : "${x11Env}/sbin:${x11Env}/bin:${hostEnv}/bin:\$PATH" \ - --prefix LD_LIBRARY_PATH : "${x11Env}/lib:${hostEnv}/lib:\$LD_LIBRARY_PATH" \ - --set FONTCONFIG_FILE "/etc/fonts/fonts.conf" \ - --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ - --set XKB_DIR "${xkeyboard_config}/etc/X11/xkb" + --set XKB_BINDIR "${xkbcomp}/bin" \ + --prefix PATH : "${bbdPath}" \ + --prefix LD_LIBRARY_PATH : "${bbdLibs}" wrapProgram "$out/bin/optirun" \ - --prefix PATH : "${hostEnv}/bin" - '' + (if i686Env == null - then "" - else '' - makeWrapper "$out/bin/.optirun-wrapped" "$out/bin/optirun32" \ - --prefix PATH : "${i686Env}/bin" - ''); + --prefix PATH : "${virtualgl}/bin" + ''; - meta = { + meta = with stdenv.lib; { homepage = http://github.com/Bumblebee-Project/Bumblebee; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; - license = stdenv.lib.licenses.gpl3; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/X11/bumblebee/nixos.patch b/pkgs/tools/X11/bumblebee/nixos.patch new file mode 100644 index 00000000000..00fb8ad7a53 --- /dev/null +++ b/pkgs/tools/X11/bumblebee/nixos.patch @@ -0,0 +1,81 @@ +diff --git a/conf/xorg.conf.nouveau b/conf/xorg.conf.nouveau +index 87e48cb..60d6eaf 100644 +--- a/conf/xorg.conf.nouveau ++++ b/conf/xorg.conf.nouveau +@@ -15,4 +15,5 @@ Section "Device" + # This Setting is needed on Ubuntu 13.04. + # BusID "PCI:01:00:0" + ++@nouveauDeviceOptions@ + EndSection +diff --git a/conf/xorg.conf.nvidia b/conf/xorg.conf.nvidia +index c3107f9..17072f4 100644 +--- a/conf/xorg.conf.nvidia ++++ b/conf/xorg.conf.nvidia +@@ -29,6 +29,6 @@ Section "Device" + Option "ProbeAllGpus" "false" + + Option "NoLogo" "true" +- Option "UseEDID" "false" +- Option "UseDisplayDevice" "none" ++ ++@nvidiaDeviceOptions@ + EndSection +diff --git a/src/bbsecondary.c b/src/bbsecondary.c +index 71a6b73..a682d8a 100644 +--- a/src/bbsecondary.c ++++ b/src/bbsecondary.c +@@ -145,6 +145,23 @@ bool start_secondary(bool need_secondary) { + } + + bb_log(LOG_INFO, "Starting X server on display %s.\n", bb_config.x_display); ++ const char mod_appends[] = X_MODULE_APPENDS; ++ ++ char *mod_path; ++ int pathlen = strlen(bb_config.mod_path); ++ if (pathlen == 0) { ++ mod_path = mod_appends; ++ } else { ++ mod_path = malloc(pathlen + 1 + sizeof(mod_appends)); ++ if (!mod_path) { ++ set_bb_error("Could not allocate memory for modules path\n"); ++ return false; ++ } ++ strcpy(mod_path, bb_config.mod_path); ++ mod_path[pathlen] = ','; ++ strcpy(mod_path + pathlen + 1, mod_appends); ++ } ++ + char *x_argv[] = { + XORG_BINARY, + bb_config.x_display, +@@ -153,24 +170,25 @@ bool start_secondary(bool need_secondary) { + "-sharevts", + "-nolisten", "tcp", + "-noreset", ++ "-logfile", "/var/log/X.bumblebee.log", ++ "-xkbdir", X_XKB_DIR, + "-verbose", "3", + "-isolateDevice", pci_id, +- "-modulepath", bb_config.mod_path, // keep last ++ "-modulepath", mod_path, + NULL + }; + enum {n_x_args = sizeof(x_argv) / sizeof(x_argv[0])}; +- if (!*bb_config.mod_path) { +- x_argv[n_x_args - 3] = 0; //remove -modulepath if not set +- } + //close any previous pipe, if it (still) exists + if (bb_status.x_pipe[0] != -1){close(bb_status.x_pipe[0]); bb_status.x_pipe[0] = -1;} + if (bb_status.x_pipe[1] != -1){close(bb_status.x_pipe[1]); bb_status.x_pipe[1] = -1;} + //create a new pipe + if (pipe2(bb_status.x_pipe, O_NONBLOCK | O_CLOEXEC)){ + set_bb_error("Could not create output pipe for X"); ++ if (pathlen > 0) free(mod_path); + return false; + } + bb_status.x_pid = bb_run_fork_ld_redirect(x_argv, bb_config.ld_path, bb_status.x_pipe[1]); ++ if (pathlen > 0) free(mod_path); + //close the end of the pipe that is not ours + if (bb_status.x_pipe[1] != -1){close(bb_status.x_pipe[1]); bb_status.x_pipe[1] = -1;} + } diff --git a/pkgs/tools/X11/bumblebee/nvidia-conf.patch b/pkgs/tools/X11/bumblebee/nvidia-conf.patch deleted file mode 100644 index f5535c417cf..00000000000 --- a/pkgs/tools/X11/bumblebee/nvidia-conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bumblebee-3.2.1/conf/xorg.conf.nvidia -+++ bumblebee-3.2.1/conf/xorg.conf.nvidia -@@ -29,6 +29,5 @@ Section "Device" - Option "ProbeAllGpus" "false" - - Option "NoLogo" "true" -- Option "UseEDID" "false" -- Option "UseDisplayDevice" "none" -+@deviceOptions@ - EndSection - diff --git a/pkgs/tools/X11/bumblebee/xopts.patch b/pkgs/tools/X11/bumblebee/xopts.patch deleted file mode 100644 index 6fd3a6a0483..00000000000 --- a/pkgs/tools/X11/bumblebee/xopts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bumblebee-3.2.1/src/bbsecondary.c 2012-02-05 00:03:06.003439638 +0100 -+++ bumblebee-3.2.1/src/bbsecondary.c 2012-02-05 00:46:38.017382619 +0100 -@@ -149,6 +149,8 @@ - "-sharevts", - "-nolisten", "tcp", - "-noreset", -+ "-xkbdir", getenv("XKB_DIR"), -+ "-logfile", "/var/log/X.bumblebee.log", - "-verbose", "3", - "-isolateDevice", pci_id, - "-modulepath", diff --git a/pkgs/tools/X11/primus/builder.sh b/pkgs/tools/X11/primus/builder.sh deleted file mode 100644 index 3c6b6afdc09..00000000000 --- a/pkgs/tools/X11/primus/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -cp -r $src src -cd src - -export LIBDIR=$out/lib -export PRIMUS_libGLa=$nvidia/lib/libGL.so -export PRIMUS_libGLd=$mesa/lib/libGL.so -export PRIMUS_LOAD_GLOBAL=$mesa/lib/libglapi.so - -make -ln -s $LIBDIR/libGL.so.1 $LIBDIR/libGL.so diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 1aa7909a43d..f0a971dde18 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -5,31 +5,18 @@ # Other distributions do the same. { stdenv , primusLib -, writeScript +, writeScriptBin , primusLib_i686 ? null +, useNvidia ? true }: -with stdenv.lib; + let - version = "1.0.0748176"; - ldPath = makeLibraryPath ([primusLib] ++ optional (primusLib_i686 != null) primusLib_i686); - primusrun = writeScript "primusrun" -'' + primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; }; + primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; }; + ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); + +in writeScriptBin "primusrun" '' + #!${stdenv.shell} export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" -''; -in -stdenv.mkDerivation { - name = "primus-${version}"; - builder = writeScript "builder" - '' - source $stdenv/setup - mkdir -p $out/bin - cp ${primusrun} $out/bin/primusrun - ''; - - meta = { - homepage = https://github.com/amonakov/primus; - description = "Faster OpenGL offloading for Bumblebee"; - maintainers = with maintainers; [ coconnor ]; - }; -} +'' diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index 96a4ac16c9b..ce805933109 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,20 +1,35 @@ { stdenv, fetchgit , xlibsWrapper, mesa -, nvidia +, nvidia_x11 ? null +, libX11 }: -let - version = "1.0.0748176"; -in + stdenv.mkDerivation { - name = "primus-lib-${version}"; + name = "primus-lib-20151204"; + src = fetchgit { url = git://github.com/amonakov/primus.git; - rev = "074817614c014e3a99259388cb18fd54648b659a"; - sha256 = "0mrh432md6zrm16avxyk57mgszrqpgwdjahspchvlaccqxp3x82v"; + rev = "d1afbf6fce2778c0751eddf19db9882e04f18bfd"; + sha256 = "8f095b5e2030cdb155a42a49873832843c1e4dc3087a6fb94d198de982609923"; }; - inherit nvidia mesa; + buildInputs = [ libX11 mesa ]; - buildInputs = [ xlibsWrapper mesa ]; - builder = ./builder.sh; + makeFlags = [ "LIBDIR=$(out)/lib" + "PRIMUS_libGLa=${if nvidia_x11 == null then mesa else nvidia_x11}/lib/libGL.so" + "PRIMUS_libGLd=${mesa}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" + ]; + + installPhase = '' + ln -s $out/lib/libGL.so.1 $out/lib/libGL.so + ''; + + meta = with stdenv.lib; { + description = "Low-overhead client-side GPU offloading"; + homepage = https://github.com/amonakov/primus; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = with maintainers; [ abbradar ]; + }; } diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index ceeadbaafaa..7203229c47b 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -1,33 +1,22 @@ -{ stdenv, fetchurl, mesa, libX11, openssl, libXext -, libjpeg_turbo, cmake }: +{ lib, buildEnv +, virtualglLib +, virtualglLib_i686 ? null +}: -let - version = "2.3.2"; -in -stdenv.mkDerivation { - name = "virtualgl-${version}"; - src = fetchurl { - url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "062lrhd8yr13ch4wpgzxdabqs92j4q7fcl3a0c3sdlav4arspqmy"; - }; +buildEnv { + name = "virtualgl-${lib.getVersion virtualglLib}"; - patches = [ ./xshm.patch ./fixturbopath.patch ]; + paths = [ virtualglLib ]; - prePatch = '' - sed -i s,LD_PRELOAD=lib,LD_PRELOAD=$out/lib/lib, server/vglrun + postBuild = lib.optionalString (virtualglLib_i686 != null) '' + rm $out/fakelib + # workaround for #4621 + rm $out/bin + mkdir $out/bin + for i in ${virtualglLib}/bin/*; do + ln -s $i $out/bin + done + ln -s ${virtualglLib}/bin/.vglrun.vars64 $out/bin + ln -s ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin ''; - - cmakeFlags = [ "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; - - preInstall = '' - export makeFlags="prefix=$out" - ''; - - buildInputs = [ cmake mesa libX11 openssl libXext libjpeg_turbo ]; - - meta = { - homepage = http://www.virtualgl.org/; - description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; - license = stdenv.lib.licenses.free; # many parts under different free licenses - }; } diff --git a/pkgs/tools/X11/virtualgl/fixturbopath.patch b/pkgs/tools/X11/virtualgl/fixturbopath.patch deleted file mode 100644 index 2177555e33a..00000000000 --- a/pkgs/tools/X11/virtualgl/fixturbopath.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- VirtualGL-2.3/cmakescripts/FindTurboJPEG.cmake.orig 2012-02-02 17:33:49.496283001 +0100 -+++ VirtualGL-2.3/cmakescripts/FindTurboJPEG.cmake 2012-02-02 17:44:18.772483239 +0100 -@@ -40,8 +40,11 @@ - endif() - endif() - --set(TJPEG_LIBRARY ${DEFAULT_TJPEG_LIBRARY} CACHE PATH -- "TurboJPEG library path (default: ${DEFAULT_TJPEG_LIBRARY})") -+if(NOT TJPEG_LIBRARY) -+ message(STATUS "TJPEG_LIBRARY environment variable not set") -+ set(TJPEG_LIBRARY ${DEFAULT_TJPEG_LIBRARY} CACHE PATH -+ "TurboJPEG library path (default: ${DEFAULT_TJPEG_LIBRARY})") -+endif() - - if(WIN32) - set(CMAKE_REQUIRED_DEFINITIONS -MT) diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix new file mode 100644 index 00000000000..5c4456f6348 --- /dev/null +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }: + +let + version = "2.4.1"; +in +stdenv.mkDerivation { + name = "virtualgl-lib-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; + sha256 = "0bngb4hrl0kn19qb3sa6mg6dbaahfk09gx2ng18l00xm6pmwd298"; + }; + + cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ]; + + meta = with stdenv.lib; { + homepage = http://www.virtualgl.org/; + description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; + license = licenses.free; # many parts under different free licenses + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/X11/virtualgl/xshm.patch b/pkgs/tools/X11/virtualgl/xshm.patch deleted file mode 100644 index 2ca81b559ea..00000000000 --- a/pkgs/tools/X11/virtualgl/xshm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/util/fbx.c b/util/fbx.c -index 06ea835..0d89842 100644 ---- a/util/fbx.c -+++ b/util/fbx.c -@@ -15,6 +15,8 @@ - // This library abstracts fast frame buffer access - #include - #include -+#include -+#include - #include "fbx.h" - - #define MINWIDTH 160 diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index c4de8090e05..39ea3d637fc 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -2,18 +2,18 @@ pythonPackages.buildPythonPackage rec { name = "awscli-${version}"; - version = "1.7.47"; + version = "1.9.6"; namePrefix = ""; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "1955y1ar2mqzqgfngpwp8pc78wphh1qdgwwy0gs6i352jaqzkvwi"; + sha256 = "08qclasxf8zdxwmngvynq9n5vv4nwdy68ma7wn7ji40bxmls37g2"; }; propagatedBuildInputs = [ - pythonPackages.botocore_1_1_10 + pythonPackages.botocore pythonPackages.bcdoc pythonPackages.six pythonPackages.colorama diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix index 8e818aee9cf..5481ad3aaf7 100644 --- a/pkgs/tools/admin/letsencrypt/default.nix +++ b/pkgs/tools/admin/letsencrypt/default.nix @@ -3,9 +3,9 @@ let src = fetchurl { url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz"; - sha256 = "00p94pmli4lr5l3vqi11374p9jxiqir1ygx89zgfm4db47srx41z"; + sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw"; }; - version = "0.0.0.dev20151123"; + version = "0.1.0"; acme = pythonPackages.buildPythonPackage rec { name = "acme-${version}"; inherit src version; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index bacfbdfe1ca..f46a2c20de4 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -16,10 +16,11 @@ let patch = writeText "rsnapshot-config.patch" '' ''; in stdenv.mkDerivation rec { - name = "rsnapshot-1.3.1"; + name = "rsnapshot-1.4.1"; + src = fetchurl { - url = "mirror://sourceforge/rsnapshot/${name}.tar.gz"; - sha256 = "0pn7vlg3yxl7xrvfwmp4zlrg3cckmlldq6qr5bs3b2b281zcgdll"; + url = "http://rsnapshot.org/downloads/${name}.tar.gz"; + sha256 = "1s28wkpqajgmwi88n3xs3qsa4b7yxd6lkl4zfi0mr06klwli2jpv"; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/pkgs/tools/backup/rsnapshot/git.nix b/pkgs/tools/backup/rsnapshot/git.nix deleted file mode 100644 index d1025a11d29..00000000000 --- a/pkgs/tools/backup/rsnapshot/git.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ fetchFromGitHub, stdenv, writeText, perl, openssh, rsync, logger, - configFile ? "/etc/rsnapshot.conf" }: - -let patch = writeText "rsnapshot-config.patch" '' ---- rsnapshot-program.pl 2013-10-05 20:31:08.715991442 +0200 -+++ rsnapshot-program.pl 2013-10-05 20:31:42.496193633 +0200 -@@ -383,7 +383,7 @@ - } - - # set global variable -- $config_file = $default_config_file; -+ $config_file = '${configFile}'; - } - - # accepts no args -''; -in -stdenv.mkDerivation rec { - name = "rsnapshot-1.4git"; - src = fetchFromGitHub { - owner = "DrHyde"; - repo = "rsnapshot"; - rev = "1047cbb57937c29233388e2fcd847fecd3babe74"; - sha256 = "173y9q89dp4zf7nysqhjp3i2m086n7qdpawb9vx0ml5zha6mxf2p"; - }; - - propagatedBuildInputs = [perl openssh rsync logger]; - - patchPhase = '' - substituteInPlace "Makefile.in" --replace \ - "/usr/bin/pod2man" "${perl}/bin/pod2man" - patch -p0 <${patch} - ''; - - # I still think this is a good idea, but it currently fails in the chroot because it checks - # that things are writable and so on. - #checkPhase = '' - # if [ -f "${configFile}" ] - # then - # ${perl}/bin/perl -w ./rsnapshot configtest - # else - # echo File "${configFile}" does not exist, not checking - # fi - #''; - - meta = with stdenv.lib; { - description = "A filesystem snapshot utility for making backups of local and remote systems"; - homepage = http://rsnapshot.org/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 3be824d9a40..85bd21f9b72 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy"; }; + patches = + [ (fetchurl { + url = "https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-misc/bfr/files/bfr-1.6-perl.patch?revision=1.1"; + sha256 = "1pk9jm3c1qzs727lh0bw61w3qbykaqg4jblywf9pvq5bypk88qfj"; + }) + ]; + buildInputs = [ perl ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 0943c1a026b..baa3900ad97 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -2,6 +2,7 @@ , aclSupport ? false, acl ? null , selinuxSupport? false, libselinux ? null, libsepol ? null , autoconf, automake114x, texinfo +, withPrefix ? false }: assert aclSupport -> acl != null; @@ -86,6 +87,17 @@ let makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; + # e.g. ls -> gls; grep -> ggrep + postFixup = # feel free to simplify on a mass rebuild + if withPrefix then + '' + ( + cd "$out/bin" + find * -type f -executable -exec mv {} g{} \; + ) + '' + else null; + meta = { homepage = http://www.gnu.org/software/coreutils/; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index ab02c7dc3d1..15bb44a0e47 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r {Gemfile*,vendor,lib} $out - cp bin/logstash $out/logstash - cp bin/plugin $out/logstash-plugin + cp -r {Gemfile*,vendor,lib,bin} $out + mv $out/bin/plugin $out/bin/logstash-plugin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 52d79a9bd5d..d21b4fb2f3f 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils -, kmod, pciutils, smartmontools, x86_energy_perf_policy +, module_init_tools, pciutils, smartmontools, x86_energy_perf_policy , enableRDW ? false, networkmanager }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation { buildInputs = [ perl ]; paths = lib.makeSearchPath "bin" - ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools + ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools x86_energy_perf_policy ] ++ lib.optional enableRDW networkmanager diff --git a/pkgs/tools/misc/xapian-omega/default.nix b/pkgs/tools/misc/xapian-omega/default.nix new file mode 100644 index 00000000000..68241ac0e90 --- /dev/null +++ b/pkgs/tools/misc/xapian-omega/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, xapian, perl, pcre, zlib }: + +stdenv.mkDerivation rec { + name = "xapian-omega-${version}"; + version = "1.2.21"; + + src = fetchurl { + url = "http://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; + sha256 = "0zjjr4ypanwrjkcpgi37d72v2jjcfwnw8lgddv0i7z2jf1fklbc6"; + }; + + buildInputs = [ pkgconfig xapian perl pcre zlib ]; + + meta = with stdenv.lib; { + description = "Indexer and CGI search front-end built on Xapian library"; + homepage = http://xapian.org/; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 0e905bb6547..35cd7ae4661 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -29,9 +29,15 @@ stdenv.mkDerivation rec { "LOCALEDIR=$(out)/share/locale" ]; + postBuild = '' + make -C contrib/wrt + ''; + postInstall = '' install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf + install -Dm755 contrib/wrt/dhcp_lease_time $out/bin/dhcp_lease_time + install -Dm755 contrib/wrt/dhcp_release $out/bin/dhcp_release mkdir -p $out/share/dbus-1/system-services cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 6b4c1f55643..0ec0f35f1bd 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2015.70"; + name = "dropbear-2015.71"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0mzj1gwamxmk8rab4xmcvldcxdvs5zczim2hdza3dwfhy4ywra32"; + sha256 = "1bw3lzmisn6gs6zy9vcqbfnicl437ydskqcayklpw60fkhb18qip"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index e780865ab3b..f90370edf51 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -21,8 +21,6 @@ stdenv.mkDerivation rec { --enable-systemd --enable-iproute2 IPROUTE=${iproute}/sbin/ip - '' + optionalString stdenv.isDarwin '' - --disable-plugin-auth-pam ''; postInstall = '' diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index d702e3b9700..ccb004ffb8c 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl xmlrpc_c ]; - configureFlags = "--with-xmlrpc-c"; + configureFlags = [ "--with-xmlrpc-c" "--with-posix-fallocate" ]; # postInstall = '' # mkdir -p $out/share/man/man1 $out/share/rtorrent diff --git a/pkgs/tools/networking/snabbswitch/default.nix b/pkgs/tools/networking/snabbswitch/default.nix index d633bda1799..40800c5f42c 100644 --- a/pkgs/tools/networking/snabbswitch/default.nix +++ b/pkgs/tools/networking/snabbswitch/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "snabb-${version}"; - version = "2015.11"; + version = "2015.12"; src = fetchurl { url = "https://github.com/SnabbCo/snabbswitch/archive/v${version}.tar.gz"; - sha256 = "1llyqbjjmh2s23hnx154qj0y6pn5mpxk8qj1fxfpk7dnbq78q601"; + sha256 = "1949a6d3hqdr2hdfmrr1na9gvjdwdahadbhmvz2pg7azmpq6ssmr"; }; installPhase = '' diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix index abc409b2937..5b98bcbbe12 100644 --- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix +++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix @@ -1,40 +1,52 @@ -{ stdenv, makeWrapper, +{ stdenv, makeWrapper, buildEnv, git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils }: -stdenv.mkDerivation { - name = "nix-prefetch-scripts"; - buildInputs = [ makeWrapper ]; +let mkPrefetchScript = tool: src: deps: + stdenv.mkDerivation { + name = "nix-prefetch-${tool}"; + + buildInputs = [ makeWrapper ]; + + phases = [ "installPhase" "fixupPhase" ]; + installPhase = '' + mkdir -p $out/bin - phases = [ "installPhase" "fixupPhase" ]; - installPhase = '' - mkdir -p $out/bin - function copyScript { - local name=nix-prefetch-$1; - local src=$2; local wrapArgs="" - cp $src $out/bin/$name; - for dep in ''${@:3}; do + cp ${src} $out/bin/$name; + for dep in ${stdenv.lib.concatStringsSep " " deps}; do wrapArgs="$wrapArgs --prefix PATH : $dep/bin" done wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin" wrapArgs="$wrapArgs --set HOME : /homeless-shelter" wrapProgram $out/bin/$name $wrapArgs - } + ''; - copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial} - copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git} ${coreutils} - copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion} - copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar} - copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs} - copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl} - ''; + preferLocalBuild = true; - meta = with stdenv.lib; { - description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; - maintainers = with maintainers; [ bennofs ]; - platforms = with stdenv.lib.platforms; unix; - # Quicker to build than to download, I hope - hydraPlatforms = []; + meta = with stdenv.lib; { + description = "Script used to obtain source hashes for fetch${tool}"; + maintainers = with maintainers; [ bennofs ]; + platforms = stdenv.lib.platforms.unix; + }; + }; +in rec { + nix-prefetch-bzr = mkPrefetchScript "bzr" ../../../build-support/fetchbzr/nix-prefetch-bzr [bazaar]; + nix-prefetch-cvs = mkPrefetchScript "cvs" ../../../build-support/fetchcvs/nix-prefetch-cvs [cvs]; + nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils]; + nix-prefetch-hg = mkPrefetchScript "hg" ../../../build-support/fetchhg/nix-prefetch-hg [mercurial]; + nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion]; + nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl]; + + nix-prefetch-scripts = buildEnv { + name = "nix-prefetch-scripts"; + + paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn nix-prefetch-zip ]; + + meta = with stdenv.lib; { + description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes"; + maintainers = with maintainers; [ bennofs ]; + platforms = stdenv.lib.platforms.unix; + }; }; } diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 5fbd6e83970..9390207e14a 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -13,16 +13,16 @@ with stdenv.lib; assert x11Support -> pinentry != null; stdenv.mkDerivation rec { - name = "gnupg-2.1.9"; + name = "gnupg-2.1.10"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1dpp555glln6fldk72ad7lkrn8h3cr2bg714z5kfn2qrawx67dqw"; + sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck"; }; postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; + ''; #" fix Emacs syntax highlighting :-( buildInputs = [ pkgconfig libgcrypt libassuan libksba libiconv npth diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix new file mode 100644 index 00000000000..98ef14cb578 --- /dev/null +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchgit +, pass, rofi, coreutils, utillinux, xdotool, gnugrep +, makeWrapper }: + +stdenv.mkDerivation rec { + name = "rofi-pass-${version}"; + version = "1.3.1"; + + src = fetchgit { + url = "https://github.com/carnager/rofi-pass"; + rev = "refs/tags/${version}"; + sha256 = "1r206fq96avhlgkf2fzf8j2a25dav0s945qv66hwvqwhxq74frrv"; + }; + + buildInputs = [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp -a $src/rofi-pass $out/bin/rofi-pass + + mkdir -p $out/share/doc/rofi-pass/ + cp -a $src/config.example $out/share/doc/rofi-pass/config.example + ''; + + wrapperPath = with stdenv.lib; makeSearchPath "bin/" [ + coreutils + utillinux + rofi + pass + xdotool + gnugrep + ]; + + fixupPhase = '' + patchShebangs $out/bin + + wrapProgram $out/bin/rofi-pass \ + --prefix PATH : "${wrapperPath}" + ''; + + meta = { + description = "A script to make rofi work with password-store"; + homepage = https://github.com/carnager/rofi-pass; + maintainers = with stdenv.lib.maintainers; [ hiberno the-kenny ]; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 4c96c947f57..41c10685435 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation rec { configureFlags = [ # The OS should care on preparing the drivers into this location "--enable-usbdropdir=/var/lib/pcsc/drivers" - "--with-systemdsystemunitdir=\${out}/etc/systemd/system" "--enable-confdir=/etc" - ]; + ] ++ stdenv.lib.optional stdenv.isLinux + "--with-systemdsystemunitdir=\${out}/etc/systemd/system"; nativeBuildInputs = [ pkgconfig perl python2 ]; - buildInputs = [ udev dbus_libs ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ udev dbus_libs ]; meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = http://pcsclite.alioth.debian.org/; license = licenses.bsd3; maintainers = with maintainers; [ viric wkennington ]; - platforms = platforms.linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/system/ansible/2.nix b/pkgs/tools/system/ansible/2.nix new file mode 100644 index 00000000000..21469e645bb --- /dev/null +++ b/pkgs/tools/system/ansible/2.nix @@ -0,0 +1,33 @@ +{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }: + +pythonPackages.buildPythonPackage rec { + version = "v2.0.0_0.6.rc1"; + name = "ansible-${version}"; + namePrefix = ""; + + src = fetchurl { + url = "http://releases.ansible.com/ansible/ansible-2.0.0-0.6.rc1.tar.gz"; + sha256 = "0v7fqi7qg9lzvpsjlaw9rzas8n1cdsyp3y9jrqzjxs9nbknwcibd"; + }; + + prePatch = '' + sed -i "s,/usr/,$out," lib/ansible/constants.py + ''; + + doCheck = false; + dontStrip = true; + dontPatchELF = true; + dontPatchShebangs = true; + + pythonPath = with pythonPackages; [ + paramiko jinja2 pyyaml httplib2 boto six + ] ++ stdenv.lib.optional windowsSupport pywinrm; + + meta = with stdenv.lib; { + homepage = "http://www.ansible.com"; + description = "A simple automation tool"; + license = licenses.gpl3; + maintainers = [ maintainers.copumpkin ]; + platforms = platforms.linux ++ [ "x86_64-darwin" ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 8624fdf96af..6723526ff62 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation ( rec { pname = "auctex"; - version = "11.88"; + version = "11.89"; name = "${pname}-${version}"; meta = { @@ -12,7 +12,7 @@ stdenv.mkDerivation ( rec { src = fetchurl { url = "mirror://gnu/${pname}/${name}.tar.gz"; - sha256 = "0gy89nzha20p6m7kpv2nl1fnsfka9scc3mw1lz66fp6czganfs3i"; + sha256 = "1cf9fkkmzjxa4jvk6c01zgxdikr4zzb5pcx8i4r0hwdk0xljkbwq"; }; buildInputs = [ emacs texLive ]; diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 223f72c6785..5cd5515400d 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -10,24 +10,29 @@ rec { , extraFiles ? [] , compressBlanksInIndex ? true , packages ? [] + , texPackages ? {} , copySources ? false }: assert generatePDF -> !generatePS; - + + let + tex = pkgs.texlive.combine texPackages; + in + pkgs.stdenv.mkDerivation { name = "doc"; - + builder = ./run-latex.sh; copyIncludes = ./copy-includes.pl; - + inherit rootFile generatePDF generatePS extraFiles compressBlanksInIndex copySources; includes = map (x: [x.key (baseNameOf (toString x.key))]) (findLaTeXIncludes {inherit rootFile;}); - - buildInputs = [ pkgs.tetex pkgs.perl ] ++ packages; + + buildInputs = [ tex pkgs.perl ] ++ packages; }; @@ -41,7 +46,7 @@ rec { builtins.genericClosure { startSet = [{key = rootFile;}]; - + operator = {key, ...}: @@ -72,7 +77,7 @@ rec { in pkgs.lib.fold foundDeps [] deps; }; - + findLhs2TeXIncludes = { rootFile @@ -80,7 +85,7 @@ rec { builtins.genericClosure { startSet = [{key = rootFile;}]; - + operator = {key, ...}: @@ -103,10 +108,10 @@ rec { builder = ./dot2pdf.sh; inherit dotGraph fontsConf; buildInputs = [ - pkgs.perl pkgs.tetex pkgs.graphviz + pkgs.perl pkgs.graphviz ]; }; - + dot2ps = { dotGraph @@ -117,7 +122,7 @@ rec { builder = ./dot2ps.sh; inherit dotGraph; buildInputs = [ - pkgs.perl pkgs.tetex pkgs.graphviz pkgs.ghostscript + pkgs.perl pkgs.graphviz pkgs.ghostscript ]; }; @@ -132,7 +137,7 @@ rec { includes = map (x: [x.key (baseNameOf (toString x.key))]) (findLhs2TeXIncludes {rootFile = source;}); }; - + animateDot = dotGraph: nrFrames: pkgs.stdenv.mkDerivation { name = "dot-frames"; builder = ./animatedot.sh; @@ -163,7 +168,7 @@ rec { # Convert a Postscript file to a PNG image, trimming it so that - # there is no unnecessary surrounding whitespace. + # there is no unnecessary surrounding whitespace. postscriptToPNG = { postscript }: @@ -173,7 +178,7 @@ rec { inherit postscript; buildInputs = [pkgs.imagemagick pkgs.ghostscript]; - + buildCommand = '' if test -d $postscript; then input=$(ls $postscript/*.ps) @@ -240,5 +245,5 @@ rec { "${pkgs.ghostscript}/share/ghostscript/fonts" ]; }; - + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5465e20172d..7b93fc27f67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -274,13 +274,15 @@ let }; buildFHSChrootEnv = args: chrootFHSEnv { - env = buildFHSEnv args; + env = buildFHSEnv (removeAttrs args [ "extraInstallCommands" ]); + extraInstallCommands = args.extraInstallCommands or ""; }; buildFHSUserEnv = args: userFHSEnv { - env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" ]); + env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" ]); runScript = args.runScript or "bash"; extraBindMounts = args.extraBindMounts or []; + extraInstallCommands = args.extraInstallCommands or ""; }; buildMaven = callPackage ../build-support/build-maven.nix {}; @@ -673,9 +675,7 @@ let bchunk = callPackage ../tools/cd-dvd/bchunk { }; - bfr = callPackage ../tools/misc/bfr { - perl = perl516; # Docs fail to build with newer versions - }; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; @@ -1155,6 +1155,8 @@ let aclSupport = stdenv.isLinux; }; + coreutils-prefixed = coreutils.override { withPrefix = true; }; + cpio = callPackage ../tools/archivers/cpio { }; crackxls = callPackage ../tools/security/crackxls { }; @@ -1602,13 +1604,15 @@ let gitinspector = callPackage ../applications/version-management/gitinspector { }; gitlab = callPackage ../applications/version-management/gitlab { - ruby = ruby_2_1_3; + ruby = ruby_2_2_2; }; gitlab-shell = callPackage ../applications/version-management/gitlab-shell { - ruby = ruby_2_1_3; + ruby = ruby_2_2_2; }; + gitlab-git-http-server = callPackage ../applications/version-management/gitlab-git-http-server { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -2904,16 +2908,10 @@ let rng_tools = callPackage ../tools/security/rng-tools { }; rsnapshot = callPackage ../tools/backup/rsnapshot { - perl = perl516; # fails to create docs: POD document had syntax errors # For the `logger' command, we can use either `utillinux' or # GNU Inetutils. The latter is more portable. - logger = inetutils; + logger = if stdenv.isLinux then utillinux else inetutils; }; - rsnapshotGit = lowPrio (callPackage ../tools/backup/rsnapshot/git.nix { - # For the `logger' command, we can use either `utillinux' or - # GNU Inetutils. The latter is more portable. - logger = inetutils; - }); rlwrap = callPackage ../tools/misc/rlwrap { }; @@ -3185,11 +3183,9 @@ let tcpflow = callPackage ../tools/networking/tcpflow { }; - teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer/10.nix { }; - - teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { }); - - teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { }); + teamviewer = callPackage ../applications/networking/remote/teamviewer { + stdenv = stdenv_32bit; + }; telnet = callPackage ../tools/networking/telnet { }; @@ -5115,8 +5111,6 @@ let ocropus = callPackage ../applications/misc/ocropus { }; - perl516 = callPackage ../development/interpreters/perl/5.16 { }; - perl520 = callPackage ../development/interpreters/perl/5.20 { fetchurl = fetchurlBoot; }; @@ -5364,6 +5358,8 @@ let ansible = callPackage ../tools/system/ansible { }; + ansible2 = callPackage ../tools/system/ansible/2.nix { }; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3 = callPackage ../development/tools/parsing/antlr { }; @@ -8687,6 +8683,8 @@ let xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix { # TODO perl php Java, tcl, C#, python }; + xapian-omega = callPackage ../tools/misc/xapian-omega {}; + xavs = callPackage ../development/libraries/xavs { }; Xaw3d = callPackage ../development/libraries/Xaw3d { }; @@ -9261,7 +9259,7 @@ let mpd = callPackage ../servers/mpd { aacSupport = config.mpd.aacSupport or true; - clientSupport = config.mpd.clientSupport or false; + clientSupport = config.mpd.clientSupport or true; ffmpegSupport = config.mpd.ffmpegSupport or true; opusSupport = config.mpd.opusSupport or true; @@ -10841,10 +10839,6 @@ let proggyfonts = callPackage ../data/fonts/proggyfonts { }; - pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { - perl = perl516; # syntax error at troffprepro line 49, near "do subst(" - }; - sampradaya = callPackage ../data/fonts/sampradaya { }; shared_mime_info = callPackage ../data/misc/shared-mime-info { }; @@ -12901,7 +12895,7 @@ let automake = automake114x; }; - rofi-pass = callPackage ../applications/misc/rofi/pass.nix { }; + rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { }; rstudio = callPackage ../applications/editors/rstudio { }; @@ -13400,17 +13394,23 @@ let virtinst = callPackage ../applications/virtualization/virtinst {}; - virtualgl = callPackage ../tools/X11/virtualgl { }; + virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { + fltk = fltk13; + }; + + virtualgl = callPackage ../tools/X11/virtualgl { + virtualglLib_i686 = if system == "x86_64-linux" + then pkgsi686Linux.virtualglLib + else null; + }; + + primusLib = callPackage ../tools/X11/primus/lib.nix { + nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; + }; primus = callPackage ../tools/X11/primus { - primusLib = callPackage ../tools/X11/primus/lib.nix { - nvidia = linuxPackages.nvidia_x11; - }; - primusLib_i686 = if system == "x86_64-linux" - then callPackage_i686 ../tools/X11/primus/lib.nix { - nvidia = pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; }; - } + then pkgsi686Linux.primusLib else null; }; @@ -13419,17 +13419,11 @@ let nvidia_x11_i686 = if system == "x86_64-linux" then pkgsi686Linux.linuxPackages.nvidia_x11.override { libsOnly = true; } else null; - virtualgl = virtualgl; - virtualgl_i686 = if system == "x86_64-linux" - then pkgsi686Linux.virtualgl + primusLib_i686 = if system == "x86_64-linux" + then pkgsi686Linux.primusLib else null; }; - # use if you intend to connect the nvidia card to a monitor - bumblebee_display = bumblebee.override { - useDisplayDevice = true; - }; - vkeybd = callPackage ../applications/audio/vkeybd {}; vlc = callPackage ../applications/video/vlc { @@ -13596,6 +13590,7 @@ let ++ optional (config.kodi.enableGenesis or false) genesis ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher + ++ optional (config.kodi.enablePVRHTS or false) pvr-hts ); }; @@ -14852,6 +14847,8 @@ let coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; + flocq = callPackage ../development/coq-modules/flocq {}; + mathcomp = callPackage ../development/coq-modules/mathcomp { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; @@ -15264,7 +15261,14 @@ let nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; - nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; + inherit (callPackages ../tools/package-management/nix-prefetch-scripts { }) + nix-prefetch-bzr + nix-prefetch-cvs + nix-prefetch-git + nix-prefetch-hg + nix-prefetch-svn + nix-prefetch-zip + nix-prefetch-scripts; nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 98da54879f3..90ba8e387f2 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -691,6 +691,23 @@ let self = _self // overrides; }; }; + f = melpaBuild rec { + pname = "f"; + version = "20151113"; + src = fetchFromGitHub { + owner = "rejeep"; + repo = "f.el"; + rev = "e0259ee060ff9a3f12204adcc8630869080acd68"; + sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1"; + }; + fileSpecs = [ "f.el" ]; + packageRequires = [ dash s ]; + meta = { + description = "Emacs library for working with files and directories"; + license = gpl3Plus; + }; + }; + find-file-in-project = melpaBuild rec { pname = "find-file-in-project"; version = "3.5"; @@ -1014,22 +1031,6 @@ let self = _self // overrides; }; }; - helm-swoop = melpaBuild rec { - pname = "helm-swoop"; - version = "20141224"; - src = fetchFromGitHub { - owner = "ShingoFukuyama"; - repo = pname; - rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; - sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; - }; - packageRequires = [ helm ]; - meta = { - description = "An Emacs mode which constructs an editable grep for a buffer"; - license = gpl3Plus; - }; - }; - helm = melpaBuild rec { pname = "helm"; version = "20150105"; @@ -1046,6 +1047,38 @@ let self = _self // overrides; }; }; + helm-bibtex = melpaBuild rec { + pname = "helm-bibtex"; + version = "20151125"; + src = fetchFromGitHub { + owner = "tmalsburg"; + repo = pname; + rev = "bfcd5064dcc7c0ac62c46985832b2a73082f96e0"; + sha256 = "1nvc4ha9wj5j47qg7hdbv1xpjy8a8idc9vc2myl3xa33ywllwdwi"; + }; + packageRequires = [ dash f helm parsebib s ]; + meta = { + description = "Bibliography Manager for Emacs"; + license = gpl2; + }; + }; + + helm-swoop = melpaBuild rec { + pname = "helm-swoop"; + version = "20141224"; + src = fetchFromGitHub { + owner = "ShingoFukuyama"; + repo = pname; + rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; + sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; + }; + packageRequires = [ helm ]; + meta = { + description = "An Emacs mode which constructs an editable grep for a buffer"; + license = gpl3Plus; + }; + }; + hi2 = melpaBuild rec { pname = "hi2"; version = "1.0"; @@ -1444,6 +1477,21 @@ let self = _self // overrides; }; }; + parsebib = melpaBuild rec { + pname = "parsebib"; + version = "20151006"; + src = fetchFromGitHub { + owner = "joostkremers"; + repo = pname; + rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"; + sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml"; + }; + meta = { + description = "Emacs library for reading .bib files"; + license = bsd3; + }; + }; + perspective = melpaBuild rec { pname = "perspective"; version = "1.12"; @@ -1642,12 +1690,12 @@ let self = _self // overrides; s = melpaBuild rec { pname = "s"; - version = "20140910"; + version = "20151023"; src = fetchFromGitHub { owner = "magnars"; repo = "${pname}.el"; - rev = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d"; - sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f"; + rev = "372e94c1a28031686d75d6c52bfbe833a118a72a"; + sha256 = "1zn8n3mv0iscs242dbkf5vmkkizfslq5haw9z0d0g3wknq18286h"; }; meta = { description = "String manipulation library for Emacs"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6dff2274b0f..e994c070e56 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1730,11 +1730,13 @@ in modules // { boto3 = buildPythonPackage rec { name = "boto3-${version}"; - version = "1.1.4"; + version = "1.2.2"; - src = pkgs.fetchurl { - url = "https://github.com/boto/boto3/archive/${version}.zip"; - sha256 = "11fdfbq8ann11wdzmbd0djnb1biyyhs1jcc8maxmkcj2q9fw6dk0"; + src = pkgs.fetchFromGitHub { + owner = "boto"; + repo = "boto3"; + rev = version; + sha256 = "1w53lhhdzi29d31qzhflb5mcwb24mfrj4frv70w6qyn8vmqznnjy"; }; propagatedBuildInputs = [ self.botocore @@ -1759,44 +1761,17 @@ in modules // { }; botocore = buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.6"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "0wj98fsiwqzy0i0zh86fx15sgdjkwqi6crxig6b4kvrckl8bkwjr"; + sha256 = "05a0ihv66fx77j16mjlm76d8zm7sd5wfzh1hx4nm3ilb9gz5h016"; }; propagatedBuildInputs = [ self.dateutil - self.requests - self.jmespath - ]; - - buildInputs = [ self.docutils ]; - - meta = { - homepage = https://github.com/boto/botocore; - - license = "bsd"; - - description = "A low-level interface to a growing number of Amazon Web Services"; - - }; - }; - - botocore_1_1_10 = buildPythonPackage rec { - version = "1.1.10"; - name = "botocore-${version}"; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "0syj0m0l7k4wa0n9h7h8ywayjv9fgpn5wyzpdriws0j417y1zlyc"; - }; - - propagatedBuildInputs = - [ self.dateutil - self.requests + self.requests2 self.jmespath ]; @@ -6431,6 +6406,16 @@ in modules // { django = self.django_1_7; + django_gis = self.django.override rec { + patches = [ + (pkgs.substituteAll { + src = ../development/python-modules/django/1.7.7-gis-libs.template.patch; + geos = pkgs.geos; + gdal = pkgs.gdal; + }) + ]; + }; + django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.4"; @@ -7963,29 +7948,6 @@ in modules // { }; }; - glance = buildPythonPackage rec { - name = "glance-0.1.7"; - - src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/g/glance/${name}.tar.gz"; - md5 = "e733713ccd23e4a6253386a47971cfb5"; - }; - - buildInputs = with self; [ nose mox ]; - - # tests fail for python2.6 - doCheck = python.majorVersion != "2.6"; - - propagatedBuildInputs = with self; [ gflags sqlalchemy webob routes eventlet ]; - - PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; - - meta = { - homepage = https://launchpad.net/glance; - description = "Services for discovering, registering, and retrieving virtual machine images"; - }; - }; - glances = buildPythonPackage rec { name = "glances-${version}"; version = "2.4.2"; @@ -11746,6 +11708,13 @@ in modules // { sha256 = "1711rlmykizw675ihbaqmk3ph6ah0njbygxr9lrdnacy6yrlmbd5"; }; + # https://bugs.launchpad.net/oslo.rootwrap/+bug/1519839 + patchPhase = '' + substituteInPlace oslo_rootwrap/filters.py \ + --replace "/bin/cat" "${pkgs.coreutils}/bin/cat" \ + --replace "/bin/kill" "${pkgs.coreutils}/bin/kill" + ''; + buildInputs = with self; [ eventlet mock oslotest ]; propagatedBuildInputs = with self; [ six pbr diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 435438d0ea6..f4c58e5d9a8 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -160,7 +160,6 @@ let pmccabe = linux; ppl = all; procps = linux; - pthreadmanpages = linux; pygtk = linux; python = allBut cygwin; pythonFull = linux;